commit e340221acda6bc0bf05a0ff6e6114902c4307670 tree adabdf60913a1e6ffff10197262af5f3b52d12bd parent a8e0c51c71fc973b400f6502382063553b82af5a author Andreas Schwab Wed, 05 Jul 2006 18:57:48 +0200 committer Linus Torvalds Wed, 05 Jul 2006 10:08:16 -0700 [PATCH] Makefile typo Fix a typo in the toplevel makefile. Signed-off-by: Andreas Schwab Signed-off-by: Linus Torvalds commit a8e0c51c71fc973b400f6502382063553b82af5a tree 72312c480c89289a885f907248a6a0ef8e1b0bb2 parent ba1826e5eced176cc9ec0033ad8ee0f1cd5ad2e4 author David Woodhouse Wed, 05 Jul 2006 11:24:26 +0100 committer Linus Torvalds Wed, 05 Jul 2006 09:39:54 -0700 [PATCH] powerpc: implement missing jiffies64_to_cputime64() asm-powerpc/cputime.h doesn't declare jiffies64_to_cputime64() or cputime64_sub(), and due to CONFIG_VIRT_CPU_ACCOUNTING it's not picking up the definition from asm-generic like x86-64 & friends do. Cc: Dave Jones Cc: Andrew Morton Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit ba1826e5eced176cc9ec0033ad8ee0f1cd5ad2e4 tree 56a9e6aab061bde5402ced7b7a875a01888b4e2c parent ca78f6baca863afe2e6a244a0fe94b3a70211d46 author Benjamin Herrenschmidt Wed, 05 Jul 2006 15:36:15 +1000 committer Linus Torvalds Wed, 05 Jul 2006 09:29:43 -0700 [PATCH] powerpc: Fix loss of interrupts with MPIC With the new interrupt rework, an interrupt "host" map() callback can be called after the interrupt is already active. It's called again for an already mapped interrupt to allow changing the trigger setup, and currently this is not guarded with a test of wether the interrupt is requested or not. I plan to change some of this logic to be a bit less lenient against random reconfiguring of live interrupts but just not yet. The ported MPIC driver has a bug where when that happens, it will mask the interrupt. This changes it to preserve the previous masking of the interrupt instead. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit ca78f6baca863afe2e6a244a0fe94b3a70211d46 tree f5a3a169b6cfafa36f9c35cc86e782596c820915 parent 7ad7153b051d9628ecd6a336b543ea6ef099bd2c parent ae90dd5dbee461652b90d9f7d292ba47dc3dc4b8 author Linus Torvalds Tue, 04 Jul 2006 14:00:26 -0700 committer Linus Torvalds Tue, 04 Jul 2006 14:00:26 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq * master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq: Move workqueue exports to where the functions are defined. [CPUFREQ] Misc cleanups in ondemand. [CPUFREQ] Make ondemand sampling per CPU and remove the mutex usage in sampling path. [CPUFREQ] Add queue_delayed_work_on() interface for workqueues. [CPUFREQ] Remove slowdown from ondemand sampling path. commit 7ad7153b051d9628ecd6a336b543ea6ef099bd2c tree f7a5cb33e45fe785e7c04ea24dc0971995842d9c parent 6fa0cb1141da80eed4f86155fb51931bc1c31888 author Linus Torvalds Tue, 04 Jul 2006 14:00:06 -0700 committer Linus Torvalds Tue, 04 Jul 2006 14:00:06 -0700 Fix up headers_install wrt devfs removal No devfs_fs.h header any more.. Signed-off-by: Linus Torvalds commit 6fa0cb1141da80eed4f86155fb51931bc1c31888 tree df9b3c378ae4f44260eaae1a4b9d5c4ccf7bb641 parent c6482dde1c2811afba289b2344268f850595f350 parent 257a5bdeb0441789d8e34e1b3e92b26d0f51bbf0 author Linus Torvalds Tue, 04 Jul 2006 12:55:45 -0700 committer Linus Torvalds Tue, 04 Jul 2006 12:55:45 -0700 Merge git://git.infradead.org/hdrinstall-2.6 * git://git.infradead.org/hdrinstall-2.6: Remove export of include/linux/isdn/tpam.h Remove and from userspace export Restrict headers exported to userspace for SPARC and SPARC64 Add empty Kbuild files for 'make headers_install' in remaining arches. Add Kbuild file for Alpha 'make headers_install' Add Kbuild file for SPARC 'make headers_install' Add Kbuild file for IA64 'make headers_install' Add Kbuild file for S390 'make headers_install' Add Kbuild file for i386 'make headers_install' Add Kbuild file for x86_64 'make headers_install' Add Kbuild file for PowerPC 'make headers_install' Add generic Kbuild files for 'make headers_install' Basic implementation of 'make headers_check' Basic implementation of 'make headers_install' commit c6482dde1c2811afba289b2344268f850595f350 tree bfd2ab0c2bcfe6fe4de64bab40f2c19f25131a97 parent a46f9484f8926aacb2e79a0e1676de3a6a6fbae8 author Arjan van de Ven Tue, 04 Jul 2006 03:07:22 -0700 committer Linus Torvalds Tue, 04 Jul 2006 10:24:57 -0700 [PATCH] fix AB-BA deadlock inversion at cs46xx_dsp_remove_scb There is a code sequence where the locking is substream->self_group.lock -> ins->scbs[index].lock substream->self_group.lock is interrupt safe, and taken from irq context as well (trace is snipped for brevity) so what can happen is cpu 0 cpu 1 user context user context take ins->scbs[index].lock without disabling interrupts get substream->self_group.lock (irqsafe) try to get ins->scbs[index].lock (spins) interrupt happens try to get substream->self_group.lock (spins) which is an obvious AB-BA deadlock fix is to just take the lock with _irqsafe Signed-off-by: Arjan van de Ven Cc: Jaroslav Kysela Acked-by: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a46f9484f8926aacb2e79a0e1676de3a6a6fbae8 tree 21d90306af4677091547465c1ba02e0545276d1a parent dd8041f16b117f63f40fb844d6cdebe8b03514d2 author Zach Brown Tue, 04 Jul 2006 02:57:52 -0700 committer Linus Torvalds Tue, 04 Jul 2006 10:24:57 -0700 [PATCH] mthca: initialize send and receive queue locks separately mthca: initialize send and receive queue locks separately lockdep identifies a lock by the call site of its initialization. By initializing the send and receive queue locks in mthca_wq_init() we confuse lockdep. It warns that that the ordered acquiry of both locks in mthca_modify_qp() is recursive acquiry of one lock: ============================================= [ INFO: possible recursive locking detected ] --------------------------------------------- modprobe/1192 is trying to acquire lock: (&wq->lock){....}, at: [] mthca_modify_qp+0x60/0xa7b [ib_mthca] but task is already holding lock: (&wq->lock){....}, at: [] mthca_modify_qp+0x53/0xa7b [ib_mthca] Initializing the locks separately in mthca_alloc_qp_common() stops the warning and will let lockdep enforce proper ordering on paths that acquire both locks. Signed-off-by: Zach Brown Cc: Roland Dreier Cc: Arjan van de Ven Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd8041f16b117f63f40fb844d6cdebe8b03514d2 tree 40521ea93b2034484ceb1f16af7d47bfa1b35b6c parent 31304c909e6945b005af62cd55a582e9c010a0b4 author Yasunori Goto Tue, 04 Jul 2006 02:57:51 -0700 committer Linus Torvalds Tue, 04 Jul 2006 10:24:57 -0700 [PATCH] Fix copying of pgdat array on each node for ia64 memory hotplug I found a bug in memory hot-add code for ia64. IA64's code has copies of pgdat's array on each node to reduce memory access over crossing node. This array is used by NODE_DATA() macro. When new node is hot-added, this pgdat's array should be updated and copied on new node too. However, I used for_each_online_node() in scatter_node_data() to copy it. This meant its array is not copied on new node. Because initialization of structures for new node was halfway, so online_node_map couldn't be set at this time. To copy arrays on new node, I changed it to check value of pgdat_list[] which is source array of copies. I tested this patch with my Memory Hotadd emulation on Tiger4. This patch is for 2.6.17-git20. Signed-off-by: Yasunori Goto Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31304c909e6945b005af62cd55a582e9c010a0b4 tree 18cc603ac965319699d30dfea05289be9699a1d8 parent e82ca04387dd6c98722f5f48235089839fd04268 author Greg Ungerer Tue, 04 Jul 2006 15:04:39 +1000 committer Linus Torvalds Mon, 03 Jul 2006 22:37:13 -0700 [PATCH] uclinux: fix proc_task()/get_proc-task() naming Fix changed name of proc_task() to get_proc_task(). Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit e82ca04387dd6c98722f5f48235089839fd04268 tree 8fb4b0435e57c7dab70dfd4cc71b4cd35686126d parent 075395d228641646159dae3dd170fa3fc6ff477a parent 309b0f125a22ee34c8f6962677255f7bf6af5e3d author Linus Torvalds Mon, 03 Jul 2006 21:32:50 -0700 committer Linus Torvalds Mon, 03 Jul 2006 21:32:50 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (44 commits) ACPI: remove function tracing macros from drivers/acpi/*.c ACPI: add support for Smart Battery ACPI: handle battery notify event on broken BIOS ACPI: handle AC notify event on broken BIOS ACPI: asus_acpi: add S1N WLED control ACPI: asus_acpi: correct M6N/M6R display nodes ACPI: asus_acpi: add S1N WLED control ACPI: asus_acpi: rework model detection ACPI: asus_acpi: support L5D ACPI: asus_acpi: handle internal Bluetooth / support W5A ACPI: asus_acpi: support A4G ACPI: asus_acpi: support W3400N ACPI: asus_acpi: LED display support ACPI: asus_acpi: support A3G ACPI: asus_acpi: misc cleanups ACPI: video: Remove unneeded acpi_handle from driver. ACPI: thermal: Remove unneeded acpi_handle from driver. ACPI: power: Remove unneeded acpi_handle from driver. ACPI: pci_root: Remove unneeded acpi_handle from driver. ACPI: pci_link: Remove unneeded acpi_handle from driver. ... commit 075395d228641646159dae3dd170fa3fc6ff477a tree 7cd5ace653d722549b23a2594140084c49bfcad6 parent 060ec6f2fb3c8abb85927758de8ac5d1018e6a43 parent 61a116ef29e712147d7ee7a6738886e6f91df5f5 author Linus Torvalds Mon, 03 Jul 2006 21:31:05 -0700 committer Linus Torvalds Mon, 03 Jul 2006 21:31:05 -0700 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial * 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] Ensure 8250_pci quirks are not marked __devinit [SERIAL] Convert fifosize to an unsigned int commit 060ec6f2fb3c8abb85927758de8ac5d1018e6a43 tree 14d451f638805a4db17d6cf38d5003220b1314df parent 0d1782144e81faf6203075c5fcd0a2f0db91af5b parent 0f1482fdd7e5efc473335b92f350027b8f1519fb author Linus Torvalds Mon, 03 Jul 2006 21:30:03 -0700 committer Linus Torvalds Mon, 03 Jul 2006 21:30:03 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] Fix lh7a40x_udc.c [ARM] Fix warning in consistent.c [ARM] Fix warnings in arch/arm/kernel/setup.c [ARM] Fix ecard.c resource warnings. [ARM] Fix ISA IRQ resources [ARM] Fix bad asm instruction in proc-arm925.S [ARM] More missing proc-macros.S includes [ARM] 3708/2: fix SMP build after section ioremap changes commit 0d1782144e81faf6203075c5fcd0a2f0db91af5b tree 761dd18870e97ec9c6c14bc1c4db1429065483c0 parent 67ab33db8be1cd466c09dfcba334d69d3e2f92e6 parent c7afb0f97700e73109564f83c35bfeeb14cb653b author Linus Torvalds Mon, 03 Jul 2006 21:29:08 -0700 committer Linus Torvalds Mon, 03 Jul 2006 21:29:08 -0700 Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: [JFFS2][XATTR] Fix memory leak in POSIX-ACL support fs/jffs2/: make 2 functions static [MTD] NAND: Fix broken sharpsl driver [JFFS2][XATTR] Fix xd->refcnt race condition MTD: kernel-doc fixes + additions MTD: fix all kernel-doc warnings [MTD] DOC: Fixup read functions and do a little cleanup commit 67ab33db8be1cd466c09dfcba334d69d3e2f92e6 tree 3ae6448755977f0bbeea0f8da028b58bb1564580 parent f7d57e42e7ebd085133506ef6325e70e822196dc parent 300b93974ff64f1bef1ac8294547c573954f0300 author Linus Torvalds Mon, 03 Jul 2006 21:28:14 -0700 committer Linus Torvalds Mon, 03 Jul 2006 21:28:14 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits) [Bluetooth] Add RFCOMM role switch support [Bluetooth] Allow disabling of credit based flow control [Bluetooth] Small cleanup of the L2CAP source code [Bluetooth] Use real devices for host controllers [Bluetooth] Add platform device for virtual and serial devices [Bluetooth] Add automatic sniff mode support [Bluetooth] Correct SCO buffer size on request [Bluetooth] Add suspend/resume support to the HCI USB driver [Bluetooth] Use raw mode for the Frontline sniffer device [BRIDGE]: br_dump_ifinfo index fix [ATM]: add+use poison defines [NET]: add+use poison defines [IOAT]: fix kernel-doc in source files [IOAT]: fix header file kernel-doc [TG3]: Add ipv6 TSO feature [IPV6]: Fix ipv6 GSO payload length [TIPC] Fixed sk_buff panic caused by tipc_link_bundle_buf (REVISED) [NET]: Verify gso_type too in gso_segment [IPVS]: Add sysctl documentation [ROSE]: Try all routes when establishing a ROSE connections. ... commit f7d57e42e7ebd085133506ef6325e70e822196dc tree 1851633f96b1eeaac58edcff94669bed3921dec7 parent 51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9 parent c4e00fac42f268ed0a547cdd1d12bb8399864040 author Linus Torvalds Mon, 03 Jul 2006 21:27:18 -0700 committer Linus Torvalds Mon, 03 Jul 2006 21:27:18 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (57 commits) [SCSI] fix error handling in scsi_io_completion [SCSI] qla1280: fix section mismatch warnings [SCSI] mptsas: eliminate ghost devices [SCSI] qla2xxx: make some more functions static [SCSI] small whitespace cleanup for qlogic driver [SCSI] mptbase: mpt_interrupt should return IRQ_NONE [SCSI] mptsas: make two functions static [SCSI] sg.c: Fix bad error handling in [SCSI] 53c700: fix breakage caused by the autosense update [SCSI] iscsi: add async notification of session events [SCSI] iscsi: pass target nr to session creation [SCSI] iscsi: break up session creation into two stages [SCSI] iscsi: rm channel usage from iscsi [SCSI] iscsi: fix session refcouting [SCSI] iscsi: convert iscsi_tcp to new set/get param fns [SCSI] iscsi: convert iser to new set/get param fns [SCSI] iscsi: fixup set/get param functions [SCSI] iscsi: add target discvery event to transport class [SCSI] st: remove unused st_buffer.in_use [SCSI] atp870u: reduce huge stack usage ... commit 51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9 tree 4bd5332323a26b020dfeac6eb2e77fba790aed2e parent d8cb7c1ded6e5a80a7335716dde60784a0d51c1d parent 63104eec234bdecb55fd9c15467ae00d0a3f42ac author Linus Torvalds Mon, 03 Jul 2006 21:26:12 -0700 committer Linus Torvalds Mon, 03 Jul 2006 21:26:12 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kbuild: introduce utsrelease.h kbuild: explicit turn off gcc stack-protector commit d8cb7c1ded6e5a80a7335716dde60784a0d51c1d tree e7c975ad049fa84549ef1c9fef45f9f96ccae829 parent 38c54ee8d5338f49aca986081ea41a987c15cf9d author Andrew Morton Mon, 03 Jul 2006 17:32:22 -0700 committer Linus Torvalds Mon, 03 Jul 2006 21:25:20 -0700 [PATCH] revert "kthread: convert stop_machine into a kthread" Jiri reports that the stop_machin kthread conversion caused his machine to hang when suspending. Hyperthreading is apparently involved. I don't see why that would be and I can't reproduce it. Revert to the 2.6.17 code. Cc: "Serge E. Hallyn" Cc: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38c54ee8d5338f49aca986081ea41a987c15cf9d tree 3777f13ea147e10d56ce9933837d4dcc4d83b90b parent 9f09c548e185b63a3567498b96783f897b5f0399 author Heiko Carstens Mon, 03 Jul 2006 17:32:21 -0700 committer Linus Torvalds Mon, 03 Jul 2006 21:25:20 -0700 [PATCH] zfcp: fix incorrect usage of fsf_req_list_lock ================================= [ INFO: inconsistent lock state ] --------------------------------- inconsistent {in-hardirq-W} -> {hardirq-on-W} usage. swapper/0 [HC0[0]:SC1[1]:HE1:SE0] takes: (&adapter->fsf_req_list_lock){++..}, at: [<0000000000274486>] zfcp_qdio_reqid_check+0x46/0x178 {in-hardirq-W} state was registered at: [<000000000005fb0c>] __lock_acquire+0xad8/0xed0 [<00000000000604ae>] lock_acquire+0x9a/0xc8 [<000000000035a326>] _spin_lock+0x4e/0x68 [<0000000000274486>] zfcp_qdio_reqid_check+0x46/0x178 [<000000000027469e>] zfcp_qdio_response_handler+0xe6/0x430 [<0000000000219dd4>] tiqdio_thinint_handler+0xd20/0x213c [<000000000020229a>] do_adapter_IO+0xb2/0xc0 [<0000000000206f32>] do_IRQ+0x136/0x16c [<0000000000020462>] io_no_vtime+0x16/0x1c [<0000000000019432>] cpu_idle+0x222/0x250 irq event stamp: 129220 hardirqs last enabled at (129220): [<00000000000411e6>] tasklet_hi_action+0x5a/0x19c hardirqs last disabled at (129219): [<00000000000411c0>] tasklet_hi_action+0x34/0x19c softirqs last enabled at (129212): [<0000000000040b62>] __do_softirq+0x13a/0x180 softirqs last disabled at (129217): [<000000000001fd58>] do_softirq+0xec/0xf0 other info that might help us debug this: no locks held by swapper/0. stack backtrace: 00000000012bb670 0000000000000002 0000000000000000 00000000012bb780 00000000012bb6e8 0000000000399122 0000000000399122 0000000000016b0a 0000000000000000 0000000000000000 0000000000000000 00000000004660e8 0000000000000000 000000000000000d 00000000012bb6e0 00000000012bb758 0000000000368b90 0000000000016b0a 00000000012bb6e0 00000000012bb730 Call Trace: ([<0000000000016a26>] show_trace+0x76/0xdc) [<0000000000016b2c>] show_stack+0xa0/0xd0 [<0000000000016b8a>] dump_stack+0x2e/0x3c [<000000000005e3da>] print_usage_bug+0x27e/0x290 [<000000000005ea9c>] mark_lock+0x6b0/0x6c0 [<000000000005f33e>] __lock_acquire+0x30a/0xed0 [<00000000000604ae>] lock_acquire+0x9a/0xc8 [<000000000035a326>] _spin_lock+0x4e/0x68 [<0000000000274486>] zfcp_qdio_reqid_check+0x46/0x178 [<000000000027469e>] zfcp_qdio_response_handler+0xe6/0x430 [<0000000000217bd2>] tiqdio_tl+0xd02/0x2120 [<000000000004123a>] tasklet_hi_action+0xae/0x19c [<0000000000040ae4>] __do_softirq+0xbc/0x180 [<000000000001fd58>] do_softirq+0xec/0xf0 [<0000000000040c38>] irq_exit+0x90/0xa8 [<0000000000206f40>] do_IRQ+0x144/0x16c [<0000000000020462>] io_no_vtime+0x16/0x1c [<0000000000019432>] cpu_idle+0x222/0x250 ([<0000000000019416>] cpu_idle+0x206/0x250) [<000000000001405a>] rest_init+0x5a/0x68 [<0000000000536998>] start_kernel+0x39c/0x3dc [<0000000000013046>] _stext+0x46/0x1000 Fix incorrect usage of fsf_req_list_lock. It's used in tasklet context (irqs on) as well as in irq context. Therefore use the spin_lock_irqsave variant to avoid deadlocks. Acked-by: Andreas Herrmann Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f09c548e185b63a3567498b96783f897b5f0399 tree f02ec2cd44bb6d046a7302daae7e30b17b12de42 parent b6a7c79a52939513ef043d6eb9fcf12a056c010e author Heiko Carstens Mon, 03 Jul 2006 17:32:20 -0700 committer Linus Torvalds Mon, 03 Jul 2006 21:25:20 -0700 [PATCH] zfcp: fix incorrect usage of erp_lock ================================= [ INFO: inconsistent lock state ] --------------------------------- inconsistent {hardirq-on-W} -> {in-hardirq-W} usage. swapper/0 [HC1[1]:SC0[0]:HE0:SE1] takes: (&adapter->erp_lock){+-..}, at: [<000000000026c7f8>] zfcp_erp_async_handler+0x3c/0x70 {hardirq-on-W} state was registered at: [<000000000005f33e>] __lock_acquire+0x30a/0xed0 [<00000000000604ae>] lock_acquire+0x9a/0xc8 [<000000000035a7ae>] _write_lock+0x4e/0x68 [<000000000026d822>] zfcp_erp_adapter_strategy_generic+0x286/0xd94 [<000000000026fd72>] zfcp_erp_strategy_do_action+0x91e/0x1a94 [<0000000000271a3a>] zfcp_erp_thread+0x21a/0x1568 [<0000000000019096>] kernel_thread_starter+0x6/0xc [<0000000000019090>] kernel_thread_starter+0x0/0xc irq event stamp: 12078 hardirqs last enabled at (12077): [<0000000000019416>] cpu_idle+0x206/0x250 hardirqs last disabled at (12078): [<0000000000020458>] io_no_vtime+0xc/0x1c softirqs last enabled at (12072): [<0000000000040b62>] __do_softirq+0x13a/0x180 softirqs last disabled at (12059): [<000000000001fd58>] do_softirq+0xec/0xf0 other info that might help us debug this: no locks held by swapper/0. stack backtrace: 00000000012bb648 0000000000000002 0000000000000000 00000000012bb758 00000000012bb6c0 0000000000399122 0000000000399122 0000000000016b0a 0000000000000000 0000000000000001 0000000000000000 00000000004660e8 0000000000000000 000000000000000d 00000000012bb6b8 00000000012bb730 0000000000368b90 0000000000016b0a 00000000012bb6b8 00000000012bb708 Call Trace: ([<0000000000016a26>] show_trace+0x76/0xdc) [<0000000000016b2c>] show_stack+0xa0/0xd0 [<0000000000016b8a>] dump_stack+0x2e/0x3c [<000000000005e3da>] print_usage_bug+0x27e/0x290 [<000000000005e934>] mark_lock+0x548/0x6c0 [<000000000005fb0c>] __lock_acquire+0xad8/0xed0 [<00000000000604ae>] lock_acquire+0x9a/0xc8 [<000000000035a662>] _write_lock_irqsave+0x62/0x80 [<000000000026c7f8>] zfcp_erp_async_handler+0x3c/0x70 [<0000000000279178>] zfcp_fsf_req_dispatch+0xd8/0x1fa8 [<000000000027e538>] zfcp_fsf_req_complete+0x104/0xe4c [<0000000000274534>] zfcp_qdio_reqid_check+0xf4/0x178 [<000000000027469e>] zfcp_qdio_response_handler+0xe6/0x430 [<0000000000219dd4>] tiqdio_thinint_handler+0xd20/0x213c [<000000000020229a>] do_adapter_IO+0xb2/0xc0 [<0000000000206f32>] do_IRQ+0x136/0x16c [<0000000000020462>] io_no_vtime+0x16/0x1c [<0000000000019432>] cpu_idle+0x222/0x250 ([<0000000000019416>] cpu_idle+0x206/0x250) [<000000000001405a>] rest_init+0x5a/0x68 [<0000000000536998>] start_kernel+0x39c/0x3dc [<0000000000013046>] _stext+0x46/0x1000 Fix incorrect usage of erp_lock. Using the write_lock() variant is wrong, since this might lead to deadlocks. Acked-by: Andreas Herrmann Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6a7c79a52939513ef043d6eb9fcf12a056c010e tree 30cf12aeda448cbc9072b4db91cd93a6c3a9ecda parent 912b2539e1e062cec73e2e61448e507f7719bd08 author OGAWA Hirofumi Mon, 03 Jul 2006 17:32:20 -0700 committer Linus Torvalds Mon, 03 Jul 2006 21:25:20 -0700 [PATCH] Fix modular cpuid.ko With recent change, if CONFIG_HOTPLUG_CPU is disabled, register_cpu_notifier() is not exported. And it breaked moduler msr/cpuid (msr.c was already fixed). We need to use register_hotcpu_notifier() now in module, instead of register_cpu_notifier(). Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 300b93974ff64f1bef1ac8294547c573954f0300 tree 94b33acffd99c50986ba4ede3e61495485a88342 parent 7c2660b00fae0575dd4ce5c7b6bf30762b632045 author Marcel Holtmann Mon, 03 Jul 2006 10:37:55 +0200 committer David S. Miller Mon, 03 Jul 2006 19:54:09 -0700 [Bluetooth] Add RFCOMM role switch support This patch adds the support for RFCOMM role switching before the connection is fully established. Signed-off-by: Marcel Holtmann commit 7c2660b00fae0575dd4ce5c7b6bf30762b632045 tree de8be4ccdb2d1977be00af5afae65a0a97a7aec9 parent 0139418c943c3389cf75afc4f4d2b2fa52bbf7c9 author Marcel Holtmann Mon, 03 Jul 2006 10:02:51 +0200 committer David S. Miller Mon, 03 Jul 2006 19:54:07 -0700 [Bluetooth] Allow disabling of credit based flow control This patch adds the module parameter disable_cfc which can be used to disable the credit based flow control. The credit based flow control was introduced with the Bluetooth 1.1 specification and devices can negotiate its support, but for testing purpose it is helpful to allow disabling of it. Signed-off-by: Marcel Holtmann commit 0139418c943c3389cf75afc4f4d2b2fa52bbf7c9 tree f4f760f37b516d9c6c375217aec31a1d9f6fdaa2 parent a91f2e396f5b32b21d842b4757bc8de5e88eac66 author Marcel Holtmann Mon, 03 Jul 2006 10:02:46 +0200 committer David S. Miller Mon, 03 Jul 2006 19:54:05 -0700 [Bluetooth] Small cleanup of the L2CAP source code This patch is a small cleanup of the L2CAP source code. It makes some coding style changes and moves some functions around to avoid forward declarations. Signed-off-by: Marcel Holtmann commit a91f2e396f5b32b21d842b4757bc8de5e88eac66 tree 174b88a20feea87734bf63ec7104eae0b205649a parent 27d35284258c596900e0e41c46932ec4abe6a7b1 author Marcel Holtmann Mon, 03 Jul 2006 10:02:41 +0200 committer David S. Miller Mon, 03 Jul 2006 19:54:02 -0700 [Bluetooth] Use real devices for host controllers This patch converts the Bluetooth class devices into real devices. The Bluetooth class is kept and the driver core provides the appropriate symlinks for backward compatibility. Signed-off-by: Marcel Holtmann commit 27d35284258c596900e0e41c46932ec4abe6a7b1 tree d1a0f236b589e14f3c6251e9dfcb2b2aafdaf5ad parent 04837f6447c7f3ef114cda1ad761822dedbff8cf author Marcel Holtmann Mon, 03 Jul 2006 10:02:37 +0200 committer David S. Miller Mon, 03 Jul 2006 19:54:00 -0700 [Bluetooth] Add platform device for virtual and serial devices This patch adds a generic Bluetooth platform device that can be used as parent device by virtual and serial devices. Signed-off-by: Marcel Holtmann commit 04837f6447c7f3ef114cda1ad761822dedbff8cf tree 66dbb53e82550723191ffe54f0457eafc3a92d32 parent da1f519851d1c66331363253f364bdb5d924ea96 author Marcel Holtmann Mon, 03 Jul 2006 10:02:33 +0200 committer David S. Miller Mon, 03 Jul 2006 19:53:58 -0700 [Bluetooth] Add automatic sniff mode support This patch introduces the automatic sniff mode feature. This allows the host to switch idle connections into sniff mode to safe power. Signed-off-by: Ulisses Furquim Signed-off-by: Marcel Holtmann commit da1f519851d1c66331363253f364bdb5d924ea96 tree 8760b2edb53a50d679403385dc2cbf960bb3cffc parent dcdcf63ef12dc3fbaa17a6d04f16ada8e63bb4d0 author Marcel Holtmann Mon, 03 Jul 2006 10:02:29 +0200 committer David S. Miller Mon, 03 Jul 2006 19:53:56 -0700 [Bluetooth] Correct SCO buffer size on request This patch introduces a quirk that allows the drivers to tell the host to correct the SCO buffer size values. Signed-off-by: Olivier Galibert Signed-off-by: Marcel Holtmann commit dcdcf63ef12dc3fbaa17a6d04f16ada8e63bb4d0 tree ebcd16f8c4221305782fd1643eef018b546df36e parent 2b86ad21deec4c47a1f0089298f12e4038c2aa68 author Marcel Holtmann Mon, 03 Jul 2006 10:02:24 +0200 committer David S. Miller Mon, 03 Jul 2006 19:53:52 -0700 [Bluetooth] Add suspend/resume support to the HCI USB driver This patch implements the suspend/resume methods for the HCI USB driver by killing all outstanding URBs on suspend, and re-issuing them on resume. Signed-off-by: Johannes Berg Signed-off-by: Marcel Holtmann commit 2b86ad21deec4c47a1f0089298f12e4038c2aa68 tree b6224bbad23a5acc57ba10d2b52093d0a51e3a80 parent 69ee20a58fa0cad6520c2a9538100a87ef0abd7d author Marcel Holtmann Mon, 03 Jul 2006 10:02:18 +0200 committer David S. Miller Mon, 03 Jul 2006 19:53:50 -0700 [Bluetooth] Use raw mode for the Frontline sniffer device The Frontline sniffer device looks like a normal H:2 Bluetooth device, but it is not and so mark it as raw mode device. Signed-off-by: Marcel Holtmann commit 69ee20a58fa0cad6520c2a9538100a87ef0abd7d tree 3045353c484b04b1ff38a6650085415a9a9b046b parent 3c6b377321678c649f9b3c66da0149975c614102 author Andrey Savochkin Mon, 03 Jul 2006 19:50:14 -0700 committer David S. Miller Mon, 03 Jul 2006 19:50:14 -0700 [BRIDGE]: br_dump_ifinfo index fix Fix for inability of br_dump_ifinfo to handle non-zero start index: loop index never increases when entered with non-zero start. Spotted by Kirill Korotaev. Signed-off-by: Andrey Savochkin Signed-off-by: David S. Miller commit 3c6b377321678c649f9b3c66da0149975c614102 tree 0e7c7a40ad55402ae009fd5a59741a28b5d8ea4b parent 4bdbf6c033ba05bff65f69989baccd7103c5a530 author Randy Dunlap Mon, 03 Jul 2006 19:48:25 -0700 committer David S. Miller Mon, 03 Jul 2006 19:48:25 -0700 [ATM]: add+use poison defines ATM: add and use POISON define values. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 4bdbf6c033ba05bff65f69989baccd7103c5a530 tree e4559c8222b066113d441b9545744a1c2bd569fc parent 6508871eddbbd3e62799f3b6182a6a4fd3ef31d5 author Randy Dunlap Mon, 03 Jul 2006 19:47:27 -0700 committer David S. Miller Mon, 03 Jul 2006 19:47:27 -0700 [NET]: add+use poison defines Add and use poison defines in net/. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 6508871eddbbd3e62799f3b6182a6a4fd3ef31d5 tree f8d5275b81e827326d8638b0286abd6bf19cd95c parent fe4ada2d6f0b746246e9b5bf0f4f2e4d3a07d26e author Randy Dunlap Mon, 03 Jul 2006 19:45:31 -0700 committer David S. Miller Mon, 03 Jul 2006 19:45:31 -0700 [IOAT]: fix kernel-doc in source files Fix kernel-doc warnings in drivers/dma/: - use correct function & parameter names - add descriptions where omitted Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit fe4ada2d6f0b746246e9b5bf0f4f2e4d3a07d26e tree 4087d9e0d655cc6b6e1b31f61edf40ee3549a650 parent b0026624f1aa3e38a887cb483de61f104d600b97 author Randy Dunlap Mon, 03 Jul 2006 19:44:51 -0700 committer David S. Miller Mon, 03 Jul 2006 19:44:51 -0700 [IOAT]: fix header file kernel-doc Fix kernel-doc problems in include/linux/dmaengine.h: - add some fields/parameters - expand some descriptions - fix typos Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit b0026624f1aa3e38a887cb483de61f104d600b97 tree 16ab702d08c7235456f3d2f926932307aa90b0ad parent 6703931c546e6dec0431776fa616d5accd3e7162 author Michael Chan Mon, 03 Jul 2006 19:42:14 -0700 committer David S. Miller Mon, 03 Jul 2006 19:42:14 -0700 [TG3]: Add ipv6 TSO feature Enable ipv6 TSO feature on chips that support it. Update version to 3.61. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 6703931c546e6dec0431776fa616d5accd3e7162 tree 69b5b001f9d8f6e639878215dc81dc77186eb398 parent 863fae666acb87b150f4634e6e79476ebe274f43 author Michael Chan Mon, 03 Jul 2006 19:41:11 -0700 committer David S. Miller Mon, 03 Jul 2006 19:41:11 -0700 [IPV6]: Fix ipv6 GSO payload length Fix ipv6 GSO payload length calculation. The ipv6 payload length excludes the ipv6 base header length and so must be subtracted. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 863fae666acb87b150f4634e6e79476ebe274f43 tree 59b09c818b986972dc831f43a81ada63f3f824f3 parent bbcf467dab42ea3c85f368df346c82af2fbba665 author Allan Stephens Mon, 03 Jul 2006 19:39:36 -0700 committer David S. Miller Mon, 03 Jul 2006 19:39:36 -0700 [TIPC] Fixed sk_buff panic caused by tipc_link_bundle_buf (REVISED) The recent change to direct inspection of bundle buffer tailroom did not account for the possiblity of unrequested tailroom added by skb_alloc(), thereby allowing a bundle to be created that exceeds the current link MTU. An additional check now ensures that bundling works correctly no matter if the bundle buffer is smaller, larger, or equal to the link MTU. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit bbcf467dab42ea3c85f368df346c82af2fbba665 tree e9fe30c1be9c6a3773454bad3eefaabf4f5bee48 parent 6ce1669fdb6b0a0faf9b2e2ba08048b520c57841 author Herbert Xu Mon, 03 Jul 2006 19:38:35 -0700 committer David S. Miller Mon, 03 Jul 2006 19:38:35 -0700 [NET]: Verify gso_type too in gso_segment We don't want nasty Xen guests to pass a TCPv6 packet in with gso_type set to TCPv4 or even UDP (or a packet that's both TCP and UDP). Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 6ce1669fdb6b0a0faf9b2e2ba08048b520c57841 tree 828d6c3c3b4d4754b42665163218fed35b92f0d3 parent d85838c55d836c33077344fab424f200f2827d84 author Horms Mon, 03 Jul 2006 19:35:40 -0700 committer David S. Miller Mon, 03 Jul 2006 19:35:40 -0700 [IPVS]: Add sysctl documentation * Derived from http://www.linuxvirtualserver.org/docs/sysctl.html, v1.4 maintained by Wensong Zhang * Adjusted preample to match ip-sysctl.txt * Sorted options into alphabetical order * Added expire_quiescent_template * Removed timeout_* which are no longer present * Incoporated doc/debug-levels.txt from IPVS source tree into description of ipvs_debug * Minor spelling fixes * Further editing more than welcome Signed-Off-By: Horms Signed-off-by: David S. Miller commit d85838c55d836c33077344fab424f200f2827d84 tree 780dbeaa81b38b0edf3631f945b2ea9582dfe48e parent 18601a7d30c8340af4d786793ee52828471d2630 author Ralf Baechle Mon, 03 Jul 2006 19:32:23 -0700 committer David S. Miller Mon, 03 Jul 2006 19:32:23 -0700 [ROSE]: Try all routes when establishing a ROSE connections. From Jean-Paul F6FBB ROSE will only try to establish a route using the first route in its routing table. Fix to iterate through all additional routes if a connection attempt has failed. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 18601a7d30c8340af4d786793ee52828471d2630 tree f3451f508f4784323829bb6618dbd0ca9bdd604d parent 006f68b84fe19fc5015a8cf838a10d75f91f0218 author Ralf Baechle DL5RB Mon, 03 Jul 2006 19:31:14 -0700 committer David S. Miller Mon, 03 Jul 2006 19:31:14 -0700 [NETROM]: Use socket helpers instead of direct fiddling with struct sock Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 006f68b84fe19fc5015a8cf838a10d75f91f0218 tree 2c9377778e4e09bb8d10084341207ba1352f600a parent 8dc22d2b642f8a6f14ef8878777a05311e5d1d7e author Ralf Baechle DL5RB Mon, 03 Jul 2006 19:30:18 -0700 committer David S. Miller Mon, 03 Jul 2006 19:30:18 -0700 [AX.25]: Reference counting for AX.25 routes. In the past routes could be freed even though the were possibly in use ... Signed-off-by: Ralf Baechle DL5RB Signed-off-by: David S. Miller commit 8dc22d2b642f8a6f14ef8878777a05311e5d1d7e tree fb6ec490d0318cf7c267668f6d06391b2033b2fb parent 518d1c9679f644811adaa22d853f43a83fbdae84 author Ralf Baechle Mon, 03 Jul 2006 19:29:15 -0700 committer David S. Miller Mon, 03 Jul 2006 19:29:15 -0700 [ROSE]: Fix dereference of skb pointer after free. If rose_route_frame return success we'll dereference a stale pointer. Likely this is only going to result in bad statistics for the ROSE interface. This fixes coverity 946. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 518d1c9679f644811adaa22d853f43a83fbdae84 tree 52705bc452ee453eb16127b1f9063e0f012481e6 parent 56e0873b7b146564a0c36e225624f5a9b2d63791 author Benoit Boissinot Mon, 03 Jul 2006 19:28:13 -0700 committer David S. Miller Mon, 03 Jul 2006 19:28:13 -0700 [IOAT]: Fix a warning in ioatdma drivers/dma/ioatdma.c: In function 'ioat_init_module': drivers/dma/ioatdma.c:830: warning: control reaches end of non-void function Signed-off-by: Benoit Boissinot Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 56e0873b7b146564a0c36e225624f5a9b2d63791 tree 6a7049712cf02a7e6e5b85277e4dd56e41aeea1e parent 882d02d6fb040a246b005305ffeb790bb5ce80ad author Adrian Bunk Mon, 03 Jul 2006 19:27:20 -0700 committer David S. Miller Mon, 03 Jul 2006 19:27:20 -0700 [IOAT]: drivers/dma/iovlock.c: make num_pages_spanned() static This patch makes the needlessly global num_pages_spanned() static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 882d02d6fb040a246b005305ffeb790bb5ce80ad tree 454ca6b30e08d9057feae2c9f6e84b58caac7559 parent c1b4df5d2a5b1a9c037fe3b2e42804cf1267c750 author Andrew Morton Mon, 03 Jul 2006 19:26:15 -0700 committer David S. Miller Mon, 03 Jul 2006 19:26:15 -0700 [AF_UNIX]: datagram getpeersec fix The unix_get_peersec_dgram() stub should have been inlined so that it disappears. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c1b4df5d2a5b1a9c037fe3b2e42804cf1267c750 tree 2e21f21d25c4c5dc315b230d9dbe792799eca4be parent 912b2539e1e062cec73e2e61448e507f7719bd08 author Randy Dunlap Mon, 03 Jul 2006 19:24:19 -0700 committer David S. Miller Mon, 03 Jul 2006 19:24:19 -0700 [IOAT]: fix sparse ulong warning Fix sparse warning: drivers/dma/ioatdma.c:444:32: warning: constant 0xFFFFFFFFFFFFFFC0 is so big it is unsigned long Also needs a MAINTAINERS entry. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 912b2539e1e062cec73e2e61448e507f7719bd08 tree 233807569ee5e0ab3118dd54c0ae9164fec8343e parent 70b97a7f0b19cf1f2619deb5cc41e8b78c591aa7 parent 39ab9c212aac48f2744f2fd7722fa639ec048eb7 author Linus Torvalds Mon, 03 Jul 2006 15:28:34 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:28:34 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: powerpc: add defconfig for Freescale MPC8349E-mITX board powerpc: Add base support for the Freescale MPC8349E-mITX eval board Documentation: correct values in MPC8548E SEC example node [POWERPC] Actually copy over i8259.c to arch/ppc/syslib this time [POWERPC] Add new interrupt mapping core and change platforms to use it [POWERPC] Copy i8259 code back to arch/ppc [POWERPC] New device-tree interrupt parsing code [POWERPC] Use the genirq framework [PATCH] genirq: Allow fasteoi handler to retrigger disabled interrupts [POWERPC] Update the SWIM3 (powermac) floppy driver [POWERPC] Fix error handling in detecting legacy serial ports [POWERPC] Fix booting on Momentum "Apache" board (a Maple derivative) [POWERPC] Fix various offb and BootX-related issues [POWERPC] Add a default config for 32-bit CHRP machines [POWERPC] fix implicit declaration on cell. [POWERPC] change get_property to return void * commit 70b97a7f0b19cf1f2619deb5cc41e8b78c591aa7 tree 619683f95396f26048c1818735818d53a3c0233e parent 36c8b586896f60cb91a4fd526233190b34316baf author Ingo Molnar Mon, 03 Jul 2006 00:25:42 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:11 -0700 [PATCH] sched: cleanup, convert sched.c-internal typedefs to struct convert: - runqueue_t to 'struct rq' - prio_array_t to 'struct prio_array' - migration_req_t to 'struct migration_req' I was the one who added these but they are both against the kernel coding style and also were used inconsistently at places. So just get rid of them at once, now that we are flushing the scheduler patch-queue anyway. Conversion was mostly scripted, the result was reviewed and all secondary whitespace and style impact (if any) was fixed up by hand. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36c8b586896f60cb91a4fd526233190b34316baf tree 003246e1e676de33703daa979b3e3109ca202a89 parent 48f24c4da1ee7f3f22289cb85e8b8a73e4df4db5 author Ingo Molnar Mon, 03 Jul 2006 00:25:41 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:11 -0700 [PATCH] sched: cleanup, remove task_t, convert to struct task_struct cleanup: remove task_t and convert all the uses to struct task_struct. I introduced it for the scheduler anno and it was a mistake. Conversion was mostly scripted, the result was reviewed and all secondary whitespace and style impact (if any) was fixed up by hand. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48f24c4da1ee7f3f22289cb85e8b8a73e4df4db5 tree c827ac2ad2bba931753b8213123f059bcf773534 parent 829035fd709119d9def124a6d40b94d317573e6f author Ingo Molnar Mon, 03 Jul 2006 00:25:40 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:10 -0700 [PATCH] sched: clean up fallout of recent changes Clean up some of the impact of recent (and not so recent) scheduler changes: - turning macros into nice inline functions - sanitizing and unifying variable definitions - whitespace, style consistency, 80-lines, comment correctness, spelling and curly braces police Due to the macro hell and variable placement simplifications there's even 26 bytes of .text saved: text data bss dec hex filename 25510 4153 192 29855 749f sched.o.before 25484 4153 192 29829 7485 sched.o.after [akpm@osdl.org: build fix] Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 829035fd709119d9def124a6d40b94d317573e6f tree 09dfdf1a8cf02ccd88716b9b4701cb17b03fa06f parent 8688cfcebf09b84385b5e2c461ae08fcde8a5d18 author Paul Mackerras Mon, 03 Jul 2006 00:25:40 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:10 -0700 [PATCH] lockdep: irqtrace subsystem, move account_system_vtime() calls into kernel/softirq.c At the moment, powerpc and s390 have their own versions of do_softirq which include local_bh_disable() and __local_bh_enable() calls. They end up calling __do_softirq (in kernel/softirq.c) which also does local_bh_disable/enable. Apparently the two levels of disable/enable trigger a warning from some validation code that Ingo is working on, and he would like to see the outer level removed. But to do that, we have to move the account_system_vtime calls that are currently in the arch do_softirq() implementations for powerpc and s390 into the generic __do_softirq() (this is a no-op for other archs because account_system_vtime is defined to be an empty inline function on all other archs). This patch does that. Signed-off-by: Paul Mackerras Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8688cfcebf09b84385b5e2c461ae08fcde8a5d18 tree f0546182c06db34c271ba9a81b50e2e24afafb7b parent 479ceddd7baf3b387665c4d69a7398918b201ad0 author Ingo Molnar Mon, 03 Jul 2006 00:25:39 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:10 -0700 [PATCH] lockdep: annotate forcedeth.c disable_irq() nv_do_nic_poll() is called from timer softirqs, which has interrupts enabled, but np->lock might also be taken by some other interrupt context. The driver does disable_irq() to get around this problem, so annotate the disable_irq()/enable_irq() calls for lockdep. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Ayaz Abdulla Cc: Manfred Spraul Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 479ceddd7baf3b387665c4d69a7398918b201ad0 tree 453002ff1907fb757dbc4fa0a8933dda745ce8c3 parent cd11acdd8542cb0c0fa7cd86590b1ba79d7e263a author Andrew Morton Mon, 03 Jul 2006 00:25:37 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:10 -0700 [PATCH] forcedeth: typecast cleanup Someone went nuts in there. Cc: Ayaz Abdulla Cc: Manfred Spraul Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd11acdd8542cb0c0fa7cd86590b1ba79d7e263a tree 0b3fd5ec340e05ea831fa24f46806350838bb296 parent a5b5bb9a053a973c23b867738c074acb3e80c0a0 author Arjan van de Ven Mon, 03 Jul 2006 00:25:36 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:10 -0700 [PATCH] lockdep: annotate hostap netdev ->xmit_lock On Fri, 2006-06-30 at 15:45 -0700, Miles Lane wrote: > Okay, I rebuilt my kernel with your combo patch applied. > Then, I inserted my US Robotics USR2210 PCMCIA wifi card, > ran "pccardutil eject", popped out the card and then inserted > a Compaq iPaq wifi card. This triggered the following. > > [ INFO: possible circular locking dependency detected ] > ------------------------------------------------------- > syslogd/1886 is trying to acquire lock: > (&dev->queue_lock){-+..}, at: [] dev_queue_xmit+0x120/0x24b > > but task is already holding lock: > (&dev->_xmit_lock){-+..}, at: [] dev_queue_xmit+0x183/0x24b > > which lock already depends on the new lock. ok this appears to be hostap playing games... it has 2 network devices for one piece of hardware and one calls the other via the networking layer; there is thankfully a natural ordering between the two, so just making the slave one a separate type ought to make this work. Signed-off-by: Ingo Molnar Cc: Arjan van de Ven Cc: "John W. Linville" Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5b5bb9a053a973c23b867738c074acb3e80c0a0 tree 8eb78d458cfb309c566d6aaafb25639723920bcd parent 0afffc723c8041a005134099847ac2a2fd0316a0 author Ingo Molnar Mon, 03 Jul 2006 00:25:35 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:10 -0700 [PATCH] lockdep: annotate sk_locks Teach sk_lock semantics to the lock validator. In the softirq path the slock has mutex_trylock()+mutex_unlock() semantics, in the process context sock_lock() case it has mutex_lock()/mutex_unlock() semantics. Thus we treat sock_owned_by_user() flagged areas as an exclusion area too, not just those areas covered by a held sk_lock.slock. Effect on non-lockdep kernels: minimal, sk_lock_sock_init() has been turned into an inline function. Signed-off-by: Ingo Molnar Cc: Arjan van de Ven Cc: "David S. Miller" Cc: Herbert Xu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0afffc723c8041a005134099847ac2a2fd0316a0 tree 2c79415220c712a61f27d4a233a692d6afca1725 parent 5dd8d1e9eb8b51041505966fe96d081ecbe86efe author Ingo Molnar Mon, 03 Jul 2006 00:25:35 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:10 -0700 [PATCH] lockdep: annotate on-stack completions, mmc lockdep needs to have the waitqueue lock initialized for on-stack waitqueues implicitly initialized by DECLARE_COMPLETION(). Annotate mmc_wait_for_req()'s on-stack completion accordingly. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Cc: Arjan van de Ven Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5dd8d1e9eb8b51041505966fe96d081ecbe86efe tree eba7299734a893016d4e91d92cb25974a626bc61 parent 663d440eaa496db903cc58be04b9b602ba45e43b author Arjan van de Ven Mon, 03 Jul 2006 00:25:33 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:10 -0700 [PATCH] lockdep: annotate vlan net device as being a special class vlan network devices have devices nesting below it, and are a special "super class" of normal network devices; split their locks off into a separate class since they always nest. [deweerdt@free.fr: fix possible null-pointer deref] Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Frederik Deweerdt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 663d440eaa496db903cc58be04b9b602ba45e43b tree 8af6967e175693f1c163a106a1d84be7a1bd0bfc parent 2b2d5493e10051694ae3a57ea6a153e3cb4d4488 author Ingo Molnar Mon, 03 Jul 2006 00:25:33 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:10 -0700 [PATCH] lockdep: annotate blkdev nesting Teach special (recursive) locking code to the lock validator. Effects on non-lockdep kernels: - the introduction of the following function variants: extern struct block_device *open_partition_by_devnum(dev_t, unsigned); extern int blkdev_put_partition(struct block_device *); static int blkdev_get_whole(struct block_device *bdev, mode_t mode, unsigned flags); which on non-lockdep are the same as open_by_devnum(), blkdev_put() and blkdev_get(). - a subclass parameter to do_open(). [unused on non-lockdep] - a subclass parameter to __blkdev_put(), which is a new internal function for the main blkdev_put*() functions. [parameter unused on non-lockdep kernels, except for two sanity check WARN_ON()s] these functions carry no semantical difference - they only express object dependencies towards the lockdep subsystem. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b2d5493e10051694ae3a57ea6a153e3cb4d4488 tree e44a89aa4d9c7c635770cb8891703f555d48b08d parent 897c6ff9568bcb102ffc6b465ebe1def0cba829d author Ingo Molnar Mon, 03 Jul 2006 00:25:28 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:09 -0700 [PATCH] lockdep: annotate SLAB code Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Fix initialize-locks-via-memcpy assumptions. Effects on non-lockdep kernels: the subclass nesting parameter is passed into cache_free_alien() and __cache_free(), and turns one internal kmem_cache_free() call into an open-coded __cache_free() call. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Pekka Enberg Cc: Christoph Lameter Cc: Manfred Spraul Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 897c6ff9568bcb102ffc6b465ebe1def0cba829d tree 05e0ea4e39fd5b064bdcab351a468b1f3cb963d5 parent cf51624999e56c88154b5f7d451a265db6aabff7 author Arjan van de Ven Mon, 03 Jul 2006 00:25:28 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:09 -0700 [PATCH] lockdep: annotate sb ->s_umount The s_umount rwsem needs to be classified as per-superblock since it's perfectly legit to keep multiple of those recursively in the VFS locking rules. Has no effect on non-lockdep kernels. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf51624999e56c88154b5f7d451a265db6aabff7 tree eee3fd290f9d79b26c4b6a2f1041f596da896a3c parent 91ebe2a9320db7195d1e25152b5d158fc66dc133 author Ingo Molnar Mon, 03 Jul 2006 00:25:27 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:09 -0700 [PATCH] lockdep: annotate ->s_lock Teach special (per-filesystem) locking code to the lock validator. Minimal effect on non-lockdep kernels: one extra parameter to alloc_super(). Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91ebe2a9320db7195d1e25152b5d158fc66dc133 tree daed7fa1d7ce173ac2c423baf3247b88399b239c parent 60be6b9a41cb0da0df7a9f11486da56baebf04cd author Heiko Carstens Mon, 03 Jul 2006 00:25:26 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:09 -0700 [PATCH] lockdep: annotate qeth driver Annotate the qeth driver which uses a private skb-queue-head that is safely used in hardirq context too. Has no effect on non-lockdep kernels. Signed-off-by: Heiko Carstens Acked-by: Ingo Molnar Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60be6b9a41cb0da0df7a9f11486da56baebf04cd tree 26cb558d0d57183fdbf9136ad54b581328d6f016 parent 366c7f554e888e51b8395f9b07b273fe775c7ff3 author Ingo Molnar Mon, 03 Jul 2006 00:25:26 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:09 -0700 [PATCH] lockdep: annotate on-stack completions lockdep needs to have the waitqueue lock initialized for on-stack waitqueues implicitly initialized by DECLARE_COMPLETION(). Annotate on-stack completions accordingly. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 366c7f554e888e51b8395f9b07b273fe775c7ff3 tree 324fab660758f1c5be4585ca2fcdb313feb53cef parent 0a9da4bd8eb30fb3f36e841c2cc72e426a17bbe2 author Ingo Molnar Mon, 03 Jul 2006 00:25:25 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:09 -0700 [PATCH] lockdep: annotate enable_in_hardirq() Make use of local_irq_enable_in_hardirq() API to annotate places that enable hardirqs in hardirq context. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a9da4bd8eb30fb3f36e841c2cc72e426a17bbe2 tree 3feb0e536edb9b3d08efa8d096bd8aed371170d9 parent e745165c6d235c03e9fa0e57984ca6fd3d3b2c50 author Ingo Molnar Mon, 03 Jul 2006 00:25:24 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:09 -0700 [PATCH] lockdep: annotate 3c59x.c disable_irq() 3c59x.c's vortex_timer() function knows that vp->lock can only be used by an irq context that it disabled - and can hence take the vp->lock without disabling hardirqs. Teach lockdep about this. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e745165c6d235c03e9fa0e57984ca6fd3d3b2c50 tree 29f859b398109d82c018d9c4ed2d9565d8c58cf9 parent 933a2efc59513551dcfa7b814752dc581bd3c60b author Ingo Molnar Mon, 03 Jul 2006 00:25:23 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:09 -0700 [PATCH] lockdep: annotate 8390.c disable_irq() 8390.c knows that ei_local->page_lock can only be used by an irq context that it disabled - and can hence take the ->page_lock without disabling hardirqs. Teach lockdep about this. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Cc: Arjan van de Ven Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 933a2efc59513551dcfa7b814752dc581bd3c60b tree 6c97a7bff4100759dfa9ae5d198b341f1e4996ae parent d8371f0481fd1ad2701081d37815b0bb5d236b92 author Arjan van de Ven Mon, 03 Jul 2006 00:25:22 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:08 -0700 [PATCH] lockdep: annotate sound/core/seq/seq_device.c The ops structure has complex locking rules, where not all ops are equal, some are subordinate on others for some complex sound cards. This requires for lockdep checking that each individual reg_mutex is considered in separation for its locking rules. Has no effect on non-lockdep kernels. Signed-off-by: Arjan van de Ven Cc: Ingo Molnar Cc: Takashi Iwai Cc: Jaroslav Kysela Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8371f0481fd1ad2701081d37815b0bb5d236b92 tree ad127a93c6216dde9b89549c01a2fd0df5c8290d parent 8e7795ef6b5fd117b22b87ea7d501de2526a25f7 author Ingo Molnar Mon, 03 Jul 2006 00:25:21 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:08 -0700 [PATCH] lockdep: annotate sound/core/seq/seq_ports.c Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Takashi Iwai Cc: Jaroslav Kysela Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e7795ef6b5fd117b22b87ea7d501de2526a25f7 tree 2054071ac762b7d822366390d8a3e6dc229ac85f parent 5c81a4197de38411fe3e27f8593fff73a5d6b868 author Arjan van de Ven Mon, 03 Jul 2006 00:25:21 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:08 -0700 [PATCH] lockdep: annotate USBFS In usbfs's fs_remove_file() function, the aim is to remove a file or directory from usbfs. This is done by first taking the i_mutex of the parent directory of this file/dir via mutex_lock(&parent->d_inode->i_mutex); and then to call either usbfs_rmdir() for a directory or usbfs_unlink() for a file. Both these functions then take the i_mutex for the to-be-removed object themselves: mutex_lock(&inode->i_mutex); This is a classical parent->child locking order relationship that the VFS uses all over the place; the VFS locking rule is "you need to take the parent first". This patch annotates the usbfs code to make this explicit and thus informs the lockdep code that those two locks indeed have this relationship. The rules for unlink that we already use in the VFS for unlink are to use I_MUTEX_PARENT for the parent directory, and a normal mutex for the file itself; this patch follows that convention. Has no effect on non-lockdep kernels. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c81a4197de38411fe3e27f8593fff73a5d6b868 tree 0a7867025e08353bf9946759864beeaf0ff01ad2 parent 59345374742ee6673c2d04b0fa8c888e881b7209 author Arjan van de Ven Mon, 03 Jul 2006 00:25:20 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:08 -0700 [PATCH] lockdep: annotate the quota code The quota code plays interesting games with the lock ordering; to quote Jan: | i_mutex of inode containing quota file is acquired after all other | quota locks. i_mutex of all other inodes is acquired before quota | locks. Quota code makes sure (by resetting inode operations and | setting special flag on inode) that noone tries to enter quota code | while holding i_mutex on a quota file... The good news is that all of this special case i_mutex grabbing happens in the (per filesystem) low level quota write function. For this special case we need a new I_MUTEX_* nesting level, since this just entirely outside any of the regular VFS locking rules for i_mutex. I trust Jan on his blue eyes that this is not ever going to deadlock; and based on that the patch below is what it takes to inform lockdep of these very interesting new locking rules. The new locking rule for the I_MUTEX_QUOTA nesting level is that this is the deepest possible level of nesting for i_mutex, and that this only should be used in quota write (and possibly read) function of filesystems. This makes the lock ordering of the I_MUTEX_* levels: I_MUTEX_PARENT -> I_MUTEX_CHILD -> I_MUTEX_NORMAL -> I_MUTEX_QUOTA Has no effect on non-lockdep kernels. Signed-off-by: Arjan van de Ven Acked-by: Ingo Molnar Cc: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59345374742ee6673c2d04b0fa8c888e881b7209 tree c58ca74efe0c361086c6ffa70bc7597ec5674c95 parent c6573c2904231279de0584787d6214f19a128d0b author Ingo Molnar Mon, 03 Jul 2006 00:25:18 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:08 -0700 [PATCH] lockdep: annotate NTFS locking rules NTFS uses lots of type-opaque objects which acquire their true identity runtime - so the lock validator needs to be helped in a couple of places to figure out object types. Many thanks to Anton Altaparmakov for giving lots of explanations about NTFS locking rules. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Anton Altaparmakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6573c2904231279de0584787d6214f19a128d0b tree 6d751e87c8b069d10f9e199a0e1df791fd822b7d parent ad33945175bed649ca5fe0881269db005bbb449a author Arjan van de Ven Mon, 03 Jul 2006 00:25:16 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:08 -0700 [PATCH] lockdep: annotate sunrpc code Add i_mutex ordering annotations to the sunrpc rpc_pipe code. This code has 3 levels of i_mutex hierarchy in some cases: parent dir, client dir and file inside client dir; the i_mutex ordering is I_MUTEX_PARENT -> I_MUTEX_CHILD -> I_MUTEX_NORMAL This patch applies this ordering annotation to the various functions. This is in line with the VFS expected ordering where it is always OK to lock a child after locking a parent; the sunrpc code is very diligent in doing this correctly. Has no effect on non-lockdep kernels. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Cc: Trond Myklebust Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad33945175bed649ca5fe0881269db005bbb449a tree 2aac47ea54ac59f33e8188e25e1e9d9807eecae7 parent d378834840907326ac9d448056d957d13cc3718f author Ingo Molnar Mon, 03 Jul 2006 00:25:15 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:08 -0700 [PATCH] lockdep: annotate ->mmap_sem Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d378834840907326ac9d448056d957d13cc3718f tree c3b75251c66ed9e9ea9a5af385a520f006f99d55 parent c63661848581a9842dfc72d9a400285dd284fc47 author Ingo Molnar Mon, 03 Jul 2006 00:25:14 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:08 -0700 [PATCH] lockdep: annotate ieee1394 skb-queue-head locking ieee1394 reuses the skb infrastructure of the networking code, and uses two skb-head queues: ->pending_packet_queue and hpsbpkt_queue. The latter is used in the usual fashion: processed from a kernel thread. The other one, ->pending_packet_queue is also processed from hardirq context (f.e. in hpsb_bus_reset()), which is not what the networking code usually does (which completes from softirq or process context). This locking assymetry can be totally correct if done carefully, but it can also be dangerous if networking helper functions are reused, which could assume traditional networking use. It would probably be more robust to push this completion into a workqueue - but technically the code can be 100% correct, and lockdep has to be taught about it. The solution is to split the ->pending_packet_queue skb-head->lock class from the networking lock-class by using a private lock-validator key. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Cc: Stefan Richter Cc: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c63661848581a9842dfc72d9a400285dd284fc47 tree 83c8372a5289e14237eea64207886508866ee1a4 parent a09785a2414afb261d9f719d544742af4300df22 author Ingo Molnar Mon, 03 Jul 2006 00:25:13 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:08 -0700 [PATCH] lockdep: annotate bh_lock_sock() Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a09785a2414afb261d9f719d544742af4300df22 tree a9fcbd82e9610cb77e7a2e1338ab901876dbcea8 parent da21f24dd73954c2ed0cd39a698e2c9916c05d71 author Ingo Molnar Mon, 03 Jul 2006 00:25:12 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:07 -0700 [PATCH] lockdep: annotate af_unix locking Teach special (recursive) locking code to the lock validator. Also splits af_unix's sk_receive_queue.lock class from the other networking skb-queue locks. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da21f24dd73954c2ed0cd39a698e2c9916c05d71 tree 22829e3791f0602d284b8f5398526b228faa9501 parent 543655244866b8ec648fea1eb9c32a35ffba5721 author Ingo Molnar Mon, 03 Jul 2006 00:25:12 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:07 -0700 [PATCH] lockdep: annotate sock_lock_init() Teach special (multi-initialized, per-address-family) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 543655244866b8ec648fea1eb9c32a35ffba5721 tree 7c1dd5b588e7b809648d75f680f2bfa5f94be782 parent fcb993712f231a4faea8393513d1276170679107 author Ingo Molnar Mon, 03 Jul 2006 00:25:11 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:07 -0700 [PATCH] lockdep: annotate hrtimer base locks Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fcb993712f231a4faea8393513d1276170679107 tree c92cf94cd5e705192c69b3cb712e4b6c8346f477 parent d730e882a15c38de02b63a063be636b2ff9e9ed1 author Ingo Molnar Mon, 03 Jul 2006 00:25:10 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:07 -0700 [PATCH] lockdep: annotate scheduler runqueue locks Teach per-CPU runqueue locks and recursive locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d730e882a15c38de02b63a063be636b2ff9e9ed1 tree 89e45dd870d7de3f50b487e87cf0ec1135f912dd parent 06825ba3553151eea24206bc53d4fc3de49e0ab1 author Ingo Molnar Mon, 03 Jul 2006 00:25:10 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:07 -0700 [PATCH] lockdep: annotate timer base locks Split the per-CPU timer base locks up into separate lock classes, because they are used recursively. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06825ba3553151eea24206bc53d4fc3de49e0ab1 tree 9fb7a35ebd98b57a8be1f5e992256da1c15e82b1 parent 3aceafc1e2596f1c2c4e053126561f00b68e3a1a author Ingo Molnar Mon, 03 Jul 2006 00:25:09 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:07 -0700 [PATCH] lockdep: annotate skb_queue_head_init Teach special (multi-initialized) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3aceafc1e2596f1c2c4e053126561f00b68e3a1a tree bd570bd077ef3e8ab43bf7904c40711cf42a8323 parent f20dc5f7c1adf1c4b68b7672d6f2002cb824e636 author Arjan van de Ven Mon, 03 Jul 2006 00:25:08 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:07 -0700 [PATCH] lockdep: annotate serio The PS/2 code has a natural device order and there is a one level recursion in this device order in terms of the cmd_mutex; annotate this explicit recursion as ok. Has no effect on non-lockdep kernels. Signed-off-by: Arjan van de Ven Cc: Dmitry Torokhov Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f20dc5f7c1adf1c4b68b7672d6f2002cb824e636 tree ffd31717399ff783da29444f3446a63285f22b14 parent eb4542b98c81e22e08587b747b21986a45360999 author Ingo Molnar Mon, 03 Jul 2006 00:25:08 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:07 -0700 [PATCH] lockdep: annotate mm Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb4542b98c81e22e08587b747b21986a45360999 tree e983cc095333c11bed51950ed39ad3a51d140398 parent 243c7621aac4ed1aa79524c9a1cecf7c05a28124 author Ingo Molnar Mon, 03 Jul 2006 00:25:07 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:07 -0700 [PATCH] lockdep: annotate waitqueues Create one lock class for all waitqueue locks in the kernel. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 243c7621aac4ed1aa79524c9a1cecf7c05a28124 tree d8f7a1fce57c9349183bfd9ab6738a763078db85 parent 8b8f319fc7f4ab59f567d6a401a62659b3d37007 author Ingo Molnar Mon, 03 Jul 2006 00:25:06 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:06 -0700 [PATCH] lockdep: annotate genirq Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b8f319fc7f4ab59f567d6a401a62659b3d37007 tree f483c5447619de848e2357ba157a1e09277b5c93 parent f2eace23e924bd3f05aedea4fc505eb5508d2d93 author Ingo Molnar Mon, 03 Jul 2006 00:25:05 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:06 -0700 [PATCH] lockdep: annotate futex Teach special (recursive) locking code to the lock validator. Introduces double_lock_hb() to unify double- hash-bucket-lock taking. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2eace23e924bd3f05aedea4fc505eb5508d2d93 tree 3e78dc1c4be979164a91665f56299e344fb6d6b6 parent a90b9c05df3c1e58eaedc28795d0f5abd896c098 author Ingo Molnar Mon, 03 Jul 2006 00:25:05 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:06 -0700 [PATCH] lockdep: annotate i_mutex Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a90b9c05df3c1e58eaedc28795d0f5abd896c098 tree bc9c1233bad94175abca731daa9120151e0d9c7e parent 13e83599d282ddfd544600df9db5ab343ac4662f author Ingo Molnar Mon, 03 Jul 2006 00:25:04 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:06 -0700 [PATCH] lockdep: annotate dcache Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13e83599d282ddfd544600df9db5ab343ac4662f tree 85a75807442a52f672d454326453400c50aea0b7 parent d8aa905b429700e8b6b6b301a8ac2d4a24f2c19b author Ingo Molnar Mon, 03 Jul 2006 00:25:03 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:06 -0700 [PATCH] lockdep: annotate serial Teach special (dual-initialized) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8aa905b429700e8b6b6b301a8ac2d4a24f2c19b tree 7ba82a5ae7bb63fe45f404424a470c126e59e6da parent 2b105ff9cccea5533ad518bb37dc9b43a322f7b1 author Ingo Molnar Mon, 03 Jul 2006 00:25:02 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:06 -0700 [PATCH] lockdep: annotate direct io Teach special (rwsem-in-irq) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b105ff9cccea5533ad518bb37dc9b43a322f7b1 tree 2d75bfe9857b3520708a8729f659807a7ede3c5f parent 1e9505279a8a2303d8feef4e464e6f48ea644f03 author Ingo Molnar Mon, 03 Jul 2006 00:25:02 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:06 -0700 [PATCH] lockdep: enable on s390 Enable LOCKDEP_SUPPORT on s390. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e9505279a8a2303d8feef4e464e6f48ea644f03 tree f7a4e6b90b996a004d672146583aa14c3b6763b3 parent cbbf437a8de3192739334eb8cae7c9acee38590f author Ingo Molnar Mon, 03 Jul 2006 00:25:01 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:05 -0700 [PATCH] lockdep: enable on x86_64 Enable LOCKDEP_SUPPORT on x86_64. Signed-off-by: Ingo Molnar Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cbbf437a8de3192739334eb8cae7c9acee38590f tree e9c7a280f666f5a747384ec3490a7e230bfa7fcc parent 8e9ccae6ee2bb19b7752b7d412e1bbbaf28e7fe1 author Ingo Molnar Mon, 03 Jul 2006 00:25:00 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:05 -0700 [PATCH] lockdep: enable on i386 Enable LOCKDEP_SUPPORT on i386. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e9ccae6ee2bb19b7752b7d412e1bbbaf28e7fe1 tree 85449e3b5cacd69cefdd353b1767d4fac13f1a80 parent 6205120044bb75ca06019491d1aa0e727fdd35be author Heiko Carstens Mon, 03 Jul 2006 00:25:00 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:05 -0700 [PATCH] lockdep: s390 turn validator off in machine-check handler Machine checks on s390 are always enabled (except in the machine check handler itself). Therefore use lockdep_off()/on() in the machine check handler to avoid deadlocks in the lock validator. Signed-off-by: Heiko Carstens Acked-by: Ingo Molnar Cc: Martin Schwidefsky Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6205120044bb75ca06019491d1aa0e727fdd35be tree 6e770ddc5a4ac3ff44977fde863046921394863a parent a0f1ccfd8d37457a6d8a9e01acebeefcdfcc306e author Ingo Molnar Mon, 03 Jul 2006 00:24:59 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:05 -0700 [PATCH] lockdep: fix RT_HASH_LOCK_SZ On lockdep we have a quite big spinlock_t, so keep the size down. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0f1ccfd8d37457a6d8a9e01acebeefcdfcc306e tree e16b7fe211c8ed685bed942910e2ace06e7c2e27 parent 3047e99ede366298c6233d1870d12a520d4d92f3 author Ingo Molnar Mon, 03 Jul 2006 00:24:58 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:05 -0700 [PATCH] lockdep: do not recurse in printk Make printk()-ing from within the lock validation code safer by using the lockdep-recursion counter. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3047e99ede366298c6233d1870d12a520d4d92f3 tree 7e7626f2019c6b0564d7b20b039dc836cc29910d parent 2148270cd2ebe0d05e4289b7c77b1435c45481bf author Ingo Molnar Mon, 03 Jul 2006 00:24:57 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:04 -0700 [PATCH] lockdep: x86 smp alternatives workaround Disable SMP alternatives fixups (the patching in of NOPs on 1-CPU systems) if the lock validator is enabled: there is a binutils section handling bug that causes corrupted instructions when UP instructions are patched in. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2148270cd2ebe0d05e4289b7c77b1435c45481bf tree d2ad8c7579f9aecfc57dbf2cdc523e0bcaf042b1 parent 8c64580d522542e50f2ba689316128b7fbae497b author Ingo Molnar Mon, 03 Jul 2006 00:24:57 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:04 -0700 [PATCH] lockdep: x86_64 early init x86_64 uses spinlocks very early - earlier than start_kernel(). So call lockdep_init() from the arch setup code. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c64580d522542e50f2ba689316128b7fbae497b tree f3379b93197d0b4ac5509ec36d3ba4227ec18340 parent 4d9f34ad366a7935be3d6e7cca90805e6b7a692d author Ingo Molnar Mon, 03 Jul 2006 00:24:56 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:04 -0700 [PATCH] lockdep: print all lock classes on SysRQ-D Print all lock-classes on SysRq-D. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d9f34ad366a7935be3d6e7cca90805e6b7a692d tree deccf57af35511a21164b94495efbc9683cb91e0 parent ef5d4707b9065c0cf8a69fa3716893f3b75201ba author Ingo Molnar Mon, 03 Jul 2006 00:24:55 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:04 -0700 [PATCH] lockdep: kconfig Offer the following lock validation options: CONFIG_PROVE_LOCKING Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef5d4707b9065c0cf8a69fa3716893f3b75201ba tree 9ec92f31356bf404486c1b26df9fa40bd784f983 parent 8a25d5debff2daee280e83e09d8c25d67c26a972 author Ingo Molnar Mon, 03 Jul 2006 00:24:55 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:04 -0700 [PATCH] lockdep: prove mutex locking correctness Use the lock validator framework to prove mutex locking correctness. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a25d5debff2daee280e83e09d8c25d67c26a972 tree 3bccfef9acb66fc62863bfd6c16493c5e8c8e394 parent 4ea2176dfa714882e88180b474e4cbcd888b70af author Ingo Molnar Mon, 03 Jul 2006 00:24:54 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:04 -0700 [PATCH] lockdep: prove spinlock rwlock locking correctness Use the lock validator framework to prove spinlock and rwlock locking correctness. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ea2176dfa714882e88180b474e4cbcd888b70af tree 7ff3810f6b8750c226234887bb3063d91e1d71c3 parent a8f24a3978c5f82419e1c90dc90460731204f46f author Ingo Molnar Mon, 03 Jul 2006 00:24:53 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:04 -0700 [PATCH] lockdep: prove rwsem locking correctness Use the lock validator framework to prove rwsem locking correctness. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8f24a3978c5f82419e1c90dc90460731204f46f tree 431cf447835463c04f6d982bade874e8b0eee767 parent f3e97da38e1d69d24195d76f96b912323f5ee30c author Ingo Molnar Mon, 03 Jul 2006 00:24:52 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:04 -0700 [PATCH] lockdep: procfs Lock validator /proc/lockdep and /proc/lockdep_stats support. (FIXME: should go into debugfs) Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3e97da38e1d69d24195d76f96b912323f5ee30c tree 49943800df5e10ef2852745cafa3ff6359972d8f parent 6c9076ec9cd448f43bbda871352a7067f456ee26 author Ingo Molnar Mon, 03 Jul 2006 00:24:52 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:04 -0700 [PATCH] lockdep: design docs Lock validator design documentation. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c9076ec9cd448f43bbda871352a7067f456ee26 tree 8691366aa511f20146eb9cfe942e0d94c4136e1a parent fbb9ce9530fd9b66096d5187fa6a115d16d9746c author Ingo Molnar Mon, 03 Jul 2006 00:24:51 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:04 -0700 [PATCH] lockdep: allow read_lock() recursion of same class From: Ingo Molnar lockdep so far only allowed read-recursion for the same lock instance. This is enough in the overwhelming majority of cases, but a hostap case triggered and reported by Miles Lane relies on same-class different-instance recursion. So we relax the restriction on read-lock recursion. (This change does not allow rwsem read-recursion, which is still forbidden.) Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fbb9ce9530fd9b66096d5187fa6a115d16d9746c tree 1151a55e5d56045bac17b9766e6a4696cff0a26f parent cae2ed9aa573415c6e5de9a09b7ff0d74af793bc author Ingo Molnar Mon, 03 Jul 2006 00:24:50 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:03 -0700 [PATCH] lockdep: core Do 'make oldconfig' and accept all the defaults for new config options - reboot into the kernel and if everything goes well it should boot up fine and you should have /proc/lockdep and /proc/lockdep_stats files. Typically if the lock validator finds some problem it will print out voluminous debug output that begins with "BUG: ..." and which syslog output can be used by kernel developers to figure out the precise locking scenario. What does the lock validator do? It "observes" and maps all locking rules as they occur dynamically (as triggered by the kernel's natural use of spinlocks, rwlocks, mutexes and rwsems). Whenever the lock validator subsystem detects a new locking scenario, it validates this new rule against the existing set of rules. If this new rule is consistent with the existing set of rules then the new rule is added transparently and the kernel continues as normal. If the new rule could create a deadlock scenario then this condition is printed out. When determining validity of locking, all possible "deadlock scenarios" are considered: assuming arbitrary number of CPUs, arbitrary irq context and task context constellations, running arbitrary combinations of all the existing locking scenarios. In a typical system this means millions of separate scenarios. This is why we call it a "locking correctness" validator - for all rules that are observed the lock validator proves it with mathematical certainty that a deadlock could not occur (assuming that the lock validator implementation itself is correct and its internal data structures are not corrupted by some other kernel subsystem). [see more details and conditionals of this statement in include/linux/lockdep.h and Documentation/lockdep-design.txt] Furthermore, this "all possible scenarios" property of the validator also enables the finding of complex, highly unlikely multi-CPU multi-context races via single single-context rules, increasing the likelyhood of finding bugs drastically. In practical terms: the lock validator already found a bug in the upstream kernel that could only occur on systems with 3 or more CPUs, and which needed 3 very unlikely code sequences to occur at once on the 3 CPUs. That bug was found and reported on a single-CPU system (!). So in essence a race will be found "piecemail-wise", triggering all the necessary components for the race, without having to reproduce the race scenario itself! In its short existence the lock validator found and reported many bugs before they actually caused a real deadlock. To further increase the efficiency of the validator, the mapping is not per "lock instance", but per "lock-class". For example, all struct inode objects in the kernel have inode->inotify_mutex. If there are 10,000 inodes cached, then there are 10,000 lock objects. But ->inotify_mutex is a single "lock type", and all locking activities that occur against ->inotify_mutex are "unified" into this single lock-class. The advantage of the lock-class approach is that all historical ->inotify_mutex uses are mapped into a single (and as narrow as possible) set of locking rules - regardless of how many different tasks or inode structures it took to build this set of rules. The set of rules persist during the lifetime of the kernel. To see the rough magnitude of checking that the lock validator does, here's a portion of /proc/lockdep_stats, fresh after bootup: lock-classes: 694 [max: 2048] direct dependencies: 1598 [max: 8192] indirect dependencies: 17896 all direct dependencies: 16206 dependency chains: 1910 [max: 8192] in-hardirq chains: 17 in-softirq chains: 105 in-process chains: 1065 stack-trace entries: 38761 [max: 131072] combined max dependencies: 2033928 hardirq-safe locks: 24 hardirq-unsafe locks: 176 softirq-safe locks: 53 softirq-unsafe locks: 137 irq-safe locks: 59 irq-unsafe locks: 176 The lock validator has observed 1598 actual single-thread locking patterns, and has validated all possible 2033928 distinct locking scenarios. More details about the design of the lock validator can be found in Documentation/lockdep-design.txt, which can also found at: http://redhat.com/~mingo/lockdep-patches/lockdep-design.txt [bunk@stusta.de: cleanups] Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cae2ed9aa573415c6e5de9a09b7ff0d74af793bc tree 1a7bcea760681872bcc6020843886c5597130eb4 parent 1f194a4c393103ac925001d7e04b05fbb122580d author Ingo Molnar Mon, 03 Jul 2006 00:24:48 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:03 -0700 [PATCH] lockdep: locking API self tests Introduce DEBUG_LOCKING_API_SELFTESTS, which uses the generic lock debugging code's silent-failure feature to run a matrix of testcases. There are 210 testcases currently: +----------------------- | Locking API testsuite: +------------------------------+------+------+------+------+------+------+ | spin |wlock |rlock |mutex | wsem | rsem | -------------------------------+------+------+------+------+------+------+ A-A deadlock: ok | ok | ok | ok | ok | ok | A-B-B-A deadlock: ok | ok | ok | ok | ok | ok | A-B-B-C-C-A deadlock: ok | ok | ok | ok | ok | ok | A-B-C-A-B-C deadlock: ok | ok | ok | ok | ok | ok | A-B-B-C-C-D-D-A deadlock: ok | ok | ok | ok | ok | ok | A-B-C-D-B-D-D-A deadlock: ok | ok | ok | ok | ok | ok | A-B-C-D-B-C-D-A deadlock: ok | ok | ok | ok | ok | ok | double unlock: ok | ok | ok | ok | ok | ok | bad unlock order: ok | ok | ok | ok | ok | ok | --------------------------------------+------+------+------+------+------+ recursive read-lock: | ok | | ok | --------------------------------------+------+------+------+------+------+ non-nested unlock: ok | ok | ok | ok | --------------------------------------+------+------+------+ hard-irqs-on + irq-safe-A/12: ok | ok | ok | soft-irqs-on + irq-safe-A/12: ok | ok | ok | hard-irqs-on + irq-safe-A/21: ok | ok | ok | soft-irqs-on + irq-safe-A/21: ok | ok | ok | sirq-safe-A => hirqs-on/12: ok | ok | ok | sirq-safe-A => hirqs-on/21: ok | ok | ok | hard-safe-A + irqs-on/12: ok | ok | ok | soft-safe-A + irqs-on/12: ok | ok | ok | hard-safe-A + irqs-on/21: ok | ok | ok | soft-safe-A + irqs-on/21: ok | ok | ok | hard-safe-A + unsafe-B #1/123: ok | ok | ok | soft-safe-A + unsafe-B #1/123: ok | ok | ok | hard-safe-A + unsafe-B #1/132: ok | ok | ok | soft-safe-A + unsafe-B #1/132: ok | ok | ok | hard-safe-A + unsafe-B #1/213: ok | ok | ok | soft-safe-A + unsafe-B #1/213: ok | ok | ok | hard-safe-A + unsafe-B #1/231: ok | ok | ok | soft-safe-A + unsafe-B #1/231: ok | ok | ok | hard-safe-A + unsafe-B #1/312: ok | ok | ok | soft-safe-A + unsafe-B #1/312: ok | ok | ok | hard-safe-A + unsafe-B #1/321: ok | ok | ok | soft-safe-A + unsafe-B #1/321: ok | ok | ok | hard-safe-A + unsafe-B #2/123: ok | ok | ok | soft-safe-A + unsafe-B #2/123: ok | ok | ok | hard-safe-A + unsafe-B #2/132: ok | ok | ok | soft-safe-A + unsafe-B #2/132: ok | ok | ok | hard-safe-A + unsafe-B #2/213: ok | ok | ok | soft-safe-A + unsafe-B #2/213: ok | ok | ok | hard-safe-A + unsafe-B #2/231: ok | ok | ok | soft-safe-A + unsafe-B #2/231: ok | ok | ok | hard-safe-A + unsafe-B #2/312: ok | ok | ok | soft-safe-A + unsafe-B #2/312: ok | ok | ok | hard-safe-A + unsafe-B #2/321: ok | ok | ok | soft-safe-A + unsafe-B #2/321: ok | ok | ok | hard-irq lock-inversion/123: ok | ok | ok | soft-irq lock-inversion/123: ok | ok | ok | hard-irq lock-inversion/132: ok | ok | ok | soft-irq lock-inversion/132: ok | ok | ok | hard-irq lock-inversion/213: ok | ok | ok | soft-irq lock-inversion/213: ok | ok | ok | hard-irq lock-inversion/231: ok | ok | ok | soft-irq lock-inversion/231: ok | ok | ok | hard-irq lock-inversion/312: ok | ok | ok | soft-irq lock-inversion/312: ok | ok | ok | hard-irq lock-inversion/321: ok | ok | ok | soft-irq lock-inversion/321: ok | ok | ok | hard-irq read-recursion/123: ok | soft-irq read-recursion/123: ok | hard-irq read-recursion/132: ok | soft-irq read-recursion/132: ok | hard-irq read-recursion/213: ok | soft-irq read-recursion/213: ok | hard-irq read-recursion/231: ok | soft-irq read-recursion/231: ok | hard-irq read-recursion/312: ok | soft-irq read-recursion/312: ok | hard-irq read-recursion/321: ok | soft-irq read-recursion/321: ok | --------------------------------+-----+---------------- Good, all 210 testcases passed! | --------------------------------+ Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f194a4c393103ac925001d7e04b05fbb122580d tree 9185dd3ecc6a03f6bc8a15d330c862b86ad23730 parent 6375e2b74c620794e1a27a26e4338aec2e41346a author Heiko Carstens Mon, 03 Jul 2006 00:24:46 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:03 -0700 [PATCH] lockdep: irqtrace subsystem, s390 support irqtrace support for s390. Signed-off-by: Heiko Carstens Signed-off-by: Ingo Molnar Cc: Martin Schwidefsky Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6375e2b74c620794e1a27a26e4338aec2e41346a tree f966478bc214af98e9ca6235506377b5dd872526 parent 2601e64d262ee5ed4d4a5737345803800d9c4db3 author Ingo Molnar Mon, 03 Jul 2006 00:24:45 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:03 -0700 [PATCH] lockdep: irqtrace cleanup of include/asm-x86_64/irqflags.h Clean up the x86-64 irqflags.h file: - macro => inline function transformation - simplifications - style fixes Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Andi Kleen Cc: Jan Beulich Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2601e64d262ee5ed4d4a5737345803800d9c4db3 tree 67f852752af3c54f745b93f7016cdd7c5ffb1a14 parent c8558fcdecb1f920df8050be4f2d5f499060030e author Ingo Molnar Mon, 03 Jul 2006 00:24:45 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:03 -0700 [PATCH] lockdep: irqtrace subsystem, x86_64 support Add irqflags-tracing support to x86_64. [akpm@osdl.org: build fix] Signed-off-by: Ingo Molnar Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8558fcdecb1f920df8050be4f2d5f499060030e tree d293eeb7c15c604c5f200b6c498fd3584d956d81 parent 55f327fa9e876758491a82af7491104f1cc3fc4d author Ingo Molnar Mon, 03 Jul 2006 00:24:44 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:03 -0700 [PATCH] lockdep: irqtrace cleanup of include/asm-i386/irqflags.h Clean up the x86 irqflags.h file: - macro => inline function transformation - simplifications - style fixes Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55f327fa9e876758491a82af7491104f1cc3fc4d tree 79394c094de1c08ada272865ea9eae71ad798123 parent 55df314fbdb44c20fa7a5112d16546ee970c1d76 author Ingo Molnar Mon, 03 Jul 2006 00:24:43 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:03 -0700 [PATCH] lockdep: irqtrace subsystem, i386 support Add irqflags-tracing support to i386. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55df314fbdb44c20fa7a5112d16546ee970c1d76 tree 1ad08f78387841a73e4aa1226a962fb7e5f81a85 parent de30a2b355ea85350ca2f58f3b9bf4e5bc007986 author Ingo Molnar Mon, 03 Jul 2006 00:24:43 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:03 -0700 [PATCH] lockdep: irqtrace subsystem, docs Add Documentation/irqflags-tracing.txt. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de30a2b355ea85350ca2f58f3b9bf4e5bc007986 tree 0bef670aff65614b3c78ca13b20307355b8221d5 parent 5bdc9b447c0076f494a56fdcd93ee8c5e78a2afd author Ingo Molnar Mon, 03 Jul 2006 00:24:42 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:03 -0700 [PATCH] lockdep: irqtrace subsystem, core Accurate hard-IRQ-flags and softirq-flags state tracing. This allows us to attach extra functionality to IRQ flags on/off events (such as trace-on/off). Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5bdc9b447c0076f494a56fdcd93ee8c5e78a2afd tree 4e2b7a27b6cd227ac67b9d127838aaea36ec3fd8 parent 21b32bbff950771f196da91011249fa05fa83b32 author Heiko Carstens Mon, 03 Jul 2006 00:24:41 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:02 -0700 [PATCH] lockdep: stacktrace subsystem, s390 support stacktrace interface for s390 as needed by lock validator. [clg@fr.ibm.com: build fix] Signed-off-by: Heiko Carstens Acked-by: Ingo Molnar Cc: Martin Schwidefsky Cc: Arjan van de Ven Signed-off-by: Cedric Le Goater Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21b32bbff950771f196da91011249fa05fa83b32 tree a93f72bc17399df1e49427c857c8bbe904f109fb parent 4a7c7197817e7180f56110334d961f4aa6ac69cb author Ingo Molnar Mon, 03 Jul 2006 00:24:40 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:02 -0700 [PATCH] lockdep: stacktrace subsystem, x86_64 support Framework to generate and save stacktraces quickly, without printing anything to the console. x86_64 support. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a7c7197817e7180f56110334d961f4aa6ac69cb tree ae4fa9c4a54b21af812fdc4c3a75165e30a84cce parent cbbd1fa72d22896332301ca7e6b7164284be105c author Ingo Molnar Mon, 03 Jul 2006 00:24:39 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:02 -0700 [PATCH] lockdep: stacktrace subsystem, i386 support Framework to generate and save stacktraces quickly, without printing anything to the console. i386 support. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cbbd1fa72d22896332301ca7e6b7164284be105c tree a041ce22738c56b189aa1251ccc7e232385bb4a1 parent 8637c09901049f061b94f684915d4f18ecf91d79 author Heiko Carstens Mon, 03 Jul 2006 00:24:38 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:02 -0700 [PATCH] lockdep: s390 CONFIG_FRAME_POINTER support CONFIG_FRAME_POINTER support for s390. Signed-off-by: Heiko Carstens Acked-by: Ingo Molnar Cc: Martin Schwidefsky Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8637c09901049f061b94f684915d4f18ecf91d79 tree 83ca3ab38ab4d12f4e10176ba01ae33809388767 parent f0a5c315eb266edc608a29971bb4ff1a3025c58f author Ingo Molnar Mon, 03 Jul 2006 00:24:38 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:02 -0700 [PATCH] lockdep: stacktrace subsystem, core Framework to generate and save stacktraces quickly, without printing anything to the console. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0a5c315eb266edc608a29971bb4ff1a3025c58f tree 5cc74aa9c022ee8cdb434cb5fe0bcdc925d9c235 parent c9ca1ba5bde45839cdc4f8ab93730cb68e6ee8a6 author Ingo Molnar Mon, 03 Jul 2006 00:24:37 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:02 -0700 [PATCH] lockdep: i386 remove multi entry backtraces Remove CONFIG_STACK_BACKTRACE_COLS. This feature didnt work out: instead of making kernel debugging more efficient, it produces much harder to read stacktraces! Check out this trace for example: http://static.flickr.com/47/158326090_35d0129147_b_d.jpg That backtrace could have been printed much nicer as a one-entry-per-line thing, taking the same amount of screen real-estate. Plus we remove 30 lines of kernel code as well. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9ca1ba5bde45839cdc4f8ab93730cb68e6ee8a6 tree 8c1d73c012430a6d28e2602177116f684a6b8a8b parent 3ac94932a2c859e8c57a8af091fa39334e1c3f23 author Ingo Molnar Mon, 03 Jul 2006 00:24:36 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:02 -0700 [PATCH] lockdep: x86_64 document stack frame internals Document stack frame nesting internals some more. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ac94932a2c859e8c57a8af091fa39334e1c3f23 tree 0d1e17d70f1c5b2a52626f96246096688310104d parent e4d919188554a77c798a267e098059bc9aa39726 author Ingo Molnar Mon, 03 Jul 2006 00:24:36 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:02 -0700 [PATCH] lockdep: beautify x86_64 stacktraces Beautify x86_64 stacktraces to be more readable. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4d919188554a77c798a267e098059bc9aa39726 tree bb5e47e09f5d107db44358ad668988f5ae768ade parent 9cebb5526833059f327d237a032422c762378b2a author Ingo Molnar Mon, 03 Jul 2006 00:24:34 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:02 -0700 [PATCH] lockdep: locking init debugging improvement Locking init improvement: - introduce and use __SPIN_LOCK_UNLOCKED for array initializations, to pass in the name string of locks, used by debugging Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9cebb5526833059f327d237a032422c762378b2a tree 7ef264c1a33db3f63e71cc00ed9fa9c8bd396edc parent 9a11b49a805665e13a56aa067afaf81d43ec1514 author Ingo Molnar Mon, 03 Jul 2006 00:24:33 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:01 -0700 [PATCH] lockdep: mutex section binutils workaround Work around weird section nesting build bug causing smp-alternatives failures under certain circumstances. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a11b49a805665e13a56aa067afaf81d43ec1514 tree bf499956e3f67d1211d68ab1e2eb76645f453dfb parent fb7e42413a098cc45b3adf858da290033af62bae author Ingo Molnar Mon, 03 Jul 2006 00:24:33 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:01 -0700 [PATCH] lockdep: better lock debugging Generic lock debugging: - generalized lock debugging framework. For example, a bug in one lock subsystem turns off debugging in all lock subsystems. - got rid of the caller address passing (__IP__/__IP_DECL__/etc.) from the mutex/rtmutex debugging code: it caused way too much prototype hackery, and lockdep will give the same information anyway. - ability to do silent tests - check lock freeing in vfree too. - more finegrained debugging options, to allow distributions to turn off more expensive debugging features. There's no separate 'held mutexes' list anymore - but there's a 'held locks' stack within lockdep, which unifies deadlock detection across all lock classes. (this is independent of the lockdep validation stuff - lockdep first checks whether we are holding a lock already) Here are the current debugging options: CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_LOCK_ALLOC=y which do: config DEBUG_MUTEXES bool "Mutex debugging, basic checks" config DEBUG_LOCK_ALLOC bool "Detect incorrect freeing of live mutexes" Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb7e42413a098cc45b3adf858da290033af62bae tree ca8e9d46d0c16f7b3623caf42229c1c61b5a0026 parent 36596243daf7e1d795c647de04af95e835b8c5b4 author Ingo Molnar Mon, 03 Jul 2006 00:24:31 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:01 -0700 [PATCH] lockdep: remove mutex deadlock checking code With the lock validator we detect mutex deadlocks (and more), the mutex deadlock checking code is both redundant and slower. So remove it. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36596243daf7e1d795c647de04af95e835b8c5b4 tree 8348a9f5e3729cf0df5064753bfdcc1ec159eaa8 parent 9e7f4d451e99b7592a96ad0efaf8bcc1e7b2f854 author Ingo Molnar Mon, 03 Jul 2006 00:24:31 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:01 -0700 [PATCH] lockdep: remove DEBUG_BUG_ON() cleanup: remove unused DEBUG_BUG_ON() defines. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e7f4d451e99b7592a96ad0efaf8bcc1e7b2f854 tree bc61ead5d497222f93acebbb5cbe1debf6b758ee parent 61f4c3d6db3ecbdd4e1a2a7a1710c1410d085dd1 author Ingo Molnar Mon, 03 Jul 2006 00:24:30 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:01 -0700 [PATCH] lockdep: rename DEBUG_WARN_ON() Rename DEBUG_WARN_ON() to the less generic DEBUG_LOCKS_WARN_ON() name, so that it's clear that this is a lock-debugging internal mechanism. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61f4c3d6db3ecbdd4e1a2a7a1710c1410d085dd1 tree dad2fc10828f11d674770c61345be2596d2e0f2f parent c4e05116a2c4d8187127dbf77ab790aa57a47388 author Ingo Molnar Mon, 03 Jul 2006 00:24:29 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:01 -0700 [PATCH] lockdep: remove RWSEM_DEBUG remnants RWSEM_DEBUG used to be a printk based 'tracing' facility, probably used for very early prototypes of the rwsem code. Remove it. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4e05116a2c4d8187127dbf77ab790aa57a47388 tree 58f07aed47ee4d30e9588d5a820c245faa163b09 parent 8b3db9c542e18b71d4820da4dd9401ee030feacb author Ingo Molnar Mon, 03 Jul 2006 00:24:29 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:01 -0700 [PATCH] lockdep: clean up rwsems Clean up rwsems. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b3db9c542e18b71d4820da4dd9401ee030feacb tree 93e093fcb0a01b3ee06329e57d92d73d66207edd parent d7e9629de051bb4b1d104588cd97673ad770809e author Ingo Molnar Mon, 03 Jul 2006 00:24:28 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:00 -0700 [PATCH] lockdep: add DECLARE_COMPLETION_ONSTACK() API lockdep needs to have the waitqueue lock initialized for on-stack waitqueues implicitly initialized by DECLARE_COMPLETION(). Introduce the API. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7e9629de051bb4b1d104588cd97673ad770809e tree 8d9f8fd16910ef959d39cb6264a3e5da9b8d7bec parent c01d403b2e3e3f231b18ebd07ad64ecbe6a258a5 author Ingo Molnar Mon, 03 Jul 2006 00:24:27 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:00 -0700 [PATCH] lockdep: add local_irq_enable_in_hardirq() API Introduce local_irq_enable_in_hardirq() API. It is currently aliased to local_irq_enable(), hence has no functional effects. This API will be used by lockdep, but even without lockdep this will better document places in the kernel where a hardirq context enables hardirqs. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c01d403b2e3e3f231b18ebd07ad64ecbe6a258a5 tree b7ccadf4bb93d9cdb5c770e976637fb783d9dab5 parent a875a69f8b00a38b4f40d9632a4fc71a159f0e0d author Ingo Molnar Mon, 03 Jul 2006 00:24:27 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:00 -0700 [PATCH] lockdep: add disable/enable_irq_lockdep() API lockdep wants to use the disable_irq()/enable_irq() prototypes before they are provied by the platform's asm/irq.h. So move them out of the CONFIG_GENERIC_HARDIRQS define - all architectures have a common prototype for this anyway. Add special lockdep variants of irq line disabling/enabling. These should be used for locking constructs that know that a particular irq context which is disabled, and which is the only irq-context user of a lock, that it's safe to take the lock in the irq-disabled section without disabling hardirqs. [akpm@osdl.org: build fix] Signed-off-by: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a875a69f8b00a38b4f40d9632a4fc71a159f0e0d tree 5c9296441514663354a4d70ab2320f7e185d7c10 parent 8d8fdf5c76816e5263073008f03f097ffc713db3 author Ingo Molnar Mon, 03 Jul 2006 00:24:26 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:00 -0700 [PATCH] lockdep: add per_cpu_offset() Add the per_cpu_offset() generic method. (used by the lock validator) Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d8fdf5c76816e5263073008f03f097ffc713db3 tree 2c184b13bead7f72d800bc0dba61b43c8ba9334e parent 4d435f9d8ff01ae726a2a84edb9c2457787a337e author Heiko Carstens Mon, 03 Jul 2006 00:24:25 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:00 -0700 [PATCH] lockdep: add print_ip_sym() Provide a common print_ip_sym() function that prints the passed instruction pointer as well as the symbol belonging to it. Avoids adding a bunch of #ifdef CONFIG_64BIT in order to get the printk format right on 32/64 bit platforms. Acked-by: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d435f9d8ff01ae726a2a84edb9c2457787a337e tree c4c65b739187731e89893cd10faf270067c81a56 parent 93e028148fce0be9787de7fb097fa4c8582b78c1 author Ingo Molnar Mon, 03 Jul 2006 00:24:24 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:00 -0700 [PATCH] lockdep: add is_module_address() Add is_module_address() method - to be used by lockdep. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93e028148fce0be9787de7fb097fa4c8582b78c1 tree 3cc4859695f08a54a80bd473e466778474c86522 parent 3e541a4ae534a7e59ad464af9abea382b3035724 author Heiko Carstens Mon, 03 Jul 2006 00:24:24 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:00 -0700 [PATCH] lockdep: console_init after local_irq_enable() s390's console_init must enable interrupts, but early_boot_irqs_on() gets called later. To avoid problems move console_init() after local_irq_enable(). Signed-off-by: Heiko Carstens Acked-by: Ingo Molnar Cc: Martin Schwidefsky Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e541a4ae534a7e59ad464af9abea382b3035724 tree a3f0de1022e4459d0eadb1f8583956ab7067011a parent 5863aa651bd79a6bb15972894306923db088e71c author Ingo Molnar Mon, 03 Jul 2006 00:24:23 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:00 -0700 [PATCH] lockdep: floppy.c irq release fix The lock validator triggered a number of bugs in the floppy driver, all related to the floppy driver allocating and freeing irq and dma resources from interrupt context. The initial solution was to use schedule_work() to push this into process context, but this caused further problems: for example the current floppy driver in -mm2 is totally broken and all floppy commands time out with an error. (as reported by Barry K. Nathan) This patch tries another solution: simply get rid of all that dynamic IRQ and DMA allocation/freeing. I doubt it made much sense back in the heydays of floppies (if two devices raced for DMA or IRQ resources then we didnt handle those cases too gracefully anyway), and today it makes near zero sense. So the new code does the simplest and most straightforward thing: allocate IRQ and DMA resources at module init time, and free them at module removal time. Dont try to release while the driver is operational. This, besides making the floppy driver functional again has an added bonus, floppy IRQ stats are finally persistent and visible in /proc/interrupts: 6: 63 XT-PIC-level floppy Besides normal floppy IO i have also tested IO error handling, motor-off timeouts, etc. - and everything seems to be working fine. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5863aa651bd79a6bb15972894306923db088e71c tree 99e945816bedc1f72c30c8fc8cc0930a6da9e095 parent 6b8f3ef454d60e0c7ec42400400dc0fe7b5a4f7d author Andrew Morton Mon, 03 Jul 2006 00:24:22 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:00 -0700 [PATCH] sparc: resource warning fix sound/sparc/amd7930.c: In function 'amd7930_attach_common': sound/sparc/amd7930.c:1040: warning: format '%08lx' expects type 'long unsigned int', but argument 5 has type 'resource_size_t' sound/sparc/cs4231.c:2043: warning: format '%016lx' expects type 'long unsigned int', but argument 5 has type 'resource_size_t' sound/sparc/dbri.c: In function 'dbri_attach': sound/sparc/dbri.c:2650: warning: format '%016lx' expects type 'long unsigned int', but argument 5 has type 'resource_size_t' Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b8f3ef454d60e0c7ec42400400dc0fe7b5a4f7d tree d038b53b178dc63251c6dba1c71c3dbcbd69ff83 parent 62322d2554d2f9680c8ace7bbf1f97d8fa84ad1a author Andrew Morton Mon, 03 Jul 2006 00:24:21 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:27:00 -0700 [PATCH] sparc i8042 build fix drivers/input/serio/i8042-sparcio.h:91: error: '__mod_of_device_table' aliased to undefined symbol 'i8042_match' Cc: Dmitry Torokhov DESC sparc: resource warning fix EDESC From: Andrew Morton sound/sparc/amd7930.c: In function 'amd7930_attach_common': sound/sparc/amd7930.c:1040: warning: format '%08lx' expects type 'long unsigned int', but argument 5 has type 'resource_size_t' Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62322d2554d2f9680c8ace7bbf1f97d8fa84ad1a tree 904f8b8354a4079cc1daaa355fe30200dcae9dc9 parent d459ec0baa5d22e111dfb139c46d6d788a9eac20 author Arjan van de Ven Mon, 03 Jul 2006 00:24:21 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:26:59 -0700 [PATCH] make more file_operation structs static Mark the static struct file_operations in drivers/char as const. Making them const prevents accidental bugs, and moves them to the .rodata section so that they no longer do any false sharing; in addition with the proper debug option they are then protected against corruption.. [akpm@osdl.org: build fix] Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d459ec0baa5d22e111dfb139c46d6d788a9eac20 tree 7cbb8762c5c4693b68b10baa42a9d49666bc411e parent 36c9366efd63e4bab82d46e166140bddf3acc4cf author Antonino A. Daplas Mon, 03 Jul 2006 00:24:20 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:26:59 -0700 [PATCH] vt: Decrement ref count of the VT backend on deallocation When a VT is newly allocated, the module reference count of the backend will be incremented. This should be balanced by a module_put() when this VT is deallocated. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36c9366efd63e4bab82d46e166140bddf3acc4cf tree c109a3e49e9d1d4f69fb2418cdc0ed375be07eb4 parent 8320204ab495c858da7b6501f49a71b53d828e74 author Vitaly Wool Mon, 03 Jul 2006 00:24:19 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:26:59 -0700 [PATCH] fbdev: Add framebuffer and display update module support for pnx4008 Add support for Display Update Module and RGB framebuffer device on Philips PNX4008 ARM board. Signed-off-by: Grigory Tolstolytkin Signed-off-by: Vitaly Wool Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8320204ab495c858da7b6501f49a71b53d828e74 tree f450bd5305a31e0ba45071270ad6c416bbb43465 parent 0f40efbdf49913cad50edce5aa9756896c30424f author Michael Krufky Mon, 03 Jul 2006 00:24:18 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:26:59 -0700 [PATCH] add Mike Isely as pvrusb2 maintainer Update MAINTAINERS with contact info for Mike Isely, the PVRUSB2 maintainer, while also adding the pvrusb2 mailing list and web site. Signed-off-by: Mike Isely Signed-off-by: Michael Krufky Cc: Mauro Carvalho Chehab Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f40efbdf49913cad50edce5aa9756896c30424f tree 6f5d2976c9f6fdc60889e242b9f0c0520d4a109a parent ce51059be56f63762089412b3ece348067afda85 author Randy Dunlap Mon, 03 Jul 2006 00:24:15 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:26:59 -0700 [PATCH] kernel-doc MAINTAINERS Martin says that I can add self to MAINTAINERS. Signed-off-by: Randy Dunlap Cc: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce51059be56f63762089412b3ece348067afda85 tree b61b838c549a21186488931c76d6c8eb458ff7a7 parent 9614634fe6a138fd8ae044950700d2af8d203f97 author Chuck Ebbert <76306.1226@compuserve.com> Mon, 03 Jul 2006 00:24:14 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:26:59 -0700 [PATCH] binfmt_elf: fix checks for bad address Fix check for bad address; use macro instead of open-coding two checks. Taken from RHEL4 kernel update. From: Ernie Petrides For background, the BAD_ADDR() macro should return TRUE if the address is TASK_SIZE, because that's the lowest address that is *not* valid for user-space mappings. The macro was correct in binfmt_aout.c but was wrong for the "equal to" case in binfmt_elf.c. There were two in-line validations of user-space addresses in binfmt_elf.c, which have been appropriately converted to use the corrected BAD_ADDR() macro in the patch you posted yesterday. Note that the size checks against TASK_SIZE are okay as coded. The additional changes that I propose are below. These are in the error paths for bad ELF entry addresses once load_elf_binary() has already committed to exec'ing the new image (following the tearing down of the task's original address space). The 1st hunk deals with the interp-side of the outer "if". There were two problems here. The printk() should be removed because this path can be triggered at will by a bogus interpreter image created and used by a malicious user. Further, the error code should not be ENOEXEC, because that causes the loop in search_binary_handler() to continue trying other exec handlers (twice, in fact). But it's too late for this to work correctly, because the user address space has already been torn down, and an exec() failure cannot be returned to the user code because the code no longer exists. The only recovery is to force a SIGSEGV, but it's best to terminate the search loop immediately. I somewhat arbitrarily chose EINVAL as a fallback error code, but any error returned by load_elf_interp() will override that (but this value will never be seen by user-space). The 2nd hunk deals with the non-interp-side of the outer "if". There were two problems here as well. The SIGSEGV needs to be forced, because a prior sigaction() syscall might have set the associated disposition to SIG_IGN. And the ENOEXEC should be changed to EINVAL as described above. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Ernie Petrides Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9614634fe6a138fd8ae044950700d2af8d203f97 tree 9b020c1d36d8625f4048c057058efb2e17c81973 parent cb6358eb69d9854f65f2979c0ce9280eee041828 author Christoph Lameter Mon, 03 Jul 2006 00:24:13 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:26:59 -0700 [PATCH] ZVC/zone_reclaim: Leave 1% of unmapped pagecache pages for file I/O It turns out that it is advantageous to leave a small portion of unmapped file backed pages if all of a zone's pages (or almost all pages) are allocated and so the page allocator has to go off-node. This allows recently used file I/O buffers to stay on the node and reduces the times that zone reclaim is invoked if file I/O occurs when we run out of memory in a zone. The problem is that zone reclaim runs too frequently when the page cache is used for file I/O (read write and therefore unmapped pages!) alone and we have almost all pages of the zone allocated. Zone reclaim may remove 32 unmapped pages. File I/O will use these pages for the next read/write requests and the unmapped pages increase. After the zone has filled up again zone reclaim will remove it again after only 32 pages. This cycle is too inefficient and there are potentially too many zone reclaim cycles. With the 1% boundary we may still remove all unmapped pages for file I/O in zone reclaim pass. However. it will take a large number of read and writes to get back to 1% again where we trigger zone reclaim again. The zone reclaim 2.6.16/17 does not show this behavior because we have a 30 second timeout. [akpm@osdl.org: rename the /proc file and the variable] Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb6358eb69d9854f65f2979c0ce9280eee041828 tree 383765c090a291af222b08ae4044441d40a5d338 parent c32928c579d88acd43981b59e86900da65f40762 author Bjorn Helgaas Mon, 03 Jul 2006 00:24:12 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:26:58 -0700 [PATCH] SERIAL: allow shared 8250_pnp interrupts PNP devices can use shared interrupts, so check to see whether we'll need SA_SHIRQ for request_irq(). The builtin PDH UART on the HP rx8640 is an example of an ACPI/PNP device that uses a shareable level-triggered, active-low interrupt. The interrupt can be shared in very large I/O configurations or by artificially lowering IA64_DEF_LAST_DEVICE_VECTOR. Signed-off-by: Bjorn Helgaas Cc: Adam Belay Cc: Matthieu Castet Cc: Li Shaohua Cc: Len Brown Acked-by: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c32928c579d88acd43981b59e86900da65f40762 tree c7f89b713f1573d5b78a312869b2fa019d547222 parent c61a8416ed3db84481651270032696a4781cac17 author Bjorn Helgaas Mon, 03 Jul 2006 00:24:10 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:26:58 -0700 [PATCH] PNPACPI: support shareable interrupts ACPI supplies a "shareable" indication, but PNPACPI ignores it. If a PNP device uses a shared interrupt, request_irq() fails because the PNP driver can't tell whether to supply SA_SHIRQ. This patch allows PNP drivers to test (pnp_irq_flags(dev, 0) & IORESOURCE_IRQ_SHAREABLE) Signed-off-by: Bjorn Helgaas Cc: Adam Belay Cc: Matthieu Castet Cc: Li Shaohua Cc: Len Brown Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c61a8416ed3db84481651270032696a4781cac17 tree 15ffa349c0781900bf484263b47992962ba57ce9 parent 6abd219c6eab92172038e4719e02905acb7b68d4 author Theodore Tso Mon, 03 Jul 2006 00:24:09 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:26:58 -0700 [PATCH] uml build fix This is needed to fix UML compilation given that alternatives_smp_module_add and alternatives_smp_module_del are null inline functions if !CONFIG_SMP. Signed-off-by: "Theodore Ts'o" Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6abd219c6eab92172038e4719e02905acb7b68d4 tree b9ab0e856e1acf921f86baaebf14c5f34aa21371 parent b02454f43578b24bc8b8ab54a239156841f56f6d author Arjan van de Ven Mon, 03 Jul 2006 00:24:07 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:26:58 -0700 [PATCH] bcm43xx: netlink deadlock fix reported by Jure Repinc: > > http://bugzilla.kernel.org/show_bug.cgi?id=6773 > > checked out dmesg output and found the message > > > > ====================================================== > > [ BUG: hard-safe -> hard-unsafe lock order detected! ] > > ------------------------------------------------------ > > > > starting at line 660 of the dmesg.txt that I will attach. The patch below should fix the deadlock, albeit I suspect it's not the "right" fix; the right fix may well be to move the rx processing in bcm43xx to softirq context. [it's debatable, ipw2200 hit this exact same bug; at some point it's better to bite the bullet and move this to the common layer as my patch below does] Make the nl_table_lock irq-safe; it's taken for read in various netlink functions, including functions that several wireless drivers (ipw2200, bcm43xx) want to call from hardirq context. The deadlock was found by the lock validator. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Herbert Xu Cc: Michael Buesch Cc: "John W. Linville" Cc: Jeff Garzik Acked-by: "David S. Miller" Cc: jamal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b02454f43578b24bc8b8ab54a239156841f56f6d tree a3d41cde84512360c70916ceb75d0fc89db0df22 parent dada0769b95602ae791b9c4cd1cbecfc367f00a9 author Heiko Carstens Mon, 03 Jul 2006 00:24:06 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:26:58 -0700 [PATCH] lockdep: special s390 print_symbol() version Have a special version of print_symbol() for s390 which clears the most significant bit of addr before calling __print_symbol(). This seems to be better than checking/changing each place in the kernel that saves an instruction pointer. Without this the output would look like: hardirqs last enabled at (30907): [<80018c6a>] 0x80018c6a hardirqs last disabled at (30908): [<8001e48c>] 0x8001e48c softirqs last enabled at (30904): [<8001dc96>] 0x8001dc96 softirqs last disabled at (30897): [<8001dc50>] 0x8001dc50 instead of this: hardirqs last enabled at (19421): [<80018c72>] cpu_idle+0x176/0x1c4 hardirqs last disabled at (19422): [<8001e494>] io_no_vtime+0xa/0x1a softirqs last enabled at (19418): [<8001dc9e>] do_softirq+0xa6/0xe8 softirqs last disabled at (19411): [<8001dc58>] do_softirq+0x60/0xe8 Acked-by: Ingo Molnar Cc: Arjan van de Ven Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dada0769b95602ae791b9c4cd1cbecfc367f00a9 tree f44bae9c30a2fd7aec304256e622e08ee34a3739 parent 88fecaa27f398d95db6c405a1908292c6f0bc3ef author Andrew Morton Mon, 03 Jul 2006 00:24:05 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:26:58 -0700 [PATCH] genirq ia64 cleanup Remove duplicate/redundant/wrong IRQF_PERCPU definition. Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88fecaa27f398d95db6c405a1908292c6f0bc3ef tree 0789e3b19fa5529229ad5b3936636973a383ca99 parent 29454dde27d8e340bb1987bad9aa504af7081eba author john stultz Mon, 03 Jul 2006 00:24:04 -0700 committer Linus Torvalds Mon, 03 Jul 2006 15:26:58 -0700 [PATCH] time initialisation fix We're not reay to take a timer interrupt until timekeeping_init() has run. But time_init() will start the time interrupt and if it is called with local interrupts enabled we'll immediately take an interrupt and die. Fix that by running timekeeping_init() prior to time_init(). We don't know _why_ local interrupts got enabled on Jesse Brandeburg's machine. That's a separate as-yet-unsolved problem. THe patch adds a little bit of debugging to detect that. This whole requirement that local interrupts be held off during early boot keeps on biting us. Signed-off-by: John Stultz Cc: Jesse Brandeburg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39ab9c212aac48f2744f2fd7722fa639ec048eb7 tree 53002697e20e41ccd1b95e58154552a7ae74012a parent 0fbfb036adee72cbfff170075e84ffd9e54f1938 parent 71bc7bf045262e82c645cad48fd56dd17e75344e author Paul Mackerras Tue, 04 Jul 2006 07:33:28 +1000 committer Paul Mackerras Tue, 04 Jul 2006 07:33:28 +1000 Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc commit 0fbfb036adee72cbfff170075e84ffd9e54f1938 tree b6c8173e73eac17fc9ea5133b6af78c5a1cdc3e7 parent 0ebfff1491ef85d41ddf9c633834838be144f69f author Benjamin Herrenschmidt Tue, 04 Jul 2006 07:31:37 +1000 committer Paul Mackerras Tue, 04 Jul 2006 07:31:37 +1000 [POWERPC] Actually copy over i8259.c to arch/ppc/syslib this time Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 63104eec234bdecb55fd9c15467ae00d0a3f42ac tree aee8fd42c0904cbc8671a7c023a421277db1b16f parent 05668381140309088443bf5dc53add4104610fbb author Sam Ravnborg Mon, 03 Jul 2006 23:30:54 +0200 committer Sam Ravnborg Mon, 03 Jul 2006 23:30:54 +0200 kbuild: introduce utsrelease.h include/linux/version.h contained both actual KERNEL version and UTS_RELEASE that contains a subset from git SHA1 for when kernel was compiled as part of a git repository. This had the unfortunate side-effect that all files including version.h would be recompiled when some git changes was made due to changes SHA1. Split it out so we keep independent parts in separate files. Also update checkversion.pl script to no longer check for UTS_RELEASE. Signed-off-by: Sam Ravnborg commit 05668381140309088443bf5dc53add4104610fbb tree ed53039717390e1a71ff16209281b1f1c8d3e6be parent 34c162f79e374556dd1384437f0dab558b5dc657 parent 29454dde27d8e340bb1987bad9aa504af7081eba author Sam Ravnborg Mon, 03 Jul 2006 23:24:23 +0200 committer Sam Ravnborg Mon, 03 Jul 2006 23:24:23 +0200 Merge branch 'master' of /home/sam/kernel/linux-2.6/ commit 71bc7bf045262e82c645cad48fd56dd17e75344e tree a017aeef94bfb0a98027cf4c202598b2a2209f0d parent cbdb54d3ca986e30d0b8c1f755c3910b5573baae parent 913b83944b9e13c60ca4ef95cf262547ff6bf93b author Kumar Gala Mon, 03 Jul 2006 16:08:21 -0500 committer Kumar Gala Mon, 03 Jul 2006 16:08:21 -0500 Merge branch '83xx' into for_paulus commit 913b83944b9e13c60ca4ef95cf262547ff6bf93b tree 00e8d7b3320075fcf31b141d1004d5f973168828 parent 00280166993af8469dbfee24b779b61d3dd326c3 author Kim Phillips Fri, 30 Jun 2006 18:41:29 -0500 committer Kumar Gala Mon, 03 Jul 2006 15:44:33 -0500 powerpc: add defconfig for Freescale MPC8349E-mITX board Provide default configuration for the Freescale MPC8349E-mITX board, including the on-board 16MB flash. Signed-off-by: Kim Phillips Signed-off-by: Timur Tabi Signed-off-by: Kumar Gala commit 00280166993af8469dbfee24b779b61d3dd326c3 tree 9754af3c7bbdba335d84352456cb6aba71484645 parent fcc18e83e1f6fd9fa6b333735bf0fcd530655511 author Kim Phillips Fri, 30 Jun 2006 18:41:20 -0500 committer Kumar Gala Mon, 03 Jul 2006 15:43:43 -0500 powerpc: Add base support for the Freescale MPC8349E-mITX eval board Added support for the Freescale MPC8343e-mITX board. Currently based on the 8343 SYS code. The 2nd PHY (5-port switch) and SATA are untested (work in progress). Signed-off-by: Kim Phillips Signed-off-by: Timur Tabi Signed-off-by: Kumar Gala commit cbdb54d3ca986e30d0b8c1f755c3910b5573baae tree faa1c01407939d50902deaa125af0e229e587ee9 parent 0ebfff1491ef85d41ddf9c633834838be144f69f author Kim Phillips Mon, 03 Jul 2006 15:10:14 -0500 committer Kumar Gala Mon, 03 Jul 2006 15:33:38 -0500 Documentation: correct values in MPC8548E SEC example node Signed-off-by: Kim Phillips Signed-off-by: Kumar Gala commit c4e00fac42f268ed0a547cdd1d12bb8399864040 tree 1a54d87be2066c49b71a03764fcb4fc7f9c68c41 parent 29454dde27d8e340bb1987bad9aa504af7081eba parent d6b0c53723753fc0cfda63f56735b225c43e1e9a author James Bottomley Mon, 03 Jul 2006 09:41:12 -0500 committer James Bottomley Mon, 03 Jul 2006 09:41:12 -0500 Merge ../scsi-misc-2.6 Conflicts: drivers/scsi/nsp32.c drivers/scsi/pcmcia/nsp_cs.c Removal of randomness flag conflicts with SA_ -> IRQF_ global replacement. Signed-off-by: James Bottomley commit 0f1482fdd7e5efc473335b92f350027b8f1519fb tree c55997da0acf95b1b54b54a124cfc01d8ff8df45 parent 67f3a58856b6a41a46e9256a79a8ca3809f47cc6 author Russell King Mon, 03 Jul 2006 15:32:47 +0100 committer Russell King Mon, 03 Jul 2006 15:32:47 +0100 [ARM] Fix lh7a40x_udc.c In 3ae5eaec1d2d9c0cf53745352e7d4b152810ba24, I broke this driver by missing a comma. Replace the missing comma. Signed-off-by: Russell King commit 61a116ef29e712147d7ee7a6738886e6f91df5f5 tree a01b16e9b8348fae47af70539a1ac80569405f41 parent 947deee8904b3c2edc7f59ab6e6242499e4dc434 author Russell King Mon, 03 Jul 2006 15:22:35 +0100 committer Russell King Mon, 03 Jul 2006 15:22:35 +0100 [SERIAL] Ensure 8250_pci quirks are not marked __devinit The 8250_pci quirks must not be marked __devinit since they may be used from parport_serial. We only really need to mark those which might be used by cards recognised by parport_serial, but that wouldn't allow static checking. Signed-off-by: Russell King commit 67f3a58856b6a41a46e9256a79a8ca3809f47cc6 tree bb1d2a66ff351976d6e7e3ba0a143641976cdbd8 parent 4e19025bc7be18e4d1dc8d1fde06c2d23927eb4d author Russell King Mon, 03 Jul 2006 13:30:52 +0100 committer Russell King Mon, 03 Jul 2006 13:30:52 +0100 [ARM] Fix warning in consistent.c No need for 'cr' to be a local variable, which is unused in the SMP case, and only used once in the UP case. Just call get_cr() directly. Signed-off-by: Russell King commit 4e19025bc7be18e4d1dc8d1fde06c2d23927eb4d tree 2eabe17264e8d8efa87985548ad69a7a01a893c8 parent c9e4143c4df08f7b54ba2099480266a6a1303f17 author Russell King Mon, 03 Jul 2006 13:29:38 +0100 committer Russell King Mon, 03 Jul 2006 13:29:38 +0100 [ARM] Fix warnings in arch/arm/kernel/setup.c cr_alignment is unsigned long, so should be the format string. Signed-off-by: Russell King commit c9e4143c4df08f7b54ba2099480266a6a1303f17 tree 7c32d72d0a8bfc462945d9ff8f8c5770167b3789 parent 020732ad9add86b71e9d90d5fa7687d51f58ef49 author Russell King Mon, 03 Jul 2006 13:29:03 +0100 committer Russell King Mon, 03 Jul 2006 13:29:03 +0100 [ARM] Fix ecard.c resource warnings. Platforms which use ecard.c always have 32-bit resources, so might as well lose the "long" format strings. Signed-off-by: Russell King commit 020732ad9add86b71e9d90d5fa7687d51f58ef49 tree 323c94f274aa5c107187f52f8ef121078ab97d9a parent 906243d07b8bfebeaa05b5aeaa0e5ab2d4034954 author Russell King Mon, 03 Jul 2006 13:18:04 +0100 committer Russell King Mon, 03 Jul 2006 13:18:04 +0100 [ARM] Fix ISA IRQ resources The ISA IRQ code was not using named initialisers, so merging the 64-bit resource code (which re-ordered the struct members) broke this. Fix it up to use named initialisers. Signed-off-by: Russell King commit 906243d07b8bfebeaa05b5aeaa0e5ab2d4034954 tree f09f41c206a40a74954a8bdb06d3a049e3ed16ab parent 00eb0f6b6595107dd8be80d1af2220cedb71130d author Russell King Mon, 03 Jul 2006 12:44:30 +0100 committer Russell King Mon, 03 Jul 2006 12:44:30 +0100 [ARM] Fix bad asm instruction in proc-arm925.S Signed-off-by: Russell King commit 00eb0f6b6595107dd8be80d1af2220cedb71130d tree 63a4a8a89544d678518366457224f4b86ee5f28b parent 7cddc397027ddf80b2d916f6e8fb15a21e9791c5 author Russell King Mon, 03 Jul 2006 12:36:07 +0100 committer Russell King Mon, 03 Jul 2006 12:36:07 +0100 [ARM] More missing proc-macros.S includes Signed-off-by: Russell King commit 0ebfff1491ef85d41ddf9c633834838be144f69f tree 5b469a6d61a9fcfbf94e7b6d411e544dbdec8dec parent f63e115fb50db39706b955b81e3375ef6bab2268 author Benjamin Herrenschmidt Mon, 03 Jul 2006 21:36:01 +1000 committer Paul Mackerras Mon, 03 Jul 2006 21:36:01 +1000 [POWERPC] Add new interrupt mapping core and change platforms to use it This adds the new irq remapper core and removes the old one. Because there are some fundamental conflicts with the old code, like the value of NO_IRQ which I'm now setting to 0 (as per discussions with Linus), etc..., this commit also changes the relevant platform and driver code over to use the new remapper (so as not to cause difficulties later in bisecting). This patch removes the old pre-parsing of the open firmware interrupt tree along with all the bogus assumptions it made to try to renumber interrupts according to the platform. This is all to be handled by the new code now. For the pSeries XICS interrupt controller, a single remapper host is created for the whole machine regardless of how many interrupt presentation and source controllers are found, and it's set to match any device node that isn't a 8259. That works fine on pSeries and avoids having to deal with some of the complexities of split source controllers vs. presentation controllers in the pSeries device trees. The powerpc i8259 PIC driver now always requests the legacy interrupt range. It also has the feature of being able to match any device node (including NULL) if passed no device node as an input. That will help porting over platforms with broken device-trees like Pegasos who don't have a proper interrupt tree. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 7cddc397027ddf80b2d916f6e8fb15a21e9791c5 tree 86587e405b607abde4b2aef041225ff593c1f284 parent 29454dde27d8e340bb1987bad9aa504af7081eba author Lennert Buytenhek Mon, 03 Jul 2006 12:26:02 +0100 committer Russell King Mon, 03 Jul 2006 12:26:02 +0100 [ARM] 3708/2: fix SMP build after section ioremap changes Patch from Lennert Buytenhek Commit ff0daca525dde796382b9ccd563f169df2571211 broke the SMP build, this patch fixes it up again. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit f63e115fb50db39706b955b81e3375ef6bab2268 tree 92e2d42ee02806f9419301f61968968b7ea277e4 parent cc9fd71c62f542233c412b5fabc1bbe0c4d5ad08 author Benjamin Herrenschmidt Mon, 03 Jul 2006 19:36:30 +1000 committer Paul Mackerras Mon, 03 Jul 2006 19:55:30 +1000 [POWERPC] Copy i8259 code back to arch/ppc This copies the i8259 interrupt controller driver from arch/powerpc to arch/ppc. It's currently shared by both architectures, but the upcoming arch/powerpc interrupt changes will break the arch/ppc builds. The changes are too important to just use #ifdef's in the driver. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit cc9fd71c62f542233c412b5fabc1bbe0c4d5ad08 tree 67af54159a57029057765c7ce94b00081844a6c8 parent b9e5b4e6a991a5a6d521f2e20a65835404b4169f author Benjamin Herrenschmidt Mon, 03 Jul 2006 19:35:17 +1000 committer Paul Mackerras Mon, 03 Jul 2006 19:55:24 +1000 [POWERPC] New device-tree interrupt parsing code Adds new routines to prom_parse to walk the device-tree for interrupt information. This includes both direct mapping of interrupts and low level parsing functions for use with partial trees. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit b9e5b4e6a991a5a6d521f2e20a65835404b4169f tree a0ac972faae4bf9133f576d842667bb134190341 parent 5a43a066b11ac2fe84cf67307f20b83bea390f83 author Benjamin Herrenschmidt Mon, 03 Jul 2006 19:32:51 +1000 committer Paul Mackerras Mon, 03 Jul 2006 19:55:12 +1000 [POWERPC] Use the genirq framework This adapts the generic powerpc interrupt handling code, and all of the platforms except for the embedded 6xx machines, to use the new genirq framework. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 5a43a066b11ac2fe84cf67307f20b83bea390f83 tree d4770958575f4e7592620d9a0d36c431ecceefc9 parent 3e9a69275f23baec86b54febc5dad0b2fc7fb200 author Benjamin Herrenschmidt Mon, 03 Jul 2006 19:54:59 +1000 committer Paul Mackerras Mon, 03 Jul 2006 19:54:59 +1000 [PATCH] genirq: Allow fasteoi handler to retrigger disabled interrupts Make the fasteoi handler mark disabled interrupts as pending if they happen anyway. This allow implementation of a delayed disable scheme with the fasteoi handler. Signed-off-by: Benjamin Herrenschmidt Acked-by: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Paul Mackerras commit 3e9a69275f23baec86b54febc5dad0b2fc7fb200 tree f499a827aec6f3690ad35bd9427b1a04f6e7db18 parent 7c6efda5996c26c468eaba178af9bac8b70dbdcb author Benjamin Herrenschmidt Mon, 03 Jul 2006 17:25:26 +1000 committer Paul Mackerras Mon, 03 Jul 2006 17:25:26 +1000 [POWERPC] Update the SWIM3 (powermac) floppy driver Port the PowerMac floppy driver (swim3) to use the macio device infrastructure. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 7c6efda5996c26c468eaba178af9bac8b70dbdcb tree 492ae1015db7eb70d7529bf30b94161f88b0bd18 parent 980a65136569b841cebaad524a34482b0b1627a9 author Benjamin Herrenschmidt Mon, 03 Jul 2006 17:24:15 +1000 committer Paul Mackerras Mon, 03 Jul 2006 17:24:15 +1000 [POWERPC] Fix error handling in detecting legacy serial ports Previously we weren't checking for failures in translating device addresses from the firmware. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 980a65136569b841cebaad524a34482b0b1627a9 tree 7207f26dfc1085b30a8bee9651da431490d59dd3 parent ab13446616118dc61c00ea50cc49919400717dd0 author Benjamin Herrenschmidt Mon, 03 Jul 2006 17:22:05 +1000 committer Paul Mackerras Mon, 03 Jul 2006 17:22:05 +1000 [POWERPC] Fix booting on Momentum "Apache" board (a Maple derivative) This extends the maple device-tree workarounds to work on the Apache board as well, and extends the maple platform probing code to recognize the Apache board. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit ab13446616118dc61c00ea50cc49919400717dd0 tree 3758a9db2938e354ea77629330551d7be8236ccd parent 4ce631e7a229a0e073078a197ed37d437cabcde0 author Benjamin Herrenschmidt Mon, 03 Jul 2006 17:19:48 +1000 committer Paul Mackerras Mon, 03 Jul 2006 17:19:48 +1000 [POWERPC] Fix various offb and BootX-related issues This patch fixes various issues with offb (the default fbdev used on powerpc when no proper fbdev is supported). It was broken when using BootX under some circumstances and would fail to properly get the framebuffer base address in others. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 4ce631e7a229a0e073078a197ed37d437cabcde0 tree 09021f21533406d6a0f5c454cd0e282690f59993 parent 609c9991b193f99a9a9e941beffcdb540752f761 author Paul Mackerras Mon, 03 Jul 2006 16:36:17 +1000 committer Paul Mackerras Mon, 03 Jul 2006 16:36:17 +1000 [POWERPC] Add a default config for 32-bit CHRP machines Signed-off-by: Paul Mackerras commit 29454dde27d8e340bb1987bad9aa504af7081eba tree 62d872171a9c3468b9240d2ebe8465687bf931d6 parent bb8d5a55a523869ebcdd004a08ed5fab86b474e3 author Thomas Gleixner Mon, 03 Jul 2006 02:22:22 +0200 committer Linus Torvalds Sun, 02 Jul 2006 17:29:57 -0700 [PATCH] genirq: Fixup ARM devel merge ARM devel merge introduced new machine functionality which was not covered by the ARM -> genirq patches. Fix it up and make it compile again. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit bb8d5a55a523869ebcdd004a08ed5fab86b474e3 tree b1d9d8785d24ce6feae16390e7b9f697e2ded141 parent 284c66806eb6df7f5c66d298681f1abe81a5a9ab author Thomas Gleixner Mon, 03 Jul 2006 02:21:18 +0200 committer Linus Torvalds Sun, 02 Jul 2006 17:29:22 -0700 [PATCH] ARM: Fixup missing includes in arch/arm/mm/proc-.S For several proc-.S files the include of proc-macros.S is missing. Make it compile and work again. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 284c66806eb6df7f5c66d298681f1abe81a5a9ab tree b6573efe262b85a5bd3cf3c2a7964214143125ed parent 52e405eaa9806968e88b35d65e57acad954a5ab5 author Thomas Gleixner Mon, 03 Jul 2006 02:20:32 +0200 committer Linus Torvalds Sun, 02 Jul 2006 17:29:22 -0700 [PATCH] genirq:fixup missing SA_PERCPU replacement The irqflags consolidation converted SA_PERCPU_IRQ to IRQF_PERCPU but did not define the new constant. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 52e405eaa9806968e88b35d65e57acad954a5ab5 tree b42e2d50c4f9d1b00baf5a8b54309ffdf1950456 parent d061daa0e3abdddc28e21a37c8ac4536dedbf239 author Thomas Gleixner Mon, 03 Jul 2006 02:20:05 +0200 committer Linus Torvalds Sun, 02 Jul 2006 17:29:22 -0700 [PATCH] ARM: fixup irqflags breakage after ARM genirq merge The irgflags consolidation did conflict with the ARM to generic IRQ conversion and was not applied for ARM. Fix it up. Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit d061daa0e3abdddc28e21a37c8ac4536dedbf239 tree 6c08e7b8ed988053f421e38578fa11db538b0747 parent f82bc1762e0e74b7e0040a4d83be06d32c37fc2e author Thomas Gleixner Mon, 03 Jul 2006 02:18:48 +0200 committer Linus Torvalds Sun, 02 Jul 2006 17:29:21 -0700 [PATCH] genirq: ARM dyntick cleanup Linus: "The hacks in kernel/irq/handle.c are really horrid. REALLY horrid." They are indeed. Move the dyntick quirks to ARM where they belong. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit f82bc1762e0e74b7e0040a4d83be06d32c37fc2e tree 685e0c3b5a962928efb66e36d9185febddaf5964 parent 4ebd9ab387b39c44165cd296a6637082a4f0f66a parent 4cca56c50427eecfa2428cdee722848cd82f443c author Linus Torvalds Sun, 02 Jul 2006 16:35:07 -0700 committer Linus Torvalds Sun, 02 Jul 2006 16:35:07 -0700 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc * 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] sdhci: remove duplicate error message [MMC] sdhci: force DMA on some controllers [MMC] sdhci: quirk for broken reset [MMC] sdhci: Add SDHCI controller ids commit 609c9991b193f99a9a9e941beffcdb540752f761 tree a340e0b1d2328d67958e9d44fef39082424c9c15 parent a1af5b2fd49eb24ab8c024da5d853b09841d1f8f author Dave Jones Thu, 29 Jun 2006 16:52:53 -0400 committer Paul Mackerras Mon, 03 Jul 2006 08:56:46 +1000 [POWERPC] fix implicit declaration on cell. (Only fails with -Werror-implicit-function-declaration, but it should still be fixed). arch/powerpc/platforms/cell/setup.c:145: error: implicit declaration of function 'udbg_init_rtas_console' Signed-off-by: Dave Jones Signed-off-by: Paul Mackerras commit a1af5b2fd49eb24ab8c024da5d853b09841d1f8f tree a475482232e15282a2d212bbe9ccc10ac5d06234 parent 4ebd9ab387b39c44165cd296a6637082a4f0f66a author Jeremy Kerr Thu, 29 Jun 2006 20:28:18 +1000 committer Paul Mackerras Mon, 03 Jul 2006 08:56:33 +1000 [POWERPC] change get_property to return void * Change the get_property() function to return a void *. This allows us to later remove the cast done in the majority of callers. Built for pseries, iseries, pmac32, cell, cbesim, g5, systemsim, maple, and mpc* defconfigs Signed-off-by: Jeremy Kerr Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 4ebd9ab387b39c44165cd296a6637082a4f0f66a tree b6a6d5402a8108c4035a824f5ed428ef24330fb3 parent b4b9034132c7e1e4474999e688dd7d03b7d97a99 author Dominik Hackl Sun, 02 Jul 2006 17:29:26 +0200 committer Linus Torvalds Sun, 02 Jul 2006 15:10:20 -0700 [PATCH] nfs: non-procfs build fix This fixes a bug in fs/nfs which makes it impossible to build nfs without having procfs enabled. Signed-off-by: Dominik Hackl Signed-off-by: Linus Torvalds commit b4b9034132c7e1e4474999e688dd7d03b7d97a99 tree c02c571b9e0e59b9ffa18baae23c83f09ff07adb parent a8c4c20dfa8b28a3c99e33c639d9c2ea5657741e parent 07d265dd59456f702b7d2a1ac471f06ee4adc9ef author Linus Torvalds Sun, 02 Jul 2006 15:07:45 -0700 committer Linus Torvalds Sun, 02 Jul 2006 15:07:45 -0700 Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm * 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm: (24 commits) [ARM] 3683/2: ARM: Convert at91rm9200 to generic irq handling [ARM] 3682/2: ARM: Convert ixp4xx to generic irq handling [ARM] 3702/1: ARM: Convert ixp23xx to generic irq handling [ARM] 3701/1: ARM: Convert plat-omap to generic irq handling [ARM] 3700/1: ARM: Convert lh7a40x to generic irq handling [ARM] 3699/1: ARM: Convert s3c2410 to generic irq handling [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling [ARM] 3697/1: ARM: Convert shark to generic irq handling [ARM] 3696/1: ARM: Convert clps711x to generic irq handling [ARM] 3694/1: ARM: Convert ecard driver to generic irq handling [ARM] 3693/1: ARM: Convert omap1 to generic irq handling [ARM] 3691/1: ARM: Convert imx to generic irq handling [ARM] 3688/1: ARM: Convert clps7500 to generic irq handling [ARM] 3687/1: ARM: Convert integrator to generic irq handling [ARM] 3685/1: ARM: Convert pxa to generic irq handling [ARM] 3684/1: ARM: Convert l7200 to generic irq handling [ARM] 3681/1: ARM: Convert ixp2000 to generic irq handling [ARM] 3680/1: ARM: Convert footbridge to generic irq handling [ARM] 3695/1: ARM drivers/pcmcia: Fixup includes [ARM] 3689/1: ARM drivers/input/touchscreen: Fixup includes ... Manual conflict resolved in kernel/irq/handle.c (butt-ugly ARM tickless code). commit a8c4c20dfa8b28a3c99e33c639d9c2ea5657741e tree 887b64d29b5a46d9ab2ca1267d8a2f05b5845561 parent 168d04b3b4de7723eb73b3cffc9cb75224e0f393 parent 2dc7667b9d0674db6572723356fe3857031101a4 author Linus Torvalds Sun, 02 Jul 2006 15:04:12 -0700 committer Linus Torvalds Sun, 02 Jul 2006 15:04:12 -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: (44 commits) [ARM] 3541/2: workaround for PXA27x erratum E7 [ARM] nommu: provide a way for correct control register value selection [ARM] 3705/1: add supersection support to ioremap() [ARM] 3707/1: iwmmxt: use the generic thread notifier infrastructure [ARM] 3706/2: ep93xx: add cirrus logic edb9315a support [ARM] 3704/1: format IOP Kconfig with tabs, create more consistency [ARM] 3703/1: Add help description for ARCH_EP80219 [ARM] 3678/1: MMC: Make OMAP MMC work [ARM] 3677/1: OMAP: Update H2 defconfig [ARM] 3676/1: ARM: OMAP: Fix dmtimers and timer32k to compile on OMAP1 [ARM] Add section support to ioremap [ARM] Fix sa11x0 SDRAM selection [ARM] Set bit 4 on section mappings correctly depending on CPU [ARM] 3666/1: TRIZEPS4 [1/5] core ARM: OMAP: Multiplexing for 24xx GPMC wait pin monitoring ARM: OMAP: Fix SRAM to use MT_MEMORY instead of MT_DEVICE ARM: OMAP: Update dmtimers ARM: OMAP: Make clock variables static ARM: OMAP: Fix GPMC compilation when DEBUG is defined ARM: OMAP: Mux updates for external DMA and GPIO ... commit 168d04b3b4de7723eb73b3cffc9cb75224e0f393 tree 55fda7a4784902100da9c716109d44bded281e80 parent 6ce6c7faf2d0fede5e1530b0f731a90f138fd69e parent 2c5f394025df6e54a9c09afda03855f3877b9afa author Linus Torvalds Sun, 02 Jul 2006 14:58:03 -0700 committer Linus Torvalds Sun, 02 Jul 2006 14:58:03 -0700 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc * 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] sdhci: version bump sdhci [MMC] sdhci: support controller specific quirks [MMC] sdhci: more DMA capabilities tests [MMC] sdhci: reset sdhci controller early [MMC] sdhci: check controller version [MMC] sdhci: check only relevant inhibit bits [MMC] sdhci: Test for invalid block size [MMC] sdhci: Avoid sdhci DMA boundaries [MMC] Fix sdhci PIO routines [MMC] sdhci: fix interrupt handling [MMC] sdhci: correct register order [MMC] sdhci: proper timeout handling [MMC] sdhci: fix sdhci reset timeout [MMC] sdhci: fix timeout loops in sdhci [MMC] sdhci: support for multiple voltages [MMC] sdhci: print device id [MMC] sdhci: check SDHCI base clock commit 6ce6c7faf2d0fede5e1530b0f731a90f138fd69e tree eead4459ad413d88c342fcbf3470b0ac16225608 parent 65ca68b30073473583f6ca2f463cbd94ade43ddb author Thomas Gleixner Sat, 01 Jul 2006 19:29:47 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:55 -0700 [PATCH] irq-flags: documentation: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 65ca68b30073473583f6ca2f463cbd94ade43ddb tree f7d4384450fbdfcb2661a74f3c2f28e53721eeb0 parent 63a43399db67d6f94364f933f68f38f58387737a author Thomas Gleixner Sat, 01 Jul 2006 19:29:46 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:54 -0700 [PATCH] irq-flags: sound: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Jaroslav Kysela Cc: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63a43399db67d6f94364f933f68f38f58387737a tree 8cfba3ad85e5f93b5f77db68c326f7a35c0fe622 parent d54b5caa832caa3715a458115b6ea79ad17c4f31 author Thomas Gleixner Sat, 01 Jul 2006 19:29:45 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:53 -0700 [PATCH] irq-flags: video: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d54b5caa832caa3715a458115b6ea79ad17c4f31 tree cba8510790089acd4a14dee59a39a24c88669b9a parent 40663cc7f1c1ccf515d8af9470925a0cb2f59b5d author Thomas Gleixner Sat, 01 Jul 2006 19:29:44 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:53 -0700 [PATCH] irq-flags: usb: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40663cc7f1c1ccf515d8af9470925a0cb2f59b5d tree 569e10d6a6ea750970a557651bb129b7ace961d1 parent 1d6f359a2e06296418481239f8054a878f36e819 author Thomas Gleixner Sat, 01 Jul 2006 19:29:43 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:53 -0700 [PATCH] irq-flags: serial: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d6f359a2e06296418481239f8054a878f36e819 tree e3ce0c69e4f34374f51f4e226374467ca80e3993 parent 5d8c8a2e8edc63d8aef7656678f41c6c603f0443 author Thomas Gleixner Sat, 01 Jul 2006 19:29:42 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:53 -0700 [PATCH] irq-flags: scsi: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d8c8a2e8edc63d8aef7656678f41c6c603f0443 tree 233b4980f4db79193d0aa0f4e4a016a3a646c246 parent 6b4486e2e3b1044f157af44920b520f3593e3923 author Thomas Gleixner Sat, 01 Jul 2006 19:29:41 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:52 -0700 [PATCH] irq-flags: rio: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b4486e2e3b1044f157af44920b520f3593e3923 tree 93c5880ebd6dda3febb444ac6204cdaa81ba9508 parent 8c56e7214effd2fa50359e58832ad9c3eb51a3de author Thomas Gleixner Sat, 01 Jul 2006 19:29:41 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:52 -0700 [PATCH] irq-flags: pci: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c56e7214effd2fa50359e58832ad9c3eb51a3de tree e7ceab371fbd98421f503e9f773f1045e1b6b0b1 parent 1fb9df5d3069064c037c81c0ab8bf783ffa5e373 author Thomas Gleixner Sat, 01 Jul 2006 19:29:40 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:52 -0700 [PATCH] irq-flags: PARISC: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Kyle McMartin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1fb9df5d3069064c037c81c0ab8bf783ffa5e373 tree 23028cfd5b98a72fcf12256fac4bc0c68181f2c4 parent dace145374b8e39aeb920304c358ab5e220341ab author Thomas Gleixner Sat, 01 Jul 2006 19:29:39 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:51 -0700 [PATCH] irq-flags: drivers/net: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dace145374b8e39aeb920304c358ab5e220341ab tree e37c76578468f489ce2dbec4d04400380c14ee14 parent 8076fe32a7db9a6628589ffa372808e4ba25d222 author Thomas Gleixner Sat, 01 Jul 2006 19:29:38 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:50 -0700 [PATCH] irq-flags: misc drivers: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8076fe32a7db9a6628589ffa372808e4ba25d222 tree ab9a9bfef377d0fbb2ad49748488e9f7d6d9d098 parent 9ba02bec3888d391bad0fb0a8dd584f88eed6c8d author Thomas Gleixner Sat, 01 Jul 2006 19:29:37 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:50 -0700 [PATCH] irq-flags: media: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ba02bec3888d391bad0fb0a8dd584f88eed6c8d tree c57f93b56dfed5b45735cc558b739c8986b4dfdd parent 272ee69c653d4b4f15049ed956554085d4bdaa44 author Thomas Gleixner Sat, 01 Jul 2006 19:29:36 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:50 -0700 [PATCH] irq-flags: isdn: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 272ee69c653d4b4f15049ed956554085d4bdaa44 tree 2489aa0a947b0f6cf9d34cd55bea5b268db1d188 parent 362537b9abf02458967fc2bd9aa7cd18e3ef576a author Thomas Gleixner Sat, 01 Jul 2006 19:29:35 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:50 -0700 [PATCH] irq-flags: firewire: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Jody McIntyre Cc: Ben Collins Cc: Stefan Richter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 362537b9abf02458967fc2bd9aa7cd18e3ef576a tree 2952150c2727e0ace3efab29ea5ea727265090b4 parent 935f6e3abc76e868de1acbd76cf9b760e66cf237 author Thomas Gleixner Sat, 01 Jul 2006 19:29:34 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:49 -0700 [PATCH] irq-flags: ide: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Alan Cox Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 935f6e3abc76e868de1acbd76cf9b760e66cf237 tree ccec698e56a4d5cd3643382d489f1dc91d412a62 parent 0f2ed4c6bae23d2b7ef0ea2d272377e3de700c0c author Thomas Gleixner Sat, 01 Jul 2006 19:29:34 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:49 -0700 [PATCH] irq-flags: drivers/drm: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Dave Airlie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f2ed4c6bae23d2b7ef0ea2d272377e3de700c0c tree 94a24c9209eb97027e7035b2790a1592d4b2c40c parent 69ab3912d1b4dbf27ea1a383cb5731251fc0e109 author Thomas Gleixner Sat, 01 Jul 2006 19:29:33 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:49 -0700 [PATCH] irq-flags: drivers/char: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69ab3912d1b4dbf27ea1a383cb5731251fc0e109 tree d0e68c828d8f49483d4bfaccbe4d98c1b339ee94 parent 3cca53b02a5bab0f407b1add2f84c22c20243a79 author Thomas Gleixner Sat, 01 Jul 2006 19:29:32 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:49 -0700 [PATCH] irq-flags: drivers/block Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3cca53b02a5bab0f407b1add2f84c22c20243a79 tree 06d375432c8c5c8895378e0b5049920e73211b2d parent 85ac3ab254405edcc7bef7d61b03930247882efc author Thomas Gleixner Sat, 01 Jul 2006 19:29:31 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:49 -0700 [PATCH] irq-flags: generic irq: Use the new IRQF_ constants Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85ac3ab254405edcc7bef7d61b03930247882efc tree c04185d2c34b2be3abe8eaf4016696597321e852 parent b1e05aa2303e48b16e850c4be2513e60a3495238 author Thomas Gleixner Sat, 01 Jul 2006 19:29:31 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:49 -0700 [PATCH] irq-flags: XTENSA: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1e05aa2303e48b16e850c4be2513e60a3495238 tree 2086620ade94db7d712ee9df2a87049e20c9ceba parent 8b91fbb8338bae702f5a6c984fb05f1a01f6590c author Thomas Gleixner Sat, 01 Jul 2006 19:29:29 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:49 -0700 [PATCH] irq-flags: x86_64: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b91fbb8338bae702f5a6c984fb05f1a01f6590c tree 355beffd70984e9c355bafc782f1a6fa51ed7387 parent bd6aa6502e7f82c39090aea29e4b644c29e720bd author Thomas Gleixner Sat, 01 Jul 2006 19:29:28 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:48 -0700 [PATCH] irq-flags: V850: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd6aa6502e7f82c39090aea29e4b644c29e720bd tree 170b011fec12097098f6e39f9c8a716578625fbc parent 6741320247fbf147ab8aa41b2a7201425ac1e1df author Thomas Gleixner Sat, 01 Jul 2006 19:29:27 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:48 -0700 [PATCH] irq-flags: UM: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6741320247fbf147ab8aa41b2a7201425ac1e1df tree 6ef3e87744af4ecf77f969eb7de0e7d54a25eb73 parent d356d7f4f2761b1391ec41404eefe280e4f11f76 author Thomas Gleixner Sat, 01 Jul 2006 19:29:26 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:48 -0700 [PATCH] irq-flags: SPARC: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d356d7f4f2761b1391ec41404eefe280e4f11f76 tree 83504abb7cd82aec3796a799d6d041e4b0c3d326 parent 6d20819f8050092d40e9c99c55d82c8e26d42599 author Thomas Gleixner Sat, 01 Jul 2006 19:29:26 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:48 -0700 [PATCH] irq-flags: SPARC64: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d20819f8050092d40e9c99c55d82c8e26d42599 tree 01ef4df564bda53f282617c019a1503d391f0093 parent 5fb55ae955cee254f9e3b45636266a4855bb88a5 author Thomas Gleixner Sat, 01 Jul 2006 19:29:25 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:48 -0700 [PATCH] irq-flags: SH: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Kazumoto Kojima Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fb55ae955cee254f9e3b45636266a4855bb88a5 tree 26a41aed39c7476ca06bb2fe697b6c662f7d9427 parent dacdb3b23a918d52ff52708b25d6d45dab7ea14b author Thomas Gleixner Sat, 01 Jul 2006 19:29:24 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:48 -0700 [PATCH] irq-flags: SH64: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dacdb3b23a918d52ff52708b25d6d45dab7ea14b tree aa59432276167b6065e298aa73fc68f56caeafa3 parent bc59d2800d535ff36dc9e6c5328b4a075076bbaa author Thomas Gleixner Sat, 01 Jul 2006 19:29:23 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:48 -0700 [PATCH] irq-flags: S390: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Martin Schwidefsky Cc: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc59d2800d535ff36dc9e6c5328b4a075076bbaa tree fc2c82e64004a769226b9de38184212bd2e351d9 parent 6714465e83e784d65d0f4dbab7f2238574febfce author Thomas Gleixner Sat, 01 Jul 2006 19:29:22 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:48 -0700 [PATCH] irq-flags: PPC: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6714465e83e784d65d0f4dbab7f2238574febfce tree 42e2f992203b84577ec5b18033ed54099f2f1bf9 parent 733ea869e5756e0fd0333728cc1ed7c42e6ddfc0 author Thomas Gleixner Sat, 01 Jul 2006 19:29:22 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:47 -0700 [PATCH] irq-flags: POWERPC: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 733ea869e5756e0fd0333728cc1ed7c42e6ddfc0 tree 91fa076106e45ad7fb0c6b1492eee6b060fa4e43 parent f40298fddcc3c8115c6135c9733f5a0de52dcea9 author Thomas Gleixner Sat, 01 Jul 2006 19:29:21 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:47 -0700 [PATCH] irq-flags: PARISC: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Kyle McMartin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f40298fddcc3c8115c6135c9733f5a0de52dcea9 tree c0ff0cc1bd589cf764a55cfc93e3f7bbd559fe92 parent b0b9fdc123cf0f1b671ac3f593d77af325ad4cf3 author Thomas Gleixner Sat, 01 Jul 2006 19:29:20 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:47 -0700 [PATCH] irq-flags: MIPS: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0b9fdc123cf0f1b671ac3f593d77af325ad4cf3 tree e4884524c5c85bbc2de481d4efecf3ca4b8bc349 parent f6f238875c93d020efb4d51cbca464dff31ec1f9 author Thomas Gleixner Sat, 01 Jul 2006 19:29:19 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:47 -0700 [PATCH] irq-flags: M68K: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Roman Zippel Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6f238875c93d020efb4d51cbca464dff31ec1f9 tree 2cb7374485cd37b73adfd1505ed85d0043f66672 parent aff60147049c0be346909ee2e1dbe600a5c7aa91 author Thomas Gleixner Sat, 01 Jul 2006 19:29:18 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:47 -0700 [PATCH] irq-flags: M68KNOMMU: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aff60147049c0be346909ee2e1dbe600a5c7aa91 tree 7ec472e1187d622e36634fbd3417eb82308a05cf parent 121a4226e89aae6654d667d58ab72df740b97b92 author Thomas Gleixner Sat, 01 Jul 2006 19:29:18 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:47 -0700 [PATCH] irq-flags: M32R: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 121a4226e89aae6654d667d58ab72df740b97b92 tree 906a351589bd914dec718a106291cf856a13fcb2 parent 4879d77c4c2fdc81ba1ff0ad56fa41b3676d0472 author Thomas Gleixner Sat, 01 Jul 2006 19:29:17 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:47 -0700 [PATCH] irq-flags: IA64: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4879d77c4c2fdc81ba1ff0ad56fa41b3676d0472 tree 15b1c96fea677afcde7c0d947d39f64b3e5d3396 parent b98d3396f69f047163b3a1dc2ffabb7402a244b2 author Thomas Gleixner Sat, 01 Jul 2006 19:29:16 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:47 -0700 [PATCH] irq-flags: i386: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b98d3396f69f047163b3a1dc2ffabb7402a244b2 tree c9f6949729d8d674ffedd75e313096bffe3174ee parent bc2e2635bd814dc893e45e866774883a0a66cd36 author Thomas Gleixner Sat, 01 Jul 2006 19:29:15 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:47 -0700 [PATCH] irq-flags: H8300: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc2e2635bd814dc893e45e866774883a0a66cd36 tree e9870d5b9d16a73fd1fea22fdc3c386a90631346 parent aa7135ff33bf697196f2a3104d93837096c63ff0 author Thomas Gleixner Sat, 01 Jul 2006 19:29:15 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:46 -0700 [PATCH] irq-flags: FRV: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa7135ff33bf697196f2a3104d93837096c63ff0 tree 0301eb95cfb942af6d53d0105d09dc74e0239afb parent af0f4d3609d97dc5edbed759456ae568f6ac9ca1 author Thomas Gleixner Sat, 01 Jul 2006 19:29:14 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:46 -0700 [PATCH] irq-flags: CRIS: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Mikael Starvik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af0f4d3609d97dc5edbed759456ae568f6ac9ca1 tree f68b089afed6d1cd98267d8304016183f52bdf52 parent d18ecedc021351ca432a5b7e28d8f91c00957dc7 author Thomas Gleixner Sat, 01 Jul 2006 19:29:12 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:46 -0700 [PATCH] irq-flags: ARM26: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d18ecedc021351ca432a5b7e28d8f91c00957dc7 tree 312354a1f88cab5562dc97b5b4bf15b36d754d06 parent 6e21361619328751e2637b004e14cf360aafbddc author Thomas Gleixner Sat, 01 Jul 2006 19:29:11 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:46 -0700 [PATCH] irq-flags: ALPHA: Use the new IRQF_ constants Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e21361619328751e2637b004e14cf360aafbddc tree ca52e5321d429a6b346ef17c629c2186f88c781d parent d63fb6c55f5f9eb3032fc5c3ab6eb9a26dd67cdc author Thomas Gleixner Sat, 01 Jul 2006 19:29:03 -0700 committer Linus Torvalds Sun, 02 Jul 2006 13:58:46 -0700 [PATCH] irq-flags: consolidate flags for request_irq The recent interrupt rework introduced bit value conflicts with sparc. Instead of introducing new architecture flags mess, move the interrupt SA_ flags out of the signal namespace and replace them by interrupt related flags. This allows to remove the obsolete SA_INTERRUPT flag and clean up the bit field values. This patch: Move the interrupt related SA_ flags out of linux/signal.h and rename them to IRQF_ . This moves the interrupt related flags out of the signal namespace and allows to remove the architecture dependencies. SA_INTERRUPT is not needed by userspace and glibc so it can be removed safely. The existing SA_ constants are kept for easy transition and will be removed after a 6 month grace period. Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: "Randy.Dunlap" Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: "Antonino A. Daplas" Cc: Greg KH Cc: Russell King Cc: James Bottomley Cc: Kyle McMartin Cc: Jeff Garzik Cc: Mauro Carvalho Chehab Cc: Karsten Keil Cc: Jody McIntyre Cc: Ben Collins Cc: Stefan Richter Cc: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Dave Airlie Cc: Jens Axboe Cc: Chris Zankel Cc: Andi Kleen Cc: Miles Bader Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Ralf Baechle Cc: Roman Zippel Cc: Geert Uytterhoeven Cc: Greg Ungerer Cc: "Luck, Tony" Cc: Yoshinori Sato Cc: David Howells Cc: Mikael Starvik Cc: Russell King Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 947deee8904b3c2edc7f59ab6e6242499e4dc434 tree 76f7c5b98508df4b6dea7b8dc01d973b9df43e60 parent 4faf4e0e7d4e1935fbfc5043d3ebd8d51a3d898d author Russell King Sun, 02 Jul 2006 20:45:51 +0100 committer Russell King Sun, 02 Jul 2006 20:45:51 +0100 [SERIAL] Convert fifosize to an unsigned int Some UARTs have more than 255 bytes of FIFO, which can't be represented by an unsigned char. Change the kernel's internal structure to be an unsigned int, but still export an unsigned char via the TIOCGSERIAL ioctl. If the TIOCSSERIAL ioctl provides a fifo size of 0, assume this means "don't change" otherwise we'll corrupt the larger fifo sizes. Signed-off-by: Russell King commit 34c162f79e374556dd1384437f0dab558b5dc657 tree 555770fa50a734b75031f2aed2a7501328b930b4 parent 701842e3bdd7db09db6af43fc5906ee19b61338d author Sam Ravnborg Sun, 02 Jul 2006 20:21:49 +0200 committer Sam Ravnborg Sun, 02 Jul 2006 20:21:49 +0200 kbuild: explicit turn off gcc stack-protector Ubuntu has enabled -fstack-protector per default in gcc breaking kernel build. Explicit turn it off for now. Later we may decide to make it configurable if the kernel starts to support it. Signed-off-by: Sam Ravnborg commit 4cca56c50427eecfa2428cdee722848cd82f443c tree 712c56aaf853550628a6fee7a3f4694f5dadeb8b parent 98608076a21914ab12f1c858a0cdf55366260f12 author Pierre Ossman Fri, 30 Jun 2006 02:22:34 -0700 committer Russell King Sun, 02 Jul 2006 18:02:02 +0100 [MMC] sdhci: remove duplicate error message When there is remaining blocks untransferred, we get two error messages saying almost the same thing. Make sure at most one is shown. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 98608076a21914ab12f1c858a0cdf55366260f12 tree e027e6689c66fa3c5dfacac4d6217efc5553252c parent 645289dca5021224279e67b4655796cafdfdad00 author Pierre Ossman Fri, 30 Jun 2006 02:22:34 -0700 committer Russell King Sun, 02 Jul 2006 18:02:01 +0100 [MMC] sdhci: force DMA on some controllers Some controllers incorrectly report that the cannot do DMA. Forcefully enable it for those that we know it works fine on. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 645289dca5021224279e67b4655796cafdfdad00 tree 93b577adc6d6a8c77553525696726eb2d5297fb4 parent 067da0f4faea4cc077a346d7848eec39a58870b4 author Pierre Ossman Fri, 30 Jun 2006 02:22:33 -0700 committer Russell King Sun, 02 Jul 2006 18:02:00 +0100 [MMC] sdhci: quirk for broken reset Some controllers fail to complete a reset unless you touch the clock register first. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 067da0f4faea4cc077a346d7848eec39a58870b4 tree cd9a61f8f6932fdeb94cefaac4eaf6325b95bb01 parent 2c5f394025df6e54a9c09afda03855f3877b9afa author Pierre Ossman Fri, 30 Jun 2006 02:22:32 -0700 committer Russell King Sun, 02 Jul 2006 18:01:56 +0100 [MMC] sdhci: Add SDHCI controller ids Add ids for SDHCI controllers so that they can be identified for quirks. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit d6b0c53723753fc0cfda63f56735b225c43e1e9a tree 7ca09539e8b026b9ee2a885f391f8c5b13226a17 parent f58f8313a6f552d1e7889926a29f0cf91c02f55d author James Bottomley Sun, 02 Jul 2006 10:06:28 -0500 committer James Bottomley Sun, 02 Jul 2006 11:17:19 -0500 [SCSI] fix error handling in scsi_io_completion There was a logic fault in scsi_io_completion() where zero transfer commands that complete successfully were sent to the block layer as not up to date. This patch removes the if (good_bytes > 0) gate around the successful completion, since zero transfer commands do have good_bytes == 0. Signed-off-by: James Bottomley commit 2c5f394025df6e54a9c09afda03855f3877b9afa tree f2b22f931f07da1f886cf3d1d69177da3351a6f0 parent df673b227ce08a7706b30fd2bf6512393d9c3c29 author Pierre Ossman Fri, 30 Jun 2006 02:22:32 -0700 committer Russell King Sun, 02 Jul 2006 16:55:00 +0100 [MMC] sdhci: version bump sdhci New version number for sdhci driver. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit df673b227ce08a7706b30fd2bf6512393d9c3c29 tree 026fb02f088a922b1a7b5c2b984e779df266625f parent 6743527441430586aa82a0dee1b2700a2a974ebc author Pierre Ossman Fri, 30 Jun 2006 02:22:31 -0700 committer Russell King Sun, 02 Jul 2006 16:54:59 +0100 [MMC] sdhci: support controller specific quirks As some specific controllers will have bugs, we need a way to map special behaviour to certain hardware. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 6743527441430586aa82a0dee1b2700a2a974ebc tree 6977160737a9d300c236bde53fb8ca5535e8bafb parent d96649ed5ace812ffc8d86252d7c663326ca47f8 author Pierre Ossman Fri, 30 Jun 2006 02:22:31 -0700 committer Russell King Sun, 02 Jul 2006 16:54:56 +0100 [MMC] sdhci: more DMA capabilities tests Properly test for controller interface to see if it's DMA capable. As many controllers are misconfigured in this regard, also add debug parameters to force DMA support either way. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit d96649ed5ace812ffc8d86252d7c663326ca47f8 tree 12e56f8c72310ecfa68ed7c807f30328534d644d parent 4a9655051fb1efa568e53baf5dfb21e33bad6bf6 author Pierre Ossman Fri, 30 Jun 2006 02:22:30 -0700 committer Russell King Sun, 02 Jul 2006 16:54:54 +0100 [MMC] sdhci: reset sdhci controller early The specification states that the capabilities register might need a reset to get correct values after boot up. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 4a9655051fb1efa568e53baf5dfb21e33bad6bf6 tree 4cafaf33d3d9c821f39c3604ebdeeb85c5b911ef parent fd2208d7c72ef5995b730f1e23b082261499e334 author Pierre Ossman Fri, 30 Jun 2006 02:22:29 -0700 committer Russell King Sun, 02 Jul 2006 16:54:53 +0100 [MMC] sdhci: check controller version Check the interface version of the controller and bail out if it's an unknown version. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit fd2208d7c72ef5995b730f1e23b082261499e334 tree 45ae8cd310437e2688bf78a53a194bc655a940b7 parent 1d676e02970d9e511c9b96101501da90954ee265 author Pierre Ossman Fri, 30 Jun 2006 02:22:28 -0700 committer Russell King Sun, 02 Jul 2006 16:54:50 +0100 [MMC] sdhci: check only relevant inhibit bits Conform to the sdhci specification as to which inhibit bits should be checked at different times. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 1d676e02970d9e511c9b96101501da90954ee265 tree 59a5e1c46584cfa7683d33d4c3ff494589ee65e3 parent bab7696184bbf0ea48d56902bd1f9ac983079ad2 author Pierre Ossman Sun, 02 Jul 2006 16:52:10 +0100 committer Russell King Sun, 02 Jul 2006 16:52:10 +0100 [MMC] sdhci: Test for invalid block size The controller has an upper limit on the block size. Make sure we do not cross it. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit bab7696184bbf0ea48d56902bd1f9ac983079ad2 tree f8b90b4c561858c47624307df4d1e67498f23df2 parent a406f5a3b68ee1db2306a2ba1c9b00dbd3505d05 author Pierre Ossman Sun, 02 Jul 2006 16:51:35 +0100 committer Russell King Sun, 02 Jul 2006 16:51:35 +0100 [MMC] sdhci: Avoid sdhci DMA boundaries The sdhci controllers will issue an interrupt when a configurable number of bytes have been transfered using DMA. The purpose is to handle multiple, scattered memory pages. Unfortunately, it requires that all transfers are completely aligned to memory pages, which we cannot guarantee. So we just disable the function. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit a406f5a3b68ee1db2306a2ba1c9b00dbd3505d05 tree 47434d59bab5732b7154522e14923c591c666360 parent 3192a28f7d34ea8f1d0fef8ca5bc0314b5b5bb19 author Pierre Ossman Sun, 02 Jul 2006 16:50:59 +0100 committer Russell King Sun, 02 Jul 2006 16:50:59 +0100 [MMC] Fix sdhci PIO routines The sdhci controllers operate with blocks, not bytes. The PIO routines must therefore make sure that the minimum unit transfered is a complete block. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit 3192a28f7d34ea8f1d0fef8ca5bc0314b5b5bb19 tree 8e10e81299096729254d87cb1b7aba94a150c84d parent c7fa9963ee6317b54e85b260791d603ea2feb8e3 author Pierre Ossman Fri, 30 Jun 2006 02:22:26 -0700 committer Russell King Sun, 02 Jul 2006 16:02:05 +0100 [MMC] sdhci: fix interrupt handling The specification says that interrupts should be cleared before the source is removed. We should also not set unknown bits. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit c7fa9963ee6317b54e85b260791d603ea2feb8e3 tree 1d0a79b0556321ff60ddf9c71ef80c3816614aa7 parent 1c8cde92fa5c57daa9ff58d970ca6374f8d484a2 author Pierre Ossman Fri, 30 Jun 2006 02:22:25 -0700 committer Russell King Sun, 02 Jul 2006 16:02:04 +0100 [MMC] sdhci: correct register order The sdhci specification states that some registers must be written to in a specific order. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 1c8cde92fa5c57daa9ff58d970ca6374f8d484a2 tree 96ddfe6071bcede86521fda46c0eafd27c4689c1 parent e16514d8d86ecbde18a2a7495cf028861b34c157 author Pierre Ossman Fri, 30 Jun 2006 02:22:25 -0700 committer Russell King Sun, 02 Jul 2006 16:02:04 +0100 [MMC] sdhci: proper timeout handling Use the give timeout clock and calculate a proper timeout instead of using the maximum at all times. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit e16514d8d86ecbde18a2a7495cf028861b34c157 tree 9bef8f5f095d8fb4088ec1344369ada10c106d00 parent 7cb2c76fa2251474e42d55b75163c9d7ed11741e author Pierre Ossman Fri, 30 Jun 2006 02:22:24 -0700 committer Russell King Sun, 02 Jul 2006 16:02:03 +0100 [MMC] sdhci: fix sdhci reset timeout The reset register is automatically cleared when the reset has completed. Hence, we should busy wait and not have a fixed delay. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 7cb2c76fa2251474e42d55b75163c9d7ed11741e tree 65354e6d46ae68915481a7a3f86fbcbb92c4d803 parent 146ad66eac836c0b976c98f428d73e1f6a75270d author Pierre Ossman Fri, 30 Jun 2006 02:22:23 -0700 committer Russell King Sun, 02 Jul 2006 16:02:02 +0100 [MMC] sdhci: fix timeout loops in sdhci The current timeout loop assume that jiffies are updated. This might not be the case depending on locks and if the kernel is compiled without preemption. Change the system to use a counter and fixed delays. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 146ad66eac836c0b976c98f428d73e1f6a75270d tree 7f1dd2b34a6225360fab04abffa4c9dd2e124cd2 parent 51f82bc07a9673d790c2a17de8e3fa8046543f04 author Pierre Ossman Fri, 30 Jun 2006 02:22:23 -0700 committer Russell King Sun, 02 Jul 2006 16:02:01 +0100 [MMC] sdhci: support for multiple voltages The sdhci controllers can support up to three voltage levels. Detect which and report back to the MMC layer. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 51f82bc07a9673d790c2a17de8e3fa8046543f04 tree 1bd7a839f07fb63dc23c79708a64b4513d4c3179 parent 8ef1a14379e105c1419d21e96ffac53202bc0501 author Pierre Ossman Fri, 30 Jun 2006 02:22:22 -0700 committer Russell King Sun, 02 Jul 2006 16:02:01 +0100 [MMC] sdhci: print device id As sdhci is a generic driver, it is helpful to see some more specific identification of the actual hardware in dmesg. PCI vendor, device and revision is sufficient in most cases. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 8ef1a14379e105c1419d21e96ffac53202bc0501 tree 695548d0cd542e135634eab88d811b0b6e29ed3a parent d63fb6c55f5f9eb3032fc5c3ab6eb9a26dd67cdc author Pierre Ossman Fri, 30 Jun 2006 02:22:21 -0700 committer Russell King Sun, 02 Jul 2006 16:01:59 +0100 [MMC] sdhci: check SDHCI base clock A base clock value of 0 means that the driver must get the base clock through some other means. As we have no other way of getting it, we must abort. Signed-off-by: Pierre Ossman Signed-off-by: Andrew Morton Signed-off-by: Russell King commit c7afb0f97700e73109564f83c35bfeeb14cb653b tree bd1c0f0e3b095e0dea15d569967a50703e05586e parent c05d52c748da10a3f27f6e638875514153776b15 author KaiGai Kohei Sun, 02 Jul 2006 15:13:46 +0100 committer David Woodhouse Sun, 02 Jul 2006 15:13:46 +0100 [JFFS2][XATTR] Fix memory leak in POSIX-ACL support jffs2_clear_acl() which releases acl caches allocated by kmalloc() was defined but it was never called. Thus, we faced to the risk of memory leaking. This patch plugs jffs2_clear_acl() into jffs2_do_clear_inode(). It ensures to release acl cache when inode is cleared. Signed-off-by: KaiGai Kohei Signed-off-by: David Woodhouse commit d63fb6c55f5f9eb3032fc5c3ab6eb9a26dd67cdc tree 8e2d3ff8deef62cf64f3989d5f6804feaa3753fe parent fc25465f09414538afdbceacc517dd4dbabadeca author Benjamin Herrenschmidt Sun, 02 Jul 2006 11:55:03 +1000 committer Linus Torvalds Sat, 01 Jul 2006 20:11:56 -0700 [PATCH] powermac: Fix some 64b resource damage The 64 bits resource patches did a bit of damage on PowerMac causing a buffer overflow in macio_asic and a warning in a sound driver. The former is fixed by reverting the sprintf of the bus_id to %08x as it was before. The bus_id used for macio devices is always a 32 bits value (macio always sits in 32 bits space) and since it's exposed to userland, the format of the string shouldn't be changed like that anyway. The second by using the proper type for printk. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 07d265dd59456f702b7d2a1ac471f06ee4adc9ef tree ff7039264302251de8879bb253bf3678ad4aab0a parent 698dfe2b4513f8a13c0e082d141e8b64e63e0313 author Thomas Gleixner Sat, 01 Jul 2006 23:01:50 +0100 committer Russell King Sat, 01 Jul 2006 23:01:50 +0100 [ARM] 3683/2: ARM: Convert at91rm9200 to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 698dfe2b4513f8a13c0e082d141e8b64e63e0313 tree 4784ffd675b687167a89d16f91fa7575944d172e parent ae71c426ba4b5214b75bb0e624d73a4abcffbe57 author Thomas Gleixner Sat, 01 Jul 2006 23:01:49 +0100 committer Russell King Sat, 01 Jul 2006 23:01:49 +0100 [ARM] 3682/2: ARM: Convert ixp4xx to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit ae71c426ba4b5214b75bb0e624d73a4abcffbe57 tree 628115951b2d76efcd6950cf7e259e30ddd24847 parent 418ca1f0a0d3405c5f674d005363ab1ef850c367 author Thomas Gleixner Sat, 01 Jul 2006 22:32:42 +0100 committer Russell King Sat, 01 Jul 2006 22:32:42 +0100 [ARM] 3702/1: ARM: Convert ixp23xx to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 418ca1f0a0d3405c5f674d005363ab1ef850c367 tree 9c071049c06187d498df58ee88e6ee8e1e6b7356 parent c75c625df7e2395d09a1aa33cdc2212d75928de6 author Thomas Gleixner Sat, 01 Jul 2006 22:32:41 +0100 committer Russell King Sat, 01 Jul 2006 22:32:41 +0100 [ARM] 3701/1: ARM: Convert plat-omap to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit c75c625df7e2395d09a1aa33cdc2212d75928de6 tree 87c6e94783708fef6aff522c719cfa7e239afb49 parent 544b46de259c8be67c042bcdfaf81f0bc6fa2e6d author Thomas Gleixner Sat, 01 Jul 2006 22:32:40 +0100 committer Russell King Sat, 01 Jul 2006 22:32:40 +0100 [ARM] 3700/1: ARM: Convert lh7a40x to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 544b46de259c8be67c042bcdfaf81f0bc6fa2e6d tree 051583ef7e10dad59030ca56e86a4d5a54d1a27e parent 119c641c9e665718f080ccde3422dd97259e0fc8 author Thomas Gleixner Sat, 01 Jul 2006 22:32:39 +0100 committer Russell King Sat, 01 Jul 2006 22:32:39 +0100 [ARM] 3699/1: ARM: Convert s3c2410 to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 119c641c9e665718f080ccde3422dd97259e0fc8 tree f8166dc6bcf1d3de87b494e9f160929e7fb9e6d7 parent 5a67b777bc4dd1d02c1381ba07e9965cfa9346e8 author Thomas Gleixner Sat, 01 Jul 2006 22:32:38 +0100 committer Russell King Sat, 01 Jul 2006 22:32:38 +0100 [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 5a67b777bc4dd1d02c1381ba07e9965cfa9346e8 tree a5e359841bc1314a18944f5ea450698bcab5c6ee parent 6f77dde8915638003bc038a18074e84b13aba39d author Thomas Gleixner Sat, 01 Jul 2006 22:32:37 +0100 committer Russell King Sat, 01 Jul 2006 22:32:37 +0100 [ARM] 3697/1: ARM: Convert shark to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 6f77dde8915638003bc038a18074e84b13aba39d tree 191637848ab507ea3fc5efeb6fa12100947007a1 parent 33e39f1d5b910e37d73815d7cb856786880c60e0 author Thomas Gleixner Sat, 01 Jul 2006 22:32:37 +0100 committer Russell King Sat, 01 Jul 2006 22:32:37 +0100 [ARM] 3696/1: ARM: Convert clps711x to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 33e39f1d5b910e37d73815d7cb856786880c60e0 tree 34469305161691b9cfae6be21f7a3566b04933ee parent d533c1289e87cc16b0590077a182f06e4d6ad8aa author Thomas Gleixner Sat, 01 Jul 2006 22:32:36 +0100 committer Russell King Sat, 01 Jul 2006 22:32:36 +0100 [ARM] 3694/1: ARM: Convert ecard driver to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit d533c1289e87cc16b0590077a182f06e4d6ad8aa tree 9bbb926555483cdc057fa268aa00aa2d9df05fe5 parent a6284acbe429d6afa7746530098ea1b1bbf9f6fe author Thomas Gleixner Sat, 01 Jul 2006 22:32:35 +0100 committer Russell King Sat, 01 Jul 2006 22:32:35 +0100 [ARM] 3693/1: ARM: Convert omap1 to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit a6284acbe429d6afa7746530098ea1b1bbf9f6fe tree 6be4b00a9820d306c04b07be673136f681efb687 parent cb03f87c98526d88f457f1ae4587142842f7e12e author Thomas Gleixner Sat, 01 Jul 2006 22:32:34 +0100 committer Russell King Sat, 01 Jul 2006 22:32:34 +0100 [ARM] 3691/1: ARM: Convert imx to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit cb03f87c98526d88f457f1ae4587142842f7e12e tree 7d7660567020d67a3f2c0aace4cd820614bbbeff parent a03d4d2765a047914c1f278c11e98aee44dd10bb author Thomas Gleixner Sat, 01 Jul 2006 22:32:33 +0100 committer Russell King Sat, 01 Jul 2006 22:32:33 +0100 [ARM] 3688/1: ARM: Convert clps7500 to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit a03d4d2765a047914c1f278c11e98aee44dd10bb tree 858e4021ea6a143356b3701bde70041cab3c682d parent 1623dee87b4b244099eb79adc87e71e3961b86d7 author Thomas Gleixner Sat, 01 Jul 2006 22:32:32 +0100 committer Russell King Sat, 01 Jul 2006 22:32:32 +0100 [ARM] 3687/1: ARM: Convert integrator to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 1623dee87b4b244099eb79adc87e71e3961b86d7 tree a9beac1e5b6f40e8e619809be6c7c79f0c530731 parent 427923d10c2998f05ce06c5683a0f80c8be5b744 author Thomas Gleixner Sat, 01 Jul 2006 22:32:20 +0100 committer Russell King Sat, 01 Jul 2006 22:32:20 +0100 [ARM] 3685/1: ARM: Convert pxa to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 427923d10c2998f05ce06c5683a0f80c8be5b744 tree b8043562bc933d6708a2ecedb8dfb42aeb607996 parent 64ffae8a32b8e5a5753527860a0aeca2b17724d6 author Thomas Gleixner Sat, 01 Jul 2006 22:32:19 +0100 committer Russell King Sat, 01 Jul 2006 22:32:19 +0100 [ARM] 3684/1: ARM: Convert l7200 to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 64ffae8a32b8e5a5753527860a0aeca2b17724d6 tree 8359bc8c058a93ee1719106926b29d0f839c7f55 parent 55e8698931c514becdc2e225c87bbbbb0f64ca1b author Thomas Gleixner Sat, 01 Jul 2006 22:32:18 +0100 committer Russell King Sat, 01 Jul 2006 22:32:18 +0100 [ARM] 3681/1: ARM: Convert ixp2000 to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 55e8698931c514becdc2e225c87bbbbb0f64ca1b tree df231c6e762a9c0691bfa557f847bf5ce0603a35 parent ff632054ced5e1a8a28e7196c013e5af37895f7b author Thomas Gleixner Sat, 01 Jul 2006 22:32:17 +0100 committer Russell King Sat, 01 Jul 2006 22:32:17 +0100 [ARM] 3680/1: ARM: Convert footbridge to generic irq handling Patch from Thomas Gleixner From: Thomas Gleixner Fixup the conversion to generic irq subsystem. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit ff632054ced5e1a8a28e7196c013e5af37895f7b tree 7b2a18678f9280b2fbefad07f5f12433b9f10521 parent e6e3c3be8add9167c36c27f54954dfd8d7533543 author Thomas Gleixner Sat, 01 Jul 2006 22:32:16 +0100 committer Russell King Sat, 01 Jul 2006 22:32:16 +0100 [ARM] 3695/1: ARM drivers/pcmcia: Fixup includes Patch from Thomas Gleixner From: Thomas Gleixner Include the generic header file instead of the ARM specific one. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit e6e3c3be8add9167c36c27f54954dfd8d7533543 tree fc767a61530ae89518f18794e7437765b4270f9a parent c4bfa28aec58c588de55babe99f4c172ec534704 author Thomas Gleixner Sat, 01 Jul 2006 22:32:15 +0100 committer Russell King Sat, 01 Jul 2006 22:32:15 +0100 [ARM] 3689/1: ARM drivers/input/touchscreen: Fixup includes Patch from Thomas Gleixner From: Thomas Gleixner Include the generic header file instead of the ARM specific one. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit c4bfa28aec58c588de55babe99f4c172ec534704 tree dc105fc1c44b26e19a82b076b37370812192bd0c parent 4a2581a080098ca3a0c4e416d7a282e96c75ebf8 author Thomas Gleixner Sat, 01 Jul 2006 22:32:14 +0100 committer Russell King Sat, 01 Jul 2006 22:32:14 +0100 [ARM] 3686/1: ARM: arm/common: convert irq handling Patch from Thomas Gleixner From: Thomas Gleixner Convert the files in arch/arm/common to use the generic irq handling functions. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 4a2581a080098ca3a0c4e416d7a282e96c75ebf8 tree 6709b53f00a271fe8dd76b6cfb821419c8afb206 parent f8b5473fcbddbfde827ecf82aa0e81fa2a878220 author Thomas Gleixner Sat, 01 Jul 2006 22:30:09 +0100 committer Russell King Sat, 01 Jul 2006 22:30:09 +0100 [ARM] 3692/1: ARM: coswitch irq handling to the generic implementation Patch from Thomas Gleixner From: Thomas Gleixner Switch the ARM irq core handling to the generic implementation. The ARM specific header files now contain mostly migration stubs and helper macros. Note that each machine type must be converted after this step seperately. This was seperated out from the patch for easier review. The main changes for the machine type code is the conversion of the type handlers to a 'type flow' and 'chip' model. This affects only the multiplex interrupt handlers. A conversion macro needs to be added to those implementations, which defines the data structure which is registered by the set_irq_chained_handler() macro. Some minor fixups of include files and the conversion of data structure access is necessary all over the place. The mostly macro based conversion was provided to allow an easy migration of the existing implementations. The code compiles on all defconfigs available in arch/arm/configs except those which were broken also before applying the conversion patches. The code has been boot and runtime tested on most ARM platforms. The results of an extensive testing and bugfixing series can be found at: http://www.linutronix.de/index.php?page=testing Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit f8b5473fcbddbfde827ecf82aa0e81fa2a878220 tree 0d6d504f95830610cb2c2fb1e6e9e1ebf932762b parent a2166abd06e7a9fd34eb18b7b27da18c6146e6ef author Thomas Gleixner Sat, 01 Jul 2006 22:30:08 +0100 committer Russell King Sat, 01 Jul 2006 22:30:08 +0100 [ARM] 3690/1: genirq: Introduce and make use of dummy irq chip Patch from Thomas Gleixner From: Thomas Gleixner ARM has a couple of really dumb interrupt controllers. Implement a generic one and fixup the ARM migration. ARM reused the no_irq_chip for this purpose, but this does not work out for platforms which are not converted to the new interrupt type handling model. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit a2166abd06e7a9fd34eb18b7b27da18c6146e6ef tree 42071bca4f8e53295c2c5ce50db43e86a3d4fc37 parent 9262e9149f346a5443300f8c451b8e7631e81a42 author Thomas Gleixner Sat, 01 Jul 2006 22:30:07 +0100 committer Russell King Sat, 01 Jul 2006 22:30:07 +0100 [ARM] 3679/1: ARM: Make ARM dyntick implementation work with genirq Patch from Thomas Gleixner From: Thomas Gleixner Make the ARM dyntick implementation work with the generic irq code. This hopefully goes away once we consolidated the dyntick implementations. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit 309b0f125a22ee34c8f6962677255f7bf6af5e3d tree ba5897f4b13d9b3fb35f9fcf1e420537da37c08f parent d0e5f39f1ee2e55d140064bb6d74c8bad25d71d0 parent 635227ee89929a6e2920fc8aa1cd48f7225d3d93 author Len Brown Sat, 01 Jul 2006 17:21:39 -0400 committer Len Brown Sat, 01 Jul 2006 17:21:39 -0400 Pull smart-battery into release branch commit d0e5f39f1ee2e55d140064bb6d74c8bad25d71d0 tree b4dbf354ded61dcaf7c06be3f799303d2d1d6cfd parent 361ea93cbff0e42cbc6a0f3c7a8238db9ed15648 parent 9fdae727645215d4dbb88912b9a176ef87911a05 author Len Brown Sat, 01 Jul 2006 17:21:26 -0400 committer Len Brown Sat, 01 Jul 2006 17:21:26 -0400 Pull bugzilla-3241 into release branch commit 361ea93cbff0e42cbc6a0f3c7a8238db9ed15648 tree d3cf377d6a63d85c4316ad594b166220d3dc1d19 parent 5f765b8d68fe99c8a575265d81c62382893e1e8a parent 9becf5b91ec7b600a3cfea12724165aaaf4d4527 author Len Brown Sat, 01 Jul 2006 17:20:40 -0400 committer Len Brown Sat, 01 Jul 2006 17:20:40 -0400 Pull asus_acpi-0.30 into release branch commit 5f765b8d68fe99c8a575265d81c62382893e1e8a tree ef6ec9815aadfab4b8bcb09aeeb85d8dc29f4919 parent b197ba3c70638a3a2ae39296781912f26ac0f991 parent d07a8577f695c807977af003b6e75f996e01a15f author Len Brown Sat, 01 Jul 2006 17:19:34 -0400 committer Len Brown Sat, 01 Jul 2006 17:19:34 -0400 Pull acpi_device_handle_cleanup into release branch commit b197ba3c70638a3a2ae39296781912f26ac0f991 tree 596f795437337d86edaa02d612120f4d5b3ce35d parent fc25465f09414538afdbceacc517dd4dbabadeca parent 02438d8771ae6a4b215938959827692026380bf9 author Len Brown Sat, 01 Jul 2006 17:19:08 -0400 committer Len Brown Sat, 01 Jul 2006 17:19:08 -0400 Pull acpi_os_free into release branch commit 635227ee89929a6e2920fc8aa1cd48f7225d3d93 tree b40e81898310a364ca7be378f42212e06dd71238 parent 3f86b83243d59bb50caf5938d284d22e10d082a4 author Len Brown Sat, 01 Jul 2006 16:48:23 -0400 committer Len Brown Sat, 01 Jul 2006 16:48:23 -0400 ACPI: remove function tracing macros from drivers/acpi/*.c a few invocations appeared due to the SBS and other patches. Signed-off-by: Len Brown commit 3f86b83243d59bb50caf5938d284d22e10d082a4 tree ebc93aff4abae0b3f4aa96c19973782eede3411d parent 37672d4c5263d54ee4302f55242f6fd5317b0f9f author Rich Townsend Sat, 01 Jul 2006 11:36:54 -0400 committer Len Brown Sat, 01 Jul 2006 16:36:14 -0400 ACPI: add support for Smart Battery Most batteries today are ACPI "Control Method" batteries, but some models ship with the older "Smart Battery" that requires this code. Rich Townsend and Bruno Ducrot were the original authors. Vladimir Lebedev updated to run on latest kernel. http://bugzilla.kernel.org/show_bug.cgi?id=3734 Signed-off-by: Len Brown commit 2dc7667b9d0674db6572723356fe3857031101a4 tree 39a69f5928bd052de309ffc4df288642f70b0f89 parent 3f8efdbe73a5bc96e006b2379a8c8d1d8ef52a9d author Nicolas Pitre Sat, 01 Jul 2006 21:29:32 +0100 committer Russell King Sat, 01 Jul 2006 21:29:32 +0100 [ARM] 3541/2: workaround for PXA27x erratum E7 Patch from Nicolas Pitre According to the Intel PXA27x Processor Family Specification Update document (doc.nr. 280071-009) erratum E7, some care must be taken to locate the disabling and re-enabling of the MMU to the beginning of a cache line to avoid problems in some circumstances. Credits to Simon Vogl for bringing this up. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 9becf5b91ec7b600a3cfea12724165aaaf4d4527 tree 54217637c4e2005a862d85d427249f5f3f382996 parent 96d1142084281ae4601fab02be061e1267e431a3 author Karol Kozimor Fri, 30 Jun 2006 19:15:00 -0400 committer Len Brown Sat, 01 Jul 2006 16:20:10 -0400 ACPI: asus_acpi: correct M6N/M6R display nodes This patch switches back the display nodes for M6R and M6N -- this happened a while ago when a patch was misapplied (only the in-tree version was affected). Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit 3f8efdbe73a5bc96e006b2379a8c8d1d8ef52a9d tree 9171fa7f40177ef34cdcf44b83c9e57687a47ec5 parent a069c896d0d6c028581089da7a9a9037a63c2803 parent 22b1908610dd7ff68471cd4fbd383dbdfe5e0ecd author Russell King Sat, 01 Jul 2006 20:43:57 +0100 committer Russell King Sat, 01 Jul 2006 20:43:57 +0100 Merge nommu branch commit a069c896d0d6c028581089da7a9a9037a63c2803 tree 7b82eeab31974be5e5554f696dbf4351f678e680 parent ae95bfbb2b67eba5d67a0478a8715682a87e2616 author Lennert Buytenhek Sat, 01 Jul 2006 19:58:20 +0100 committer Russell King Sat, 01 Jul 2006 19:58:20 +0100 [ARM] 3705/1: add supersection support to ioremap() Patch from Lennert Buytenhek Analogous to the previous patch that allows ioremap() to use section mappings, this patch allows ioremap() to use supersection mappings. Original patch by Deepak Saxena. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit ae95bfbb2b67eba5d67a0478a8715682a87e2616 tree 39441dab1f8934f0596bfaef267994aefb266921 parent 9b8417556cca8d56467fd47a39667a4cf3ae21f3 author Lennert Buytenhek Sat, 01 Jul 2006 19:56:48 +0100 committer Russell King Sat, 01 Jul 2006 19:56:48 +0100 [ARM] 3707/1: iwmmxt: use the generic thread notifier infrastructure Patch from Lennert Buytenhek This patch makes the iWMMXt context switch hook use the generic thread notifier infrastructure that was recently merged in commit d6551e884cf66de072b81f8b6d23259462c40baf. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 9b8417556cca8d56467fd47a39667a4cf3ae21f3 tree a7383bd823cb9c536d0ebd44c9811f05ec344e22 parent 179d1c6ac98a46c57e08a96a6f7f44e3a4d169da author Lennert Buytenhek Sat, 01 Jul 2006 19:56:47 +0100 committer Russell King Sat, 01 Jul 2006 19:56:47 +0100 [ARM] 3706/2: ep93xx: add cirrus logic edb9315a support Patch from Lennert Buytenhek This patch adds support for the Cirrus Logic EDB9315A, an evaluation board based on the Cirrus Logic EP9315 SoC, with 64M RAM, two USB host ports, audio in/out, three serial ports, 10/100 ethernet, and IDE, VGA, and LCD interfaces. The EDB9315A is a low-cost version of the EDB9315, and has only 16M of NOR flash, while the EDB9315 has 32M. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 179d1c6ac98a46c57e08a96a6f7f44e3a4d169da tree 7d3cc2963abcfed82f621a8b2c7737bbfbaede4f parent 34e00cef810d0350d3ec17345786b73ccd1287ef author Martin Michlmayr Sat, 01 Jul 2006 19:56:46 +0100 committer Russell King Sat, 01 Jul 2006 19:56:46 +0100 [ARM] 3704/1: format IOP Kconfig with tabs, create more consistency Patch from Martin Michlmayr Some cosmetic changes to increase the consistency of the IOP Kconfig file. Change some space into tabs and add a dot at the end of a help description. Signed-off-by: Martin Michlmayr Signed-off-by: Russell King commit 34e00cef810d0350d3ec17345786b73ccd1287ef tree c8d3f910af946bc1da6950595464292088588b4c parent ce9c1a8388e16f2a158491ceb5c58a6101b905f6 author Martin Michlmayr Sat, 01 Jul 2006 19:56:45 +0100 committer Russell King Sat, 01 Jul 2006 19:56:45 +0100 [ARM] 3703/1: Add help description for ARCH_EP80219 Patch from Martin Michlmayr Add a brief help description for ARCH_EP80219. Signed-off-by: Martin Michlmayr Signed-off-by: Russell King commit ce9c1a8388e16f2a158491ceb5c58a6101b905f6 tree 00028beeb3c308dc16c47622c5855a84ebf783b0 parent 0d1bca1602fb9996a3730e0e882945d7361507b1 author Tony Lindgren Sat, 01 Jul 2006 19:56:44 +0100 committer Russell King Sat, 01 Jul 2006 19:56:44 +0100 [ARM] 3678/1: MMC: Make OMAP MMC work Patch from Tony Lindgren This patch makes OMAP MMC work again: - Fix compile errors - Do not ioremap base as it is already statically mapped - Clean-up platform device handling - Fix compile warnings Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 0d1bca1602fb9996a3730e0e882945d7361507b1 tree f59ea6cabdaf0c6f5d2fcfc5d94545c33277b89f parent 35912c799722f0c63b8c2c49c7650d4516a5fe8a author Tony Lindgren Sat, 01 Jul 2006 19:56:43 +0100 committer Russell King Sat, 01 Jul 2006 19:56:43 +0100 [ARM] 3677/1: OMAP: Update H2 defconfig Patch from Tony Lindgren Update OMAP H2 defconfig and leave out hw random for now until it's been updated. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 35912c799722f0c63b8c2c49c7650d4516a5fe8a tree c8f37a3c1ea5138d593be82634913f3fbedf46ec parent ff0daca525dde796382b9ccd563f169df2571211 author Tony Lindgren Sat, 01 Jul 2006 19:56:42 +0100 committer Russell King Sat, 01 Jul 2006 19:56:42 +0100 [ARM] 3676/1: ARM: OMAP: Fix dmtimers and timer32k to compile on OMAP1 Patch from Tony Lindgren Fixes compilation errors on OMAP1. Patch from Timo Teras. Signed-off-by: Timo Teras Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit fc25465f09414538afdbceacc517dd4dbabadeca tree 0e1b051a7ee108d3062949094da55626729d0a5b parent b4bc7b53ccfa0cb793591ba11af49db8f1bc5a4d parent b915543b46a2aa599fdd2169e51bcfd88812a12b author Linus Torvalds Sat, 01 Jul 2006 09:59:08 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:59:08 -0700 Merge branch 'audit.b22' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current * 'audit.b22' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: [PATCH] audit syscall classes [PATCH] audit: support for object context filters [PATCH] audit: rename AUDIT_SE_* constants [PATCH] add rule filterkey commit b4bc7b53ccfa0cb793591ba11af49db8f1bc5a4d tree bb0d32d8c8a9d558794dbda60542beace0d2bcbc parent 0cadaf45bd7c19f0bef49d1eebfff38a046b9ba4 parent 701842e3bdd7db09db6af43fc5906ee19b61338d author Linus Torvalds Sat, 01 Jul 2006 09:58:43 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:58:43 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kbuild: documentation change on allowing checkers besides sparse kbuild: warn when a moduled uses a symbol marked UNUSED kbuild: fix segv in modpost kconfig: enhancing accessibility of lxdialog kbuild: fix ia64 breakage after introducing make -rR commit 0cadaf45bd7c19f0bef49d1eebfff38a046b9ba4 tree b2b053df10c8d32417dd9505be65fbe6c17480fc parent 9c7a41691f37a1538a88e5eb9b0b73df1f834542 author Andrew Morton Sat, 01 Jul 2006 04:36:37 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:04 -0700 [PATCH] pnp: suppress request_irq() warning Suppress the "setup_irq: irq handler mismatch" coming out of pnp_check_irq(): failures are expected here. Cc: Cc: Santiago Garcia Mantinan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c7a41691f37a1538a88e5eb9b0b73df1f834542 tree b18c4358c56ec2d3866206660ce0be966489a1c8 parent f47634b276db6956998350e5fc26a0673fdb125c author Ingo van Lil Sat, 01 Jul 2006 04:36:36 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:04 -0700 [PATCH] drivers/block/nbd.c compile fix The Network Block Device driver doesn't compile if NDEBUG is defined. Signed-off-by: Ingo van Lil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f47634b276db6956998350e5fc26a0673fdb125c tree 7e74f91dd554882041d51cfe9e67ee64abdfcd1e parent faab17ba06d86adf5568f3e9ff914e124546d19e author Randy Dunlap Sat, 01 Jul 2006 04:36:36 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:04 -0700 [PATCH] kernel-doc: make man/text mode function output same Make output of function descriptions in text mode match contents of 'man' mode by adding Name: plus function-short-description ("purpose") and changing Function: to Synopsis:. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit faab17ba06d86adf5568f3e9ff914e124546d19e tree 4ffa8138f67dd002192317c4d7081b8fe516361c parent 1d7e1d4517f11ebeb80f92e227c8fdbc3215385c author Alan Cox Sat, 01 Jul 2006 04:36:34 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:04 -0700 [PATCH] Fix problem with ATAPI DMA on IT8212 in Linux Missing variable initialisation would mean it would sometimes not put ATAPI devices into DMA by default. Signed-off-by: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d7e1d4517f11ebeb80f92e227c8fdbc3215385c tree 8512de18d137a976eb056b2c5d4ccd66e2949b79 parent dd535a5965cef7551da34aef5cec47f46e97b6d9 author Randy.Dunlap Sat, 01 Jul 2006 04:36:34 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:04 -0700 [PATCH] kernel-doc: consistent text/man mode output Add a space between data type and struct field name in man-mode bitfield struct output so that they don't run together. For text-mode struct output, print the struct 'purpose' or short description (as done in man-mode output). For text-mode enum output, print the enum 'purpose' or short description (as done in man-mode output). For text-mode typedef output, print the typedef 'purpose' or short description (as done in man-mode output). Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd535a5965cef7551da34aef5cec47f46e97b6d9 tree 104840ddc1afa4f86292fcfb3c99dbdca99aaf50 parent d882b172512758703ff8d9efb96505eaaee48d2e author Vladimir Saveliev Sat, 01 Jul 2006 04:36:32 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:04 -0700 [PATCH] reiserfs: update ctime and mtime on expanding truncate Reiserfs does not update ctime and mtime on expanding truncate via truncate(). This patch fixes it. Signed-off-by: Vladimir Saveliev Cc: Hans Reiser Cc: Michael Kerrisk Cc: Chris Mason Cc: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d882b172512758703ff8d9efb96505eaaee48d2e tree 64b61d69b4af1395b80446fbc61f0488fbaeedb3 parent a581c2a4697ee264699b364399b73477af408e00 author Heiko Carstens Sat, 01 Jul 2006 04:36:31 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:04 -0700 [PATCH] s390: put sys_call_table into .rodata section and write protect it Put s390's syscall tables into .rodata section and write protect this section to prevent misuse of it. Suggested by Arjan van de Ven . Cc: Arjan van de Ven Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a581c2a4697ee264699b364399b73477af408e00 tree 972d8dd6b6a90de49b080340806487c30a07cc1a parent e2c2770096b686b4d2456173f53cb50e01aa635c author Heiko Carstens Sat, 01 Jul 2006 04:36:30 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:03 -0700 [PATCH] add __[start|end]_rodata sections to asm-generic/sections.h Add __start_rodata and __end_rodata to sections.h to avoid extern declarations. Needed by s390 code (see following patch). [akpm@osdl.org: update architectures] Cc: Arjan van de Ven Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Cc: Andi Kleen Acked-by: Kyle McMartin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2c2770096b686b4d2456173f53cb50e01aa635c tree d1d23d331e52945b61783e53fea9be75c3a2379e parent 1add6781c85d7e2ee512315113a16193b3e3937d author Andrew Morton Sat, 01 Jul 2006 04:36:30 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:03 -0700 [PATCH] hotcpu_notifier-fixes Always use do {} while (0). Failing to do so can cause subtle compile failures or bugs. Cc: Chandra Seetharaman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1add6781c85d7e2ee512315113a16193b3e3937d tree 583d64952133fcd3b169f190890369238de6f15c parent fa79837d5b562766a3e3cfad4753a3df8e0a1319 author Ben Dooks Sat, 01 Jul 2006 04:36:26 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:03 -0700 [PATCH] RTC: class driver for Samsung S3C series SoC This is a renamed and tested version of the previous S3C24XX RTC class driver. The driver has been renamed from the original s3c2410-rtc, which is now too narrow for the range of devices supported. The rtc-s3c has been chosen as there is the distinct possibility of this driver being carried forward into newer Samsung SoC silicon. Signed-off-by: Ben Dooks Cc: Alessandro Zummo Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa79837d5b562766a3e3cfad4753a3df8e0a1319 tree 5cbc2a4de92acce3e0ad47e6481c4524c810b33a parent 10e5dce07e6f8f9cea1b54161a888bb099484f88 author Ralf Baechle Sat, 01 Jul 2006 04:36:25 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:03 -0700 [PATCH] Fix IS_ERR Threshold Value o Raise the maximum error number in IS_ERR_VALUE to 4095. o Make that number available as a new constant MAX_ERRNO. Signed-off-by: Ralf Baechle Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10e5dce07e6f8f9cea1b54161a888bb099484f88 tree 9c7949cf82763344d86ae302748f8e1d278b565a parent eb28931e4a2c89e53d2b0c1a02a843240bff0806 author Evgeniy Dushistov Sat, 01 Jul 2006 04:36:24 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:03 -0700 [PATCH] ufs: truncate should allocate block for last byte This patch fixes buggy behaviour of UFS in such kind of scenario: open(, O_TRUNC...) ftruncate(, 1024) ftruncate(, 0) Such a scenario causes ufs_panic and remount read-only. This happen because of according to specification UFS should always allocate block for last byte, and many parts of our implementation rely on this, but `ufs_truncate' doesn't care about this. To make possible return error code and to know about old size, this patch removes `truncate' from ufs inode_operations and uses `setattr' method to call ufs_truncate. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb28931e4a2c89e53d2b0c1a02a843240bff0806 tree 14592f5cb45c8d4f4dace422b5deb98e9a9d5574 parent 912ad92220038b0bb67e3310b8447e4d8802d581 author Paolo 'Blaisorblade' Giarrusso Sat, 01 Jul 2006 04:36:24 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:03 -0700 [PATCH] uml: rename and improve actually_do_remove() Rename actually_do_remove() to remove_files_and_dir(), make it call closedir(), make it ignore ENOENT (I see it frequently enough). ENOENT is probably due to multiple threads calling the exitcall functions together*, but fixing that is non-trivial; and ignoring it is perfectly ok in any case. * it can surely happen: last_ditch_exit() is installed as SIGTERM handler at boot, and it's not removed on thread creation. So killall vmlinux (which I do) surely causes that. I've seen also a crash which seems to do the same. Installing the handler on only the main thread would make UML do no cleanup when another thread exits, and we're not sure we want that. And mutual exclusion in that context is tricky - we can't use spinlock in code not on a kernel stack (spinlock debugging uses "current" a lot). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 912ad92220038b0bb67e3310b8447e4d8802d581 tree a4131156931d9ebd5022d969ffbbf3c6bc51e055 parent 47e5243afe0bd2a1aca1e1f05dfbcc214267fbc9 author Paolo 'Blaisorblade' Giarrusso Sat, 01 Jul 2006 04:36:23 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:03 -0700 [PATCH] uml: fix not_dead_yet when directory is in bad state The bug occurred to me when a UML left an empty ~/.uml/Sarge-norm folder - when trying to reuse not_dead_yet() failed one of its check. The comment says that's ok and means that we can take the directory, but while normally not_dead_yet() removes it and returns 0 (i.e. go on, use this), on failure it returns 0 but forgets to remove it. The fix is to remove it anytime we're going to return 0. But since "not_dead_yet" didn't make the interface so clear, causing this bug, and I couldn't find a convenient name for the mix of things it did, I split it into two parts: is_umdir_used() - returns a boolean, contains all checks of not_dead_yet() umdir_take_if_dead - tries to remove the dir unless it's used - returns whether it removed it, that is we now own it. With this changes the control flow is IMHO a bit clearer and needs less comment for control flow. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47e5243afe0bd2a1aca1e1f05dfbcc214267fbc9 tree 4c71d9b03077f597bc627393ea24099b838a4db9 parent 8ec4d41f88872e6a5980558e362c0174dce54e40 author Paolo 'Blaisorblade' Giarrusso Sat, 01 Jul 2006 04:36:19 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:03 -0700 [PATCH] uml: make copy_*_user atomic Make __copy_*_user_inatomic really atomic to avoid "Sleeping function called in atomic context" warnings, especially from futex code. This is made by adding another kmap_atomic slot and making copy_*_user_skas use kmap_atomic; also copy_*_user() becomes atomic, but that's true and is not a problem for i386 (and we can always add might_sleep there as done elsewhere). For TT mode kmap is not used, so there's no need for this. I've had to use another slot since both KM_USER0 and KM_USER1 are used elsewhere and could cause conflicts. Till now we reused the kmap_atomic slot list from the subarch, but that's not needed as that list must contain the common ones (used by generic code) + the ones used in architecture specific code (and Uml till now used none); so I've taken the i386 one after comparing it with ones from other archs, and added KM_UML_USERCOPY. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ec4d41f88872e6a5980558e362c0174dce54e40 tree f02eaf6b61832ded30bc19bd8e5d8494d91f8bc6 parent 27b678dd04a636f2c351816f4b3042c8815d4e9d author Gerd Hoffmann Sat, 01 Jul 2006 04:36:18 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:02 -0700 [PATCH] SMP alternatives: skip with UP kernels Hide the magic in alternative.h and provide some dummy inline functions for the UP case (gcc should manage to optimize away these calls). No changes in module.c. Cc: Dave Jones Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27b678dd04a636f2c351816f4b3042c8815d4e9d tree 08b409db5d54bab50e1616b1bf65479b0751de5b parent 357b552ff3d82a2e6b97c63c6394f748cb217cf8 author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:17 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:02 -0700 [PATCH] IB/ipath: namespace cleanup: replace ips with ipath Remove ips namespace from infinipath drivers. This renames ips_common.h to ipath_common.h. Definitions, data structures, etc. that were not used by kernel modules have moved to user-only headers. All names including ips have been renamed to ipath. Some names have had an ipath prefix added. Signed-off-by: Christian Bell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 357b552ff3d82a2e6b97c63c6394f748cb217cf8 tree e3579183539fb16eeffad16f02fc2725452bfbce parent 3e0018bc74275ab99d223fb5dca0b65067a5ffc1 author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:16 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:02 -0700 [PATCH] IB/ipath: ignore receive queue size if SRQ is specified The receive work queue size should be ignored if the QP is created to use a shared receive queue according to the IB spec. Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e0018bc74275ab99d223fb5dca0b65067a5ffc1 tree b1addb04e932a5e58f9269427af0a0502709a271 parent 35783ec07c3f7f6902abe4433e7be1b664d0bbaf author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:15 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:01 -0700 [PATCH] IB/ipath: remove some #if 0 code related to lockable memory Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35783ec07c3f7f6902abe4433e7be1b664d0bbaf tree f2bdf80a430862c46cc820b597fcb7cb88c7e777 parent 6d8e9dd050ea78862b6c5e2c873ad6407f9b2428 author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:15 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:01 -0700 [PATCH] IB/ipath: fix a bug that results in addresses near 0 being written via DMA We can't tell for sure if any packets are in the infinipath receive buffer when we shut down a chip port. Normally this is taken care of by orderly shutdown, but when processes are terminated, or sending process has a bug, we can continue to receive packets. So rather than writing zero to the address registers for the closing port, we point it at a dummy memory. Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d8e9dd050ea78862b6c5e2c873ad6407f9b2428 tree 4279eb8f2b6ac1359f0e4af32f6df75b124e5efe parent 8307c28eecea917c4754075fbb85eb398a3bc516 author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:14 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:01 -0700 [PATCH] IB/ipath: read/write correct sizes through diag interface We must increment uaddr by size we are reading or writing, since it's passed as a char *, not a pointer to the appropriate size. Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8307c28eecea917c4754075fbb85eb398a3bc516 tree 1e11c5632bf01deed1e14559b9f5a2024fac9d81 parent 46bbeac922906559ec46454cbc76caf03bc57353 author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:13 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:01 -0700 [PATCH] IB/ipath: support more models of InfiniPath hardware We do a few more explicit checks for specific models, and now also support the old PathScale serial number style, or new QLogic style. This is backwards compatible with previous versions of software and hardware. That is, older software will see a plausible serial number and correct GUID when used with a new board, while newer software will correctly handle an older board. Signed-off-by: Mike Albaugh Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46bbeac922906559ec46454cbc76caf03bc57353 tree 4834eacc3c4c0bd9c8b882a377e32511ec3b4a91 parent 1eb68b990aab4c007e520acae39c74d8116693bc author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:12 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:01 -0700 [PATCH] IB/ipath: drop the "stats" sysfs attribute group This attribute group made it into the original driver, but should not have. Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1eb68b990aab4c007e520acae39c74d8116693bc tree 9e11f750a252879c22636048f68503b622cf2fbc parent 12eef41f8b72b6e11e36b48c78849c17e49781c8 author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:11 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:01 -0700 [PATCH] IB/ipath: purge sps_lid and sps_mlid arrays The two arrays only had space for 4 units. Also changed from ipath_set_sps_lid() to ipath_set_lid(); the sps was leftover. Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12eef41f8b72b6e11e36b48c78849c17e49781c8 tree 3a8bd77d77c7542e19d200d3abf25fc07f0d8f51 parent fba75200ad92892bf32d8d6f1443c6f1e4f48676 author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:10 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:01 -0700 [PATCH] IB/ipath: rC receive interrupt performance changes This patch separates QP state used for sending and receiving RC packets so the processing in the receive interrupt handler can be done mostly without locks being held. ACK packets are now sent without requiring synchronization with the send tasklet. Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fba75200ad92892bf32d8d6f1443c6f1e4f48676 tree 289d5db3b7fc9f9ce4c49f9f1299bbf3985b87d4 parent 85322947d761d08bd84165500f35b93c702aaaf3 author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:09 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:01 -0700 [PATCH] IB/ipath: fixes to performance get counters for IB compliance This patch fixes some problems uncovered during IB compliance testing to return the right values for error counters returned by the Performance Get Counters packet. Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85322947d761d08bd84165500f35b93c702aaaf3 tree 22bdbdedcf877e4c9acc6b6f100d8c88cce7dc70 parent 7cd658cd2bca48d3a0e747b4525c72eb8855278e author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:08 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:01 -0700 [PATCH] IB/ipath: check for valid LID and multicast LIDs Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7cd658cd2bca48d3a0e747b4525c72eb8855278e tree f12e9b533ffea61978e4aea642066f774aa16777 parent c100f622fd9e529e0f4e4324b93f66d105dde61d author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:08 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:00 -0700 [PATCH] IB/ipath: removed redundant statements The tail register read became redundant as the result of earlier receive interrupt bug fixes. Drop another unneeded register read. And another line that got duplicated. Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c100f622fd9e529e0f4e4324b93f66d105dde61d tree 42ff4ee04b33e9a162e280676ec3884f4631f773 parent 4faba98a1a11a6129cbcc772422c9ffc0c11dd2e author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:07 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:00 -0700 [PATCH] IB/ipath: don't confuse the max message size with the MTU Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4faba98a1a11a6129cbcc772422c9ffc0c11dd2e tree 7222224fdc3d7c4708cf48624263c92151f120e0 parent 57abad25f844e760082c0b1ab2b176dad682ea16 author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:06 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:00 -0700 [PATCH] IB/ipath: disallow send of invalid packet sizes over UD Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57abad25f844e760082c0b1ab2b176dad682ea16 tree 5a61c70ed4ae1ad7ccb8c246c22480d8bb045f46 parent f5f99929ac584126ef3f47d805dc619abc54768c author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:05 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:00 -0700 [PATCH] IB/ipath: fix lost interrupts on HT-400 Do an extra check to see if in-memory tail changed while processing packets, and if so, going back through the loop again (but only once per call to ipath_kreceive()). In practice, this seems to be enough to guarantee that if we crossed the clearing of an interrupt at start of ipath_intr with a scheduled tail register update, that we'll process the "extra" packet that lost the interrupt because we cleared it just as it was about to arrive. Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5f99929ac584126ef3f47d805dc619abc54768c tree 31c6030139a2094915d5fd3ac1d57d491fa437b0 parent 13aef4942c291742064c1d5ac71df6493c4a00a9 author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:05 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:00 -0700 [PATCH] IB/ipath: fixed bug 9776 for real The problem was that I was updating the head register multiple times in the rcvhdrq processing loop, and setting the counter on each update. Since that meant that the tail register was ahead of head for all but the last update, we would get extra interrupts. The fix was to not write the counter value except on the last update. I also changed to update rcvhdrhead and rcvegrindexhead at most every 16 packets, if there were lots of packets in the queue (and of course, on the last packet, regardless). I also made some small cleanups while debugging this. With these changes, xeon/monty typically sees two openib packets per interrupt on sdp and ipoib, opteron/monty is about 1.25 pkts/intr. I'm seeing about 3800 Mbit/s monty/xeon, and 5000-5100 opteron/monty with netperf sdp. Netpipe doesn't show as good as that, peaking at about 4400 on opteron/monty sdp. Plain ipoib xeon is about 2100+ netperf, opteron 2900+, at 128KB Signed-off-by: olson@eng-12.pathscale.com Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13aef4942c291742064c1d5ac71df6493c4a00a9 tree b52657fa68485a00b5c94d3f37ed0a9f0cb7179d parent f37bda92461313ad3bbfbf5660adc849c69718bf author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:04 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:00 -0700 [PATCH] IB/ipath: reduce overhead on receive interrupts Also count the number of interrupts where that works (fastrcvint). On any interrupt where the port0 head and tail registers are not equal, just call the ipath_kreceive code without reading the interrupt status, thus saving the approximately 0.25usec processor stall waiting for the read to return. If any other interrupt bits are set, or head==tail, take the normal path, but that has been reordered to handle read ahead of pioavail. Also no longer call ipath_kreceive() from ipath_qcheck(), because that just seems to make things worse, and isn't really buying us anything, these days. Also no longer loop in ipath_kreceive(); better to not hold things off too long (I saw many cases where we would loop 4-8 times, and handle thousands (up to 3500) in a single call). Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f37bda92461313ad3bbfbf5660adc849c69718bf tree a5fe4737ca6b8fcbe2cf9b58466d6340ee12fe56 parent 06993ca6bc46419027b45198a58447f4f05c14f6 author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:03 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:00 -0700 [PATCH] IB/ipath: memory management cleanups Made in-memory rcvhdrq tail update be in dma_alloc'ed memory, not random user or special kernel (needed for ppc, also "just the right thing to do"). Some cleanups to make unexpected link transitions less likely to produce complaints about packet errors, and also to not leave SMA packets stuck and unable to go out. A few other random debug and comment cleanups. Always init rcvhdrq head/tail registers to 0, to avoid race conditions (should have been that way some time ago). Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06993ca6bc46419027b45198a58447f4f05c14f6 tree de446bbc024a0710e2009e7310dce30d138e93ed parent 0ed9a4a0b6df0548f9ccadb62add2c0155d5262c author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:02 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:00 -0700 [PATCH] IB/ipath: use vmalloc to allocate struct ipath_devdata This is not a DMA target, so no need to use dma_alloc_coherent on it. Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ed9a4a0b6df0548f9ccadb62add2c0155d5262c tree 8652f891b78b8c7048ff6d75d272fdab6a2ddaee parent a40f55fc333cc20d85af92887334f41f7844e0c2 author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:01 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:56:00 -0700 [PATCH] IB/ipath: use more appropriate gfp flags This helps us to survive better when memory is fragmented. Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a40f55fc333cc20d85af92887334f41f7844e0c2 tree 3858247889f81c011604b4f998ff94eb071585e7 parent b1d8865a2075934158af41bea5fde725efb70408 author Bryan O'Sullivan Sat, 01 Jul 2006 04:36:00 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:59 -0700 [PATCH] IB/ipath: enable freeze mode when shutting down device Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1d8865a2075934158af41bea5fde725efb70408 tree 98ee3408971132f6cd3aa474c28d8a3ff63aed2b parent b35f004dd3276fc43f242d9a52b4cf74877137c3 author Bryan O'Sullivan Sat, 01 Jul 2006 04:35:59 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:59 -0700 [PATCH] IB/ipath: print better debug info when handling 32/64-bit DMA mask problems Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b35f004dd3276fc43f242d9a52b4cf74877137c3 tree 78f436e31481dfc43ad1869f646216f7c36b340c parent fe62546a6afa141c4ab9aef65f5978a1b36cb523 author Bryan O'Sullivan Sat, 01 Jul 2006 04:35:59 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:59 -0700 [PATCH] IB/ipath: removed unused field ipath_kregvirt from struct ipath_devdata Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe62546a6afa141c4ab9aef65f5978a1b36cb523 tree 44b317774fc0db45e90c394a1575bb19d08c00bb parent e8a88f09f21c55a7e7f570290ecde570e2c37771 author Bryan O'Sullivan Sat, 01 Jul 2006 04:35:58 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:59 -0700 [PATCH] IB/ipath: enforce device resource limits These limits are somewhat artificial in that we don't actually have any device limits. However, the verbs layer expects that such limits exist and are enforced, so we make up arbitrary (but sensible) limits. Signed-off-by: Robert Walsh Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8a88f09f21c55a7e7f570290ecde570e2c37771 tree 26a41167c95a5cccfcc7af0d8008ceaec539b37d parent 9edbd990bb60dd7678f7f4f8ca3d92e03a1f0e67 author Bryan O'Sullivan Sat, 01 Jul 2006 04:35:57 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:59 -0700 [PATCH] IB/ipath: report correct device identification information in /sys Signed-off-by: Robert Walsh Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9edbd990bb60dd7678f7f4f8ca3d92e03a1f0e67 tree 2afeef84ec90d166506b3470dca2e8a527236ece parent 60460dfd425e3d301831d8dd6398620d67bbda2b author Bryan O'Sullivan Sat, 01 Jul 2006 04:35:56 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:59 -0700 [PATCH] IB/ipath: return an error for unknown multicast GID Signed-off-by: Robert Walsh Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60460dfd425e3d301831d8dd6398620d67bbda2b tree 737332fcd49bbb571cc0b1fc1d19e840e5bceb69 parent 4a45b7d4ece0e6dc425e9f66fa8b501b72d846db author Bryan O'Sullivan Sat, 01 Jul 2006 04:35:55 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:59 -0700 [PATCH] IB/ipath: fix some memory leaks on failure paths Signed-off-by: Robert Walsh Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a45b7d4ece0e6dc425e9f66fa8b501b72d846db tree 6e858b3343ffb3670eb6f5a838479d52791e0a30 parent 6665ddee85bfc336d691ea5132a2c20a1d0e8053 author Bryan O'Sullivan Sat, 01 Jul 2006 04:35:55 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:59 -0700 [PATCH] IB/ipath: don't allow resources to be created with illegal values Signed-off-by: Robert Walsh Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6665ddee85bfc336d691ea5132a2c20a1d0e8053 tree d45fcdf5a51652f9007ed06497c40aba5d4e8c5b parent 685f97e81b5510cfcbeccf6ae0400d3664ba8ea3 author Bryan O'Sullivan Sat, 01 Jul 2006 04:35:54 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:59 -0700 [PATCH] IB/ipath: remove some duplicate code Signed-off-by: Robert Walsh Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 685f97e81b5510cfcbeccf6ae0400d3664ba8ea3 tree cd10ce87e00a61f5ca52ab770d716b6c9fac801e parent a2acb2ff36876fdfa5f7a8bf811765aadc74c1c1 author Bryan O'Sullivan Sat, 01 Jul 2006 04:35:53 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:59 -0700 [PATCH] IB/ipath: update some comments and fix typos Signed-off-by: Robert Walsh Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2acb2ff36876fdfa5f7a8bf811765aadc74c1c1 tree ea0e6aaacd36cac011dacae3554b6576dea56d9d parent 6700efdfc06d2dc9ef77988a00182c2ede0f1be0 author Bryan O'Sullivan Sat, 01 Jul 2006 04:35:52 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:58 -0700 [PATCH] IB/ipath: allow diags on any unit There is no longer a /dev/ipath_diag file; instead, there's /dev/ipath_diag0, 1, etc. It's still not possible to have diags run on more than one unit at a time, but that's easy to fix at some point. Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6700efdfc06d2dc9ef77988a00182c2ede0f1be0 tree a428669e9bb9b88c1dbe4192378bec454cdadfed parent 7bbb15ea8543e2e49476a27b507be3b02828a124 author Bryan O'Sullivan Sat, 01 Jul 2006 04:35:51 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:58 -0700 [PATCH] IB/ipath: fix shared receive queues for RC Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bbb15ea8543e2e49476a27b507be3b02828a124 tree 8f5b92db6e28905798edd17d390af5e120a9c9ec parent ddd4bb22108417fdc5c35324bd13a3265581ae76 author Bryan O'Sullivan Sat, 01 Jul 2006 04:35:51 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:58 -0700 [PATCH] IB/ipath: fix an indenting problem Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddd4bb22108417fdc5c35324bd13a3265581ae76 tree 5cc35e54e8761af27746bae48ef66318237ad8a0 parent 759d57686dab8169ca68bbf938ce8e965d1e107a author Bryan O'Sullivan Sat, 01 Jul 2006 04:35:50 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:58 -0700 [PATCH] IB/ipath: share more common code between RC and UC protocols Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 759d57686dab8169ca68bbf938ce8e965d1e107a tree c51c3415b9ae789d1b1df3ba829313b288c14fb5 parent 443a64abbcb130caa315eb1110d7146365846235 author Bryan O'Sullivan Sat, 01 Jul 2006 04:35:49 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:58 -0700 [PATCH] IB/ipath: update copyrights and other strings to reflect new company name Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 443a64abbcb130caa315eb1110d7146365846235 tree 4d026a545c69fffe3f387f53155aede10615cb68 parent 345a6e6aea43cd544c682601926bbd11c09c999b author Bryan O'Sullivan Sat, 01 Jul 2006 04:35:48 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:58 -0700 [PATCH] IB/ipath: name zero counter offsets so it's clear they aren't counters Signed-off-by: Ralph Campbell Signed-off-by: Bryan O'Sullivan Cc: "Michael S. Tsirkin" Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 345a6e6aea43cd544c682601926bbd11c09c999b tree 27c7c4a9b7559353f67839100fd6f0ecbd057c4a parent 929a40ec324e947d4ad14cc1ced785c104c560e2 author Jae-hyeon Park Sat, 01 Jul 2006 04:35:47 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:58 -0700 [PATCH] ACPI: fix not power-manageable device message Fix typo in message. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 929a40ec324e947d4ad14cc1ced785c104c560e2 tree 35f37c5b5e52cb11296cb65e5afff5cbe1c20c2f parent e8c4b9d003e72199a705fb5a40fcd2487fa16933 author Doug Thompson Sat, 01 Jul 2006 04:35:45 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:58 -0700 [PATCH] EDAC: fix module names quoted in sysfs Fix the quoted module name in the sysfs for EDAC modules and reported by several people. Instead of ../_edac_e752x_/ now the following will be presented, like other modules: ../edac_e752x/ Signed-off-by: Doug Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8c4b9d003e72199a705fb5a40fcd2487fa16933 tree e1bad5c0ba134e55c1e22921a96eabf348c305c0 parent 17311c03c3e2c16d64d9e8cb2a3f45be2e2f8d3b author Bjorn Helgaas Sat, 01 Jul 2006 04:35:45 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:57 -0700 [PATCH] IRQ: warning message cleanup Make warnings more consistent. Signed-off-by: Bjorn Helgaas Cc: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17311c03c3e2c16d64d9e8cb2a3f45be2e2f8d3b tree 69e3f1f22323f0399c953584439b48ead7d2d5a8 parent ed6f7b10e657b98b4ba89385d02852c8bdf3980e author Bjorn Helgaas Sat, 01 Jul 2006 04:35:44 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:57 -0700 [PATCH] IRQ: Use SA_PERCPU_IRQ, not IRQ_PER_CPU, for irqaction.flags IRQ_PER_CPU is a bit in the struct irq_desc "status" field, not in the struct irqaction "flags", so the previous code checked the wrong bit. SA_PERCPU_IRQ is only used by drivers/char/mmtimer.c for SGI ia64 boxes. Signed-off-by: Bjorn Helgaas Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed6f7b10e657b98b4ba89385d02852c8bdf3980e tree a53bfca204307322400c3fff1e75563233d38dfc parent a99e4e413e1ab9f3c567b5519f5557afd786dc62 author Ingo Molnar Sat, 01 Jul 2006 04:35:46 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:57 -0700 [PATCH] pi-futex: futex_wake() lockup fix Fix futex_wake() exit condition bug when handling the robust-list with PI futexes on them. (reported by Ulrich Drepper, debugged by the lock validator.) Signed-off-by: Ingo Molnar Cc: Ulrich Drepper Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a99e4e413e1ab9f3c567b5519f5557afd786dc62 tree 31998183648206018452ae0c3c46aaa19724bd74 parent 9262e9149f346a5443300f8c451b8e7631e81a42 author Vernon Mauery Sat, 01 Jul 2006 04:35:42 -0700 committer Linus Torvalds Sat, 01 Jul 2006 09:55:57 -0700 [PATCH] pi-futex: fix mm_struct memory leak lock_queue was getting called essentially twice in a row and was continually incrementing the mm_count ref count, thus causing a memory leak. Dinakar Guniguntala provided a proper fix for the problem that simply grabs the spinlock for the hash bucket queue rather than calling lock_queue. The second time we do a queue_lock in futex_lock_pi, we really only need to take the hash bucket lock. Signed-off-by: Dinakar Guniguntala Signed-off-by: Vernon Mauery Acked-by: Paul E. McKenney Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9fdae727645215d4dbb88912b9a176ef87911a05 tree e1087f6e8f7616a7cf836bef04aba61c77b18b88 parent 03d782524e2d0511317769521c8d5daadbab8482 author Vladimir Lebedev Tue, 27 Jun 2006 04:49:00 -0400 committer Len Brown Sat, 01 Jul 2006 12:13:49 -0400 ACPI: handle battery notify event on broken BIOS http://bugzilla.kernel.org/show_bug.cgi?id=3241 Signed-off-by: Vladimir Lebedev Signed-off-by: Len Brown commit 03d782524e2d0511317769521c8d5daadbab8482 tree c8d1d5b828993712e1a23022f58e61077fe5341e parent 37672d4c5263d54ee4302f55242f6fd5317b0f9f author Christian Lupien Thu, 19 Aug 2004 01:26:00 -0400 committer Len Brown Sat, 01 Jul 2006 12:09:27 -0400 ACPI: handle AC notify event on broken BIOS http://bugzilla.kernel.org/show_bug.cgi?id=3241 updated by Vladimir Lebedev Signed-off-by: Len Brown commit 701842e3bdd7db09db6af43fc5906ee19b61338d tree f76445c893876eb3b1c83eb3f24d83bb3bf2a72f parent c96fca213737a5b4bc569e1d9a0ef6adeff661e9 author Dustin Kirkland Tue, 23 May 2006 15:57:23 -0500 committer Sam Ravnborg Sat, 01 Jul 2006 17:08:33 +0200 kbuild: documentation change on allowing checkers besides sparse Minor documentation change on allowing checkers besides sparse This patch cleans up a couple of mentions of sparse in the inline toplevel Makefile documentation such that it's clear that other checkers besides sparse can override CHECK and CHECKFLAGS. Signed-off-by: Dustin Kirkland Signed-off-by: Sam Ravnborg commit 37672d4c5263d54ee4302f55242f6fd5317b0f9f tree 70f2eb3581817ac494334858dcaf547264944433 parent b2f71bade430d468398167d696731bf770de2db8 parent 2df8386cec47520b76822cb39d96709f5d353cf8 author Len Brown Sat, 01 Jul 2006 11:06:01 -0400 committer Len Brown Sat, 01 Jul 2006 11:06:01 -0400 Pull asus_acpi-0.30 into release branch commit b2f71bade430d468398167d696731bf770de2db8 tree b804b0b21e722a42d5f2ee5edead8cab2e41be8b parent ba290ab7dace8b3339c0cc86c221d48eed21e956 parent d07a8577f695c807977af003b6e75f996e01a15f author Len Brown Sat, 01 Jul 2006 11:05:19 -0400 committer Len Brown Sat, 01 Jul 2006 11:05:19 -0400 Pull acpi_device_handle_cleanup into release branch commit b915543b46a2aa599fdd2169e51bcfd88812a12b tree 8025e6654829d4c245b5b6b6f47a84543ebffb7b parent 6e5a2d1d32596850a0ebf7fb3e54c0d69901dabd author Al Viro Sat, 01 Jul 2006 03:56:16 -0400 committer Al Viro Sat, 01 Jul 2006 07:44:10 -0400 [PATCH] audit syscall classes Allow to tie upper bits of syscall bitmap in audit rules to kernel-defined sets of syscalls. Infrastructure, a couple of classes (with 32bit counterparts for biarch targets) and actual tie-in on i386, amd64 and ia64. Signed-off-by: Al Viro commit c96fca213737a5b4bc569e1d9a0ef6adeff661e9 tree d20a7d0550cf92040df1b2cf1c00199483d8f7f3 parent 534b89a9f6a86a28300cd71619112c4bbca7c0ae author Sam Ravnborg Sat, 01 Jul 2006 11:44:23 +0200 committer Sam Ravnborg Sat, 01 Jul 2006 11:44:23 +0200 kbuild: warn when a moduled uses a symbol marked UNUSED We now have infrastructure in place to mark an EXPORTed symbol as unused. So the natural next step is to warn during buildtime when a module uses a symbol marked UNUSED. Signed-off-by: Sam Ravnborg commit 6e5a2d1d32596850a0ebf7fb3e54c0d69901dabd tree 27718d7df96c9b9f08a2ba333aa36c8e9ebbadfe parent 3a6b9f85c641a3b89420b0c8150ed377526a1fe1 author Darrel Goeddel Thu, 29 Jun 2006 16:57:08 -0500 committer Al Viro Sat, 01 Jul 2006 05:44:19 -0400 [PATCH] audit: support for object context filters This patch introduces object audit filters based on the elements of the SELinux context. Signed-off-by: Darrel Goeddel Acked-by: Stephen Smalley kernel/auditfilter.c | 25 +++++++++++++++++++++++++ kernel/auditsc.c | 40 ++++++++++++++++++++++++++++++++++++++++ security/selinux/ss/services.c | 18 +++++++++++++++++- 3 files changed, 82 insertions(+), 1 deletion(-) Signed-off-by: Al Viro commit 3a6b9f85c641a3b89420b0c8150ed377526a1fe1 tree e44e64edf0620d3f6da443c57540b09882231459 parent 5adc8a6adc91c4c85a64c75a70a619fffc924817 author Darrel Goeddel Thu, 29 Jun 2006 16:56:39 -0500 committer Al Viro Sat, 01 Jul 2006 05:44:08 -0400 [PATCH] audit: rename AUDIT_SE_* constants This patch renames some audit constant definitions and adds additional definitions used by the following patch. The renaming avoids ambiguity with respect to the new definitions. Signed-off-by: Darrel Goeddel include/linux/audit.h | 15 ++++++++---- kernel/auditfilter.c | 50 ++++++++++++++++++++--------------------- kernel/auditsc.c | 10 ++++---- security/selinux/ss/services.c | 32 +++++++++++++------------- 4 files changed, 56 insertions(+), 51 deletions(-) Signed-off-by: Al Viro commit 5adc8a6adc91c4c85a64c75a70a619fffc924817 tree ace9af6bbc3cf711f43cfd88e834baeb6989ca3f parent 9262e9149f346a5443300f8c451b8e7631e81a42 author Amy Griffis Wed, 14 Jun 2006 18:45:21 -0400 committer Al Viro Sat, 01 Jul 2006 05:43:06 -0400 [PATCH] add rule filterkey Add support for a rule key, which can be used to tie audit records to audit rules. This is useful when a watched file is accessed through a link or symlink, as well as for general audit log analysis. Because this patch uses a string key instead of an integer key, there is a bit of extra overhead to do the kstrdup() when a rule fires. However, we're also allocating memory for the audit record buffer, so it's probably not that significant. I went ahead with a string key because it seems more user-friendly. Note that the user must ensure that filterkeys are unique. The kernel only checks for duplicate rules. Signed-off-by: Amy Griffis commit 534b89a9f6a86a28300cd71619112c4bbca7c0ae tree bdde1be43f714e671f83f860f528f1065f597d98 parent 66392c4f2246641c13b5dc60d15b09a71e09276f author Sam Ravnborg Sat, 01 Jul 2006 10:10:19 +0200 committer Sam Ravnborg Sat, 01 Jul 2006 10:10:19 +0200 kbuild: fix segv in modpost Parsing an old Modules.symvers file casued modpost to SEGV. Signed-off-by: Sam Ravnborg commit 66392c4f2246641c13b5dc60d15b09a71e09276f tree 3ff02370bd1040cc42cbd60666299e7b24619e06 parent 5e8d780d745c1619aba81fe7166c5a4b5cad2b84 author Samuel Thibault Fri, 30 Jun 2006 02:18:50 -0700 committer Sam Ravnborg Sat, 01 Jul 2006 10:05:42 +0200 kconfig: enhancing accessibility of lxdialog Some fix that I forgot for good accessibility of lxdialog (the cursor should always be left at the focus location): Have the checklist display the currently highlighted entry last, for having the cursor left on it (rather than on the last line of the list). Signed-off-by: Samuel Thibault Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 5e8d780d745c1619aba81fe7166c5a4b5cad2b84 tree a1631c493bc44294e346ec09b89ed524572d85cb parent 598736c55622f7ea65b98f93c825ff95c433877c author Sam Ravnborg Sat, 01 Jul 2006 09:58:02 +0200 committer Sam Ravnborg Sat, 01 Jul 2006 09:58:02 +0200 kbuild: fix ia64 breakage after introducing make -rR kbuild used $¤(*F to get filename of target without extension. This was used in several places all over kbuild, but introducing make -rR broke his for all cases where we specified full path to target/prerequsite. It is assumed that make -rR disables old style suffix-rules which is why is suddenly failed. ia64 was impacted by this change because several div* routines in arch/ia64/lib are build using explicit paths and then kbuild failed. Thanks to David Mosberger-Tang for an explanation what was the root-cause and for testing on ia64. This patch also fixes two uses of $(*F) in arch/um Signed-off-by: Sam Ravnborg commit f58f8313a6f552d1e7889926a29f0cf91c02f55d tree b533091ab2ccc8510f5e6f898d8439c0bf523df4 parent 2686de27a356914e098329463d5a8cd7aa6f29a4 author Randy Dunlap Fri, 30 Jun 2006 02:33:14 -0700 committer James Bottomley Fri, 30 Jun 2006 21:56:22 -0500 [SCSI] qla1280: fix section mismatch warnings Fix section mismatch warnings: WARNING: drivers/scsi/qla1280.o - Section mismatch: reference to .init.data: from .text between 'qla1280_get_token' (at offset 0x2a16) and 'qla1280_probe_one' WARNING: drivers/scsi/qla1280.o - Section mismatch: reference to .init.data: from .text between 'qla1280_get_token' (at offset 0x2a3c) and 'qla1280_probe_one' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 2686de27a356914e098329463d5a8cd7aa6f29a4 tree 8bf625cb1a387f6f179662a101ca256463e67f7f parent 413975a0f1a43a896490fc5c589d05c95624c6d2 author James Bottomley Fri, 30 Jun 2006 12:54:02 -0500 committer James Bottomley Fri, 30 Jun 2006 21:35:17 -0500 [SCSI] mptsas: eliminate ghost devices One of the current problems the mptsas driver has is that of "ghost" devices (these are devices the firmware reports as existing, but what they actually represent are the parents of a lower device), so for example in my dual expander configuration, three expanders actually show up, two for the real expanders but a third is created because the firmware reports that the lower expander also has another expander connected (which is simply the port going back to the upper expander). The attached patch eliminates all these ghosts by not allocating any devices for them if the SAS address is the SAS address of the parent. Signed-off-by: James Bottomley commit 413975a0f1a43a896490fc5c589d05c95624c6d2 tree 3bfa62366accaa7a6e475dbebadc1db4dbe277c8 parent 900d9f98737b502fbd0303cfcab2773b465bb1f8 author Adrian Bunk Fri, 30 Jun 2006 02:33:06 -0700 committer James Bottomley Fri, 30 Jun 2006 21:34:18 -0500 [SCSI] qla2xxx: make some more functions static Make some needlessly global functions static. Signed-off-by: Adrian Bunk Acked-by: Andrew Vasquez Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 900d9f98737b502fbd0303cfcab2773b465bb1f8 tree fe8c4f956d8778b038551170371182ee712f3f68 parent 3e00a5b28782d65b7ac91e1e9812c281c2ec7af0 author Jesper Juhl Fri, 30 Jun 2006 02:33:07 -0700 committer James Bottomley Fri, 30 Jun 2006 21:30:01 -0500 [SCSI] small whitespace cleanup for qlogic driver Add a few spaces to MODULE_PARM_DESC() text for qla2xxx. Without these spaces text runs together when modinfo prints the text. Signed-off-by: Jesper Juhl Acked-by: Andrew Vasquez Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 3e00a5b28782d65b7ac91e1e9812c281c2ec7af0 tree b9dd446bf2bbc043cc1982c5cfe664588094ac8e parent 376ac8307868f93a0b9aa277f43dee0f63c41c1b author Eric Moore Thu, 29 Jun 2006 17:38:43 -0600 committer James Bottomley Fri, 30 Jun 2006 21:29:23 -0500 [SCSI] mptbase: mpt_interrupt should return IRQ_NONE The way mpt_interrupt() was coded, it was impossible for the unhandled interrupt detection logic to ever trigger. All interrupt handlers should return IRQ_NONE when they have nothing to do. Signed-off-by: Jan Beulich Signed-off-by: Andrew Morton Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 376ac8307868f93a0b9aa277f43dee0f63c41c1b tree 3ff66ae2ecf4934cd4437d820eb75320c46e90f6 parent 454e8957eb60841016deb319dbbf83042fb32a39 author Eric Moore Thu, 29 Jun 2006 17:36:26 -0600 committer James Bottomley Fri, 30 Jun 2006 21:29:00 -0500 [SCSI] mptsas: make two functions static Make two needlessly global functions static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 454e8957eb60841016deb319dbbf83042fb32a39 tree 0b638af6bd2ac0083e244d228adfd12a8f6b4585 parent 0f13fc09db68de92585558984bff1c51b87db72f author Ishai Rabinovitz Thu, 29 Jun 2006 16:39:54 +0300 committer James Bottomley Fri, 30 Jun 2006 21:28:35 -0500 [SCSI] sg.c: Fix bad error handling in I got a NULL derefrence in cdev_del+1 when called from sg_remove. By looking at the code of sg_add, sg_alloc and sg_remove (all in drivers/scsi/sg.c) I found out that sg_add is calling sg_alloc but if it fails afterwards it does not deallocate the space that was allocated in sg_alloc and the redundant entry has NULL in cdev. When sg_remove is being called, it tries to perform cdev_del to this NULL cdev and fails. Signed-off-by: Ishai Rabinovitz Acked-by: Douglas Gilbert Signed-off-by: James Bottomley commit 2df8386cec47520b76822cb39d96709f5d353cf8 tree 54217637c4e2005a862d85d427249f5f3f382996 parent 96d1142084281ae4601fab02be061e1267e431a3 author Karol Kozimor Fri, 30 Jun 2006 19:15:00 -0400 committer Len Brown Fri, 30 Jun 2006 20:38:10 -0400 ACPI: asus_acpi: add S1N WLED control This patch switches back the display nodes for M6R and M6N -- this happened a while ago when a patch was misapplied (only the in-tree version was affected). Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit 96d1142084281ae4601fab02be061e1267e431a3 tree d006887c3db7e8a116bb7248a9d7c8c89438f198 parent ffab0d9507dc527ff6d704ec5e7e7ccfee119fb1 author Karol Kozimor Fri, 30 Jun 2006 19:13:00 -0400 committer Len Brown Fri, 30 Jun 2006 20:38:02 -0400 ACPI: asus_acpi: add S1N WLED control This small patch adds back WLED control for S1N models, this was accidentally removed a while ago. Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit ffab0d9507dc527ff6d704ec5e7e7ccfee119fb1 tree b19a776fa4df3619583173f1b14348220eb7f294 parent ebccb84810729f0e86a83a65681ba2de45ff84d8 author Karol Kozimor Fri, 30 Jun 2006 19:11:00 -0400 committer Len Brown Fri, 30 Jun 2006 20:37:50 -0400 ACPI: asus_acpi: rework model detection This patch reworks laptop model detection. This addresses the Samsung P30 issue, where the INIT method would return no object, but the implicit return in the AML interpreter would confuse the driver. It also accounts for a newer batch of Asus models whose INIT returns ACPI_TYPE_BUFFER instead of STRING. The handling is now much leaner, if we get a buffer or a string, we check against known values, in every other case we use a different path (currently DSDT signatures). The bulk of this patch is separating the string matching from asus_hotk_get_info() into a separate function. This patch properly fixes http://bugme.osdl.org/show_bug.cgi?id=5067 and http://bugme.osdl.org/show_bug.cgi?id=5092 and makes the driver fully functional again with acpi=strict on all machines. Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit ebccb84810729f0e86a83a65681ba2de45ff84d8 tree 8aec29f80fd6e81d312ffab44735a2893a3ca6b9 parent e067aaa7612c273d4bfd70d1bd8d80313a57685c author Karol Kozimor Fri, 30 Jun 2006 19:08:00 -0400 committer Len Brown Fri, 30 Jun 2006 20:37:40 -0400 ACPI: asus_acpi: support L5D This patch adds support for Asus L5D and thus fixes http://bugme.osdl.org/show_bug.cgi?id=4695 Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit e067aaa7612c273d4bfd70d1bd8d80313a57685c tree 305bac3e2fac826b78531a25d9394bbe1c17c65e parent f78c589d108f4b06a012817536c9ced37f473eae author Karol Kozimor Fri, 30 Jun 2006 19:07:00 -0400 committer Len Brown Fri, 30 Jun 2006 20:37:27 -0400 ACPI: asus_acpi: handle internal Bluetooth / support W5A This patch creates a new file named "bluetooth" under /proc/acpi/asus/. This file controls both the internal Bluetooth adapter's presence on the USB bus and the associated LED. echo 1 > /proc/acpi/asus/bluetooth to enable, 0 to disable. Additionally, the patch add support for Asus W5A, the first model that uses this feature. Patch originally by Fernando A. P. Gomes. Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit f78c589d108f4b06a012817536c9ced37f473eae tree f02e65b528352f6a1a15c42f1efa731a495e4262 parent c067a7899790ed4c03b00ed186c6e3b6a3964379 author Karol Kozimor Fri, 30 Jun 2006 19:06:00 -0400 committer Len Brown Fri, 30 Jun 2006 20:35:12 -0400 ACPI: asus_acpi: support A4G This patch adds support for Asus A4G. Originally by Giuseppe Rota. Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit c067a7899790ed4c03b00ed186c6e3b6a3964379 tree a98f6d36dd9dba8ec23659fcff407816b03a4887 parent 42cb891295795ed9b3048c8922d93f7a71f63968 author Karol Kozimor Fri, 30 Jun 2006 19:05:00 -0400 committer Len Brown Fri, 30 Jun 2006 20:35:01 -0400 ACPI: asus_acpi: support W3400N This patch adds support for Asus W3400N. Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit 42cb891295795ed9b3048c8922d93f7a71f63968 tree 2312b48ed28963e52fdd5fddca9891d8e78d98d5 parent ed2cb07b2bb04f14793cdeecb0b384374e979525 author Karol Kozimor Fri, 30 Jun 2006 19:04:00 -0400 committer Len Brown Fri, 30 Jun 2006 20:34:06 -0400 ACPI: asus_acpi: LED display support This patch adds handling for front LED displays found on W1N and the like. Additionally, W1N is given its own model_data instance. Patch originally by Éric Burghard. Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit ed2cb07b2bb04f14793cdeecb0b384374e979525 tree d3cc6a250954f218bb7d0d7acc772a75bb1756d2 parent a170a5317c0298538deb170028376ec1631acc2f author Karol Kozimor Fri, 30 Jun 2006 19:03:00 -0400 committer Len Brown Fri, 30 Jun 2006 20:33:02 -0400 ACPI: asus_acpi: support A3G This patch adds support for Asus A3G. Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit a170a5317c0298538deb170028376ec1631acc2f tree 0273f7812062769a67de2a0482f5a9a595b242be parent ba290ab7dace8b3339c0cc86c221d48eed21e956 author Karol Kozimor Fri, 30 Jun 2006 19:03:00 -0400 committer Len Brown Fri, 30 Jun 2006 20:32:55 -0400 ACPI: asus_acpi: misc cleanups This patch updates the version string, copyright notices and does whitespace cleanup (it looks weird, blame Lindent). Signed-off-by: Karol Kozimor Signed-off-by: Len Brown commit ba290ab7dace8b3339c0cc86c221d48eed21e956 tree b2e5d1e96b2799cd13010b140ffabd43e8f04963 parent 9262e9149f346a5443300f8c451b8e7631e81a42 parent 02438d8771ae6a4b215938959827692026380bf9 author Len Brown Fri, 30 Jun 2006 20:07:01 -0400 committer Len Brown Fri, 30 Jun 2006 20:07:01 -0400 Pull kmalloc into release branch commit 9262e9149f346a5443300f8c451b8e7631e81a42 tree f21b2d6f9270c7d0ff807f070e38d0f665582f21 parent e37a72de84d27ee8bc0e7dbb5c2f1774ed306dbb parent 6e990b50ed0b45d506ff6809034508d3e210497d author Linus Torvalds Fri, 30 Jun 2006 15:40:35 -0700 committer Linus Torvalds Fri, 30 Jun 2006 15:40:35 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Kill sun4v virtual device layer. [SERIAL] sunhv: Convert to of_driver layer. [SPARC64]: Mask out top 8-bits in physical address when building resources. [SERIAL] sunsu: Missing return statement in su_probe(). commit e37a72de84d27ee8bc0e7dbb5c2f1774ed306dbb tree f9da35cbd79b52a5bd08d4a0f960bde6af741da0 parent 93fdf10d4c28edaa1b9f80e7f9c3002359186d00 parent f83ef8c0b58dac17211a4c0b6df0e2b1bd6637b1 author Linus Torvalds Fri, 30 Jun 2006 15:40:17 -0700 committer Linus Torvalds Fri, 30 Jun 2006 15:40:17 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IPV6]: Added GSO support for TCPv6 [NET]: Generalise TSO-specific bits from skb_setup_caps [IPV6]: Added GSO support for TCPv6 [IPV6]: Remove redundant length check on input [NETFILTER]: SCTP conntrack: fix crash triggered by packet without chunks [TG3]: Update version and reldate [TG3]: Add TSO workaround using GSO [TG3]: Turn on hw fix for ASF problems [TG3]: Add rx BD workaround [TG3]: Add tg3_netif_stop() in vlan functions [TCP]: Reset gso_segs if packet is dodgy commit 93fdf10d4c28edaa1b9f80e7f9c3002359186d00 tree 4c5700b7f647470dcbb3b2a0531529ba35531b3d parent 22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 parent 0d8fdfd71bc871ffc07fe4429db8d4934185a8ec author Linus Torvalds Fri, 30 Jun 2006 15:39:49 -0700 committer Linus Torvalds Fri, 30 Jun 2006 15:39:49 -0700 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IB/core: Set alternate port number when initializing QP attributes IB/uverbs: Set correct user handle for user SRQs commit 22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 tree 7ef158ba2c30e0dde2dc103d1904fae243759a6b parent 39302175c26d74be35715c05a0f342c9e64c21bf parent 6ab3d5624e172c553004ecc862bfeac16d9d68b7 author Linus Torvalds Fri, 30 Jun 2006 15:39:30 -0700 committer Linus Torvalds Fri, 30 Jun 2006 15:39:30 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: Remove obsolete #include remove obsolete swsusp_encrypt arch/arm26/Kconfig typos Documentation/IPMI typos Kconfig: Typos in net/sched/Kconfig v9fs: do not include linux/version.h Documentation/DocBook/mtdnand.tmpl: typo fixes typo fixes: specfic -> specific typo fixes in Documentation/networking/pktgen.txt typo fixes: occuring -> occurring typo fixes: infomation -> information typo fixes: disadvantadge -> disadvantage typo fixes: aquire -> acquire typo fixes: mecanism -> mechanism typo fixes: bandwith -> bandwidth fix a typo in the RTC_CLASS help text smb is no longer maintained Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S commit 39302175c26d74be35715c05a0f342c9e64c21bf tree dcb582a16276592f09a1def1e9c296c2c6a437a9 parent 1cfef5ed631dedc55ca3c57a5fcfd01c77db3b59 parent 4b7a89a3c1cf545b03470416aa821fc2ff826b91 author Linus Torvalds Fri, 30 Jun 2006 15:36:52 -0700 committer Linus Torvalds Fri, 30 Jun 2006 15:36:52 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/ * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/: [PATCH] pcmcia: fix deadlock in pcmcia_parse_events [PATCH] com20020_cs: more device support [PATCH] au1xxx: pcmcia: fix __init called from non-init [PATCH] kill open-coded offsetof in cm4000_cs.c ZERO_DEV() [PATCH] pcmcia: convert pcmcia_cs to kthread [PATCH] pcmcia: fix kernel-doc function name [PATCH] pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_cs [PATCH] pcmcia: at91_cf suspend/resume/wakeup [PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO space is not available [PATCH] pcmcia: TI PCIxx12 CardBus controller support [PATCH] pcmcia: warn if driver requests exclusive, but gets a shared IRQ [PATCH] pcmcia: expose tool in pcmcia/Documentation/pcmcia/ [PATCH] pcmcia: another ID for serial_cs.c [PATCH] yenta: fix hidden PCI bus numbers [PATCH] yenta: do power-up only after socket is configured commit 1cfef5ed631dedc55ca3c57a5fcfd01c77db3b59 tree a2e9e10518c677071ed6c5c5b4df478d548901dd parent 3e8d6ad9bf1f02fdb9fd119c3c266d4b73b7175d parent 00819f87d883bb4aff97aecc7cc722ba27bd183a author Linus Torvalds Fri, 30 Jun 2006 15:36:19 -0700 committer Linus Torvalds Fri, 30 Jun 2006 15:36:19 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (4290): Add support for the TCL M2523_3DB_E tuner. V4L/DVB (4289): Missing statement in drivers/media/dvb/frontends/cx22700.c V4L/DVB (4288): Clean out a zillion sparse warnings in pvrusb2 V4L/DVB (4287): Pvrusb2/: possible cleanups V4L/DVB (4285): Cx88: add support for Geniatech Digistar / Digiwave 103g V4L/DVB (4284): Cx24123: fix set_voltage function according to the specs V4L/DVB (4282): Fix: use swzigzag for swalgo V4L/DVB (4281): TDA9887_SET_CONFIG should only be handled by the tda9887. V4L/DVB (4277): Fix CI interface on PRO KNC1 cards V4L/DVB (4276): Fix CI on old KNC1 DVBC cards V4L/DVB (4275): The FE_SET_FRONTEND_TUNE_MODE ioctl always returns EOPNOTSUPP V4L/DVB (4274): Eliminate use of tda9887 from pvrusb2 driver V4L/DVB (4273): Always log pvrusb2 device register / unregister events V4L/DVB (4272): Fix tveeprom supported standards V4L/DVB (4270): Add tda9887-specific tuner configuration V4L/DVB (4269): Subject: videocodec: make 1-bit fields unsigned V4L/DVB (4267): Remove all instances of request_module("tda9887") V4L/DVB (4264): Cx88-blackbird: implement VIDIOC_QUERYCTRL and VIDIOC_QUERYMENU commit 3e8d6ad9bf1f02fdb9fd119c3c266d4b73b7175d tree b5bfbb88a489ad5e3ce6692697b0be6e68b12dae parent 598736c55622f7ea65b98f93c825ff95c433877c parent 55910b28f7ca80af8fdfac84ddd6ece201a5928b author Linus Torvalds Fri, 30 Jun 2006 15:34:15 -0700 committer Linus Torvalds Fri, 30 Jun 2006 15:34:15 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (25 commits) ACPI: Kconfig: ACPI_SRAT depends on ACPI ACPI: drivers/acpi/scan.c: make acpi_bus_type static ACPI: fixup memhotplug debug message ACPI: ACPICA 20060623 ACPI: C-States: only demote on current bus mastering activity ACPI: C-States: bm_activity improvements ACPI: C-States: accounting of sleep states ACPI: additional blacklist entry for ThinkPad R40e ACPI: restore comment justifying 'extra' P_LVLx access ACPI: fix battery on HP NX6125 ACPIPHP: prevent duplicate slot numbers when no _SUN ACPI: static-ize handle_hotplug_event_func() ACPIPHP: use ACPI dock driver ACPI: dock driver KEVENT: add new uevent for dock ACPI: asus_acpi_init: propagate correct return value [ACPI] Print error message if remove/install notify handler fails ACPI: delete tracing macros from drivers/acpi/*.c ACPI: HW P-state coordination support ACPI: un-export ACPI_ERROR() -- use printk(KERN_ERR...) ... commit 6e990b50ed0b45d506ff6809034508d3e210497d tree 167fd890356b2c55b9f60c4940a8325d1daa42b5 parent 93872ba21d1087cde1d5f9603f3265c1c54d471c author David S. Miller Fri, 30 Jun 2006 00:07:40 -0700 committer David S. Miller Fri, 30 Jun 2006 14:13:41 -0700 [SPARC64]: Kill sun4v virtual device layer. Replace with a simple IRQ translater in the PROM device tree builder. Signed-off-by: David S. Miller commit 93872ba21d1087cde1d5f9603f3265c1c54d471c tree 43100e01bf8ea119820ae2b46d50e248350fb765 parent 1815aed5edbc79c6f3de6f022efb0af30dd0a70d author David S. Miller Fri, 30 Jun 2006 00:00:22 -0700 committer David S. Miller Fri, 30 Jun 2006 14:13:38 -0700 [SERIAL] sunhv: Convert to of_driver layer. Signed-off-by: David S. Miller commit 1815aed5edbc79c6f3de6f022efb0af30dd0a70d tree e614bc9663061cca90665d433ab46c3ccbf335ae parent a1d22d3258aed732e1778ecb2e840e6c95cb668e author David S. Miller Thu, 29 Jun 2006 19:58:28 -0700 committer David S. Miller Fri, 30 Jun 2006 14:13:36 -0700 [SPARC64]: Mask out top 8-bits in physical address when building resources. These top 8-bits are supposed to be ignored in the ranges and top-level reg properties on this platform. Signed-off-by: David S. Miller commit a1d22d3258aed732e1778ecb2e840e6c95cb668e tree 8aade70dd6833842d8e9ec1964f694293816e93d parent 598736c55622f7ea65b98f93c825ff95c433877c author David S. Miller Thu, 29 Jun 2006 19:40:19 -0700 committer David S. Miller Fri, 30 Jun 2006 14:13:34 -0700 [SERIAL] sunsu: Missing return statement in su_probe(). If we have a keyboard/mouse port, don't drop through to calling sunsu_autoconfig(). Signed-off-by: David S. Miller commit f83ef8c0b58dac17211a4c0b6df0e2b1bd6637b1 tree 61661a587df97cb2a9f73b5d0d1cf30f09644051 parent bcd76111178ebccedd46a9b3eaff65c78e5a70af author Herbert Xu Fri, 30 Jun 2006 13:37:03 -0700 committer David S. Miller Fri, 30 Jun 2006 14:12:10 -0700 [IPV6]: Added GSO support for TCPv6 This patch adds GSO support for IPv6 and TCPv6. This is based on a patch by Ananda Raju . His original description is: This patch enables TSO over IPv6. Currently Linux network stacks restricts TSO over IPv6 by clearing of the NETIF_F_TSO bit from "dev->features". This patch will remove this restriction. This patch will introduce a new flag NETIF_F_TSO6 which will be used to check whether device supports TSO over IPv6. If device support TSO over IPv6 then we don't clear of NETIF_F_TSO and which will make the TCP layer to create TSO packets. Any device supporting TSO over IPv6 will set NETIF_F_TSO6 flag in "dev->features" along with NETIF_F_TSO. In case when user disables TSO using ethtool, NETIF_F_TSO will get cleared from "dev->features". So even if we have NETIF_F_TSO6 we don't get TSO packets created by TCP layer. SKB_GSO_TCPV4 renamed to SKB_GSO_TCP to make it generic GSO packet. SKB_GSO_UDPV4 renamed to SKB_GSO_UDP as UFO is not a IPv4 feature. UFO is supported over IPv6 also The following table shows there is significant improvement in throughput with normal frames and CPU usage for both normal and jumbo. -------------------------------------------------- | | 1500 | 9600 | | ------------------|-------------------| | | thru CPU | thru CPU | -------------------------------------------------- | TSO OFF | 2.00 5.5% id | 5.66 20.0% id | -------------------------------------------------- | TSO ON | 2.63 78.0 id | 5.67 39.0% id | -------------------------------------------------- Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit bcd76111178ebccedd46a9b3eaff65c78e5a70af tree b0f059f3cb19d425d30cf42b2088aca4cae12a0a parent adcfc7d0b4d7bc3c7edac6fdde9f3ae510bd6054 author Herbert Xu Fri, 30 Jun 2006 13:36:35 -0700 committer David S. Miller Fri, 30 Jun 2006 14:12:08 -0700 [NET]: Generalise TSO-specific bits from skb_setup_caps This patch generalises the TSO-specific bits from sk_setup_caps by adding the sk_gso_type member to struct sock. This makes sk_setup_caps generic so that it can be used by TCPv6 or UFO. The only catch is that whoever uses this must provide a GSO implementation for their protocol which I think is a fair deal :) For now UFO continues to live without a GSO implementation which is OK since it doesn't use the sock caps field at the moment. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit adcfc7d0b4d7bc3c7edac6fdde9f3ae510bd6054 tree 6bf8f6facbfbac9ea8ed4d3310ea46a7518ae453 parent 2889139a6acd2945f6143eb85f7dc2a22a352e1a author Herbert Xu Fri, 30 Jun 2006 13:36:15 -0700 committer David S. Miller Fri, 30 Jun 2006 14:12:06 -0700 [IPV6]: Added GSO support for TCPv6 This patch adds GSO support for IPv6 and TCPv6. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 2889139a6acd2945f6143eb85f7dc2a22a352e1a tree 67d21e371107c46f6f0e7a2708b19ad24d8cbfbe parent dd7271feba61d5dc0fab1cb5365db9926d35ea3a author Herbert Xu Fri, 30 Jun 2006 13:35:46 -0700 committer David S. Miller Fri, 30 Jun 2006 14:12:04 -0700 [IPV6]: Remove redundant length check on input We don't need to check skb->len when we're just about to call pskb_may_pull since that checks it for us. Signed-off-by: Herbert Xu Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit dd7271feba61d5dc0fab1cb5365db9926d35ea3a tree 36adf4a907e72b07eb4b37bbd679357fe4c0729f parent 2c6059bca8cf5e7f722d909f2e5edda0491ac604 author Patrick McHardy Thu, 29 Jun 2006 21:40:23 -0700 committer David S. Miller Fri, 30 Jun 2006 14:12:01 -0700 [NETFILTER]: SCTP conntrack: fix crash triggered by packet without chunks When a packet without any chunks is received, the newconntrack variable in sctp_packet contains an out of bounds value that is used to look up an pointer from the array of timeouts, which is then dereferenced, resulting in a crash. Make sure at least a single chunk is present. Problem noticed by George A. Theall Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 2c6059bca8cf5e7f722d909f2e5edda0491ac604 tree 8e09bcdd1ee366b4167fe601e4919412863b2bfc parent 52c0fd834ea0e7c6ef8616ce0a1f85bac4233ed7 author Michael Chan Thu, 29 Jun 2006 20:16:28 -0700 committer David S. Miller Fri, 30 Jun 2006 14:11:59 -0700 [TG3]: Update version and reldate Update version to 3.61. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 52c0fd834ea0e7c6ef8616ce0a1f85bac4233ed7 tree 92897bedf97906699f654fd94985fbada0497daa parent 1661394e78b3b2cc868cd0e89c1066974302aaca author Michael Chan Thu, 29 Jun 2006 20:15:54 -0700 committer David S. Miller Fri, 30 Jun 2006 14:11:57 -0700 [TG3]: Add TSO workaround using GSO Use GSO to workaround a rare TSO bug on some chips. This hardware bug may be triggered when the TSO header size is greater than 80 bytes. When this condition is detected in a TSO packet, the driver will use GSO to segment the packet to workaround the hardware bug. Thanks to Juergen Kreileder for reporting the problem and collecting traces to help debug the problem. And thanks to Herbert Xu for providing the GSO mechanism that happens to be the perfect workaround for this problem. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 1661394e78b3b2cc868cd0e89c1066974302aaca tree bdbbe205062b8bb2ae2edc5aab2d224c58ca862b parent f92905deb9bc89834dac247ca1a0d905ebcf629b author Michael Chan Thu, 29 Jun 2006 20:15:13 -0700 committer David S. Miller Fri, 30 Jun 2006 14:11:55 -0700 [TG3]: Turn on hw fix for ASF problems Clear a bit to enable a hardware fix for some ASF related problem. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit f92905deb9bc89834dac247ca1a0d905ebcf629b tree 63d3eb18e3dd5426791726eed8004087cfa7fbb4 parent 29315e8770c20cbfe607ad962d87867115a44555 author Michael Chan Thu, 29 Jun 2006 20:14:29 -0700 committer David S. Miller Fri, 30 Jun 2006 14:11:52 -0700 [TG3]: Add rx BD workaround Add workaround to limit the burst size of rx BDs being DMA'ed to the chip. This works around hardware errata on a number of 5750, 5752, and 5755 chips. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 29315e8770c20cbfe607ad962d87867115a44555 tree 904b055d26a4201e4c9026aa181c136e700d3578 parent 3820c3f3e41786322c0bb225b9c77b8deff869d1 author Michael Chan Thu, 29 Jun 2006 20:12:30 -0700 committer David S. Miller Fri, 30 Jun 2006 14:11:50 -0700 [TG3]: Add tg3_netif_stop() in vlan functions Add tg3_netif_stop() when changing the vlgrp (vlan group) pointer. It is necessary to quiesce the device before changing that pointer. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 3820c3f3e41786322c0bb225b9c77b8deff869d1 tree a422ad9d119950af2d139849fe24e935ad9f0a22 parent 598736c55622f7ea65b98f93c825ff95c433877c author Herbert Xu Thu, 29 Jun 2006 20:11:25 -0700 committer David S. Miller Fri, 30 Jun 2006 14:11:47 -0700 [TCP]: Reset gso_segs if packet is dodgy I wasn't paranoid enough in verifying GSO information. A bogus gso_segs could upset drivers as much as a bogus header would. Let's reset it in the per-protocol gso_segment functions. I didn't verify gso_size because that can be verified by the source of the dodgy packets. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 0d8fdfd71bc871ffc07fe4429db8d4934185a8ec tree ebe8acbba8e8e9a1ede6364867ce55dfbc55d1dc parent 146d26b2bf167f831d3b7442a01cfdc2b183cb0b author Sean Hefty Fri, 30 Jun 2006 14:10:14 -0700 committer Roland Dreier Fri, 30 Jun 2006 14:10:14 -0700 IB/core: Set alternate port number when initializing QP attributes Set alternate port number when initializing QP attributes. This bug is OpenFabrics bugzilla bug #160. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 146d26b2bf167f831d3b7442a01cfdc2b183cb0b tree d23aebdd2ce0198c6778193201f603c920d34d99 parent 598736c55622f7ea65b98f93c825ff95c433877c author Roland Dreier Fri, 30 Jun 2006 13:40:13 -0700 committer Roland Dreier Fri, 30 Jun 2006 13:40:13 -0700 IB/uverbs: Set correct user handle for user SRQs Store away the user handle passed in from userspace when creating an SRQ, so that the kernel can return the correct handle when an SRQ asynchronous event occurs. (A 0 was incorrectly stored as the user handle as part of the changes in 9ead190b, "IB/uverbs: Don't serialize with ib_uverbs_idr_mutex") Signed-off-by: Roland Dreier commit 4b7a89a3c1cf545b03470416aa821fc2ff826b91 tree ba2d19e733eeb891dafd91b1dbe39e9bbf26f16e parent 6bb1c39a43d23e4cecc7e815491b6964c6758a29 author Arjan van de Ven Fri, 30 Jun 2006 10:31:13 +0200 committer Dominik Brodowski Fri, 30 Jun 2006 22:09:13 +0200 [PATCH] pcmcia: fix deadlock in pcmcia_parse_events The PCMCIA layer calls pcmcia_parse_events both from user context and IRQ context; the lock thus needs to be irqsave to avoid deadlocks Signed-off-by: Arjan van de Ven Signed-off-by: Dominik Brodowski commit 6bb1c39a43d23e4cecc7e815491b6964c6758a29 tree 13966a7d705b4b02123201d28f3078bb3760dbe4 parent 0973ddddca72bc8aee8a273c232060b9608d1793 author Marc Sowen Sun, 25 Jun 2006 01:56:24 -0700 committer Dominik Brodowski Fri, 30 Jun 2006 22:09:13 +0200 [PATCH] com20020_cs: more device support Enable the com20020_cs arcnet driver to see the SoHard (now Mercury Computer Systems Inc.) SH ARC-PCMCIA card. Signed-off-by: Andrew Morton Signed-off-by: Dominik Brodowski commit 0973ddddca72bc8aee8a273c232060b9608d1793 tree 3c8af748681e22ea453344e4229f4bd06ad16fec parent a2bcce8ede4fbda0c2a5f2132115715dff056b9c author Domen Puncer Fri, 23 Jun 2006 12:06:56 +0100 committer Dominik Brodowski Fri, 30 Jun 2006 22:09:13 +0200 [PATCH] au1xxx: pcmcia: fix __init called from non-init This must not be marked __init, as it is called from au1x00_drv_pcmcia_probe. Signed-off-by: Domen Puncer Signed-off-by: Dominik Brodowski commit a2bcce8ede4fbda0c2a5f2132115715dff056b9c tree c111990b9d4fe86a5b358b235bdc6c51e3aaf199 parent 1da9ab7389b8a0789a1b3ad43d3efe80b4c57c03 author Al Viro Thu, 15 Jun 2006 12:26:55 +0100 committer Dominik Brodowski Fri, 30 Jun 2006 22:09:13 +0200 [PATCH] kill open-coded offsetof in cm4000_cs.c ZERO_DEV() ... to make sure that it doesn't break again when a field changes (see "[PATCH] pcmcia: fix zeroing of cm4000_cs.c data" for recent example). Signed-off-by: Al Viro Signed-off-by: Dominik Brodowski commit 1da9ab7389b8a0789a1b3ad43d3efe80b4c57c03 tree 44964d5151b6a7b825517480ce0fdbf19bd348f1 parent 66005216074337e3925514456175b202f17e23ef author Serge E. Hallyn Wed, 14 Jun 2006 08:01:26 -0500 committer Dominik Brodowski Fri, 30 Jun 2006 22:09:13 +0200 [PATCH] pcmcia: convert pcmcia_cs to kthread Convert pcmcia_cs to use kthread instead of the deprecated kernel_thread. Signed-off-by: Serge E. Hallyn Signed-off-by: Dominik Brodowski commit 66005216074337e3925514456175b202f17e23ef tree 486eba665acf7d6769be1b56d0071a4448388a7e parent fd99ddd0701385344eadaf2daa6abbc5fb086750 author Randy Dunlap Tue, 06 Jun 2006 12:06:41 -0700 committer Dominik Brodowski Fri, 30 Jun 2006 22:09:12 +0200 [PATCH] pcmcia: fix kernel-doc function name Fix kernel-doc function name spello. Signed-off-by: Randy Dunlap Signed-off-by: Dominik Brodowski commit fd99ddd0701385344eadaf2daa6abbc5fb086750 tree 013d75048f086edfa7a89ac3f3301dde13017817 parent 0db6095d4ff8918350797dfe299d572980e82fa0 author Komuro Mon, 17 Apr 2006 21:41:21 +0900 committer Dominik Brodowski Fri, 30 Jun 2006 22:09:12 +0200 [PATCH] pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_cs Comment out the ID 0xc00f,0x0000 in hostap_cs.c, as it conflicts with the pcnet_cs driver. Signed-off-by: komurojun-mbn@nifty.com Signed-off-by: Dominik Brodowski commit 0db6095d4ff8918350797dfe299d572980e82fa0 tree 72d42bc165a382fe82a279222efc1c5c4cb7addb parent 5040cb8b7e61b7a03e8837920b9eb2c839bb1947 author David Brownell Wed, 19 Apr 2006 06:37:48 -0700 committer Dominik Brodowski Fri, 30 Jun 2006 22:09:12 +0200 [PATCH] pcmcia: at91_cf suspend/resume/wakeup AT91 CF updates, mostly for power management: - Add suspend/resume methods to the AT91 CF driver, disabling non-wakeup IRQs during system suspend. The card detect IRQ serves as a wakeup event source. - Convert the driver to the more-current "platform_driver" style. So inserting or removing a CF card will wake the system, unless that has been disabled by updating the sysfs file; and there will be no more warnings about spurious IRQs during suspend/resume cycles. Signed-off-by: David Brownell Signed-off-by: Dominik Brodowski commit 5040cb8b7e61b7a03e8837920b9eb2c839bb1947 tree 2ac0e2b5781a746f9aff06d1695f440ec5955be2 parent 59e35ba1257903eaff5203f62f77554da02f5b63 author Thomas Kleffel Sun, 14 May 2006 15:16:30 +0200 committer Dominik Brodowski Fri, 30 Jun 2006 22:09:11 +0200 [PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO space is not available This patch enables ide_cs to access CF-cards via their common memory rather than via their IO space. Signed-off-by: Thomas Kleffel Signed-off-by: Dominik Brodowski commit 59e35ba1257903eaff5203f62f77554da02f5b63 tree 09f465afe4cc2a5c33525d925ed83b4b34fe4eca parent c533120b8da215dc02310c535fa87c5c480d0f14 author Alex Williamson Mon, 08 May 2006 23:22:07 -0600 committer Dominik Brodowski Fri, 30 Jun 2006 22:09:11 +0200 [PATCH] pcmcia: TI PCIxx12 CardBus controller support The patch below adds support for the TI PCIxx12 CardBus controllers. This seems to be sufficient to detect the cardbus bridge on an HP nc6320 and works with an orinoco wifi card. Signed-off-by: Alex Williamson Signed-off-by: Dominik Brodowski commit c533120b8da215dc02310c535fa87c5c480d0f14 tree 5142cad1107953e1655c7153ef10b7cc0719f068 parent d29693bf10f376870d9bfd34bde80dd061cc4575 author Alan Cox Tue, 16 May 2006 16:16:44 +0100 committer Dominik Brodowski Fri, 30 Jun 2006 22:09:10 +0200 [PATCH] pcmcia: warn if driver requests exclusive, but gets a shared IRQ The patch below cleans up the pcmcia code a bit on the IRQ side (I did this while debugging the problem just so I could read wtf it was doing), and also adds a warning and passes back the correct information when a device asks for exclusive but gets given shared. This at least means the dmesg dump of a problem triggered by this will have a signature to find. Signed-off-by: Alan Cox Signed-off-by: Dominik Brodowski commit d29693bf10f376870d9bfd34bde80dd061cc4575 tree 03979ead72d5d7813ca26789aa8c3c22752343d1 parent fec21889cd6ef5e604b410c08b50a8c1522d74d4 author Randy Dunlap Sun, 21 May 2006 20:57:42 -0700 committer Dominik Brodowski Fri, 30 Jun 2006 22:09:10 +0200 [PATCH] pcmcia: expose tool in pcmcia/Documentation/pcmcia/ Expose example and tool source files in the Documentation/ directory in their own files instead of being buried (almost hidden) in readme/txt files. This will make them more visible/usable to users who may need to use them, to developers who may need to test with them, and to janitors who would update them if they were more visible. Also, if any of these possibly should not be in the kernel tree at all, it will be clearer that they are here and we can discuss if they should be removed. Signed-off-by: Randy Dunlap Signed-off-by: Dominik Brodowski commit fec21889cd6ef5e604b410c08b50a8c1522d74d4 tree 1f67a488c20e16847dfdd4870d916d23e3f75694 parent b435261b1e09bb2bb6acc4abbc7f6e3d885f9e62 author Dominik Brodowski Wed, 26 Apr 2006 19:57:32 +0200 committer Dominik Brodowski Fri, 30 Jun 2006 22:09:10 +0200 [PATCH] pcmcia: another ID for serial_cs.c Add an ID for "GlobeTrotter" cards which need a CIS override Signed-off-by: Dominik Brodowski commit b435261b1e09bb2bb6acc4abbc7f6e3d885f9e62 tree ce157d0389153f7f220dd333b93365c37e0a297a parent d250a4810402ec68f64802b66340a0e70c61cbd3 author Bernhard Kaindl Tue, 30 May 2006 18:00:34 +0200 committer Dominik Brodowski Fri, 30 Jun 2006 22:09:09 +0200 [PATCH] yenta: fix hidden PCI bus numbers Fixup the subordinate number parent bridge of yenta Cardbus Bridges before the PCI bus scan starts to make the cardbus cards which are otherwise hidden for PCI scans work. Signed-off-by: Bernhard Kaindl Signed-off-by: Dominik Brodowski commit d250a4810402ec68f64802b66340a0e70c61cbd3 tree 4e14ab711399b60f0863ee90260be97f3aa4cfb6 parent 598736c55622f7ea65b98f93c825ff95c433877c author Daniel Ritz Mon, 06 Mar 2006 17:37:04 +0100 committer Dominik Brodowski Fri, 30 Jun 2006 22:09:09 +0200 [PATCH] yenta: do power-up only after socket is configured Power-up the card only after the socket is configured. power-down in the old place. The point is not to power-up the card before the interrupt routing is set up correctly. Signed-off-by: Daniel Ritz Signed-off-by: Dominik Brodowski commit 00819f87d883bb4aff97aecc7cc722ba27bd183a tree 267558db51b025ae65c3f5368ef123737d9d4f49 parent 91a079196fba6918bdf785533dcdfca5361577cb author Hans Verkuil Fri, 30 Jun 2006 13:41:26 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:53 -0300 V4L/DVB (4290): Add support for the TCL M2523_3DB_E tuner. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 91a079196fba6918bdf785533dcdfca5361577cb tree 7fe6d4302b2a55005bf4470681fcb868e2825d99 parent a0fd1cb171e8b17339a9a18ae7cf09c50022010f author Eric Sesterhenn Fri, 30 Jun 2006 11:51:11 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:51 -0300 V4L/DVB (4289): Missing statement in drivers/media/dvb/frontends/cx22700.c Stumbled over this because of coverity (id #492), seems like we are missing a return statement here and fail to do proper bounds checking. If this assumption is false we should at least change the identation to make it clear Signed-off-by: Eric Sesterhenn Signed-off-by: Mauro Carvalho Chehab commit a0fd1cb171e8b17339a9a18ae7cf09c50022010f tree fdd003ed9f8fe86d20d77fa9bb8da5e13954d494 parent 07e337eeab3660559cbe1fee6907d1092037aea7 author Mike Isely Fri, 30 Jun 2006 11:35:28 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:50 -0300 V4L/DVB (4288): Clean out a zillion sparse warnings in pvrusb2 Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 07e337eeab3660559cbe1fee6907d1092037aea7 tree d1960df404e80f7480c34a44f94ba599eb8df031 parent c02a34f4e3e65a7b1fb64507ec5c093e8328335e author Adrian Bunk Fri, 30 Jun 2006 11:30:20 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:48 -0300 V4L/DVB (4287): Pvrusb2/: possible cleanups This patch contains the following possible cleanups: - make needlessly global code static - #if 0 unused global functions Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit c02a34f4e3e65a7b1fb64507ec5c093e8328335e tree 4976dfb5952a593a7195ee7bc5316a5e6e8f401f parent ccd214b27341485bd471e4e031c33d2ba1a9aaac author Saqeb Akhter Thu, 29 Jun 2006 20:29:33 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:46 -0300 V4L/DVB (4285): Cx88: add support for Geniatech Digistar / Digiwave 103g This patch adds support for the Geniatech Digistar, aka Digiwave 103g DVB-S card. Acked-by: Andrew de Quincey Signed-off-by: Saqeb Akhter Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit ccd214b27341485bd471e4e031c33d2ba1a9aaac tree d02bb9244fd5e3ccd77369925cc68659155e7b6c parent 70d906354fd7fe3956366ade15ab36d6b7aed971 author Saqeb Akhter Thu, 29 Jun 2006 20:29:29 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:45 -0300 V4L/DVB (4284): Cx24123: fix set_voltage function according to the specs The set_voltage function in cx24123.c was corrected to match how it is described in the CX24123 specs, producing the correct behaviour for cards that require it. Acked-by: Andrew de Quincey Signed-off-by: Saqeb Akhter Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 70d906354fd7fe3956366ade15ab36d6b7aed971 tree 7a1c941f0f2e216a5693d5b1385e8a6091f03f51 parent 00e158d52a8107ebcb0eaee6442267927f149b3b author Manu Abraham Thu, 29 Jun 2006 22:05:23 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:43 -0300 V4L/DVB (4282): Fix: use swzigzag for swalgo Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 00e158d52a8107ebcb0eaee6442267927f149b3b tree 9f4e55378aba2d2657728ceaa1401a56c484d1f1 parent c5e768a1ec281926e3a3a2b804d5004a2693d7e8 author Hans Verkuil Thu, 29 Jun 2006 16:30:51 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:42 -0300 V4L/DVB (4281): TDA9887_SET_CONFIG should only be handled by the tda9887. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c5e768a1ec281926e3a3a2b804d5004a2693d7e8 tree 8697c2fe5e3c0f0dec9683d59b21dbf8fd663cc4 parent fd6decfbb86a73f3bdf3df2281191e7a978d8b77 author Andrew de Quincey Thu, 29 Jun 2006 13:16:11 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:40 -0300 V4L/DVB (4277): Fix CI interface on PRO KNC1 cards The original driver had a restriction that if a card as an saa7113 chip, then it cannot have a CI interface. This is not the case. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit fd6decfbb86a73f3bdf3df2281191e7a978d8b77 tree 8dbbe9f22dd79724d3a826b9bdfd9ed6631974ac parent 1b172e0c4e44151cd239c1e9260c7822a4eecdbf author Andrew de Quincey Thu, 29 Jun 2006 13:16:07 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:39 -0300 V4L/DVB (4276): Fix CI on old KNC1 DVBC cards These cards do not need the tda10021 configuration change when data is streamed through a CAM module. This disables it for these ones. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 1b172e0c4e44151cd239c1e9260c7822a4eecdbf tree e523197eef1fa3368b47a738eda35c5847b69ef4 parent 591b631f030cee5f4c6cf016dd71d565a5a4eff6 author Trent Piepho Thu, 29 Jun 2006 13:16:04 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:37 -0300 V4L/DVB (4275): The FE_SET_FRONTEND_TUNE_MODE ioctl always returns EOPNOTSUPP When someone added the front-end ioctl FE_SET_FRONTEND_TUNE_MODE, they forgot to set the return value to 0. It always returns EOPNOTSUPP, causing problems for programmers who actually check for error conditions. Signed-off-by: Trent Piepho Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 591b631f030cee5f4c6cf016dd71d565a5a4eff6 tree 104d634d6b631650bf5e0443d39a0139daaa3eaa parent 47ed3bc6cf03d11207ab219945fbc556885743f4 author Mike Isely Thu, 29 Jun 2006 09:26:57 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:36 -0300 V4L/DVB (4274): Eliminate use of tda9887 from pvrusb2 driver Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 47ed3bc6cf03d11207ab219945fbc556885743f4 tree aad7c04dee796411cc944db94cf8692e66be267f parent 3407e387c8144e08fafcc3287bcf9452d14f1d38 author Mike Isely Thu, 29 Jun 2006 09:26:43 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:34 -0300 V4L/DVB (4273): Always log pvrusb2 device register / unregister events Previously the pvrusb2 driver was conditionalizing printing of the device register / unregister messages against a debug mask. This sort of information should always appear, thus this patch. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 3407e387c8144e08fafcc3287bcf9452d14f1d38 tree 2c8bd1449af54adb3da8cc86822c79ed228e85e3 parent ba8fc39954bf3bc51f502e8a02f959d45edd096c author Mauro Carvalho Chehab Wed, 28 Jun 2006 18:17:44 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:33 -0300 V4L/DVB (4272): Fix tveeprom supported standards The supported standards by the tuner on tveeprom were too restricted. It were showing just the main format, instead of the format family. Signed-off-by: Mauro Carvalho Chehab commit ba8fc39954bf3bc51f502e8a02f959d45edd096c tree 3846895bb42d759c6650e1487300296955ba2833 parent 0a1153736f97db48e6bc9ab27e90b51ab50729c7 author Hans Verkuil Sun, 25 Jun 2006 15:34:39 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:32 -0300 V4L/DVB (4270): Add tda9887-specific tuner configuration Many tda9887 settings depend on the chosen tuner. Expand the tuner parameters to include these tda9887 settings. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0a1153736f97db48e6bc9ab27e90b51ab50729c7 tree 91964b6c70c23ed2c0fa2d4ffae03a01b51c05e0 parent 4987abed29247063bb70374e60916584a43975ef author Randy Dunlap Wed, 28 Jun 2006 15:05:11 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:30 -0300 V4L/DVB (4269): Subject: videocodec: make 1-bit fields unsigned Make 1-bit bitfields unsigned. Removes 68 sparse errors like these: drivers/media/video/videocodec.h:225:17: error: dubious one-bit signed bitfield drivers/media/video/msp3400-driver.h:93:32: error: dubious one-bit signed bitfield Acked-by: Hans Verkuil Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 4987abed29247063bb70374e60916584a43975ef tree 6d38712388962f5a27cd6323a8e46c678a4eee6d parent 38a2713ada91d5e7e4c0a1a0b12e45e2ec7079c3 author Michael Krufky Tue, 27 Jun 2006 00:35:41 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:29 -0300 V4L/DVB (4267): Remove all instances of request_module("tda9887") We should no longer try to load the tda9887 module, because it no longer exists. The tda9887 driver has been merged into the tuner module. This patch removes all instances of request_module("tda9887") from the following video4linux drivers: bttv, cx88, em28xx and saa7134. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 38a2713ada91d5e7e4c0a1a0b12e45e2ec7079c3 tree e3d0a2fd5b3b95f75b3e09de9dc54d2edb5e1533 parent 598736c55622f7ea65b98f93c825ff95c433877c author Michael Krufky Mon, 26 Jun 2006 23:42:39 -0300 committer Mauro Carvalho Chehab Fri, 30 Jun 2006 15:59:27 -0300 V4L/DVB (4264): Cx88-blackbird: implement VIDIOC_QUERYCTRL and VIDIOC_QUERYMENU This patch implements the newer v4l2 control features to make the standard user controls and mpeg encoder controls of cx88-blackbird video encoder boards available to userspace. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 55910b28f7ca80af8fdfac84ddd6ece201a5928b tree fbbfd8ea7812e9ff73efcfcdca89569d0f3e0e89 parent 9e5289f4dd2326fb8c0a3af23a954158ca99c354 author Andrew Morton Fri, 30 Jun 2006 05:15:00 -0400 committer Len Brown Fri, 30 Jun 2006 14:29:45 -0400 ACPI: Kconfig: ACPI_SRAT depends on ACPI arch/i386/kernel/srat.c won't compile without CONFIG_ACPI. Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 9e5289f4dd2326fb8c0a3af23a954158ca99c354 tree 93f040f73ef2898df7cf73f708e19833945ca771 parent 0a1f1ab8de815cb63a48d24450f6b5fbb1b1f89c author Adrian Bunk Fri, 30 Jun 2006 05:15:00 -0400 committer Len Brown Fri, 30 Jun 2006 14:28:50 -0400 ACPI: drivers/acpi/scan.c: make acpi_bus_type static Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 598736c55622f7ea65b98f93c825ff95c433877c tree 35878343d000080efe0e1e21d1bc1e9a39727d09 parent cfa7b0d46964300c849243d1a38a138b870bdc13 author Andrew Morton Fri, 30 Jun 2006 01:56:20 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:41 -0700 [PATCH] i2c-801: 64bit resource fix drivers/i2c/busses/i2c-i801.c: In function 'i801_probe': drivers/i2c/busses/i2c-i801.c:496: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'resource_size_t' Cc: Greg KH Cc: Vivek Goyal Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfa7b0d46964300c849243d1a38a138b870bdc13 tree cf3815daffaa442d87f77eae137f41ee1908357a parent 7c9fdcfb1b64c47ed618c103b617af3f86e1239c author Andrew Morton Fri, 30 Jun 2006 01:56:20 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:41 -0700 [PATCH] infiniband: devfs fix Remove devfs leftovers. Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c9fdcfb1b64c47ed618c103b617af3f86e1239c tree da5cd781687bfa1db4c8ba9c9ff0bb4a84366a75 parent 5c04c46aec16b3267d8fe03af886f2d41e448cd0 author J. Bruce Fields Fri, 30 Jun 2006 01:56:19 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:41 -0700 [PATCH] knfsd: svcrpc: gss: server-side implementation of rpcsec_gss privacy Server-side implementation of rpcsec_gss privacy, which enables encryption of the payload of every rpc request and response. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c04c46aec16b3267d8fe03af886f2d41e448cd0 tree c46f4e70423f4f37f73f9e875a7059c0ca2ccf3f parent e142ede8e064cb1ae9c2bfb17f36ab145b95ccd2 author J. Bruce Fields Fri, 30 Jun 2006 01:56:19 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:41 -0700 [PATCH] knfsd: nfsd: mark rqstp to prevent use of sendfile in privacy case Add a rq_sendfile_ok flag to svc_rqst which will be cleared in the privacy case so that the wrapping code will get copies of the read data instead of real page cache pages. This makes life simpler when we encrypt the response. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e142ede8e064cb1ae9c2bfb17f36ab145b95ccd2 tree c5696a44098fbc81814ea36b8ad39cb58f0f46c2 parent 9ecb6a08d84d0e795648d5add64f154bc406914b author J. Bruce Fields Fri, 30 Jun 2006 01:56:18 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:40 -0700 [PATCH] knfsd: svcrpc: Simplify nfsd rpcsec_gss integrity code Pull out some of the integrity code into its own function, otherwise svcauth_gss_release() is going to become very ungainly after the addition of privacy code. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ecb6a08d84d0e795648d5add64f154bc406914b tree 007e079b6bde7c6b0b7758d218d006e9f6bcab5d parent ba5a6a19d83babe00be3711db3deee5c57587b8f author J. Bruce Fields Fri, 30 Jun 2006 01:56:17 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:40 -0700 [PATCH] knfsd: nfsd4: fix open flag passing Since nfsv4 actually keeps around the file descriptors it gets from open (instead of just using them for a single read or write operation), we need to make sure that we can do RDWR opens and not just RDONLY/WRONLY. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba5a6a19d83babe00be3711db3deee5c57587b8f tree ccc35a1a51b6952b58b0afa27ff556b2a617881f parent 1df0cada03644e37ae6fefd7c0267d9a531991e2 author J. Bruce Fields Fri, 30 Jun 2006 01:56:16 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:40 -0700 [PATCH] knfsd: nfsd4: fix some open argument tests These tests always returned true; clearly that wasn't what was intended. In keeping with kernel style, make them functions instead of macros while we're at it. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1df0cada03644e37ae6fefd7c0267d9a531991e2 tree 5b57b7749bba84ff31e4966e18d237e1dc77c2f2 parent 270d56e536dcd37cc819a6adb51d918185411048 author J. Bruce Fields Fri, 30 Jun 2006 01:56:16 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:40 -0700 [PATCH] knfsd: svcrpc: gss: simplify rsc_parse() Adopt a simpler convention for gss_mech_put(), to simplify rsc_parse(). Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 270d56e536dcd37cc819a6adb51d918185411048 tree 7594eb9368e1977ff68bc8a9c61afa2cc41640c5 parent 6e46d8a9ccbcd3273bdb6902ca2b6da62c253e73 author David M. Richter Fri, 30 Jun 2006 01:56:15 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:40 -0700 [PATCH] knfsd: nfsd: fix misplaced fh_unlock() in nfsd_link() In the event that lookup_one_len() fails in nfsd_link(), fh_unlock() is skipped and locks are held overlong. Patch was tested on 2.6.17-rc2 by causing lookup_one_len() to fail and verifying that fh_unlock() gets called appropriately. Signed-off-by: David M. Richter Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e46d8a9ccbcd3273bdb6902ca2b6da62c253e73 tree fd5706307c249d7be444a2e4b21ac256203d1e56 parent 7fc90ec93a5eb71f4b08403baf5ba7176b3ec6b1 author J. Bruce Fields Fri, 30 Jun 2006 01:56:14 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:40 -0700 [PATCH] knfsd: nfsd4: remove superfluous grace period checks We're checking nfs_in_grace here a few times when there isn't really any reason to--bad_stateid is probably the more sensible return value anyway. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fc90ec93a5eb71f4b08403baf5ba7176b3ec6b1 tree 4fc33145b741f153a49d3623b77de82251b7316a parent a8cddc5dfc1d03a91885ef27eb91418e665577ce author J. Bruce Fields Fri, 30 Jun 2006 01:56:14 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:40 -0700 [PATCH] knfsd: nfsd: call nfsd_setuser() on fh_compose(), fix nfsd4 permissions problem In the typical v2/v3 case the only new filehandles used as arguments to operations are filehandles taken directly off the wire, which don't get dentries until fh_verify() is called. But in v4 the filehandles that are arguments to operations were often created by previous operations (putrootfh, lookup, etc.) using fh_compose, which sets the dentry in the filehandle without calling nfsd_setuser(). This also means that, for example, if filesystem B is mounted on filesystem A, and filesystem A is exported without root-squashing, then a client can bypass the rootsquashing on B using a compound that starts at a filehandle in A, crosses into B using lookups, and then does stuff in B. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8cddc5dfc1d03a91885ef27eb91418e665577ce tree a9fc586e6b6262686c406c7393f0417aa805e5f8 parent 7e4053645a67097fa9bec2794d685b1d3928757a author J. Bruce Fields Fri, 30 Jun 2006 01:56:13 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:40 -0700 [PATCH] knfsd: nfsd4: fix open_confirm locking Fix an improper unlock in an error path. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e4053645a67097fa9bec2794d685b1d3928757a tree 17efce223986ff09650ba2cb3acf8ab348424880 parent 4c9608b2f2f51e84eba72f4bf061d360259ce656 author NeilBrown Fri, 30 Jun 2006 01:56:12 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:40 -0700 [PATCH] knfsd: ignore ref_fh when crossing a mountpoint nfsd tries to return to a client the same sort of filehandle as was used by the client. This removes some filehandle aliasing issues and means that a server upgrade followed by a downgrade will not confused clients not restarted during that time. However when crossing a mountpoint, the filehandle used for one filesystem doesn't provide any useful information on what sort of filehandle should be used on the other, and can provide misleading information. So if the reference filehandle is on a different filesystem to the one being generated, ignore it. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c9608b2f2f51e84eba72f4bf061d360259ce656 tree e77a19f0dfd21b2d6a67542ef032f3aa69cf8e4a parent 4bdff8c0950afa6a3f2efec6cd15159d97fac1e6 author NeilBrown Fri, 30 Jun 2006 01:56:11 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:40 -0700 [PATCH] knfsd: remove noise about filehandle being uptodate There is a perfectly valid situation where fh_update gets called on an already uptodate filehandle - in nfsd_create_v3 where a CREATE_UNCHECKED finds an existing file and wants to just set the size. We could possible optimise out the call in that case, but the only harm involved is that fh_update prints a warning, so it is easier to remove the warning. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4bdff8c0950afa6a3f2efec6cd15159d97fac1e6 tree fe360f4241762d7cf8b12b6a531f75446d93b0b4 parent a56f39375a7bd183149c18286389e4a58ac9bc95 author Frank Filz Fri, 30 Jun 2006 01:56:11 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:39 -0700 [PATCH] knfsd: fixing missing 'expkey' support for fsid type 3 Type '3' is used for the fsid in filehandles when the device number of the device holding the filesystem has more than 8 bits in either major or minor. Unfortunately expkey_parse doesn't recognise type 3. Fix this. (Slighty modified from Frank's original) Signed-off-by: Frank Filz Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a56f39375a7bd183149c18286389e4a58ac9bc95 tree de85fd3c6917ebf75c37d32eaa33707c1a0c1111 parent 8c2a6a40902323b739e4e740ebf91ee357a5de5b author NeilBrown Fri, 30 Jun 2006 01:56:10 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:39 -0700 [PATCH] knfsd: improve the test for cross-device-rename in nfsd Just testing the i_sb isn't really enough, at least the vfsmnt must be the same. Thanks Al. Cc: Al Viro Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c2a6a40902323b739e4e740ebf91ee357a5de5b tree 6fc6a35b9b8263773c8cff55c2148fd6dc2abd5b parent 1318952514d5651c453d89989595a9df3b37267b author Doug Thompson Fri, 30 Jun 2006 01:56:09 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:39 -0700 [PATCH] EDAC: maintainers update Removed Dave Peterson as per his request as co-maintainer of EDAC Thanks Dave. Added Mark Gross as maintainer of edac-e752x driver Thanks Mark Signed-off-by: Doug Thompson Signed-off-by: Dave Peterson Signed-off-by: Mark Gross Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1318952514d5651c453d89989595a9df3b37267b tree df793132fa7e24e53c68897d4302d964eb07b526 parent 2d7bbb91c8df26c60d223205a087507430024177 author Doug Thompson Fri, 30 Jun 2006 01:56:08 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:39 -0700 [PATCH] EDAC: probe1 cleanup 1-of-2 - Add lower-level functions that handle various parts of the initialization done by the xxx_probe1() functions. Some of the xxx_probe1() functions are much too long and complicated (see "Chapter 5: Functions" in Documentation/CodingStyle). - Cleanup of probe1() functions in EDAC Signed-off-by: Doug Thompson Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d7bbb91c8df26c60d223205a087507430024177 tree 98d51dac1c1e53b2b6a887c31abc2260160eb50d parent 37f04581abac20444e5b7106c1e1f28bec5b989c author Doug Thompson Fri, 30 Jun 2006 01:56:08 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:39 -0700 [PATCH] EDAC: mc numbers refactor 1-of-2 Remove add_mc_to_global_list(). In next patch, this function will be reimplemented with different semantics. 1 Reimplement add_mc_to_global_list() with semantics that allow the caller to determine the ID number for a mem_ctl_info structure. Then modify edac_mc_add_mc() so that the caller specifies the ID number for the new mem_ctl_info structure. Platform-specific code should be able to assign the ID numbers in a platform-specific manner. For instance, on Opteron it makes sense to have the ID of the mem_ctl_info structure match the ID of the node that the memory controller belongs to. 2 Modify callers of edac_mc_add_mc() so they use the new semantics. Signed-off-by: Doug Thompson Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37f04581abac20444e5b7106c1e1f28bec5b989c tree 4112a057284749c5d53c6b9a8bf9f5e6c4ba34ef parent dc474c891c1993c4d608bed00c425b6db93d088d author Doug Thompson Fri, 30 Jun 2006 01:56:07 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:39 -0700 [PATCH] EDAC: PCI device to DEVICE cleanup Change MC drivers from using CVS revision strings for their version number, Now each driver has its own local string. Remove some PCI dependencies from the core EDAC module. Made the code 'struct device' centric instead of 'struct pci_dev' Most of the code changes here are from a patch by Dave Jiang. It may be best to eventually move the PCI-specific code into a separate source file. Signed-off-by: Doug Thompson Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc474c891c1993c4d608bed00c425b6db93d088d tree 8418996419c2cc7d34ae2746902db990f0c32ffa parent 7f04ac062e92a37bb0fa3313405597244b4702c1 author Matt LaPlante Fri, 30 Jun 2006 01:56:06 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:39 -0700 [PATCH] Documentation/IPMI typos Two typos in Documentation/IPMI. Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f04ac062e92a37bb0fa3313405597244b4702c1 tree a81e9df761334ccba5b5793866f96910842a7194 parent 7adc28ae75854d9d0940668404a14d1f006f80c0 author Josh Triplett Fri, 30 Jun 2006 01:56:05 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:39 -0700 [PATCH] rcu: Add lock annotations to RCU locking primitives Add __acquire annotations to rcu_read_lock and rcu_read_lock_bh, and add __release annotations to rcu_read_unlock and rcu_read_unlock_bh. This allows sparse to detect improperly paired calls to these functions. Signed-off-by: Josh Triplett Acked-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7adc28ae75854d9d0940668404a14d1f006f80c0 tree 57a18511f071706c79145364eaae0969bf2b750d parent 7b2baa1f8a82d0940db6fbbaa00e5b829a99b2c9 author Adrian Bunk Fri, 30 Jun 2006 01:56:04 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:38 -0700 [PATCH] drivers/cdrom/cm206.c: cleanups - make __cm206_init() __init (required since it calls the __init cm206_init()) - make the needlessly global bcdbin() static - remove a comment with an obsolete compile command Signed-off-by: Adrian Bunk Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b2baa1f8a82d0940db6fbbaa00e5b829a99b2c9 tree c0024a6a19a68f29b38376c343b55831ec8f0d21 parent 304228e29ae212952726e91511eddc0ba551bd31 author Adrian Bunk Fri, 30 Jun 2006 01:56:02 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:38 -0700 [PATCH] show Acorn-specific block devices menu only when required Don't show a menu that can't be entered due to lack of contents on arm (the options are only available on arm26). Signed-off-by: Adrian Bunk Acked-by: Ian Molton Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 304228e29ae212952726e91511eddc0ba551bd31 tree 845b6428bb3569069702c31d93348319d8434b1e parent e7b384043e27bed4f23b108481b99c518dd01a01 author Andrew Victor Fri, 30 Jun 2006 01:56:01 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:38 -0700 [PATCH] Correct rtc_wkalrm comments This corrects the comments describing the 'enabled' and 'pending' flags in struct rtc_wkalrm of include/linux/rtc.h. Signed-off-by: Andrew Victor Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7b384043e27bed4f23b108481b99c518dd01a01 tree 52f944bf39d3a7b329f4e38d619d7949e35510a0 parent 92fe15a3d24fa53e7e961c549c488d0bb642d895 author Andrew Morton Fri, 30 Jun 2006 01:56:00 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:38 -0700 [PATCH] cond_resched() fix Fix a bug identified by Zou Nan hai : If the system is in state SYSTEM_BOOTING, and need_resched() is true, cond_resched() returns true even though it didn't reschedule. Consequently need_resched() remains true and JBD locks up. Fix that by teaching cond_resched() to only return true if it really did call schedule(). cond_resched_lock() and cond_resched_softirq() have a problem too. If we're in SYSTEM_BOOTING state and need_resched() is true, these functions will drop the lock and will then try to call schedule(), but the SYSTEM_BOOTING state will prevent schedule() from being called. So on return, need_resched() will still be true, but cond_resched_lock() has to return 1 to tell the caller that the lock was dropped. The caller will probably lock up. Bottom line: if these functions dropped the lock, they _must_ call schedule() to clear need_resched(). Make it so. Also, uninline __cond_resched(). It's largeish, and slowpath. Acked-by: Ingo Molnar Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92fe15a3d24fa53e7e961c549c488d0bb642d895 tree 168020a6356ce53e52d1e22211c11c3262966c55 parent ff23db5373f66a818c296f4d58adaaa10f515fd3 author Jeff Dike Fri, 30 Jun 2006 01:55:59 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:38 -0700 [PATCH] uml: add __raw_writeq definition The x86_64 build requires a definition for __raw_writeq. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff23db5373f66a818c296f4d58adaaa10f515fd3 tree 46ac9d4e0cbee290324c8efc9bf389bd503c3b08 parent d115ec0f0f094683dc2588818cb28134dd75e6d1 author Jeff Dike Fri, 30 Jun 2006 01:55:58 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:38 -0700 [PATCH] uml: fix biarch gcc build on x86_64 I run an x86_64 kernel with i386 userspace (Ubuntu Dapper) and decided to try out UML today. I found that UML wasn't quite aware of biarch compilers (which Ubuntu i386 ships). A fix similar to what was done for x86_64 should probably be committed (see http://marc.theaimsgroup.com/?l=linux-kernel&m=113425940204010&w=2). Without the FLAGS changes, the build will fail at a number of places and without the LINK change, the final link will fail. Signed-off-by: Nishanth Aravamudan Cc: Paolo 'Blaisorblade' Giarrusso Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d115ec0f0f094683dc2588818cb28134dd75e6d1 tree c59c47992cda54a97baa0c5cdbb4af834c96366f parent 30df49191cf8c7a3d86ccea956ba0de911c1dc36 author Jeff Dike Fri, 30 Jun 2006 01:55:57 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:38 -0700 [PATCH] uml: remove stray file Forgot to remove arch/um/kernel/time.c when it was mostly moved to arch/um/os-Linux. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30df49191cf8c7a3d86ccea956ba0de911c1dc36 tree 015e377c4475e56558de5bc9352d880e79efe6a1 parent 572e614750c3ed27da1ec6b75dc486066a11fffd author Jeff Dike Fri, 30 Jun 2006 01:55:57 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:38 -0700 [PATCH] uml: remove unneeded time definitions Remove um_time() and um_stime() syscalls since they are identical to system-wide ones. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 572e614750c3ed27da1ec6b75dc486066a11fffd tree 50459d715a5145e43c7da1e0d87a85582258ca94 parent 6edb08620fbeeeba81ab63c7129a51cdb3acd8b3 author Jeff Dike Fri, 30 Jun 2006 01:55:56 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:37 -0700 [PATCH] uml: add locking to xtime accesses do_timer must be called with xtime_lock held. I'm not sure boot_timer_handler needs this, however I don't think it hurts: it simply disables irq and takes a spinlock. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6edb08620fbeeeba81ab63c7129a51cdb3acd8b3 tree 86b5227a41b7829ae32d0fe37eed395aea9c94f1 parent 190f4939222b8c07cd62a20e1ce0c7a97fffde99 author Jeff Dike Fri, 30 Jun 2006 01:55:55 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:37 -0700 [PATCH] uml: unregister useless console when it's not needed -mm in combination with an FC5 init started dying with 'stderr=1' because init didn't like the lack of /dev/console and exited. The problem was that the stderr console, which is intended to dump printk output to the terminal before the regular console is initialized, isn't a tty, and so can't make /dev/console operational. However, since it is registered first, the normal console, when it is registered, doesn't become the preferred console, and isn't attached to /dev/console. Thus, /dev/console is never operational. This patch makes the stderr console unregister itself in an initcall, which is late enough that the normal console is registered. When that happens, the normal console will become the preferred console and will be able to run /dev/console. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 190f4939222b8c07cd62a20e1ce0c7a97fffde99 tree f3de1035774a1c6358231903d847f1313db7bf0b parent c2b7a4bb30008dc256d63802e02b6fb950958443 author Jeff Dike Fri, 30 Jun 2006 01:55:55 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:37 -0700 [PATCH] uml: fix off-by-one bug in VM file creation Fix an off-by-one bug in temp file creation. Seeking to the desired length and writing a byte resulted in the file being one byte longer than expected. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c2b7a4bb30008dc256d63802e02b6fb950958443 tree 355e20a2295099dad5878c2034d39739e984d9d1 parent dd673bca474a199fb8d1b6a311832592977ecb5f author Jeff Dike Fri, 30 Jun 2006 01:55:54 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:37 -0700 [PATCH] uml: fix /proc/mounts parsing boundary condition When parsing /proc/mounts looking for a tmpfs mount on /dev/shm, if a string that we are looking for if split across reads, then it won't be recognized. Fix this by refilling the buffer whenever we advance the cursor. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd673bca474a199fb8d1b6a311832592977ecb5f tree 133bc25768485f6952c39b4553c5a3e712de23af parent 033ab7f8e5c655f49ec8039930b2efd412abbbd7 author Adrian Bunk Fri, 30 Jun 2006 01:55:51 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:37 -0700 [PATCH] UML: fix the INIT_ENV_ARG_LIMIT dependencies Fix the INIT_ENV_ARG_LIMIT dependencies to what seems to have been intended. Spotted by Jean-Luc Leger. Signed-off-by: Adrian Bunk Acked-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 033ab7f8e5c655f49ec8039930b2efd412abbbd7 tree 33fd8073e47d88731380d97be8ecdbdbd69b459e parent a1836a42daf5ddfe9a891973734bd9a7d62eb504 author Andrew Morton Fri, 30 Jun 2006 01:55:50 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:37 -0700 [PATCH] add smp_setup_processor_id() Presently, smp_processor_id() isn't necessarily set up until setup_arch(). But it's used in boot_cpu_init() and printk() and perhaps in other places, prior to setup_arch() being called. So provide a new smp_setup_processor_id() which is called before anything else, wire it up for Voyager (which boots on a CPU other than #0, and broke). Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1836a42daf5ddfe9a891973734bd9a7d62eb504 tree e8819aec40aff3fa0eecd2ef9d92df8213bce58b parent 7a01955f99b65622a00ba5c8b39202ddc6fa65f8 author David Quigley Fri, 30 Jun 2006 01:55:49 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:37 -0700 [PATCH] SELinux: Add security hook definition for getioprio and insert hooks Add a new security hook definition for the sys_ioprio_get operation. At present, the SELinux hook function implementation for this hook is identical to the getscheduler implementation but a separate hook is introduced to allow this check to be specialized in the future if necessary. This patch also creates a helper function get_task_ioprio which handles the access check in addition to retrieving the ioprio value for the task. Signed-off-by: David Quigley Acked-by: Stephen Smalley Signed-off-by: James Morris Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a01955f99b65622a00ba5c8b39202ddc6fa65f8 tree 1dc0ce68a00ba3171097dc5da9875fc6ed5b5069 parent 8f95dc58d0505516f5cc212a966aea2f2cdb5e44 author David Quigley Fri, 30 Jun 2006 01:55:48 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:37 -0700 [PATCH] SELinux: update USB code with new kill_proc_info_as_uid This patch updates the USB core to save and pass the sending task secid when sending signals upon AIO completion so that proper security checking can be applied by security modules. Signed-off-by: David Quigley Signed-off-by: James Morris Cc: Stephen Smalley Cc: Chris Wright Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f95dc58d0505516f5cc212a966aea2f2cdb5e44 tree 2a57ad36db88621ee079fffe34b1cf9bff62b1f4 parent f9008e4c5c525941967b67777945aa6266ab6326 author David Quigley Fri, 30 Jun 2006 01:55:47 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:37 -0700 [PATCH] SELinux: add security hook call to kill_proc_info_as_uid This patch adds a call to the extended security_task_kill hook introduced by the prior patch to the kill_proc_info_as_uid function so that these signals can be properly mediated by security modules. It also updates the existing hook call in check_kill_permission. Signed-off-by: David Quigley Signed-off-by: James Morris Cc: Stephen Smalley Cc: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9008e4c5c525941967b67777945aa6266ab6326 tree a0c9436485b80d548ef74d5f1aec0f6d0309af6e parent ed11d9eb2228acc483c819ab353e3c41bcb158fa author David Quigley Fri, 30 Jun 2006 01:55:46 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:36 -0700 [PATCH] SELinux: extend task_kill hook to handle signals sent by AIO completion This patch extends the security_task_kill hook to handle signals sent by AIO completion. In this case, the secid of the task responsible for the signal needs to be obtained and saved earlier, so a security_task_getsecid() hook is added, and then this saved value is passed subsequently to the extended task_kill hook for use in checking. Signed-off-by: David Quigley Signed-off-by: James Morris Cc: Stephen Smalley Cc: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed11d9eb2228acc483c819ab353e3c41bcb158fa tree fa6efec62228835be260ac55d9dd0480a9064c8a parent f8891e5e1f93a128c3900f82035e8541357896a7 author Christoph Lameter Fri, 30 Jun 2006 01:55:45 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:36 -0700 [PATCH] slab: consolidate code to free slabs from freelist Post and discussion: http://marc.theaimsgroup.com/?t=115074342800003&r=1&w=2 Code in __shrink_node() duplicates code in cache_reap() Add a new function drain_freelist that removes slabs with objects that are already free and use that in various places. This eliminates the __node_shrink() function and provides the interrupt holdoff reduction from slab_free to code that used to call __node_shrink. [akpm@osdl.org: build fixes] Signed-off-by: Christoph Lameter Cc: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8891e5e1f93a128c3900f82035e8541357896a7 tree 97b078ac97970962b17c85d39fd64cb48dc01168 parent ca889e6c45e0b112cb2ca9d35afc66297519b5d5 author Christoph Lameter Fri, 30 Jun 2006 01:55:45 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:36 -0700 [PATCH] Light weight event counters The remaining counters in page_state after the zoned VM counter patches have been applied are all just for show in /proc/vmstat. They have no essential function for the VM. We use a simple increment of per cpu variables. In order to avoid the most severe races we disable preempt. Preempt does not prevent the race between an increment and an interrupt handler incrementing the same statistics counter. However, that race is exceedingly rare, we may only loose one increment or so and there is no requirement (at least not in kernel) that the vm event counters have to be accurate. In the non preempt case this results in a simple increment for each counter. For many architectures this will be reduced by the compiler to a single instruction. This single instruction is atomic for i386 and x86_64. And therefore even the rare race condition in an interrupt is avoided for both architectures in most cases. The patchset also adds an off switch for embedded systems that allows a building of linux kernels without these counters. The implementation of these counters is through inline code that hopefully results in only a single instruction increment instruction being emitted (i386, x86_64) or in the increment being hidden though instruction concurrency (EPIC architectures such as ia64 can get that done). Benefits: - VM event counter operations usually reduce to a single inline instruction on i386 and x86_64. - No interrupt disable, only preempt disable for the preempt case. Preempt disable can also be avoided by moving the counter into a spinlock. - Handling is similar to zoned VM counters. - Simple and easily extendable. - Can be omitted to reduce memory use for embedded use. References: RFC http://marc.theaimsgroup.com/?l=linux-kernel&m=113512330605497&w=2 RFC http://marc.theaimsgroup.com/?l=linux-kernel&m=114988082814934&w=2 local_t http://marc.theaimsgroup.com/?l=linux-kernel&m=114991748606690&w=2 V2 http://marc.theaimsgroup.com/?t=115014808400007&r=1&w=2 V3 http://marc.theaimsgroup.com/?l=linux-kernel&m=115024767022346&w=2 V4 http://marc.theaimsgroup.com/?l=linux-kernel&m=115047968808926&w=2 Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca889e6c45e0b112cb2ca9d35afc66297519b5d5 tree 0a5efdec2a61540204d34bcbf56dc691d8f9c391 parent bab1846a0582f627f5ec22aa2dc5f4f3e82e8176 author Christoph Lameter Fri, 30 Jun 2006 01:55:44 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:36 -0700 [PATCH] Use Zoned VM Counters for NUMA statistics The numa statistics are really event counters. But they are per node and so we have had special treatment for these counters through additional fields on the pcp structure. We can now use the per zone nature of the zoned VM counters to realize these. This will shrink the size of the pcp structure on NUMA systems. We will have some room to add additional per zone counters that will all still fit in the same cacheline. Bits Prior pcp size Size after patch We can add ------------------------------------------------------------------ 64 128 bytes (16 words) 80 bytes (10 words) 48 32 76 bytes (19 words) 56 bytes (14 words) 8 (64 byte cacheline) 72 (128 byte) Remove the special statistics for numa and replace them with zoned vm counters. This has the side effect that global sums of these events now show up in /proc/vmstat. Also take the opportunity to move the zone_statistics() function from page_alloc.c into vmstat.c. Discussions: V2 http://marc.theaimsgroup.com/?t=115048227000002&r=1&w=2 Signed-off-by: Christoph Lameter Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bab1846a0582f627f5ec22aa2dc5f4f3e82e8176 tree 79b6f31881f578a4db8a98ed97be4fc0db3f4ac1 parent c24f21bda88df4574de0a32a2a1558a23adae1b8 author Andrew Morton Fri, 30 Jun 2006 01:55:43 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:36 -0700 [PATCH] zoned-vm-counters: remove read_page_state() No callers. Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c24f21bda88df4574de0a32a2a1558a23adae1b8 tree 1cf2f0b69cc691c2e1a9ed569a7a98179cc9683e parent d2c5e30c9a1420902262aa923794d2ae4e0bc391 author Christoph Lameter Fri, 30 Jun 2006 01:55:42 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:36 -0700 [PATCH] zoned vm counters: remove useless struct wbs Remove writeback state We can remove some functions now that were needed to calculate the page state for writeback control since these statistics are now directly available. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2c5e30c9a1420902262aa923794d2ae4e0bc391 tree b8c42c189c2bc8dd4b6d808ee8ed2b28dbd70ddd parent fd39fc8561be33065306bdac0e30414e1e8ac8e1 author Christoph Lameter Fri, 30 Jun 2006 01:55:41 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:36 -0700 [PATCH] zoned vm counters: conversion of nr_bounce to per zone counter Conversion of nr_bounce to a per zone counter nr_bounce is only used for proc output. So it could be left as an event counter. However, the event counters may not be accurate and nr_bounce is categorizing types of pages in a zone. So we really need this to also be a per zone counter. [akpm@osdl.org: bugfix] Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd39fc8561be33065306bdac0e30414e1e8ac8e1 tree ae0740716eed3f850a8f7232c61caebe360bb5ae parent ce866b34ae1b7f1ce60234cf65855886ac7e7d30 author Christoph Lameter Fri, 30 Jun 2006 01:55:40 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:36 -0700 [PATCH] zoned vm counters: conversion of nr_unstable to per zone counter Conversion of nr_unstable to a per zone counter We need to do some special modifications to the nfs code since there are multiple cases of disposition and we need to have a page ref for proper accounting. This converts the last critical page state of the VM and therefore we need to remove several functions that were depending on GET_PAGE_STATE_LAST in order to make the kernel compile again. We are only left with event type counters in page state. [akpm@osdl.org: bugfixes] Signed-off-by: Christoph Lameter Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce866b34ae1b7f1ce60234cf65855886ac7e7d30 tree e9a2664f0abc5221b9a92e1417d8e02b94a634c4 parent b1e7a8fd854d2f895730e82137400012b509650e author Christoph Lameter Fri, 30 Jun 2006 01:55:40 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:35 -0700 [PATCH] zoned vm counters: conversion of nr_writeback to per zone counter Conversion of nr_writeback to per zone counter. This removes the last page_state counter from arch/i386/mm/pgtable.c so we drop the page_state from there. [akpm@osdl.org: bugfix] Signed-off-by: Christoph Lameter Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1e7a8fd854d2f895730e82137400012b509650e tree 9fba87ff6b0146ebd4ee5bc7d5f0c8b037dbb3ad parent df849a1529c106f7460e51479ca78fe07b07dc8c author Christoph Lameter Fri, 30 Jun 2006 01:55:39 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:35 -0700 [PATCH] zoned vm counters: conversion of nr_dirty to per zone counter This makes nr_dirty a per zone counter. Looping over all processors is avoided during writeback state determination. The counter aggregation for nr_dirty had to be undone in the NFS layer since we summed up the page counts from multiple zones. Someone more familiar with NFS should probably review what I have done. [akpm@osdl.org: bugfix] Signed-off-by: Christoph Lameter Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df849a1529c106f7460e51479ca78fe07b07dc8c tree f0e52e4720160aa7540a57715c247dce44584cbc parent 9a865ffa34b6117a5e0b67640a084d8c2e198c93 author Christoph Lameter Fri, 30 Jun 2006 01:55:38 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:35 -0700 [PATCH] zoned vm counters: conversion of nr_pagetables to per zone counter Conversion of nr_page_table_pages to a per zone counter [akpm@osdl.org: bugfix] Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a865ffa34b6117a5e0b67640a084d8c2e198c93 tree c295d5a0831df81eeeded3834f32f513b9ae05c7 parent 34aa1330f9b3c5783d269851d467326525207422 author Christoph Lameter Fri, 30 Jun 2006 01:55:38 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:35 -0700 [PATCH] zoned vm counters: conversion of nr_slab to per zone counter - Allows reclaim to access counter without looping over processor counts. - Allows accurate statistics on how many pages are used in a zone by the slab. This may become useful to balance slab allocations over various zones. [akpm@osdl.org: bugfix] Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34aa1330f9b3c5783d269851d467326525207422 tree a47db4fa53527ea937dee9e763267ab21865ce11 parent f3dbd34460ff54962d3e3244b6bcb7f5295356e6 author Christoph Lameter Fri, 30 Jun 2006 01:55:37 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:35 -0700 [PATCH] zoned vm counters: zone_reclaim: remove /proc/sys/vm/zone_reclaim_interval The zone_reclaim_interval was necessary because we were not able to determine how many unmapped pages exist in a zone. Therefore we had to scan in intervals to figure out if any pages were unmapped. With the zoned counters and NR_ANON_PAGES we now know the number of pagecache pages and the number of mapped pages in a zone. So we can simply skip the reclaim if there is an insufficient number of unmapped pages. We use SWAP_CLUSTER_MAX as the boundary. Drop all support for /proc/sys/vm/zone_reclaim_interval. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3dbd34460ff54962d3e3244b6bcb7f5295356e6 tree 91caae2b90d684a7640b5da451a9a2ff8a5c8fb8 parent bf02cf4b6cf931d060ad5c6ce9b960af6faefd2d author Christoph Lameter Fri, 30 Jun 2006 01:55:36 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:35 -0700 [PATCH] zoned vm counters: split NR_ANON_PAGES off from NR_FILE_MAPPED The current NR_FILE_MAPPED is used by zone reclaim and the dirty load calculation as the number of mapped pagecache pages. However, that is not true. NR_FILE_MAPPED includes the mapped anonymous pages. This patch separates those and therefore allows an accurate tracking of the anonymous pages per zone. It then becomes possible to determine the number of unmapped pages per zone and we can avoid scanning for unmapped pages if there are none. Also it may now be possible to determine the mapped/unmapped ratio in get_dirty_limit. Isnt the number of anonymous pages irrelevant in that calculation? Note that this will change the meaning of the number of mapped pages reported in /proc/vmstat /proc/meminfo and in the per node statistics. This may affect user space tools that monitor these counters! NR_FILE_MAPPED works like NR_FILE_DIRTY. It is only valid for pagecache pages. Signed-off-by: Christoph Lameter Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf02cf4b6cf931d060ad5c6ce9b960af6faefd2d tree 9856eceb13b2c86c7748f4060bbb3b35008b7ee0 parent 347ce434d57da80fd5809c0c836f206a50999c26 author Christoph Lameter Fri, 30 Jun 2006 01:55:36 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:35 -0700 [PATCH] zoned vm counters: remove NR_FILE_MAPPED from scan control structure We can now access the number of pages in a mapped state in an inexpensive way in shrink_active_list. So drop the nr_mapped field from scan_control. [akpm@osdl.org: bugfix] Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 347ce434d57da80fd5809c0c836f206a50999c26 tree f730d151be77977f594e5cc083a93bbeb4c602cc parent 65ba55f500a37272985d071c9bbb35256a2f7c14 author Christoph Lameter Fri, 30 Jun 2006 01:55:35 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:34 -0700 [PATCH] zoned vm counters: conversion of nr_pagecache to per zone counter Currently a single atomic variable is used to establish the size of the page cache in the whole machine. The zoned VM counters have the same method of implementation as the nr_pagecache code but also allow the determination of the pagecache size per zone. Remove the special implementation for nr_pagecache and make it a zoned counter named NR_FILE_PAGES. Updates of the page cache counters are always performed with interrupts off. We can therefore use the __ variant here. Signed-off-by: Christoph Lameter Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 65ba55f500a37272985d071c9bbb35256a2f7c14 tree e7735326ef2d2dca9d00a6c5ae47e9eb03c7834f parent 2244b95a7bcf8d24196f8a3a44187ba5dfff754c author Christoph Lameter Fri, 30 Jun 2006 01:55:34 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:34 -0700 [PATCH] zoned vm counters: convert nr_mapped to per zone counter nr_mapped is important because it allows a determination of how many pages of a zone are not mapped, which would allow a more efficient means of determining when we need to reclaim memory in a zone. We take the nr_mapped field out of the page state structure and define a new per zone counter named NR_FILE_MAPPED (the anonymous pages will be split off from NR_MAPPED in the next patch). We replace the use of nr_mapped in various kernel locations. This avoids the looping over all processors in try_to_free_pages(), writeback, reclaim (swap + zone reclaim). [akpm@osdl.org: bugfix] Signed-off-by: Christoph Lameter Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2244b95a7bcf8d24196f8a3a44187ba5dfff754c tree 771ef8eae45c2794fd73f870109c74d67c28888a parent f6ac2354d791195ca40822b84d73d48a4e8b7f2b author Christoph Lameter Fri, 30 Jun 2006 01:55:33 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:34 -0700 [PATCH] zoned vm counters: basic ZVC (zoned vm counter) implementation Per zone counter infrastructure The counters that we currently have for the VM are split per processor. The processor however has not much to do with the zone these pages belong to. We cannot tell f.e. how many ZONE_DMA pages are dirty. So we are blind to potentially inbalances in the usage of memory in various zones. F.e. in a NUMA system we cannot tell how many pages are dirty on a particular node. If we knew then we could put measures into the VM to balance the use of memory between different zones and different nodes in a NUMA system. For example it would be possible to limit the dirty pages per node so that fast local memory is kept available even if a process is dirtying huge amounts of pages. Another example is zone reclaim. We do not know how many unmapped pages exist per zone. So we just have to try to reclaim. If it is not working then we pause and try again later. It would be better if we knew when it makes sense to reclaim unmapped pages from a zone. This patchset allows the determination of the number of unmapped pages per zone. We can remove the zone reclaim interval with the counters introduced here. Futhermore the ability to have various usage statistics available will allow the development of new NUMA balancing algorithms that may be able to improve the decision making in the scheduler of when to move a process to another node and hopefully will also enable automatic page migration through a user space program that can analyse the memory load distribution and then rebalance memory use in order to increase performance. The counter framework here implements differential counters for each processor in struct zone. The differential counters are consolidated when a threshold is exceeded (like done in the current implementation for nr_pageache), when slab reaping occurs or when a consolidation function is called. Consolidation uses atomic operations and accumulates counters per zone in the zone structure and also globally in the vm_stat array. VM functions can access the counts by simply indexing a global or zone specific array. The arrangement of counters in an array also simplifies processing when output has to be generated for /proc/*. Counters can be updated by calling inc/dec_zone_page_state or _inc/dec_zone_page_state analogous to *_page_state. The second group of functions can be called if it is known that interrupts are disabled. Special optimized increment and decrement functions are provided. These can avoid certain checks and use increment or decrement instructions that an architecture may provide. We also add a new CONFIG_DMA_IS_NORMAL that signifies that an architecture can do DMA to all memory and therefore ZONE_NORMAL will not be populated. This is only currently set for IA64 SGI SN2 and currently only affects node_page_state(). In the best case node_page_state can be reduced to retrieving a single counter for the one zone on the node. [akpm@osdl.org: cleanups] [akpm@osdl.org: export vm_stat[] for filesystems] Signed-off-by: Christoph Lameter Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6ac2354d791195ca40822b84d73d48a4e8b7f2b tree 5f600175cf3591eac3d32bb8cebfd45d0aabf804 parent 672b2714ae57af16fe7d760dc4e0918a7a6cb0fa author Christoph Lameter Fri, 30 Jun 2006 01:55:32 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:34 -0700 [PATCH] zoned vm counters: create vmstat.c/.h from page_alloc.c/.h NOTE: ZVC are *not* the lightweight event counters. ZVCs are reliable whereas event counters do not need to be. Zone based VM statistics are necessary to be able to determine what the state of memory in one zone is. In a NUMA system this can be helpful for local reclaim and other memory optimizations that may be able to shift VM load in order to get more balanced memory use. It is also useful to know how the computing load affects the memory allocations on various zones. This patchset allows the retrieval of that data from userspace. The patchset introduces a framework for counters that is a cross between the existing page_stats --which are simply global counters split per cpu-- and the approach of deferred incremental updates implemented for nr_pagecache. Small per cpu 8 bit counters are added to struct zone. If the counter exceeds certain thresholds then the counters are accumulated in an array of atomic_long in the zone and in a global array that sums up all zone values. The small 8 bit counters are next to the per cpu page pointers and so they will be in high in the cpu cache when pages are allocated and freed. Access to VM counter information for a zone and for the whole machine is then possible by simply indexing an array (Thanks to Nick Piggin for pointing out that approach). The access to the total number of pages of various types does no longer require the summing up of all per cpu counters. Benefits of this patchset right now: - Ability for UP and SMP configuration to determine how memory is balanced between the DMA, NORMAL and HIGHMEM zones. - loops over all processors are avoided in writeback and reclaim paths. We can avoid caching the writeback information because the needed information is directly accessible. - Special handling for nr_pagecache removed. - zone_reclaim_interval vanishes since VM stats can now determine when it is worth to do local reclaim. - Fast inline per node page state determination. - Accurate counters in /sys/devices/system/node/node*/meminfo. Current counters are counting simply which processor allocated a page somewhere and guestimate based on that. So the counters were not useful to show the actual distribution of page use on a specific zone. - The swap_prefetch patch requires per node statistics in order to figure out when processors of a node can prefetch. This patch provides some of the needed numbers. - Detailed VM counters available in more /proc and /sys status files. References to earlier discussions: V1 http://marc.theaimsgroup.com/?l=linux-kernel&m=113511649910826&w=2 V2 http://marc.theaimsgroup.com/?l=linux-kernel&m=114980851924230&w=2 V3 http://marc.theaimsgroup.com/?l=linux-kernel&m=115014697910351&w=2 V4 http://marc.theaimsgroup.com/?l=linux-kernel&m=115024767318740&w=2 Performance tests with AIM7 did not show any regressions. Seems to be a tad faster even. Tested on ia64/NUMA. Builds fine on i386, SMP / UP. Includes fixes for s390/arm/uml arch code. This patch: Move counter code from page_alloc.c/page-flags.h to vmstat.c/h. Create vmstat.c/vmstat.h by separating the counter code and the proc functions. Move the vm_stat_text array before zoneinfo_show. [akpm@osdl.org: s390 build fix] [akpm@osdl.org: HOTPLUG_CPU build fix] Signed-off-by: Christoph Lameter Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 672b2714ae57af16fe7d760dc4e0918a7a6cb0fa tree d337918a69993af5cbfef46ed470f3e4482e9873 parent e09793bb9182115e6f5d15fd6571ac2b72d7a08a author Adrian Bunk Fri, 30 Jun 2006 01:55:30 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:34 -0700 [PATCH] fix ISTALLION=y drivers/char/istallion.c: In function ‘stli_initbrds’: drivers/char/istallion.c:4150: error: implicit declaration of function ‘stli_parsebrd’ drivers/char/istallion.c:4150: error: ‘stli_brdsp’ undeclared (first use in this function) drivers/char/istallion.c:4150: error: (Each undeclared identifier is reported only once drivers/char/istallion.c:4150: error: for each function it appears in.) drivers/char/istallion.c:4164: error: implicit declaration of function ‘stli_argbrds’ While I was at it, I also removed the #ifdef MODULE around the initialation code to allow it to perhaps work when built into the kernel and made a needlessly global function static. Signed-off-by: Adrian Bunk Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e09793bb9182115e6f5d15fd6571ac2b72d7a08a tree d6e399ec606854cf9a1d016fcc403727d7906b08 parent 1017f6afd578fe519d316d7148356703c04e8f03 author Andrew Morton Fri, 30 Jun 2006 01:55:29 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:34 -0700 [PATCH] msr.c: use register_hotcpu_notifier() register_cpu_notifier() cannot do anything in a module, in a !CONFIG_HOTPLUG_CPU kernel. Cc: Chandra Seetharaman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1017f6afd578fe519d316d7148356703c04e8f03 tree 2903130f3a78f8e673409763bd39f210ea22559d parent 491d525ff19ead83b5e27ae4096b5c3e27805601 author Ingo Molnar Fri, 30 Jun 2006 01:55:29 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:34 -0700 [PATCH] fix platform_device_put/del mishaps This fixes drivers/char/pc8736x_gpio.c and drivers/char/scx200_gpio.c to use the platform_device_del/put ops correctly. Signed-off-by: Ingo Molnar Cc: Jim Cromie Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 491d525ff19ead83b5e27ae4096b5c3e27805601 tree bb833d1b7b343234c598dba861884543b23380dd parent 501b7c77de3e90519e95fd99e923bf9a29cd120d author Ingo Molnar Fri, 30 Jun 2006 01:55:27 -0700 committer Linus Torvalds Fri, 30 Jun 2006 11:25:34 -0700 [PATCH] fix drivers/video/imacfb.c compilation Fix build error on x86_64. There's nothing even remotely close to imacmp_seg in the kernel, so I removed the whole line. Signed-off-by: Ingo Molnar Cc: Edgar Hucek Cc: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ab3d5624e172c553004ecc862bfeac16d9d68b7 tree 6d98881fe91fd9583c109208d5c27131b93fa248 parent e02169b682bc448ccdc819dc8639ed34a23cedd8 author Jörn Engel Fri, 30 Jun 2006 19:25:36 +0200 committer Adrian Bunk Fri, 30 Jun 2006 19:25:36 +0200 Remove obsolete #include Signed-off-by: Jörn Engel Signed-off-by: Adrian Bunk commit e02169b682bc448ccdc819dc8639ed34a23cedd8 tree bc23410be990f89d13938f9e299b281b5015cf84 parent fcb4ee8852e2e9326e102f0910c029de45afabba author Pavel Machek Fri, 30 Jun 2006 18:59:59 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:59:59 +0200 remove obsolete swsusp_encrypt Remove SWSUSP_ENCRYPT config option; it is no longer implemented. Signed-off-by: Pavel Machek Signed-off-by: Adrian Bunk commit fcb4ee8852e2e9326e102f0910c029de45afabba tree b52236fa13d9ade706492a20173b1e268366c5ec parent 590abf09d62841677ac9676574f1017b7f5235e1 author Matt LaPlante Fri, 30 Jun 2006 18:57:59 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:57:59 +0200 arch/arm26/Kconfig typos Signed-off-by: Adrian Bunk commit 590abf09d62841677ac9676574f1017b7f5235e1 tree ea2f33dbdcb7daab67b828c32c93c50df11e04d7 parent 3539c272f18d54dc1e4c109d336d33d6a5c94b93 author Matt LaPlante Fri, 30 Jun 2006 18:56:29 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:56:29 +0200 Documentation/IPMI typos Acked-by: Alan Cox Signed-off-by: Adrian Bunk commit 3539c272f18d54dc1e4c109d336d33d6a5c94b93 tree 4711ca299491f984b05975d7857c058531bb59a2 parent 779cbf0bbc75629ecffd480d2f261af42ea80bbe author Matt LaPlante Fri, 30 Jun 2006 18:53:46 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:53:46 +0200 Kconfig: Typos in net/sched/Kconfig Signed-off-by: Adrian Bunk commit 779cbf0bbc75629ecffd480d2f261af42ea80bbe tree ca180cc6d650ab5e963a312085dc1955033fe601 parent 741c80c24b20b5ce1903d767a13caeac0fef62c6 author Paul Collins Fri, 30 Jun 2006 18:50:03 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:50:03 +0200 v9fs: do not include linux/version.h I noticed that part of v9fs was being rebuilt when version.h changed. Signed-off-by: Paul Collins Signed-off-by: Adrian Bunk commit 741c80c24b20b5ce1903d767a13caeac0fef62c6 tree 3e7978c5c883d132527ee1f106480ecb9be7dc54 parent d254c8f70abcb560d941e68c8c1f3b816c44a020 author Patrick Pletscher Fri, 30 Jun 2006 18:35:56 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:35:56 +0200 Documentation/DocBook/mtdnand.tmpl: typo fixes Signed-off-by: Adrian Bunk commit d254c8f70abcb560d941e68c8c1f3b816c44a020 tree 88f995180931bd13bf32186d3735b24a28f7dde1 parent d0f19d82173e46bd7f7544d0207aec7d467b3fe4 author Adrian Bunk Fri, 30 Jun 2006 18:29:51 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:29:51 +0200 typo fixes: specfic -> specific Signed-off-by: Adrian Bunk commit d0f19d82173e46bd7f7544d0207aec7d467b3fe4 tree d57b8c5c9200fbc68081028d4b0800ce0bcd736b parent 80f7228b59e4bbe9d840af3ff0f2fe480d6e7c79 author Adrian Bunk Fri, 30 Jun 2006 18:28:43 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:28:43 +0200 typo fixes in Documentation/networking/pktgen.txt Three typos in only one line... Signed-off-by: Adrian Bunk commit 80f7228b59e4bbe9d840af3ff0f2fe480d6e7c79 tree 08e6d2365abeafd7bfcc0fd7485db9055463d72c parent 47bdd718c6547d84c8e140cd0f495c016f13b08b author Adrian Bunk Fri, 30 Jun 2006 18:27:16 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:27:16 +0200 typo fixes: occuring -> occurring Signed-off-by: Adrian Bunk commit 47bdd718c6547d84c8e140cd0f495c016f13b08b tree 0e5722ecb24e246a585dc41237ba67765e05c2d6 parent fd245f00695cbcf0f8430f35841c216559d243df author Adrian Bunk Fri, 30 Jun 2006 18:25:18 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:25:18 +0200 typo fixes: infomation -> information Signed-off-by: Adrian Bunk commit fd245f00695cbcf0f8430f35841c216559d243df tree 20d1a5a98e5d626ce8215316b16c8cdf392995a7 parent 0418726bb5c7b5a70c7e7e82e860d5979d0c78cf author Adrian Bunk Fri, 30 Jun 2006 18:23:39 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:23:39 +0200 typo fixes: disadvantadge -> disadvantage Signed-off-by: Adrian Bunk commit 0418726bb5c7b5a70c7e7e82e860d5979d0c78cf tree 6804c0ac8e4eff56803b6d1d6ce6fdb19a4bd5a4 parent b3c2ffd5343645fc9b46f67e8c0eaac1e2dde7b4 author Adrian Bunk Fri, 30 Jun 2006 18:23:04 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:23:04 +0200 typo fixes: aquire -> acquire Signed-off-by: Adrian Bunk Acked-by: Mauro Carvalho Chehab commit b3c2ffd5343645fc9b46f67e8c0eaac1e2dde7b4 tree 3f3f9dd9394a7f0cecacea769fd75cda0b125c80 parent 9aaeded72f923212e6d9d7b6b8e3830e983f323e author Adrian Bunk Fri, 30 Jun 2006 18:20:44 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:20:44 +0200 typo fixes: mecanism -> mechanism Signed-off-by: Adrian Bunk commit 9aaeded72f923212e6d9d7b6b8e3830e983f323e tree ce238f0172f5e3365d5e2bf0c5905bd6308d6527 parent 27ae4104b69bd5e3d9006ba31b39fc186020f38e author Adrian Bunk Fri, 30 Jun 2006 18:19:55 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:19:55 +0200 typo fixes: bandwith -> bandwidth Signed-off-by: Adrian Bunk commit 27ae4104b69bd5e3d9006ba31b39fc186020f38e tree cca1d0314365ac7aed7cb43032b9210d0a186259 parent 9c4d3ef7b5f61625651304eb848b9be95c6c7c9a author Adrian Bunk Fri, 30 Jun 2006 18:18:41 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:18:41 +0200 fix a typo in the RTC_CLASS help text This patch fixes a typo spotted by Matt LaPlante . This patch fixes kernel Bugzilla #6704. Signed-off-by: Adrian Bunk commit 9c4d3ef7b5f61625651304eb848b9be95c6c7c9a tree d938fe17b1b256326672c1d459dae64ccca334d9 parent 501b7c77de3e90519e95fd99e923bf9a29cd120d author Adrian Bunk Fri, 30 Jun 2006 18:17:39 +0200 committer Adrian Bunk Fri, 30 Jun 2006 18:17:39 +0200 smb is no longer maintained The smb filesystem in the Linux kernel is unmaintained for years. Signed-off-by: Adrian Bunk commit 0a1f1ab8de815cb63a48d24450f6b5fbb1b1f89c tree 6fe87a1d3ac7d6b5f2ec1eff8eb7c194066516bf parent d120cfb544ed6161b9d32fb6c4648c471807ee6b author akpm@osdl.org Fri, 30 Jun 2006 03:15:00 -0400 committer Len Brown Fri, 30 Jun 2006 03:40:01 -0400 ACPI: fixup memhotplug debug message Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 02438d8771ae6a4b215938959827692026380bf9 tree cae56539e00a35770c36a1f9c03eebe65d1e9186 parent d120cfb544ed6161b9d32fb6c4648c471807ee6b author Len Brown Fri, 30 Jun 2006 03:19:10 -0400 committer Len Brown Fri, 30 Jun 2006 03:19:10 -0400 ACPI: delete acpi_os_free(), use kfree() directly Signed-off-by: Len Brown commit d07a8577f695c807977af003b6e75f996e01a15f tree 0add63c1c3b3f2818ddcfe6bf4b334913b058bac parent 8a4444bf5a3fd890441e6cbd5022a3c24edbe69a author Patrick Mochel Fri, 19 May 2006 16:54:52 -0400 committer Len Brown Fri, 30 Jun 2006 02:51:39 -0400 ACPI: video: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 8a4444bf5a3fd890441e6cbd5022a3c24edbe69a tree 986fbe350d0ee95f14fc0feda25df0b3d32a9b98 parent 14747204055d4b8fb2f8517beca91985ac617c17 author Patrick Mochel Fri, 19 May 2006 16:54:51 -0400 committer Len Brown Fri, 30 Jun 2006 02:51:38 -0400 ACPI: thermal: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 14747204055d4b8fb2f8517beca91985ac617c17 tree ed5f613034d2a6af1fbf51e4349b3df8a5c3f0c5 parent 432bfaba7d4e70483fc5af164e020066f4921bff author Patrick Mochel Fri, 19 May 2006 16:54:51 -0400 committer Len Brown Fri, 30 Jun 2006 02:51:37 -0400 ACPI: power: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 432bfaba7d4e70483fc5af164e020066f4921bff tree 5c3bcd7707ddc5c94b79bd6d0e59f8b1a6cf76c4 parent e0e4e117d4c898b0df749d5b88c86955151abf53 author Patrick Mochel Fri, 19 May 2006 16:54:51 -0400 committer Len Brown Fri, 30 Jun 2006 02:51:34 -0400 ACPI: pci_root: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit e0e4e117d4c898b0df749d5b88c86955151abf53 tree e44050f0127be6d1eca50292f10b5af50a2848f2 parent 579c896cc91434e4feb938f780eba580c93fa0da author Patrick Mochel Fri, 19 May 2006 16:54:50 -0400 committer Len Brown Fri, 30 Jun 2006 02:51:31 -0400 ACPI: pci_link: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 579c896cc91434e4feb938f780eba580c93fa0da tree 0516c82125408409923e18b7b35327fa06aeb2f1 parent 6c689537726ec665246d2f60c48475be2efac2d0 author Patrick Mochel Fri, 19 May 2006 16:54:50 -0400 committer Len Brown Fri, 30 Jun 2006 02:50:48 -0400 ACPI: fan: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 6c689537726ec665246d2f60c48475be2efac2d0 tree f5ae781f80fa6962aeea53a38076c6fe848a5ee6 parent 39cb61e26771891f843cb433ee6febd9159bce73 author Patrick Mochel Fri, 19 May 2006 16:54:50 -0400 committer Len Brown Fri, 30 Jun 2006 02:50:47 -0400 ACPI: button: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 39cb61e26771891f843cb433ee6febd9159bce73 tree eff446b42c8dc29bfe25ab4f773e65ed5afe8bfa parent 9453ece92688fedd7755d2ea54b2efe88822a91b author Patrick Mochel Fri, 19 May 2006 16:54:49 -0400 committer Len Brown Fri, 30 Jun 2006 02:50:46 -0400 ACPI: battery: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 9453ece92688fedd7755d2ea54b2efe88822a91b tree ad5a986b4e8e2911ac41181a4e555cf6e163ff26 parent 1b5b8b81bddd1c5dcf690f43422e20b0e964c349 author Patrick Mochel Fri, 19 May 2006 16:54:49 -0400 committer Len Brown Fri, 30 Jun 2006 02:50:43 -0400 ACPI: acpi_memhotplug: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 1b5b8b81bddd1c5dcf690f43422e20b0e964c349 tree d8e3135f0866e006095526ac2e8924c7fcbcb26a parent 901302688cb85b49a9551ec1f6aa86fb081ae49e author Patrick Mochel Fri, 19 May 2006 16:54:49 -0400 committer Len Brown Fri, 30 Jun 2006 02:48:37 -0400 ACPI: ac: Remove unneeded acpi_handle from driver. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 901302688cb85b49a9551ec1f6aa86fb081ae49e tree bf22c2ee09a2fc2fca5dc8ec093457d6a1bec282 parent 38ba7c9ed2e1a222103332031f76c28b726573f5 author Patrick Mochel Fri, 19 May 2006 16:54:48 -0400 committer Len Brown Fri, 30 Jun 2006 02:46:18 -0400 ACPI: video: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 38ba7c9ed2e1a222103332031f76c28b726573f5 tree 8bb55a763288c54f13d40934b07ea9f2faabec12 parent 5fbc19efdbedf9c9125774f66f80d6a6ccce4566 author Patrick Mochel Fri, 19 May 2006 16:54:48 -0400 committer Len Brown Fri, 30 Jun 2006 02:42:44 -0400 ACPI: thermal: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 5fbc19efdbedf9c9125774f66f80d6a6ccce4566 tree 8abaab4672ddfe42dad03d94e47057201aa59968 parent 2d1e0a02f16f84c2358843d91d6ca0131a0587ce author Patrick Mochel Fri, 19 May 2006 16:54:43 -0400 committer Len Brown Fri, 30 Jun 2006 02:42:43 -0400 ACPI: power: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 2d1e0a02f16f84c2358843d91d6ca0131a0587ce tree 7ab55ac5800d56d23673635ceb21b3611de75f14 parent 67a7136573b24a0d1f85a4aab131558a02910d25 author Patrick Mochel Fri, 19 May 2006 16:54:43 -0400 committer Len Brown Fri, 30 Jun 2006 02:42:41 -0400 ACPI: pci_root: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 67a7136573b24a0d1f85a4aab131558a02910d25 tree 71e944c46812ef60192c7d9a630109fc1566fc54 parent dc8c2b2744f8563aa5feb07488e4cc207a70ac70 author Patrick Mochel Fri, 19 May 2006 16:54:42 -0400 committer Len Brown Fri, 30 Jun 2006 02:42:36 -0400 ACPI: pci_link: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit dc8c2b2744f8563aa5feb07488e4cc207a70ac70 tree b9095253f00545e464ec42bda54d144027e0340c parent 27b1d3e85b1dfd9037d3fbb98b2e2aacca01da39 author Patrick Mochel Fri, 19 May 2006 16:54:42 -0400 committer Len Brown Fri, 30 Jun 2006 02:42:09 -0400 ACPI: fan: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 27b1d3e85b1dfd9037d3fbb98b2e2aacca01da39 tree 338d2460b16dae031f169b827388f86be449845a parent 3b073ec3667ee63e35b66752a30eeedef1e1e772 author Patrick Mochel Fri, 19 May 2006 16:54:42 -0400 committer Len Brown Fri, 30 Jun 2006 02:42:05 -0400 ACPI: button: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 3b073ec3667ee63e35b66752a30eeedef1e1e772 tree da718cc01a6ec044c8df373c7f4a919e8394af4d parent b863278523f7adbacb9e34133f4b6397cdab9977 author Patrick Mochel Fri, 19 May 2006 16:54:41 -0400 committer Len Brown Fri, 30 Jun 2006 02:42:04 -0400 ACPI: battery: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit b863278523f7adbacb9e34133f4b6397cdab9977 tree af774e4044e52881e2bf5ba547ed7dce05c311bc parent a6ba5ebef91a59fabd45962e576c02468dbcd33f author Patrick Mochel Fri, 19 May 2006 16:54:41 -0400 committer Len Brown Fri, 30 Jun 2006 02:42:02 -0400 ACPI: acpi_memhotplug: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit a6ba5ebef91a59fabd45962e576c02468dbcd33f tree 762aed6aee979bce60e5cb50ef0e137bfe88d89b parent e6afa0de1476290a876dfd1237a97cce7735581c author Patrick Mochel Fri, 19 May 2006 16:54:41 -0400 committer Len Brown Fri, 30 Jun 2006 02:37:05 -0400 ACPI: ac: Use acpi_device's handle instead of driver's Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit e6afa0de1476290a876dfd1237a97cce7735581c tree 6abb3a9a4e079627aa0c38e9eddbe470dbf96a9a parent 415985728895ba3127116bc4f999caf94420ed85 author Patrick Mochel Fri, 19 May 2006 16:54:40 -0400 committer Len Brown Fri, 30 Jun 2006 02:32:25 -0400 ACPI: video: add struct acpi_device to struct acpi_video_bus. - Use it instead of acpi_bus_get_device() in acpi_video_bus_notify() and use the one from struct acpi_video_device in acpi_video_device_notify(). Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 415985728895ba3127116bc4f999caf94420ed85 tree 888b4709a2301efac74f53ec4e7ebd7fccee3134 parent 8348e1b19a06b1932f65e84e1d59be29e1626c2b author Patrick Mochel Fri, 19 May 2006 16:54:40 -0400 committer Len Brown Fri, 30 Jun 2006 02:32:21 -0400 ACPI: power: add struct acpi_device to struct acpi_power_resource - Use it instead of acpi_bus_get_device() where we can.. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 8348e1b19a06b1932f65e84e1d59be29e1626c2b tree b62bb32918767e371e0faf3dc9877f260cb5bcff parent 32917e5b589d813c9dc0f2d140d8c52898ddb6fb author Patrick Mochel Fri, 19 May 2006 16:54:40 -0400 committer Len Brown Fri, 30 Jun 2006 02:32:17 -0400 ACPI: thermal: add struct acpi_device to struct acpi_thermal. - Use it instead of acpi_bus_get_device() where we can.. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 32917e5b589d813c9dc0f2d140d8c52898ddb6fb tree 4434e0709606a436a28528283214f5bce8325234 parent 74b142e0fe039fcde42030c064763577e11ca004 author Patrick Mochel Fri, 19 May 2006 16:54:39 -0400 committer Len Brown Fri, 30 Jun 2006 02:30:43 -0400 ACPI: pci root: add struct acpi_device to struct acpi_pci_root. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 74b142e0fe039fcde42030c064763577e11ca004 tree 9a17dbca1596a98a239a3b44c34948259f26c6ab parent 145def84a177c01cf3cc6cfbb67a029f39a8ac35 author Patrick Mochel Fri, 19 May 2006 16:54:39 -0400 committer Len Brown Fri, 30 Jun 2006 02:30:41 -0400 ACPI: fan: add struct acpi_device to struct acpi_fan. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 145def84a177c01cf3cc6cfbb67a029f39a8ac35 tree 074655fddeea51e1612b3ec5a210719197f5e147 parent 3b74863df5d46f794052b5ee010cfc8fd66819dd author Patrick Mochel Fri, 19 May 2006 16:54:39 -0400 committer Len Brown Fri, 30 Jun 2006 02:30:38 -0400 ACPI: battery: add struct acpi_device to struct acpi_battery. - Use it instead of acpi_bus_get_device().. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit 3b74863df5d46f794052b5ee010cfc8fd66819dd tree 0f4bd6b1bbc157befd8adfd3d830976e04a6475a parent af96179a8298832cc58be212d0e4988d8a1e11bf author Patrick Mochel Fri, 19 May 2006 16:54:38 -0400 committer Len Brown Fri, 30 Jun 2006 02:20:53 -0400 ACPI: acpi_memhotplug: add struct acpi_device to struct acpi_memory_device. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit af96179a8298832cc58be212d0e4988d8a1e11bf tree 50fe662d3ec549ea437d2be24b5fc419558b53d1 parent d120cfb544ed6161b9d32fb6c4648c471807ee6b author Patrick Mochel Fri, 19 May 2006 16:54:32 -0400 committer Len Brown Fri, 30 Jun 2006 02:18:05 -0400 ACPI: ac: Add struct acpi_device to struct acpi_ac. Signed-off-by: Patrick Mochel Signed-off-by: Len Brown commit ae90dd5dbee461652b90d9f7d292ba47dc3dc4b8 tree 694e12850d9686b1989d63ca1f92b8214359b47e parent ffac80e925e54d84f6ea580231aa46d0ef051756 author Dave Jones Fri, 30 Jun 2006 01:40:45 -0400 committer Dave Jones Fri, 30 Jun 2006 01:40:45 -0400 Move workqueue exports to where the functions are defined. Signed-off-by: Dave Jones commit ffac80e925e54d84f6ea580231aa46d0ef051756 tree 18a1fad02d45bba365164923c674edfc69d1c0db parent 2f8a835c705794f71726eb12c06fb0f24fe07ed3 author Venkatesh Pallipadi Wed, 28 Jun 2006 13:52:18 -0700 committer Dave Jones Fri, 30 Jun 2006 01:36:40 -0400 [CPUFREQ] Misc cleanups in ondemand. Misc cleanups in ondemand. Should have zero functional impact. Also adding Alexey as author. Signed-off-by: Alexey Starikovskiy Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 2f8a835c705794f71726eb12c06fb0f24fe07ed3 tree c16b1a4bf85df6822b9bcedc608f1db9ddf6e571 parent 7a6bc1cdd506cf81f856f0fef4e56a2ba0c5a26d author Venkatesh Pallipadi Wed, 28 Jun 2006 13:51:19 -0700 committer Dave Jones Fri, 30 Jun 2006 01:33:31 -0400 [CPUFREQ] Make ondemand sampling per CPU and remove the mutex usage in sampling path. Make ondemand sampling per CPU and remove the mutex usage in sampling path. Signed-off-by: Alexey Starikovskiy Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 7a6bc1cdd506cf81f856f0fef4e56a2ba0c5a26d tree 610e6ad60d447838c3e26d00458eea04523daa5e parent ccb2fe209dac9ff67f6351e783e610073afaaeaf author Venkatesh Pallipadi Wed, 28 Jun 2006 13:50:33 -0700 committer Dave Jones Fri, 30 Jun 2006 01:33:31 -0400 [CPUFREQ] Add queue_delayed_work_on() interface for workqueues. Add queue_delayed_work_on() interface for workqueues. Signed-off-by: Alexey Starikovskiy Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit ccb2fe209dac9ff67f6351e783e610073afaaeaf tree ba6793c2045604d6db11b781d87a404cb30a54b8 parent 501b7c77de3e90519e95fd99e923bf9a29cd120d author Venkatesh Pallipadi Wed, 28 Jun 2006 13:49:52 -0700 committer Dave Jones Fri, 30 Jun 2006 01:29:47 -0400 [CPUFREQ] Remove slowdown from ondemand sampling path. Remove slowdown from ondemand sampling path. This reduces the code path length in dbs_check_cpu() by half. slowdown was not used by ondemand by default. If there are any user level tools that were using this tunable, they may report error now. Signed-off-by: Alexey Starikovskiy Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 501b7c77de3e90519e95fd99e923bf9a29cd120d tree f7dc56286e7309186f335d32f03434e82f31a41d parent 74e651f0aa100f3e5d3432a8dd8869c089e8d72f parent 184d7d20d352c7374f70ebca7468dc8cd5cc618a author Linus Torvalds Thu, 29 Jun 2006 17:44:21 -0700 committer Linus Torvalds Thu, 29 Jun 2006 17:44:21 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: ocfs2: remove redundant NULL checks in ocfs2_direct_IO_get_blocks() ocfs2: clean up some osb fields ocfs2: fix init of uuid_net_key ocfs2: silence a debug print ocfs2: silence ENOENT during lookup of broken links ocfs2: Cleanup message prints ocfs2: silence -EEXIST from ocfs2_extent_map_insert/lookup [PATCH] fs/ocfs2/dlm/dlmrecovery.c: make dlm_lockres_master_requery() static ocfs2: warn the user on a dead timeout mismatch ocfs2: OCFS2_FS must depend on SYSFS ocfs2: Compile-time disabling of ocfs2 debugging output. configfs: Clear up a few extra spaces where there should be TABs. configfs: Release memory in configfs_example. commit 74e651f0aa100f3e5d3432a8dd8869c089e8d72f tree 457e8d6ec4c28f3b1f3f4fcbf45df9b91f9ee9c7 parent 6002e45045a190a112bc3bc2134d0ff4fac7ced7 parent 0702056f9f41274a06e21cb05f12b4265b4867a2 author Linus Torvalds Thu, 29 Jun 2006 17:43:43 -0700 committer Linus Torvalds Thu, 29 Jun 2006 17:43:43 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits) [TIPC]: Initial activation message now includes TIPC version number [TIPC]: Improve response to requests for node/link information [TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_buf [IrDA]: Fix the AU1000 FIR dependencies [IrDA]: Fix RCU lock pairing on error path [XFRM]: unexport xfrm_state_mtu [NET]: make skb_release_data() static [NETFILTE] ipv4: Fix typo (Bugzilla #6753) [IrDA]: MCS7780 usb_driver struct should be static [BNX2]: Turn off link during shutdown [BNX2]: Use dev_kfree_skb() instead of the _irq version [ATM]: basic sysfs support for ATM devices [ATM]: [suni] change suni_init to __devinit [ATM]: [iphase] should be __devinit not __init [ATM]: [idt77105] should be __devinit not __init [BNX2]: Add NETIF_F_TSO_ECN [NET]: Add ECN support for TSO [AF_UNIX]: Datagram getpeersec [NET]: Fix logical error in skb_gso_ok [PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000 ... commit 0702056f9f41274a06e21cb05f12b4265b4867a2 tree 5b8c9bcd7957fdc99bc0ffa532f3d895dc446f52 parent ea13847b240e689e8f291355c36b46de9f44ddf9 author Allan Stephens Thu, 29 Jun 2006 12:33:51 -0700 committer David S. Miller Thu, 29 Jun 2006 17:08:20 -0700 [TIPC]: Initial activation message now includes TIPC version number Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit ea13847b240e689e8f291355c36b46de9f44ddf9 tree 058a74fadfaf762587567ff59d87ae18db4c9d68 parent e49060c7cab6ca856d048e1e10d71c0e6fedf376 author Allan Stephens Thu, 29 Jun 2006 12:33:20 -0700 committer David S. Miller Thu, 29 Jun 2006 17:08:15 -0700 [TIPC]: Improve response to requests for node/link information Now allocates reply space for "get links" request based on number of actual links, not number of potential links. Also, limits reply to "get links" and "get nodes" requests to 32KB to match capabilities of tipc-config utility that issued request. Signed-off-by: Allan Stephens Signed-off-by: Per Liden commit e49060c7cab6ca856d048e1e10d71c0e6fedf376 tree 20b3ebd30b8cc645684c369e42c968276411e7d2 parent caf430f37119af5faac9252ec4e18cb1c55dde26 author Allan Stephens Thu, 29 Jun 2006 12:32:46 -0700 committer David S. Miller Thu, 29 Jun 2006 17:08:10 -0700 [TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_buf Now determines tailroom of bundle buffer by directly inspection of buffer. Previously, buffer was assumed to have a max capacity equal to the link MTU, but the addition of link MTU negotiation means that the link MTU can increase after the bundle buffer is allocated. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit caf430f37119af5faac9252ec4e18cb1c55dde26 tree e7284df1b82b734b42e2b42a0a428a0a521a7b0e parent 1bc1731133140dccdd08899a59bbc06d975d0a15 author Adrian Bunk Thu, 29 Jun 2006 17:03:19 -0700 committer David S. Miller Thu, 29 Jun 2006 17:03:19 -0700 [IrDA]: Fix the AU1000 FIR dependencies AU1000 FIR is broken, it should depend on SOC_AU1000. Spotted by Jean-Luc Leger. Signed-off-by: Adrian Bunk Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 1bc1731133140dccdd08899a59bbc06d975d0a15 tree 5264ce0882490e4d432d5c8e9f19f9a1b1c2a43e parent 244055fdc8dd39407a33d4eb9f4053dd4ca8f1bb author Josh Triplett Thu, 29 Jun 2006 17:02:31 -0700 committer David S. Miller Thu, 29 Jun 2006 17:02:31 -0700 [IrDA]: Fix RCU lock pairing on error path irlan_client_discovery_indication calls rcu_read_lock and rcu_read_unlock, but returns without unlocking in an error case. Fix that by replacing the return with a goto so that the rcu_read_unlock always gets executed. Signed-off-by: Josh Triplett Acked-by: Paul E. McKenney Signed-off-by: Samuel Ortiz samuel@sortiz.org <> Signed-off-by: David S. Miller commit 244055fdc8dd39407a33d4eb9f4053dd4ca8f1bb tree 0b4c7cdcd5293099bc9989f57a864d65e4554e50 parent 5bba17127e7c78e819560519449db237e1b0f99b author Adrian Bunk Thu, 29 Jun 2006 13:04:41 -0700 committer David S. Miller Thu, 29 Jun 2006 16:58:33 -0700 [XFRM]: unexport xfrm_state_mtu This patch removes the unused EXPORT_SYMBOL(xfrm_state_mtu). Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 5bba17127e7c78e819560519449db237e1b0f99b tree e2a0700004fd8a0ae56cfbe54ed952c73bfef3bf parent c22751b73a3770b3046102bb97b139218ff1875b author Adrian Bunk Thu, 29 Jun 2006 13:02:35 -0700 committer David S. Miller Thu, 29 Jun 2006 16:58:30 -0700 [NET]: make skb_release_data() static skb_release_data() no longer has any users in other files. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit c22751b73a3770b3046102bb97b139218ff1875b tree 64e4b4866f53175a40c6fced126df715e825b2cb parent 7263ade1e1e72e34fc3c179f3aeaa07a11872d22 author Matt LaPlante Thu, 29 Jun 2006 12:51:15 -0700 committer David S. Miller Thu, 29 Jun 2006 16:58:28 -0700 [NETFILTE] ipv4: Fix typo (Bugzilla #6753) This patch fixes bugzilla #6753, a typo in the netfilter Kconfig Signed-off-by: David S. Miller commit 7263ade1e1e72e34fc3c179f3aeaa07a11872d22 tree 9271f6c59a8bed7d83f8af67618faa145f38a7e0 parent 6c4f095eae35e83eb6148dec7f72874eeadf0c9b author Adrian Bunk Thu, 29 Jun 2006 12:39:07 -0700 committer David S. Miller Thu, 29 Jun 2006 16:58:26 -0700 [IrDA]: MCS7780 usb_driver struct should be static This patch makes a needlessly global struct static. Signed-off-by: Adrian Bunk Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 6c4f095eae35e83eb6148dec7f72874eeadf0c9b tree 1be263c4968b5268e0a3ebb1650a79f0833e3215 parent 745720e58303f940e12944bf7fab52bc9ce48bda author Michael Chan Thu, 29 Jun 2006 12:38:15 -0700 committer David S. Miller Thu, 29 Jun 2006 16:58:24 -0700 [BNX2]: Turn off link during shutdown Minor change in shutdown logic to effect a link down. Update version to 1.4.43. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 745720e58303f940e12944bf7fab52bc9ce48bda tree 889ec0c1c5f93a233894a90a8062659e0e7a4835 parent 656d98b09d57d4e1185c5d2436a42600d48fbcb5 author Michael Chan Thu, 29 Jun 2006 12:37:41 -0700 committer David S. Miller Thu, 29 Jun 2006 16:58:21 -0700 [BNX2]: Use dev_kfree_skb() instead of the _irq version Change all dev_kfree_skb_irq() and dev_kfree_skb_any() to dev_kfree_skb(). These calls are never used in irq context. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 656d98b09d57d4e1185c5d2436a42600d48fbcb5 tree 42c8795ea142e6c0a002bcdb26d255e2b8693e4c parent d17f086550a6fdb13fe82371d60ebf80904c6f96 author Roman Kagan Thu, 29 Jun 2006 12:36:34 -0700 committer David S. Miller Thu, 29 Jun 2006 16:58:19 -0700 [ATM]: basic sysfs support for ATM devices Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit d17f086550a6fdb13fe82371d60ebf80904c6f96 tree 161770a40009ca207942406d0b04979e73a26529 parent 249c14b55c8576ad8c6ec23c7c1b3b2219b33e54 author Chas Williams Thu, 29 Jun 2006 12:35:49 -0700 committer David S. Miller Thu, 29 Jun 2006 16:58:17 -0700 [ATM]: [suni] change suni_init to __devinit Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 249c14b55c8576ad8c6ec23c7c1b3b2219b33e54 tree 2c5a38cfe4410e2a19b6c6e5a42169ac687a5728 parent b47eb0eb9bb5fcee6394f0d9bde0b471f7329841 author Chas Williams Thu, 29 Jun 2006 12:35:32 -0700 committer David S. Miller Thu, 29 Jun 2006 16:58:14 -0700 [ATM]: [iphase] should be __devinit not __init Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit b47eb0eb9bb5fcee6394f0d9bde0b471f7329841 tree 6fc0514d48c77de6848570c9420609ab011c941c parent b11d6213529b33d81c21eeba97343e3b714e62e7 author Chas Williams Thu, 29 Jun 2006 12:35:02 -0700 committer David S. Miller Thu, 29 Jun 2006 16:58:12 -0700 [ATM]: [idt77105] should be __devinit not __init Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit b11d6213529b33d81c21eeba97343e3b714e62e7 tree bcc6fe28d2e5967610b2a596f1c87cc8485cf71c parent b0da8537037f337103348f239ad901477e907aa8 author Michael Chan Thu, 29 Jun 2006 12:31:21 -0700 committer David S. Miller Thu, 29 Jun 2006 16:58:10 -0700 [BNX2]: Add NETIF_F_TSO_ECN Add NETIF_F_TSO_ECN feature for all bnx2 hardware. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit b0da8537037f337103348f239ad901477e907aa8 tree 498a5dceb0d536fa54dcf4acc26ae1d1b43dfaf1 parent 877ce7c1b3afd69a9b1caeb1b9964c992641f52a author Michael Chan Thu, 29 Jun 2006 12:30:00 -0700 committer David S. Miller Thu, 29 Jun 2006 16:58:08 -0700 [NET]: Add ECN support for TSO In the current TSO implementation, NETIF_F_TSO and ECN cannot be turned on together in a TCP connection. The problem is that most hardware that supports TSO does not handle CWR correctly if it is set in the TSO packet. Correct handling requires CWR to be set in the first packet only if it is set in the TSO header. This patch adds the ability to turn on NETIF_F_TSO and ECN using GSO if necessary to handle TSO packets with CWR set. Hardware that handles CWR correctly can turn on NETIF_F_TSO_ECN in the dev-> features flag. All TSO packets with CWR set will have the SKB_GSO_TCPV4_ECN set. If the output device does not have the NETIF_F_TSO_ECN feature set, GSO will split the packet up correctly with CWR only set in the first segment. With help from Herbert Xu . Since ECN can always be enabled with TSO, the SOCK_NO_LARGESEND sock flag is completely removed. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 877ce7c1b3afd69a9b1caeb1b9964c992641f52a tree 740c6c0d4a2858af53c09c4635cadf06833536c1 parent d6b4991ad5d1a9840e12db507be1a6593def01fe author Catherine Zhang Thu, 29 Jun 2006 12:27:47 -0700 committer David S. Miller Thu, 29 Jun 2006 16:58:06 -0700 [AF_UNIX]: Datagram getpeersec This patch implements an API whereby an application can determine the label of its peer's Unix datagram sockets via the auxiliary data mechanism of recvmsg. Patch purpose: This patch enables a security-aware application to retrieve the security context of the peer of a Unix datagram socket. The application can then use this security context to determine the security context for processing on behalf of the peer who sent the packet. Patch design and implementation: The design and implementation is very similar to the UDP case for INET sockets. Basically we build upon the existing Unix domain socket API for retrieving user credentials. Linux offers the API for obtaining user credentials via ancillary messages (i.e., out of band/control messages that are bundled together with a normal message). To retrieve the security context, the application first indicates to the kernel such desire by setting the SO_PASSSEC option via getsockopt. Then the application retrieves the security context using the auxiliary data mechanism. An example server application for Unix datagram socket should look like this: toggle = 1; toggle_len = sizeof(toggle); setsockopt(sockfd, SOL_SOCKET, SO_PASSSEC, &toggle, &toggle_len); recvmsg(sockfd, &msg_hdr, 0); if (msg_hdr.msg_controllen > sizeof(struct cmsghdr)) { cmsg_hdr = CMSG_FIRSTHDR(&msg_hdr); if (cmsg_hdr->cmsg_len <= CMSG_LEN(sizeof(scontext)) && cmsg_hdr->cmsg_level == SOL_SOCKET && cmsg_hdr->cmsg_type == SCM_SECURITY) { memcpy(&scontext, CMSG_DATA(cmsg_hdr), sizeof(scontext)); } } sock_setsockopt is enhanced with a new socket option SOCK_PASSSEC to allow a server socket to receive security context of the peer. Testing: We have tested the patch by setting up Unix datagram client and server applications. We verified that the server can retrieve the security context using the auxiliary data mechanism of recvmsg. Signed-off-by: Catherine Zhang Acked-by: Acked-by: James Morris Signed-off-by: David S. Miller commit d6b4991ad5d1a9840e12db507be1a6593def01fe tree c2485275dae3e4cff7b86cffb91bfc8a7bb8bacd parent 4ee303dfeac6451b402e3d8512723d3a0f861857 author Herbert Xu Thu, 29 Jun 2006 12:25:53 -0700 committer David S. Miller Thu, 29 Jun 2006 16:58:04 -0700 [NET]: Fix logical error in skb_gso_ok The test in skb_gso_ok is backwards. Noticed by Michael Chan . Signed-off-by: Herbert Xu Acked-by: Michael Chan Signed-off-by: David S. Miller commit 4ee303dfeac6451b402e3d8512723d3a0f861857 tree b2a542ae60c29b58a4d9ef1dbd7d3d19af67554e parent 3d3a85337937bb5e3db676eeb4f3bf7f02533b44 author Shuya MAEDA Wed, 28 Jun 2006 01:40:35 -0700 committer David S. Miller Thu, 29 Jun 2006 16:58:01 -0700 [PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000 Signed-off-by: Shuya MAEDA Signed-off-by: David S. Miller commit 3d3a85337937bb5e3db676eeb4f3bf7f02533b44 tree 76cbcd89528bbefa0d586be55b15aeed322b8738 parent 47da8ee681d04e68ca1b1812c10e28162150d453 author Herbert Xu Tue, 27 Jun 2006 13:33:10 -0700 committer David S. Miller Thu, 29 Jun 2006 16:57:59 -0700 [NET]: Make illegal_highdma more anal Rather than having illegal_highdma as a macro when HIGHMEM is off, we can turn it into an inline function that returns zero. This will catch callers that give it bad arguments. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 47da8ee681d04e68ca1b1812c10e28162150d453 tree 05b9abc2438abe0e9ecef1b6632a9b114e6cb55b parent c7bdb545d23026b18be53289fd866d1ac07f5f8c author Sridhar Samudrala Tue, 27 Jun 2006 13:29:00 -0700 committer David S. Miller Thu, 29 Jun 2006 16:57:57 -0700 [TCP]: Export accept queue len of a TCP listening socket via rx_queue While debugging a TCP server hang issue, we noticed that currently there is no way for a user to get the acceptq backlog value for a TCP listen socket. All the standard networking utilities that display socket info like netstat, ss and /proc/net/tcp have 2 fields called rx_queue and tx_queue. These fields do not mean much for listening sockets. This patch uses one of these unused fields(rx_queue) to export the accept queue len for listening sockets. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit c7bdb545d23026b18be53289fd866d1ac07f5f8c tree 6d9a218871d88f7579dd53f14692df2529b6e712 parent 576a30eb6453439b3c37ba24455ac7090c247b5a author Darrel Goeddel Tue, 27 Jun 2006 13:26:11 -0700 committer David S. Miller Thu, 29 Jun 2006 16:57:55 -0700 [NETLINK]: Encapsulate eff_cap usage within security framework. This patch encapsulates the usage of eff_cap (in netlink_skb_params) within the security framework by extending security_netlink_recv to include a required capability parameter and converting all direct usage of eff_caps outside of the lsm modules to use the interface. It also updates the SELinux implementation of the security_netlink_send and security_netlink_recv hooks to take advantage of the sid in the netlink_skb_params struct. This also enables SELinux to perform auditing of netlink capability checks. Please apply, for 2.6.18 if possible. Signed-off-by: Darrel Goeddel Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: David S. Miller commit 576a30eb6453439b3c37ba24455ac7090c247b5a tree e0c427a61e3de5c93e797c09903d910f6f060e64 parent 68c1692e3ea5d79f24cb5cc566c4a73939d13d25 author Herbert Xu Tue, 27 Jun 2006 13:22:38 -0700 committer David S. Miller Thu, 29 Jun 2006 16:57:53 -0700 [NET]: Added GSO header verification When GSO packets come from an untrusted source (e.g., a Xen guest domain), we need to verify the header integrity before passing it to the hardware. Since the first step in GSO is to verify the header, we can reuse that code by adding a new bit to gso_type: SKB_GSO_DODGY. Packets with this bit set can only be fed directly to devices with the corresponding bit NETIF_F_GSO_ROBUST. If the device doesn't have that bit, then the skb is fed to the GSO engine which will allow the packet to be sent to the hardware if it passes the header check. This patch changes the sg flag to a full features flag. The same method can be used to implement TSO ECN support. We simply have to mark packets with CWR set with SKB_GSO_ECN so that only hardware with a corresponding NETIF_F_TSO_ECN can accept them. The GSO engine can either fully segment the packet, or segment the first MTU and pass the rest to the hardware for further segmentation. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 68c1692e3ea5d79f24cb5cc566c4a73939d13d25 tree 35a32e4bb0243013dc5a7df1f52b028ad755d434 parent ef47c6a7b8e36e3b160433673b1b68db799aabcd author Patrick McHardy Tue, 27 Jun 2006 03:02:14 -0700 committer David S. Miller Thu, 29 Jun 2006 16:57:50 -0700 [NETFILTER]: statistic match: add missing Kconfig help text Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ef47c6a7b8e36e3b160433673b1b68db799aabcd tree e79198a36e216e29bb31588b0a9d69d476399f5c parent 1c7e47726a88303e4cfa2785f0a357bf1ceecee1 author Patrick McHardy Tue, 27 Jun 2006 03:01:48 -0700 committer David S. Miller Thu, 29 Jun 2006 16:57:48 -0700 [NETFILTER]: ip_queue/nfnetlink_queue: drop bridge port references when dev disappears When a device that is acting as a bridge port is unregistered, the ip_queue/nfnetlink_queue notifier doesn't check if its one of physindev/physoutdev and doesn't release the references if it is. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d120cfb544ed6161b9d32fb6c4648c471807ee6b tree 7757ad0198d8df76ff5c60f939a687687c41da00 parent 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 parent bf7e8511088963078484132636839b59e25cf14f author Len Brown Thu, 29 Jun 2006 19:57:46 -0400 committer Len Brown Thu, 29 Jun 2006 19:57:46 -0400 merge linus into release branch Conflicts: drivers/acpi/acpi_memhotplug.c commit 1c7e47726a88303e4cfa2785f0a357bf1ceecee1 tree bc6cb39035e96cfb833393b1322246460232c6a9 parent 9abdcf6b6cf387035d934c77bf9ebe5e747166f9 author Jorge Matias Tue, 27 Jun 2006 03:01:25 -0700 committer David S. Miller Thu, 29 Jun 2006 16:57:46 -0700 [NETFILTER]: xt_sctp: fix --chunk-types matching xt_sctp uses an incorrect header offset when --chunk-types is used. Signed-off-by: Jorge Matias Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9abdcf6b6cf387035d934c77bf9ebe5e747166f9 tree 2ea946e64ed3b80d872376856b3873a43ebce82f parent 40a839fdbd5d76cebb2a61980bc1fc7ecd784be2 author Yuri Gushin Tue, 27 Jun 2006 03:01:03 -0700 committer David S. Miller Thu, 29 Jun 2006 16:57:44 -0700 [NETFILTER]: xt_tcpudp: fix double unregistration in error path "xt_unregister_match(AF_INET, &tcp_matchstruct)" is called twice, leaving "udp_matchstruct" registered, in case of a failure in the registration of the udp6 structure. Signed-off-by: Yuri Gushin Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 40a839fdbd5d76cebb2a61980bc1fc7ecd784be2 tree 205b09047d3168c61fdad234d30fa0f3d84e82ab parent da298d3a4f01dbc10c54da75d6b5717a99fb9cbc author Yasuyuki Kozakai Tue, 27 Jun 2006 03:00:35 -0700 committer David S. Miller Thu, 29 Jun 2006 16:57:42 -0700 [NETFILTER]: nf_conntrack: Fix undefined references to local_bh_* CC net/netfilter/nf_conntrack_proto_sctp.o net/netfilter/nf_conntrack_proto_sctp.c: In function `sctp_print_conntrack': net/netfilter/nf_conntrack_proto_sctp.c:206: warning: implicit declaration of function `local_bh_disable' net/netfilter/nf_conntrack_proto_sctp.c:208: warning: implicit declaration of function `local_bh_enable' CC net/netfilter/nf_conntrack_netlink.o net/netfilter/nf_conntrack_netlink.c: In function `ctnetlink_dump_table': net/netfilter/nf_conntrack_netlink.c:429: warning: implicit declaration of function `local_bh_disable' net/netfilter/nf_conntrack_netlink.c:452: warning: implicit declaration of function `local_bh_enable' Spotted by Toralf Förster Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit da298d3a4f01dbc10c54da75d6b5717a99fb9cbc tree d6cbeec6c5252b17adefcdd401d4397301bfcd1f parent bf7e8511088963078484132636839b59e25cf14f author Patrick McHardy Tue, 27 Jun 2006 03:00:09 -0700 committer David S. Miller Thu, 29 Jun 2006 16:57:40 -0700 [NETFILTER]: x_tables: fix xt_register_table error propagation When xt_register_table fails the error is not properly propagated back. Based on patch by Lepton Wu . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 tree ebe1629ecbf3182eeb3383744a98b2d900687721 parent f1b2ad5d2a8e1791d806ef244164d19c3d5c8b83 parent 967440e3be1af06ad4dc7bb18d2e3c16130fe067 author Len Brown Thu, 29 Jun 2006 19:55:27 -0400 committer Len Brown Thu, 29 Jun 2006 19:55:27 -0400 Pull acpica into release branch commit 6002e45045a190a112bc3bc2134d0ff4fac7ced7 tree 35f07eecadfcf27e5efdcfbf50b9dc2aa46d81a3 parent 675f740e557bc752cdcdb0739d80666b488abb58 author David S. Miller Thu, 29 Jun 2006 16:20:12 -0700 committer David S. Miller Thu, 29 Jun 2006 16:38:05 -0700 [SUNHME]: Mark SBUS probing routines as __devinit. Signed-off-by: David S. Miller commit 675f740e557bc752cdcdb0739d80666b488abb58 tree 51bc4681e5e182637f9086e033659ab38a3207de parent f57caaefacc2ffa7ace11a325c663e569e2b4164 author David S. Miller Thu, 29 Jun 2006 15:48:59 -0700 committer David S. Miller Thu, 29 Jun 2006 16:38:03 -0700 [SPARC64]: Print symbol name of regs->tpc on kernel unaligned accesses. This makes things easier to track down, especially in modules. Signed-off-by: David S. Miller commit f57caaefacc2ffa7ace11a325c663e569e2b4164 tree a3c00352d660d7bad6aad6415d93b4a8df1d508b parent ff0d2fc6a60624df46055f47ea7261c8198c7862 author David S. Miller Thu, 29 Jun 2006 15:42:29 -0700 committer David S. Miller Thu, 29 Jun 2006 16:38:01 -0700 [SERIO] i8042-sparcio.h: Convert to of_driver framework. Signed-off-by: David S. Miller commit ff0d2fc6a60624df46055f47ea7261c8198c7862 tree 385ff0b9b3dde2b12b94e4143808ae9a6f8b5239 parent abbce6e2fd156cbcab2fc1247c7dec8a0c68e7e3 author David S. Miller Thu, 29 Jun 2006 15:28:05 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:59 -0700 [SPARC64]: time: Kill unnecessary asm/{fhc,sbus,ebus,isa}.h includes. Signed-off-by: David S. Miller commit abbce6e2fd156cbcab2fc1247c7dec8a0c68e7e3 tree 62619be12e2db209db0c5d232dd56414c2bb5976 parent f2ad06a20133125e5b6ab6497c6d90e63ded4761 author David S. Miller Thu, 29 Jun 2006 15:22:46 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:57 -0700 [SPARC64] power: Convert to of_driver. Signed-off-by: David S. Miller commit f2ad06a20133125e5b6ab6497c6d90e63ded4761 tree 53f7ba932e0f268928462dda5e8b591a0e1a4eef parent 89d1d0ab4d99e1e0fe193352e1dd857787a0bfc0 author David S. Miller Thu, 29 Jun 2006 15:22:22 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:55 -0700 [SPARC64] auxio: Remove asm/{sbus,ebus}.h includes. Signed-off-by: David S. Miller commit 89d1d0ab4d99e1e0fe193352e1dd857787a0bfc0 tree 6d2188b9b74a0d2814025c8d9d46fadf52b5c05e parent c4d37215a824820e1b614ff9f6969af72cd953f4 author David S. Miller Thu, 29 Jun 2006 15:18:50 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:53 -0700 [SERIAL] sunsab: Fix section mis-match errors. sunsab_init_one() needs to be __devinit, not __init Signed-off-by: David S. Miller commit c4d37215a824820e1b614ff9f6969af72cd953f4 tree d972077f4961e53ff51eb125e115d46e414a9d0e parent 9efc3715f7b13127fd202108304352e1be76e077 author David S. Miller Thu, 29 Jun 2006 15:17:47 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:50 -0700 [SERIAL] sunsab: Convert to of_driver framework. Signed-off-by: David S. Miller commit 9efc3715f7b13127fd202108304352e1be76e077 tree eba7251faaf08e76f978c9716c2ea86bfd1938e3 parent 1708d242d222e751a0922e3c56ef857cf60bbedd author David S. Miller Thu, 29 Jun 2006 15:14:17 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:48 -0700 [SERIAL] sun{su,zilog}: Add missing MODULE_*() niceties. Signed-off-by: David S. Miller commit 1708d242d222e751a0922e3c56ef857cf60bbedd tree 94d6c849e3e0edf686db1f6fae82cf889acc9e9e parent 4fa97dcf9d48b02934c60a48873199850351e760 author David S. Miller Thu, 29 Jun 2006 15:14:03 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:46 -0700 [SERIAL] sunsu: Convert to of_driver framework. Signed-off-by: David S. Miller commit 4fa97dcf9d48b02934c60a48873199850351e760 tree eac7bda737afe4d723b12d8ae67dfe35d14098a7 parent 3676463178401293d625a102a00da0473fa33a1b author David S. Miller Thu, 29 Jun 2006 15:13:40 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:44 -0700 [SERIAL] sunzilog: Fix bugs in device deregristration. 1) Need to unregister 2 ports per of_device. 2) Need to of_iounmap() 1 mapping per of_device. 3) Need to free up the IRQ only after all devices have been unregistered. Signed-off-by: David S. Miller commit 3676463178401293d625a102a00da0473fa33a1b tree 5c46e9e73e068c1303b297078f9b5a1f20857bd8 parent 8f96cd1a69d4c43e3473406a1fdf15cd9f1de5e5 author David S. Miller Thu, 29 Jun 2006 15:13:17 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:42 -0700 [SERIAL] sunzilog: Convert to of_driver. Signed-off-by: David S. Miller commit 8f96cd1a69d4c43e3473406a1fdf15cd9f1de5e5 tree 34e43df9f2687720997e43a6c944c73ef61414db parent 2b1e59787198e75fb2ffb3bb4fb247da1c55ac12 author David S. Miller Thu, 29 Jun 2006 15:08:02 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:40 -0700 [SPARC]: sparc32 side of of_device layer IRQ resolution. Happily, life is much simpler on 32-bit sparc systems. The "intr" property, preferred over the "interrupts" property is used-as. Some minor translations of this value happen on sun4d systems. The stage is now set to rewrite the sparc serial driver probing to use the of_driver framework, and then to convert all SBUS, EBUS, and ISA drivers in-kind so that we can nuke all those special bus frameworks. Signed-off-by: David S. Miller commit 2b1e59787198e75fb2ffb3bb4fb247da1c55ac12 tree 96d74048849b310135e0c79f663b16c52186caa5 parent c3a8b85f5ac2c21f4ef75e87bfe55ee7a753ffcf author David S. Miller Thu, 29 Jun 2006 15:07:37 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:38 -0700 [SPARC64]: of_device layer IRQ resolution Do IRQ determination generically by parsing the PROM properties, and using IRQ controller drivers for final resolution. One immediate positive effect is that all of the IRQ frobbing in the EBUS, ISA, and PCI controller layers has been eliminated. We just look up the of_device and use the properly computed value. The PCI controller irq_build() routines are gone and no longer used. Unfortunately sbus_build_irq() has to remain as there is a direct reference to this in the sunzilog driver. That can be killed off once the sparc32 side of this is written and the sunzilog driver is transformed into an "of" bus driver. Signed-off-by: David S. Miller commit c3a8b85f5ac2c21f4ef75e87bfe55ee7a753ffcf tree c12123873c1f1f7f0e9413fe89720914be67158f parent 915214853d7681416d6bdd1591787cdbded459e7 author David S. Miller Thu, 29 Jun 2006 14:43:37 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:35 -0700 [SPARC64]: Fix typo in clock_probe(). Signed-off-by: David S. Miller commit 915214853d7681416d6bdd1591787cdbded459e7 tree 520008a7aa5afb36c5c8c48641a3fc76114c18f9 parent 00cde6748255a84beecfdea4caeaf7c9cd05a527 author David S. Miller Thu, 29 Jun 2006 14:39:40 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:33 -0700 [SPARC64] clock: Only probe central fhc clock on Enterprise boxes. Signed-off-by: David S. Miller commit 00cde6748255a84beecfdea4caeaf7c9cd05a527 tree aa169a0cff50fed0e51eab05952766a6ea16a5fb parent d44b3be88ed58bb1bbbf7d70c533598b3dc3d870 author David S. Miller Thu, 29 Jun 2006 14:39:11 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:31 -0700 [SPARC64] power: Do not pass SA_SHIRQ to request_irq(). This needs to be a unique interrupt source because we do not have a register or similar to poll to make sure the IRQ is really for us. We do not have any dev_id to pass in anyways, and the generic IRQ layer is now enforcing that when SA_SHIRQ is specified, dev_id must be non-NULL. Signed-off-by: David S. Miller commit d44b3be88ed58bb1bbbf7d70c533598b3dc3d870 tree 6c6af7471cebccd2ac6269a2090df9f8f75bd4d7 parent 24ac26d425c96659b12cf16de7cbfe3bcbd73f05 author David S. Miller Thu, 29 Jun 2006 14:38:51 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:29 -0700 [SPARC64]: Fix typo in isa_dev_get_irq_using_imap(). Signed-off-by: David S. Miller commit 24ac26d425c96659b12cf16de7cbfe3bcbd73f05 tree 6e2cbfad38d3f167dfa5b53b75f9e0ba1fb3ae83 parent 946ea09962a56674fe564b41c3007933bb41a068 author David S. Miller Thu, 29 Jun 2006 14:38:21 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:27 -0700 [SPARC64]: Let irq_install_pre_handler() get called multiple times. Signed-off-by: David S. Miller commit 946ea09962a56674fe564b41c3007933bb41a068 tree 8843085316abcc9ea7503715194f7a3c7bfd0671 parent ee5caf0ee19f65a5e29bf20a0dffd8be8b4827fd author David S. Miller Thu, 29 Jun 2006 14:37:09 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:25 -0700 [SPARC]: Kill interrupt stuff and linux_phandle from device_node. Signed-off-by: David S. Miller commit ee5caf0ee19f65a5e29bf20a0dffd8be8b4827fd tree 68eaa50b1bcc4eda6200d4121248354766e77a1d parent 36a59bd89c50c1090c7438db89f751720974a6fc author David S. Miller Thu, 29 Jun 2006 14:36:52 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:23 -0700 [SPARC]: Convert clock drivers to of_driver framework. Signed-off-by: David S. Miller commit 36a59bd89c50c1090c7438db89f751720974a6fc tree 577d1c1ae0e494e1c21d495e2dcdf59ffd8bcdeb parent 50312ce9dd794eef3df9e64194ba95ca730d82c8 author David S. Miller Thu, 29 Jun 2006 14:36:35 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:21 -0700 [SPARC64] auxio: Convert to pure of_device driver. Signed-off-by: David S. Miller commit 50312ce9dd794eef3df9e64194ba95ca730d82c8 tree 15703fd98b8b757197d43e11f8de791bbc3b8f00 parent 3ca9fab410fbef6fc3a13284f5c26faccade21d1 author David S. Miller Thu, 29 Jun 2006 14:35:52 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:18 -0700 [SPARC]: Convert all FB SBUS drivers to of_driver framework. Signed-off-by: David S. Miller commit 3ca9fab410fbef6fc3a13284f5c26faccade21d1 tree 91b4c38077db397bec0ff85f1c89c9f869b3970f parent 95714e12dfb4794ee120f058fdf763e61baaad82 author David S. Miller Thu, 29 Jun 2006 14:35:33 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:16 -0700 [SPARC]: Add of_io{remap,unmap}(). Signed-off-by: David S. Miller commit 95714e12dfb4794ee120f058fdf763e61baaad82 tree d092f799f94cba809f55069dd1236feff71550a1 parent cf44bbc26cf1361b692ab68c884f6a0df7da2fdb author David S. Miller Thu, 29 Jun 2006 14:35:14 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:14 -0700 [SPARC]: Encode I/O space into resource flags on sparc32. On sparc64 we don't need to do this because the resource values are large enough to encode the full physical address. Signed-off-by: David S. Miller commit cf44bbc26cf1361b692ab68c884f6a0df7da2fdb tree e16c980a25df8a31445a005d75da2c37f30a7b67 parent 3ae9a3489a4e2ba665a344a9250c2af05b7b0c59 author David S. Miller Thu, 29 Jun 2006 14:34:50 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:12 -0700 [SPARC]: Beginnings of generic of_device framework. The idea is to fully construct the device register and interrupt values into these of_device objects, and convert all of SBUS, EBUS, ISA drivers to use this new stuff. Much ideas and code taken from Ben H.'s powerpc work. Signed-off-by: David S. Miller commit 3ae9a3489a4e2ba665a344a9250c2af05b7b0c59 tree 7b78ceaafb19a63e195568642ede37670d88388b parent 286bbe87c143ca7ecee5bb499cd78048c5a05d49 author David S. Miller Thu, 29 Jun 2006 14:34:12 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:10 -0700 [SPARC]: Add of_n_{addr,size}_cells(). Signed-off-by: David S. Miller commit 286bbe87c143ca7ecee5bb499cd78048c5a05d49 tree 0bdb16fafa3012160cbe27bd6fc5957f658f485b parent bf7e8511088963078484132636839b59e25cf14f author David S. Miller Thu, 29 Jun 2006 14:27:13 -0700 committer David S. Miller Thu, 29 Jun 2006 16:37:08 -0700 [SPARC64]: Kill starfire_cookie from SBUS/PCI. Totally unused. We need to traverse the list of global IRQ translaters, so storing it in the per-bus structures was useless. Signed-off-by: David S. Miller commit 184d7d20d352c7374f70ebca7468dc8cd5cc618a tree bcea4e8f5eba60f03ff0c7980b4e13b4b579bf2b parent 784270435b001164054e803421a624ef1098519d author Florin Malita Sat, 03 Jun 2006 19:30:10 -0400 committer Mark Fasheh Thu, 29 Jun 2006 16:13:35 -0700 ocfs2: remove redundant NULL checks in ocfs2_direct_IO_get_blocks() Signed-off-by: Florin Malita Signed-off-by: Mark Fasheh commit 784270435b001164054e803421a624ef1098519d tree f26fec7ca476439f770fd24e5c7ec11039302b37 parent a75a6e4c3ada10b15e26f6d12f72c03efde266e0 author Mark Fasheh Thu, 04 May 2006 12:03:26 -0700 committer Mark Fasheh Thu, 29 Jun 2006 16:10:13 -0700 ocfs2: clean up some osb fields Get rid of osb->uuid, osb->proc_sub_dir, and osb->osb_id. Those fields were unused, or could easily be removed. As a result, we also no longer need MAX_OSB_ID or ocfs2_globals_lock. Signed-off-by: Mark Fasheh commit a75a6e4c3ada10b15e26f6d12f72c03efde266e0 tree 408ffc1590df90c04e98cae96affe426b6521d31 parent e7607ab3daeeaea50b3b5aebe8dfa29a1dfb8311 author Mark Fasheh Thu, 04 May 2006 11:49:22 -0700 committer Mark Fasheh Thu, 29 Jun 2006 16:06:43 -0700 ocfs2: fix init of uuid_net_key ocfs2_initialize_super() should be copying from the beginning of the uuid. Signed-off-by: Mark Fasheh commit e7607ab3daeeaea50b3b5aebe8dfa29a1dfb8311 tree dd15e3673a53b32496658323766d13b2bdbe7a0e parent d426721cf10824391fd38bd42f38357ace2b1c08 author Mark Fasheh Thu, 27 Apr 2006 17:53:22 -0700 committer Mark Fasheh Thu, 29 Jun 2006 16:03:17 -0700 ocfs2: silence a debug print Signed-off-by: Mark Fasheh commit d426721cf10824391fd38bd42f38357ace2b1c08 tree d00c565518ba8ee6116bde504449c687b92c6e26 parent 781ee3e2b1ea41d56ed86ae1c85fc40b7f330205 author Sunil Mushran Thu, 27 Apr 2006 16:44:13 -0700 committer Mark Fasheh Thu, 29 Jun 2006 15:59:52 -0700 ocfs2: silence ENOENT during lookup of broken links Signed-off-by: Sunil Mushran Signed-off-by: Mark Fasheh commit 781ee3e2b1ea41d56ed86ae1c85fc40b7f330205 tree 00e605613fbf589ec50399873eae1a4eed536635 parent a43db30c7c614c08851a97476aeb317ca2e14475 author Sunil Mushran Thu, 27 Apr 2006 16:41:31 -0700 committer Mark Fasheh Thu, 29 Jun 2006 15:56:26 -0700 ocfs2: Cleanup message prints Signed-off-by: Sunil Mushran Signed-off-by: Mark Fasheh commit a43db30c7c614c08851a97476aeb317ca2e14475 tree 8f0d7f376985967894bf91dc85cfe49dc816d991 parent 8169cae5a13b9f8ae53edc183825d20b4f4daeeb author Joel Becker Thu, 27 Apr 2006 16:36:14 -0700 committer Mark Fasheh Thu, 29 Jun 2006 15:52:56 -0700 ocfs2: silence -EEXIST from ocfs2_extent_map_insert/lookup Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 8169cae5a13b9f8ae53edc183825d20b4f4daeeb tree 6da51cc561288564d81d7b93b738358b78e7d8ef parent 0db638f44e7db9732d9c5704ca837f57ce061f42 author Adrian Bunk Fri, 31 Mar 2006 16:53:55 +0200 committer Mark Fasheh Thu, 29 Jun 2006 15:49:29 -0700 [PATCH] fs/ocfs2/dlm/dlmrecovery.c: make dlm_lockres_master_requery() static dlm_lockres_master_requery() became global without any external usage. Signed-off-by: Adrian Bunk Signed-off-by: Mark Fasheh commit 0db638f44e7db9732d9c5704ca837f57ce061f42 tree 0ac8c092bfa27a9d88431b3c404af19fa0b1bdd1 parent 4ba63adce06bc7549e1dd36344123dbaccdaa52f author Mark Fasheh Tue, 09 May 2006 15:09:35 -0700 committer Mark Fasheh Thu, 29 Jun 2006 15:45:35 -0700 ocfs2: warn the user on a dead timeout mismatch Print a warning to the user when a node with a different dead count joins the region. Signed-off-by: Mark Fasheh commit c05d52c748da10a3f27f6e638875514153776b15 tree bbe50d0e5bc94a3ccb117d2681bc3498b6d108df parent 27a288677de33c50af980e55abec5643db4cd0b8 author Adrian Bunk Thu, 22 Jun 2006 12:03:35 +0200 committer David Woodhouse Thu, 29 Jun 2006 23:08:49 +0100 fs/jffs2/: make 2 functions static This patch makes two needlessly global functions static. Signed-off-by: Adrian Bunk Signed-off-by: David Woodhouse commit 4ba63adce06bc7549e1dd36344123dbaccdaa52f tree 35711888b56dbcec39478d6c8406d002ee57c38d parent 2b388c67906ee8cd3bf1a600a7023cd0807d414f author Adrian Bunk Sun, 26 Mar 2006 14:25:52 +0200 committer Mark Fasheh Thu, 29 Jun 2006 14:56:12 -0700 ocfs2: OCFS2_FS must depend on SYSFS Signed-off-by: Adrian Bunk Signed-off-by: Mark Fasheh commit 2b388c67906ee8cd3bf1a600a7023cd0807d414f tree 9c03bb07a2a6e467fb9219e8c98fea1a5cec71de parent e7515d065d09f6450c996a8fa206ad66569e183c author Joel Becker Wed, 10 May 2006 18:28:59 -0700 committer Mark Fasheh Thu, 29 Jun 2006 14:48:30 -0700 ocfs2: Compile-time disabling of ocfs2 debugging output. Give gcc the chance to compile out the debug logging code in ocfs2. This saves some size at the expense of being able to debug the code. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit e7515d065d09f6450c996a8fa206ad66569e183c tree fe9c2514c555b79c67ed29b7393b6c853b9d70f4 parent 22dd0e88b70f5faa3a0101081e290431c3439189 author Joel Becker Fri, 10 Mar 2006 11:42:30 -0800 committer Mark Fasheh Thu, 29 Jun 2006 14:43:01 -0700 configfs: Clear up a few extra spaces where there should be TABs. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 257a5bdeb0441789d8e34e1b3e92b26d0f51bbf0 tree ffddd14a5deb8c0a010dc4ca44dda3050aeacd67 parent 1bca9f2e5bd7f92fe4b34753e57bf4f47d3a2f01 author David Woodhouse Thu, 29 Jun 2006 22:40:06 +0100 committer David Woodhouse Thu, 29 Jun 2006 22:42:21 +0100 Remove export of include/linux/isdn/tpam.h Signed-off-by: David Woodhouse commit 22dd0e88b70f5faa3a0101081e290431c3439189 tree 28df8c4f1fd038f63a26561fdd53c33f2cdd4d34 parent 8d231c11fd0b694c447e59e687754b6999eea0a2 author Joel Becker Wed, 12 Apr 2006 18:34:43 -0700 committer Mark Fasheh Thu, 29 Jun 2006 14:38:53 -0700 configfs: Release memory in configfs_example. The configfs_example module was missing a ->release(). Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit bf7e8511088963078484132636839b59e25cf14f tree 10ecf2ec650e8afd6372e55377f1a3e0e1eba004 parent 602cada851b28c5792339786efe872fbdc1f5d41 author Milan Svoboda Thu, 29 Jun 2006 12:40:00 -0700 committer Linus Torvalds Thu, 29 Jun 2006 14:27:22 -0700 [PATCH] usb gadget: fixup pxa2xx_udc to include asm/arch/udc.h again This fixes pxa2xx_udc.c to include asm/arch/udc.h again to fix current build breakage. Signed-off-by: Milan Svoboda [ forwarded by David Brownell ] [ fixed to apply properly by Linus ] Signed-off-by: Linus Torvalds commit 602cada851b28c5792339786efe872fbdc1f5d41 tree 233d474b74d6038b5bb54a07ad91dd1bb10b0218 parent 82991c6f2c361acc17279b8124d9bf1878973435 parent fee68d1cc0d9bd863e51c16cdcd707737b16bb38 author Linus Torvalds Thu, 29 Jun 2006 14:19:21 -0700 committer Linus Torvalds Thu, 29 Jun 2006 14:19:21 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6: (22 commits) [PATCH] devfs: Remove it from the feature_removal.txt file [PATCH] devfs: Last little devfs cleanups throughout the kernel tree. [PATCH] devfs: Rename TTY_DRIVER_NO_DEVFS to TTY_DRIVER_DYNAMIC_DEV [PATCH] devfs: Remove the tty_driver devfs_name field as it's no longer needed [PATCH] devfs: Remove the line_driver devfs_name field as it's no longer needed [PATCH] devfs: Remove the videodevice devfs_name field as it's no longer needed [PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed [PATCH] devfs: Remove the miscdevice devfs_name field as it's no longer needed [PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree [PATCH] devfs: Remove devfs_remove() function from the kernel tree [PATCH] devfs: Remove devfs_mk_cdev() function from the kernel tree [PATCH] devfs: Remove devfs_mk_bdev() function from the kernel tree [PATCH] devfs: Remove devfs_mk_symlink() function from the kernel tree [PATCH] devfs: Remove devfs_mk_dir() function from the kernel tree [PATCH] devfs: Remove devfs_*_tape() functions from the kernel tree [PATCH] devfs: Remove devfs support from the sound subsystem [PATCH] devfs: Remove devfs support from the ide subsystem. [PATCH] devfs: Remove devfs support from the serial subsystem [PATCH] devfs: Remove devfs from the init code [PATCH] devfs: Remove devfs from the partition code ... commit ff0daca525dde796382b9ccd563f169df2571211 tree acb3feb60cec39f316447f702a2277a7448cbad9 parent ba53201180e267bd1f0792e6c375ced7c100738e author Russell King Thu, 29 Jun 2006 20:17:15 +0100 committer Russell King Thu, 29 Jun 2006 22:14:30 +0100 [ARM] Add section support to ioremap Allow section mappings to be setup using ioremap() and torn down with iounmap(). This requires additional support in the MM context switch to ensure that mappings are properly synchronised when mapped in. Based an original implementation by Deepak Saxena, reworked and ARMv6 support added by rmk. Signed-off-by: Russell King commit 82991c6f2c361acc17279b8124d9bf1878973435 tree 6c74acf89f3c5f3c9b7f8817e56675bca818c5d3 parent 8d231c11fd0b694c447e59e687754b6999eea0a2 parent 55b4d6a52195a8f277ffddf755ddaff359878f41 author Linus Torvalds Thu, 29 Jun 2006 13:49:29 -0700 committer Linus Torvalds Thu, 29 Jun 2006 13:49:29 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] Make AGP depend on PCI [AGPGART] remove unused variable [AGPGART] Fix pci_register_driver checking in amd64-agp [AGPGART] Compile fix for ati-agp [AGPGART] Suspend/Resume support for nVidia nForce AGP. [AGPGART] Suspend/Resume improvements for ATI AGP [AGPGART] Whitespace cleanups for ati-agp commit 8d231c11fd0b694c447e59e687754b6999eea0a2 tree b0b3c17efff7018bbf948e489f642c8079f33cc0 parent 1f1332f727c3229eb2166a83fec5d3de6a73dce2 parent 8db089c6b5594c961fb6bc6d613b9926e0d3d98f author Linus Torvalds Thu, 29 Jun 2006 13:44:45 -0700 committer Linus Torvalds Thu, 29 Jun 2006 13:44:45 -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: (33 commits) [MIPS] Add missing backslashes to macro definitions. [MIPS] Death list of board support to be removed after 2.6.18. [MIPS] Remove BSD and Sys V compat data types. [MIPS] ioc3.h: Uses u8, so include . [MIPS] 74K: Assume it will also have an AR bit in config7 [MIPS] Treat CPUs with AR bit as physically indexed. [MIPS] Oprofile: Support VSMP on 34K. [MIPS] MIPS32/MIPS64 S-cache fix and cleanup [MIPS] excite: PCI makefile needs to use += if it wants a chance to work. [MIPS] excite: plat_setup -> plat_mem_setup. [MIPS] au1xxx: export dbdma functions [MIPS] au1xxx: dbdma, no sleeping under spin_lock [MIPS] au1xxx: fix PSC_SMBTXRX_RSR. [MIPS] Early printk for IP27. [MIPS] Fix handling of 0 length I & D caches. [MIPS] Typo fixes. [MIPS] MIPS32/MIPS64 secondary cache management [MIPS] Fix FIXADDR_TOP for TX39/TX49. [MIPS] Remove first timer interrupt setup in wrppmc_timer_setup() [MIPS] Fix configuration of R2 CPU features and multithreading. ... commit 8db089c6b5594c961fb6bc6d613b9926e0d3d98f tree be663aa41f8034c02838011d27d90ce188315b5c parent 127fe6af38fe237374fc158c11da6bb44bcfdc9a author Ralf Baechle Thu, 29 Jun 2006 20:06:53 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:55 +0100 [MIPS] Add missing backslashes to macro definitions. Signed-off-by: Ralf Baechle commit 127fe6af38fe237374fc158c11da6bb44bcfdc9a tree ad328995c3a937fe0face7c0b521b64f1492d0b8 parent fc103349bb7d3f011ffe9678da86a35634f4b6fc author Ralf Baechle Wed, 28 Jun 2006 12:28:27 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:54 +0100 [MIPS] Death list of board support to be removed after 2.6.18. As usual fixes would be prefered. Signed-off-by: Ralf Baechle commit fc103349bb7d3f011ffe9678da86a35634f4b6fc tree 07cbf6115b81b328c34f3d217541f3c970204ced parent 89e22d15910a47fe026fe607710ec4646efc100a author Ralf Baechle Wed, 28 Jun 2006 11:24:12 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:54 +0100 [MIPS] Remove BSD and Sys V compat data types. Signed-off-by: Ralf Baechle commit 89e22d15910a47fe026fe607710ec4646efc100a tree 16013d62dc6a1c7976dc4e6fc438a9df82da3085 parent 2e78ae3f48b2596797101fa365abd6348143299f author Ralf Baechle Tue, 27 Jun 2006 17:34:35 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:54 +0100 [MIPS] ioc3.h: Uses u8, so include . Signed-off-by: Ralf Baechle commit 2e78ae3f48b2596797101fa365abd6348143299f tree 1de5c9ccca27ce0addd89e6e89da04ad406988e5 parent beab375a48f0cd90eb08f04e2c1dad67b9e6d3f8 author Ralf Baechle Fri, 23 Jun 2006 18:48:21 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:54 +0100 [MIPS] 74K: Assume it will also have an AR bit in config7 Signed-off-by: Ralf Baechle commit beab375a48f0cd90eb08f04e2c1dad67b9e6d3f8 tree a95bf7f73a177a2590547a54759319fad758ecec parent 92c7b62fd1a6898fbfaf1db790ba4e70e90f39d2 author Ralf Baechle Mon, 19 Jun 2006 21:56:25 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:54 +0100 [MIPS] Treat CPUs with AR bit as physically indexed. Signed-off-by: Ralf Baechle commit 92c7b62fd1a6898fbfaf1db790ba4e70e90f39d2 tree e02484e4db5a263cccf0c5578403ad665bfb3241 parent a2c2bc4b263828a380813a236fa6fcf8185b460b author Ralf Baechle Fri, 23 Jun 2006 18:39:00 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:54 +0100 [MIPS] Oprofile: Support VSMP on 34K. Signed-off-by: Ralf Baechle commit a2c2bc4b263828a380813a236fa6fcf8185b460b tree 839be17964fb7777a6bb0d3d1cb21a0930c8ffa3 parent 86165879a20753e7ed86be4c2e9bba3f32ed0aff author Atsushi Nemoto Thu, 22 Jun 2006 19:42:43 +0900 committer Ralf Baechle Thu, 29 Jun 2006 21:10:54 +0100 [MIPS] MIPS32/MIPS64 S-cache fix and cleanup Use blast_scache_range, blast_inv_scache_range for mips32/mips64 scache routine. Also initialize waybit for MIPS32/MIPS64 S-cache. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 86165879a20753e7ed86be4c2e9bba3f32ed0aff tree 8b2b9f09d78b7bf310793862c4d4eafadfec8512 parent ec52d7bff060171a74a7b1826a42bd60d5b1b07d author Ralf Baechle Fri, 23 Jun 2006 15:02:03 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:54 +0100 [MIPS] excite: PCI makefile needs to use += if it wants a chance to work. Signed-off-by: Ralf Baechle commit ec52d7bff060171a74a7b1826a42bd60d5b1b07d tree 1d566ebb879f86f9fc399bf591afaee100ac6d20 parent 3e2c6ef3c67bfebe28215a18338641ecffbe73bc author Ralf Baechle Fri, 23 Jun 2006 15:00:38 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:54 +0100 [MIPS] excite: plat_setup -> plat_mem_setup. Signed-off-by: Ralf Baechle commit 3e2c6ef3c67bfebe28215a18338641ecffbe73bc tree 999eef6ea9a57fb591a116761c7b507dde3d8cf0 parent c06138941c2b5331e752546cf4ef7f4a2735ec99 author Domen Puncer Fri, 23 Jun 2006 12:00:21 +0200 committer Ralf Baechle Thu, 29 Jun 2006 21:10:53 +0100 [MIPS] au1xxx: export dbdma functions These are needed for au1550_ac97 module. Signed-off-by: Domen Puncer Signed-off-by: Ralf Baechle commit c06138941c2b5331e752546cf4ef7f4a2735ec99 tree 885ceec96ba260d3bd69b258aad866f1ac053a6a parent 38e9156147e5b0defb71a3eb7e9eff74609c496a author Domen Puncer Fri, 23 Jun 2006 11:59:50 +0200 committer Ralf Baechle Thu, 29 Jun 2006 21:10:53 +0100 [MIPS] au1xxx: dbdma, no sleeping under spin_lock kmalloc under spin_lock can't sleep. Signed-off-by: Domen Puncer Signed-off-by: Ralf Baechle commit 38e9156147e5b0defb71a3eb7e9eff74609c496a tree 1419fad8f3b79088eba7c941a2b0843a639500f9 parent a3d45391866d2c244363c3000fc6c1acb3dfcb0b author Domen Puncer Fri, 23 Jun 2006 11:58:31 +0200 committer Ralf Baechle Thu, 29 Jun 2006 21:10:53 +0100 [MIPS] au1xxx: fix PSC_SMBTXRX_RSR. Signed-off-by: Domen Puncer Signed-off-by: Ralf Baechle commit a3d45391866d2c244363c3000fc6c1acb3dfcb0b tree d68b5762068ea274e4baf488ffc4bb972ed23de6 parent 73f403527b9ec5367376076eafb3d2f505d8e2e3 author Ralf Baechle Thu, 22 Jun 2006 20:09:04 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:53 +0100 [MIPS] Early printk for IP27. Signed-off-by: Ralf Baechle commit 73f403527b9ec5367376076eafb3d2f505d8e2e3 tree bc3f080e75661231d9f30ecb385193bb57f8bc4e parent c09b47d8a99104897afd682b48f292e05461a0c2 author Chris Dearman Tue, 20 Jun 2006 18:06:52 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:53 +0100 [MIPS] Fix handling of 0 length I & D caches. Don't ask. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit c09b47d8a99104897afd682b48f292e05461a0c2 tree e20f41b35611bd915deac7733b64db5cd8c82d67 parent 9318c51acd9689505850152cc98277a6d6f2d752 author Chris Dearman Tue, 20 Jun 2006 17:15:20 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:52 +0100 [MIPS] Typo fixes. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 9318c51acd9689505850152cc98277a6d6f2d752 tree 7a8d49a377bed11ba2a45643c08af47f1222c51b parent f7a849153be3b66326b52dce0d07896b56cb4cd7 author Chris Dearman Tue, 20 Jun 2006 17:15:20 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:52 +0100 [MIPS] MIPS32/MIPS64 secondary cache management Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit f7a849153be3b66326b52dce0d07896b56cb4cd7 tree 71afe4415b664ae3d34a28568c1b09a9dd9129a3 parent 6feb6efaec9858dfb673fc5c89b8280b1b73bb08 author Atsushi Nemoto Tue, 20 Jun 2006 23:59:11 +0900 committer Ralf Baechle Thu, 29 Jun 2006 21:10:52 +0100 [MIPS] Fix FIXADDR_TOP for TX39/TX49. FIXADDR_TOP is used for HIGHMEM and for upper limit of vmalloc area on 32bit kernel. TX39XX and TX49XX have "reserved" segment in CKSEG3 area. 0xff000000-0xff3fffff on TX49XX and 0xff000000-0xfffeffff on TX39XX are reserved (unmapped, uncached) therefore can not be used as mapped area. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 6feb6efaec9858dfb673fc5c89b8280b1b73bb08 tree 47f4c175589cbb5bcdcf826be5e078b3c97edabc parent f41ae0b2b9e5b4455cfc68dcc885f4fa2a973384 author Yoichi Yuasa Tue, 20 Jun 2006 23:55:17 +0900 committer Ralf Baechle Thu, 29 Jun 2006 21:10:52 +0100 [MIPS] Remove first timer interrupt setup in wrppmc_timer_setup() The first timer interrupt setup already happens in time_init(). Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit f41ae0b2b9e5b4455cfc68dcc885f4fa2a973384 tree 1d571a10b4265233b511ce2f45d4ca03b9fbb13a parent e73ea273ef87a04ff59fc368fa33333dca275dde author Ralf Baechle Mon, 05 Jun 2006 17:24:46 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:51 +0100 [MIPS] Fix configuration of R2 CPU features and multithreading. Signed-off-by: Ralf Baechle commit e73ea273ef87a04ff59fc368fa33333dca275dde tree 65c3d7a34a1ecee336c2d194769d7b4614b68593 parent a620dbe378f3940dc058435d8ce89f5a4a7b77d5 author Ralf Baechle Sun, 04 Jun 2006 11:51:46 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:51 +0100 [MIPS] Fix build error: don't offer SMP on systems that don't have SMP. Signed-off-by: Ralf Baechle commit a620dbe378f3940dc058435d8ce89f5a4a7b77d5 tree abc001bf9250b24622eb75b1155a412229311cbb parent 08aecfb9eaf019f07384175101c970ede271c17a author Ralf Baechle Sun, 04 Jun 2006 00:35:10 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:51 +0100 [MIPS] Limit MIPS_MT to MIPS32R2 only. Signed-off-by: Ralf Baechle commit 08aecfb9eaf019f07384175101c970ede271c17a tree ddce36622b5c408f9e4d8e03b7ef72c9c9cb681a parent 1500b9a0f4381831e41f7e02f61dbef980ded342 author Yoichi Yuasa Tue, 20 Jun 2006 23:26:30 +0900 committer Ralf Baechle Thu, 29 Jun 2006 21:10:51 +0100 [MIPS] Remove set_c0_status(ST0_IM) from wrppmc's irq.c. mips_cpu_irq_init() does clear_c0_status(ST0_IM) first, so set_c0_status(ST0_IM) isn't necessary. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 1500b9a0f4381831e41f7e02f61dbef980ded342 tree cb46bb0999b91c2f832e62000d91f1af625ab697 parent 7ae7cdab97f33d6a5d42664b411be52b46572e5b author Yoichi Yuasa Tue, 20 Jun 2006 23:17:18 +0900 committer Ralf Baechle Thu, 29 Jun 2006 21:10:50 +0100 [MIPS] Remove unused system type name for DDB5074 and DDB5476. This patch removes unused system type name. DDB5074 and DDB5476 were already removed. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 7ae7cdab97f33d6a5d42664b411be52b46572e5b tree 8ea89f9fc29658680c8713c3ed9a1b1e2101dd50 parent 0ef831b1ff1ff0bcd8bf5b1890913ef6bb263250 author Ralf Baechle Thu, 29 Jun 2006 21:10:50 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:50 +0100 elf-em.h: Define and explain both EM_MIPS_RS3_LE and EM_MIPS_RS4_BE. They have been obsoleted by the ELF header EI_CLASS and EI_DATA fields in combination with e_flags. Afaics EM_MIPS_RS3_LE and EM_MIPS_RS4_BE never had any practical relevance. Binutils will not produce such binaries and the kernel will not accept them as MIPS binaries. Signed-off-by: Ralf Baechle commit 0ef831b1ff1ff0bcd8bf5b1890913ef6bb263250 tree 5504aa95d4b00ede334c773752a0b60a068cf23c parent 4277ff5ee55694f67d9c6586bb4c06991e221a68 author Yoichi Yuasa Tue, 20 Jun 2006 21:33:02 +0900 committer Ralf Baechle Thu, 29 Jun 2006 21:10:49 +0100 [MIPS] Removes unused functions for GT64120 Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 4277ff5ee55694f67d9c6586bb4c06991e221a68 tree c75ff9101d0dc14688c86f709370d3e122e7402a parent b4ab24e1c8c1442b2928bab1325b56bdbbcf898e author Ralf Baechle Sat, 03 Jun 2006 22:40:15 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:49 +0100 [MIPS] Fix use of ehb instruction for non-R2 configurations. Signed-off-by: Ralf Baechle commit b4ab24e1c8c1442b2928bab1325b56bdbbcf898e tree aa80383677ce2563fdaad652e8e45c05e722324f parent 14cd8015015199d6e8dea8aa4948b559137df7b7 author Ralf Baechle Sat, 03 Jun 2006 22:30:58 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:48 +0100 [MIPS] Define ARCH_HAS_IRQ_PER_CPU for all SMP systems. Without SMTC on non-Malta will blow up. Signed-off-by: Ralf Baechle commit 14cd8015015199d6e8dea8aa4948b559137df7b7 tree 45bddedaa7f5268bbec0dcaec54dedaa0c5a93b9 parent 136d47d3e1cc455e9e1d9cb7b9d513a8581d3835 author Ralf Baechle Thu, 29 Jun 2006 21:10:47 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:47 +0100 [MIPS] Consistent formatting for Qemu makefile segment. commit 136d47d3e1cc455e9e1d9cb7b9d513a8581d3835 tree 5a8e96ba0571685acf7d7139600cc1bf40ad572a parent 10edd8b9d5e42d5fb0a51061a0e97bc4009aeb1a author Ralf Baechle Sat, 15 Apr 2006 11:16:19 +0200 committer Ralf Baechle Thu, 29 Jun 2006 21:10:47 +0100 [MIPS] Wire up tee(2). Signed-off-by: Ralf Baechle commit 10edd8b9d5e42d5fb0a51061a0e97bc4009aeb1a tree 919d069e4e51b010cb4b33cb919e0f8453a7f210 parent 6adb5fe7020e8f99d27da932157ea27325df9263 author Ralf Baechle Thu, 29 Jun 2006 21:10:46 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:46 +0100 Remove au1x00_uart from feature-removal-schedule.txt. The driver has been removed a while ago already. Signed-off-by: Ralf Baechle commit 6adb5fe7020e8f99d27da932157ea27325df9263 tree c4bf688c3c6dfd822391dd5f80a879c13cf0aac2 parent 9247857f5acadf0ea87fd6a9514c633644634f08 author Ralf Baechle Tue, 20 Jun 2006 12:47:53 +0100 committer Ralf Baechle Thu, 29 Jun 2006 21:10:34 +0100 [MIPS] Only register RAM as resources if UNCAC_BASE != IO_BASE. This fixes a resource collision of RAM and I/O memory on systems that use the physical address space multiple times. Signed-off-by: Ralf Baechle commit 9247857f5acadf0ea87fd6a9514c633644634f08 tree 77ce13d9b8ef0076622a0225ac6b8b1607a80260 parent 0a6047eef1c465c38aacfbdab193161b3f0cd144 author Mark.Zhan Tue, 20 Jun 2006 18:15:02 +0800 committer Ralf Baechle Thu, 29 Jun 2006 21:10:34 +0100 [MIPS] Fix the build error of Wind River PPMC board, rewrite irq code to C o Fix the build error Wind River PPMC board caused by the change of plat_setup hook interface. o Rewrite first level interrupt dispatch code to C. Signed-off-by: Rongkai.Zhan Signed-off-by: Ralf Baechle commit 55b4d6a52195a8f277ffddf755ddaff359878f41 tree 06a3183a562f8da4688f65023f7a18dcad702956 parent adf8a287150667feb5747f8beade62acacc17d4e parent 1f1332f727c3229eb2166a83fec5d3de6a73dce2 author Dave Jones Thu, 29 Jun 2006 16:01:54 -0400 committer Dave Jones Thu, 29 Jun 2006 16:01:54 -0400 Merge ../linus Conflicts: drivers/char/agp/Kconfig commit ba53201180e267bd1f0792e6c375ced7c100738e tree a2c94e64b704747af7139360594735b9cdb1001b parent 8799ee9f49f6171fd58f4d64f8c067ca49006a5d author Russell King Thu, 29 Jun 2006 20:56:47 +0100 committer Russell King Thu, 29 Jun 2006 20:58:25 +0100 [ARM] Fix sa11x0 SDRAM selection Avoid folk having to edit cpu-sa1110.c to select their RAM type; instead, allow the SDRAM type to be selected via the kernel command line. Signed-off-by: Russell King commit f1b2ad5d2a8e1791d806ef244164d19c3d5c8b83 tree 87ee4837f11718ed9ce68c282c8d01f61086debe parent a51a69c0ed955f4fa6f64b4377378c744f9b737b parent c4a001b1ea32e09f7556178249b8885418858b5c author Len Brown Thu, 29 Jun 2006 15:58:09 -0400 committer Len Brown Thu, 29 Jun 2006 15:58:09 -0400 Pull c-states into release branch commit a51a69c0ed955f4fa6f64b4377378c744f9b737b tree c463970340e363a6bd362b41f87228c7c06f33e4 parent 49fee981fa98f3c0a21f3d6c8193eddcc15e84e9 parent f831335d42a9aed26449a264266763fb542dbbe3 author Len Brown Thu, 29 Jun 2006 15:57:42 -0400 committer Len Brown Thu, 29 Jun 2006 15:57:42 -0400 Pull trivial into release branch commit 27a288677de33c50af980e55abec5643db4cd0b8 tree 847e3e425faaabeb4a1e093d379fc55a851c7fd6 parent c6e8c6ccf96e9249805d0e9828b994f4c926ad51 author Thomas Gleixner Thu, 29 Jun 2006 21:25:10 +0200 committer Thomas Gleixner Thu, 29 Jun 2006 21:25:10 +0200 [MTD] NAND: Fix broken sharpsl driver Remove the not longer supported NO_VIRTBLOCKS flag and remove an unused variable while at it. Signed-off-by: Thomas Gleixner commit 1f1332f727c3229eb2166a83fec5d3de6a73dce2 tree 7897760036d7f6267fe74ced6e8cec4239c90cb5 parent 09fca29de4bdfd7eff47acbc6bd71c5fb5b79d79 author Matt LaPlante Thu, 29 Jun 2006 01:32:47 -0400 committer Linus Torvalds Thu, 29 Jun 2006 11:59:14 -0700 [PATCH] KConfig: Spellchecking 'similarity' and 'independent' Several KConfig files had 'similarity' and 'independent' spelled incorrectly... Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 09fca29de4bdfd7eff47acbc6bd71c5fb5b79d79 tree 4b18c8f881803fde2ff62f11921bbbe1fe333e25 parent 0f6c10ead876492b386a19474e6dca4710eeef8e author Karsten Keil Thu, 29 Jun 2006 13:16:29 +0200 committer Linus Torvalds Thu, 29 Jun 2006 11:59:14 -0700 [PATCH] i4l:add some checks for valid drvid and driver pointer If all drivers go away before all ISDN network interfaces are closed we got a OOps on removing interfaces, this patch avoid it. Signed-off-by: Karsten Keil Signed-off-by: Linus Torvalds commit 0f6c10ead876492b386a19474e6dca4710eeef8e tree a0a397c4b09e05c9f9d3e85b5dacac00cd83d87b parent 0950c358ee8e969fce45ba363ca1deaf211e57b0 author Karsten Keil Thu, 29 Jun 2006 13:14:51 +0200 committer Linus Torvalds Thu, 29 Jun 2006 11:59:14 -0700 [PATCH] i4l make PCMCIA for all cards working with shared IRQ most current laptops do not work without allowing shared cardbus IRQs. This patch enables IRQ sharing, so these cards work again. This was tested with shared and none shared cardbus IRQs on different laptops without problems. Signed-off-by: Karsten Keil Signed-off-by: Linus Torvalds commit 0950c358ee8e969fce45ba363ca1deaf211e57b0 tree 4c3b66e8457e1568aa26696d268e0e9c264382cb parent 3aa590c6b7c89d844f81c2e96f295cf2c6967773 parent 8caf7aa26e0797e5706043f94c491acd1a08636a author Linus Torvalds Thu, 29 Jun 2006 11:53:31 -0700 committer Linus Torvalds Thu, 29 Jun 2006 11:53:31 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa * master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: [ALSA] echoaudio - Remove kfree_nocheck() [ALSA] echoaudio - Fix Makefile [ALSA] Add Intel D965 board support [ALSA] Fix/add support of Realtek ALC883 / ALC888 and ALC861 codecs [ALSA] Fix a typo in echoaudio/midi.c [ALSA] snd-aoa: enable dual-edge in GPIOs [ALSA] snd-aoa: support iMac G5 iSight [ALSA] snd-aoa: not experimental [ALSA] Add echoaudio sound drivers [ALSA] ak4xxx-adda - Code clean-up [ALSA] Remove CONFIG_EXPERIMENTAL from intel8x0m driver [ALSA] Stereo controls for M-Audio Revolution cards [ALSA] Fix misuse of __list_add() in seq_ports.c [ALSA] hda-codec - Add model entry for Samsung X60 Chane [ALSA] make CONFIG_SND_DYNAMIC_MINORS non-experimental [ALSA] Fix wrong dependencies of snd-aoa driver [ALSA] fix build failure due to snd-aoa [ALSA] AD1888 mixer controls for DC mode [ALSA] Suppress irq handler mismatch messages in ALSA ISA drivers [ALSA] usb-audio support for Turtle Beach Roadie commit 3aa590c6b7c89d844f81c2e96f295cf2c6967773 tree 6f18b295b1ff4cd7fd1880db6f56721599d64439 parent 4d3ce21fa9d2eaeda113aa2f9c2da80d972bef64 parent 339d76c54336443f5050b00172beb675f35e3be0 author Linus Torvalds Thu, 29 Jun 2006 11:32:34 -0700 committer Linus Torvalds Thu, 29 Jun 2006 11:32:34 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (43 commits) [POWERPC] Use little-endian bit from firmware ibm,pa-features property [POWERPC] Make sure smp_processor_id works very early in boot [POWERPC] U4 DART improvements [POWERPC] todc: add support for Time-Of-Day-Clock [POWERPC] Make lparcfg.c work when both iseries and pseries are selected [POWERPC] Fix idr locking in init_new_context [POWERPC] mpc7448hpc2 (taiga) board config file [POWERPC] Add tsi108 pci and platform device data register function [POWERPC] Add general support for mpc7448hpc2 (Taiga) platform [POWERPC] Correct the MAX_CONTEXT definition powerpc: minor cleanups for mpc86xx [POWERPC] Make sure we select CONFIG_NEW_LEDS if ADB_PMU_LED is set [POWERPC] Simplify the code defining the 64-bit CPU features [POWERPC] powerpc: kconfig warning fix [POWERPC] Consolidate some of kernel/misc*.S [POWERPC] Remove unused function call_with_mmu_off [POWERPC] update asm-powerpc/time.h [POWERPC] Clean up it_lp_queue.h [POWERPC] Skip the "copy down" of the kernel if it is already at zero. [POWERPC] Add the use of the firmware soft-reset-nmi to kdump. ... commit 4d3ce21fa9d2eaeda113aa2f9c2da80d972bef64 tree 9ffa5af467d6e9f6f6c8eb496489bf882613a459 parent b026188e8214ce87790730a56f3017d0bd222751 parent c1a7a755be26f68d7f21ee769584149a96185ea8 author Linus Torvalds Thu, 29 Jun 2006 11:30:45 -0700 committer Linus Torvalds Thu, 29 Jun 2006 11:30:45 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (23 commits) [PARISC] Move os_id_to_string() inside #ifndef __ASSEMBLY__ [PARISC] Fix do_gettimeofday() hang [PARISC] Fix PCREL22F relocation problem for most modules [PARISC] Refactor show_regs in traps.c [PARISC] Add os_id_to_string helper [PARISC] OS_ID_LINUX == 0x0006 [PARISC] Ensure Space ID hashing is turned off [PARISC] Match show_cache_info with reality [PARISC] Remove unused macro fixup_branch in syscall.S [PARISC] Add is_compat_task() helper [PARISC] Update Thibaut Varene's CREDITS entry [PARISC] Reduce data footprint in pdc_stable.c [PARISC] pdc_stable version 0.30 [PARISC] Work around machines which do not support chassis warnings [PARISC] PDC_CHASSIS is implemented on all machines [PARISC] Remove unconditional #define PIC in syscall macros [PARISC] Use MFIA in current_text_addr on pa2.0 processors [PARISC] Remove dead function pc_in_user_space [PARISC] Test ioc_needs_fdc variable instead of open coding [PARISC] Fix gcc 4.1 warnings in sba_iommu.c ... commit b026188e8214ce87790730a56f3017d0bd222751 tree b4d1e482b1f77360768a5c8e565bfd311ed74232 parent 1903ac54f8536b11478e4f01c339e10b538f59e0 parent 94bb063312d872d9269deb2e5c0c7c6d5b0318e1 author Linus Torvalds Thu, 29 Jun 2006 11:01:17 -0700 committer Linus Torvalds Thu, 29 Jun 2006 11:01:17 -0700 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (28 commits) [S390] rework of channel measurement facility. [S390] appldata enhancements. [S390] Add vmpanic parameter. [S390] add PAV support to the dasd driver. [S390] remove export of sys_call_table [S390] remove unused macros from binfmt_elf32.c [S390] fix duplicate export of overflow{ug}id [S390] cio chpid offline. [S390] avenrun export in appdata_base.c Convert s390_collect_crw_info() in s390mach.c from being started [S390] dasd eer data format. [S390] preempt_count initialization. [S390] head.S code moving. [S390] dasd whitespace and other cosmetics. [S390] virtual cpu accounting vs. machine checks. [S390] add __cpuinit to appldata cpu hotplug notifier. [S390] dasd_eckd_dump_sense bug. [S390] missing check in dasd_eer_open. [S390] modular 3270 driver. [S390] console_unblank woes. ... commit 1903ac54f8536b11478e4f01c339e10b538f59e0 tree ff5410f0539ab4aa09f964fa1d0c6dc26c614dc2 parent 47c2a3aa4475d27073dd3c7e183fcc13f495c8f5 parent 87937472ff8e34ad5c7b798a8a52e4368af216df author Linus Torvalds Thu, 29 Jun 2006 10:49:17 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:49:17 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: [PATCH] i386: export memory more than 4G through /proc/iomem [PATCH] 64bit Resource: finally enable 64bit resource sizes [PATCH] 64bit Resource: convert a few remaining drivers to use resource_size_t where needed [PATCH] 64bit resource: change pnp core to use resource_size_t [PATCH] 64bit resource: change pci core and arch code to use resource_size_t [PATCH] 64bit resource: change resource core to use resource_size_t [PATCH] 64bit resource: introduce resource_size_t for the start and end of struct resource [PATCH] 64bit resource: fix up printks for resources in misc drivers [PATCH] 64bit resource: fix up printks for resources in arch and core code [PATCH] 64bit resource: fix up printks for resources in pcmcia drivers [PATCH] 64bit resource: fix up printks for resources in video drivers [PATCH] 64bit resource: fix up printks for resources in ide drivers [PATCH] 64bit resource: fix up printks for resources in mtd drivers [PATCH] 64bit resource: fix up printks for resources in pci core and hotplug drivers [PATCH] 64bit resource: fix up printks for resources in networks drivers [PATCH] 64bit resource: fix up printks for resources in sound drivers [PATCH] 64bit resource: C99 changes for struct resource declarations Fixed up trivial conflict in drivers/ide/pci/cmd64x.c (the printk that was changed by the 64-bit resources had been deleted in the meantime ;) commit 47c2a3aa4475d27073dd3c7e183fcc13f495c8f5 tree d151e03da804103753977c2c94e17b71104e3d35 parent f702d7013c7470284843a6370aaa53b8b75c5a40 author Ingo Molnar Thu, 29 Jun 2006 02:25:03 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:26 -0700 [PATCH] genirq: add chip->eoi(), fastack -> fasteoi Clean up the fastack concept by turning it into fasteoi and introducing the ->eoi() method for chips. This also allows the cleanup of an i386 EOI quirk - now the quirk is cleanly separated from the pure ACK implementation. Signed-off-by: Ingo Molnar Cc: Benjamin Herrenschmidt Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f702d7013c7470284843a6370aaa53b8b75c5a40 tree 1989bc89230b8319b3e2007b6e6238cc2dcec415 parent 98bb244b685eb2a297aa60fa2e5c0631f95828e1 author Eric W. Biederman Thu, 29 Jun 2006 02:25:02 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:25 -0700 [PATCH] genirq: irq: document what an IRQ is Signed-off-by: Eric W. Biederman Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Rajesh Shah Cc: Andi Kleen Cc: "Protasevich, Natalie" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98bb244b685eb2a297aa60fa2e5c0631f95828e1 tree 468ab2cf22dc3b10d1bc48660360b908d24cabef parent f210be198ddd3f54b17d4aa6e69b829f75f226e5 author Benjamin Herrenschmidt Thu, 29 Jun 2006 02:25:01 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:25 -0700 [PATCH] genirq: fasteoi handler: handle interrupt disabling Note when a disable interrupt happened with the fasteoi handler as well so that delayed disable can be implemented with fasteoi-type controllers. Signed-off-by: Benjamin Herrenschmidt Acked-by: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f210be198ddd3f54b17d4aa6e69b829f75f226e5 tree 121990f1d6e970dc255ed78de90f495117b333e4 parent 43f7775944e40221827e4b3aec43824aa4c4e4a9 author Benjamin Herrenschmidt Thu, 29 Jun 2006 02:25:00 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:25 -0700 [PATCH] genirq: add IRQ_TYPE_SENSE_MASK Add a #define for the mask of the part of IRQ_TYPE that represents the trigger type. I use that in my in-progress work as I've standardized the way the irq description in the firmware device-tree get translated to linux useable things by using those constants. Having this mask to isolate the "trigger type" part of the flags is useful in a few places. Signed-off-by: Benjamin Herrenschmidt Acked-by: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43f7775944e40221827e4b3aec43824aa4c4e4a9 tree 842490e2fe78b8676741d1b012a4256c2224685c parent f1c2662cbc6a0a9772655649bdf579803d33470b author Ingo Molnar Thu, 29 Jun 2006 02:24:58 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:25 -0700 [PATCH] genirq: more verbose debugging on unexpected IRQ vectors One frequent sign of IRQ handling bugs is the appearance of unexpected vectors. Print out all the IRQ state in that case. We dont want this patch upstream, but it is useful during initial testing. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1c2662cbc6a0a9772655649bdf579803d33470b tree ab6d0cc97527941e038edf0532f3917fca0953f8 parent e76de9f8eb67b7acc1cc6f28c4be8583adf0a90c author Ingo Molnar Thu, 29 Jun 2006 02:24:57 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:25 -0700 [PATCH] genirq: cleanup: no_irq_type -> no_irq_chip rename Rename no_irq_type to no_irq_chip. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e76de9f8eb67b7acc1cc6f28c4be8583adf0a90c tree b2c1c4f58f11772880a48c63c1138fe3b2787c9c parent ba9a2331bae5da8f65be3722b9e2d210f1987857 author Thomas Gleixner Thu, 29 Jun 2006 02:24:56 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:24 -0700 [PATCH] genirq: add SA_TRIGGER support Enable drivers to request an IRQ with a given irq-flow (trigger/polarity) setting. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba9a2331bae5da8f65be3722b9e2d210f1987857 tree ca7cf6a1cfcab2fc4423eb38832236cfb627eaf2 parent 7a55713ab456d267815fd5ca3c3d0fd14301f306 author Thomas Gleixner Thu, 29 Jun 2006 02:24:55 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:24 -0700 [PATCH] genirq: add irq-wake (power-management) support Enable platforms to set the irq-wake (power-management) properties of an IRQ. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a55713ab456d267815fd5ca3c3d0fd14301f306 tree a318479efa070eb912fa3dd43738d2b1ae252837 parent dd87eb3a24c4527741122713e223d74b85d43c85 author Ingo Molnar Thu, 29 Jun 2006 02:24:54 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:24 -0700 [PATCH] genirq: add handle_bad_irq() Handle bad IRQ vectors via the irqchip mechanism. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd87eb3a24c4527741122713e223d74b85d43c85 tree 0c3796af23da908515d890a7b8fde37893eb3b2a parent dae8620421833bb2e9a01c4ccc42bdc3759b81df author Thomas Gleixner Thu, 29 Jun 2006 02:24:53 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:24 -0700 [PATCH] genirq: add irq-chip support Enable platforms to use the irq-chip and irq-flow abstractions: allow setting of the chip, the type and provide highlevel handlers for common irq-flows. [rostedt@goodmis.org: misroute-irq: Don't call desc->chip->end because of edge interrupts] Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Cc: Benjamin Herrenschmidt Signed-off-by: Steven Rostedt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dae8620421833bb2e9a01c4ccc42bdc3759b81df tree a57ec739c39032d2c5bbb94951059706053cf484 parent 6a6de9ef5850d063c3d3fb50784bfe3a6d0712c6 author Ingo Molnar Thu, 29 Jun 2006 02:24:52 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:24 -0700 [PATCH] genirq MSI fixes This is a fixed up and cleaned up replacement for genirq-msi-fixes.patch, which should solve the i386 4KSTACKS problem. I also added Ben's idea of pushing the __do_IRQ() check into generic_handle_irq(). I booted this with MSI enabled, but i only have MSI devices, not MSI-X devices. I'd still expect MSI-X to work now. irqchip migration helper: call __do_IRQ() if a descriptor is attached to an irqtype-style controller. This also fixes MSI-X IRQ handling on i386 and x86_64. Signed-off-by: Ingo Molnar Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a6de9ef5850d063c3d3fb50784bfe3a6d0712c6 tree d09f1887fd8890c820559b931140afe4c68f2d7f parent a34db9b28a1c63317e1d6f1080a12d711579e7d0 author Thomas Gleixner Thu, 29 Jun 2006 02:24:51 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:24 -0700 [PATCH] genirq: core Core genirq support: add the irq-chip and irq-flow abstractions. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a34db9b28a1c63317e1d6f1080a12d711579e7d0 tree 5b4f604cb80fff6f662e407042390941cf9182c9 parent 94d39e1f6e8132ea982a1d61acbe0423d3d14365 author Ingo Molnar Thu, 29 Jun 2006 02:24:50 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:24 -0700 [PATCH] genirq: update copyrights Update/add copyrights in the generic IRQ code. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94d39e1f6e8132ea982a1d61acbe0423d3d14365 tree 68ba3666c1d2c0805089e8ffdb47da961a760450 parent 6550c775cb5ee94c132d93d84de3bb23f0abf37b author Thomas Gleixner Thu, 29 Jun 2006 02:24:50 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:24 -0700 [PATCH] genirq: add IRQ_NOAUTOEN support Enable platforms to disable the automatic enabling of freshly set up irqs. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6550c775cb5ee94c132d93d84de3bb23f0abf37b tree 818ae46cfe30265bbecc095262de53e9c8dcb012 parent 3418d72404e35eb19e7995cbf3e7a76ba8fefbce author Thomas Gleixner Thu, 29 Jun 2006 02:24:49 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:24 -0700 [PATCH] genirq: add IRQ_NOREQUEST support Enable platforms to disable request_irq() for certain interrupts. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3418d72404e35eb19e7995cbf3e7a76ba8fefbce tree 08e727f94d4ff31410730d5d42119b3520ad10ca parent a4633adcdbc15ac51afcd0e1395de58cee27cf92 author Thomas Gleixner Thu, 29 Jun 2006 02:24:49 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:24 -0700 [PATCH] genirq: add IRQ_NOPROBE support Introduce IRQ_NOPROBE: enables platforms to control chip-probing. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4633adcdbc15ac51afcd0e1395de58cee27cf92 tree 5ab714eba77aec7546e862ac6d63a22010819efe parent 11c869eaf1a9c97ef273f824a697fac017d68286 author Thomas Gleixner Thu, 29 Jun 2006 02:24:48 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:23 -0700 [PATCH] genirq: add genirq sw IRQ-retrigger Enable platforms that do not have a hardware-assisted hardirq-resend mechanism to resend them via a softirq-driven IRQ emulation mechanism. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11c869eaf1a9c97ef273f824a697fac017d68286 tree 03be0b39ab239985008d7a80960a232661b870d5 parent 77a5afecdb15e65034ab8390b46b824c186c62a8 author Thomas Gleixner Thu, 29 Jun 2006 02:24:47 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:23 -0700 [PATCH] genirq: doc: add design documentation Add docbook file - includes API documentation. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77a5afecdb15e65034ab8390b46b824c186c62a8 tree a01c9d567f74ac979f3e4ab1122312eca1e693d7 parent 8d28bc751bb9ad479e33964d5d9eedfe5fb488a5 author Ingo Molnar Thu, 29 Jun 2006 02:24:46 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:23 -0700 [PATCH] genirq: cleanup: no_irq_type cleanups Clean up no_irq_type: share the NOP functions where possible, and properly name the ack_bad() function. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d28bc751bb9ad479e33964d5d9eedfe5fb488a5 tree 23f23556a1b83e9e7e00bb0086bb57284389fb85 parent 8fee5c36177ee098fa41f5fe72999609fef4df6b author Ingo Molnar Thu, 29 Jun 2006 02:24:46 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:23 -0700 [PATCH] genirq: doc: handle_IRQ_event() and __do_IRQ() comments Document handle_IRQ_event() and __do_IRQ(). Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8fee5c36177ee098fa41f5fe72999609fef4df6b tree 92ebb57caa3d0a1c924cab9fc3f2fdaf1a38d382 parent c0ad90a32fb60f4129d0e24dfd5fd7128e2e09f2 author Ingo Molnar Thu, 29 Jun 2006 02:24:45 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:23 -0700 [PATCH] genirq: doc: comment include/linux/irq.h structures Better document the hw_interrupt_type and irq_desc structures. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0ad90a32fb60f4129d0e24dfd5fd7128e2e09f2 tree 260d99ab74d33a37cbcc3557e2f18a5e96879f4d parent 096c8131c573ed37939dc3f1440221c92c87e74b author Ingo Molnar Thu, 29 Jun 2006 02:24:44 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:23 -0700 [PATCH] genirq: add ->retrigger() irq op to consolidate hw_irq_resend() Add ->retrigger() irq op to consolidate hw_irq_resend() implementations. (Most architectures had it defined to NOP anyway.) NOTE: ia64 needs testing. i386 and x86_64 tested. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 096c8131c573ed37939dc3f1440221c92c87e74b tree b26b23978a4118e0fae1cf19065e3a23d40159c1 parent 0d7012a968d006e277eb0fe20edd7a9b5563c2b7 author Thomas Gleixner Thu, 29 Jun 2006 02:24:44 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:23 -0700 [PATCH] genirq: debug: better debug printout in enable_irq() Make enable_irq() debug printouts user-readable. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d7012a968d006e277eb0fe20edd7a9b5563c2b7 tree 1077acc018d78aed6991f8d3913f9a52d431bca1 parent cd916d31cc31273eca8a620fae02b7bf7f577559 author Ingo Molnar Thu, 29 Jun 2006 02:24:43 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:23 -0700 [PATCH] genirq: cleanup: turn ARCH_HAS_IRQ_PER_CPU into CONFIG_IRQ_PER_CPU Cleanup: change ARCH_HAS_IRQ_PER_CPU into a Kconfig method. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd916d31cc31273eca8a620fae02b7bf7f577559 tree 1af0c37c1fd92c90a178ed1a7d1d8b5a90a1ddb8 parent 4a733ee12618cf3ec25cbc337a5e0ba3ad5d7fb6 author Ingo Molnar Thu, 29 Jun 2006 02:24:42 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:22 -0700 [PATCH] genirq: cleanup: merge pending_irq_cpumask[] into irq_desc[] Consolidation: remove the pending_irq_cpumask[NR_IRQS] array and move it into the irq_desc[NR_IRQS].pending_mask field. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a733ee12618cf3ec25cbc337a5e0ba3ad5d7fb6 tree efee6dfbfcfd08fbe1f2462afb299aeb5624354b parent 71d218b75fa91219c6bd310fbdd257dfbcac6c88 author Ingo Molnar Thu, 29 Jun 2006 02:24:42 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:22 -0700 [PATCH] genirq: cleanup: merge irq_dir[], smp_affinity_entry[] into irq_desc[] Consolidation: remove the irq_dir[NR_IRQS] and the smp_affinity_entry[NR_IRQS] arrays and move them into the irq_desc[] array. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71d218b75fa91219c6bd310fbdd257dfbcac6c88 tree ec350128251756db243ad046a11ee732a00a5f07 parent 34ffdb7233d5847808d2b63ca6761dac3af9c942 author Ingo Molnar Thu, 29 Jun 2006 02:24:41 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:22 -0700 [PATCH] genirq: cleanup: include/linux/irq.h Small cleanups in include/linux/irq.h. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34ffdb7233d5847808d2b63ca6761dac3af9c942 tree 3eb73aae034729eac24f7f2ee809ba913b32a51b parent 06fcb0c6fb3aae9570a32ac3b72a8222563baa69 author Ingo Molnar Thu, 29 Jun 2006 02:24:40 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:22 -0700 [PATCH] genirq: cleanup: reduce irq_desc_t use, mark it obsolete Cleanup: remove irq_desc_t use from the generic IRQ code, and mark it obsolete. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06fcb0c6fb3aae9570a32ac3b72a8222563baa69 tree c1f9d750a42031434971b2271882b907fd7838f5 parent 2e60bbb6d50de654d8e68f115161e27878b5e72d author Ingo Molnar Thu, 29 Jun 2006 02:24:40 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:22 -0700 [PATCH] genirq: cleanup: misc code cleanups Assorted code cleanups to the generic IRQ code. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e60bbb6d50de654d8e68f115161e27878b5e72d tree ff92bd2a7aa0a6bcb3b00280fbb906ea1006b226 parent a8553acd6c14e827078779c0a0ee1c18f27b2403 author Ingo Molnar Thu, 29 Jun 2006 02:24:39 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:22 -0700 [PATCH] genirq: cleanup: remove fastcall Now that i386 defaults to regparm, explicit uses of fastcall are not needed anymore. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8553acd6c14e827078779c0a0ee1c18f27b2403 tree 0dc7b8d52e7fd5c6fba90a9495cfbfa1d4e568e6 parent a53da52fd743fd637637572838c0a7af23a2d038 author Ingo Molnar Thu, 29 Jun 2006 02:24:38 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:22 -0700 [PATCH] genirq: cleanup: remove irq_descp() Cleanup: remove irq_descp() - explicit use of irq_desc[] is shorter and more readable. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a53da52fd743fd637637572838c0a7af23a2d038 tree b62c205b609356db5bca378c6d04d6d899bfd499 parent 74ffd553a3a7fbae34be70b751852d5b6fe5acac author Ingo Molnar Thu, 29 Jun 2006 02:24:38 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:22 -0700 [PATCH] genirq: cleanup: merge irq_affinity[] into irq_desc[] Consolidation: remove the irq_affinity[NR_IRQS] array and move it into the irq_desc[NR_IRQS].affinity field. [akpm@osdl.org: sparc64 build fix] Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74ffd553a3a7fbae34be70b751852d5b6fe5acac tree a92e746310fc73cc5577b8a1cb6e6552f8dc630a parent d1bef4ed5faf7d9872337b33c4269e45ae1bf960 author Ingo Molnar Thu, 29 Jun 2006 02:24:37 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:21 -0700 [PATCH] genirq: sem2mutex probe_sem -> probing_active Convert the irq auto-probing semaphore to a mutex. (This allows us to find probing API usage bugs sooner, via the mutex debugging code.) Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1bef4ed5faf7d9872337b33c4269e45ae1bf960 tree a88c58e3102396382e9137a25a884af14421f6a6 parent cfb9e32f2ff32ef5265c1c80fe68dd1a7f03a604 author Ingo Molnar Thu, 29 Jun 2006 02:24:36 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:21 -0700 [PATCH] genirq: rename desc->handler to desc->chip This patch-queue improves the generic IRQ layer to be truly generic, by adding various abstractions and features to it, without impacting existing functionality. While the queue can be best described as "fix and improve everything in the generic IRQ layer that we could think of", and thus it consists of many smaller features and lots of cleanups, the one feature that stands out most is the new 'irq chip' abstraction. The irq-chip abstraction is about describing and coding and IRQ controller driver by mapping its raw hardware capabilities [and quirks, if needed] in a straightforward way, without having to think about "IRQ flow" (level/edge/etc.) type of details. This stands in contrast with the current 'irq-type' model of genirq architectures, which 'mixes' raw hardware capabilities with 'flow' details. The patchset supports both types of irq controller designs at once, and converts i386 and x86_64 to the new irq-chip design. As a bonus side-effect of the irq-chip approach, chained interrupt controllers (master/slave PIC constructs, etc.) are now supported by design as well. The end result of this patchset intends to be simpler architecture-level code and more consolidation between architectures. We reused many bits of code and many concepts from Russell King's ARM IRQ layer, the merging of which was one of the motivations for this patchset. This patch: rename desc->handler to desc->chip. Originally i did not want to do this, because it's a big patch. But having both "desc->handler", "desc->handle_irq" and "action->handler" caused a large degree of confusion and made the code appear alot less clean than it truly is. I have also attempted a dual approach as well by introducing a desc->chip alias - but that just wasnt robust enough and broke frequently. So lets get over with this quickly. The conversion was done automatically via scripts and converts all the code in the kernel. This renaming patch is the first one amongst the patches, so that the remaining patches can stay flexible and can be merged and split up without having some big monolithic patch act as a merge barrier. [akpm@osdl.org: build fix] [akpm@osdl.org: another build fix] Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfb9e32f2ff32ef5265c1c80fe68dd1a7f03a604 tree b5b2ea1f75a87cd7837d645faf661206785e12e4 parent d81931d9a2ec3e2e2cd8238b72f20c5fe44ccc7b author Adrian Bunk Thu, 29 Jun 2006 02:24:34 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:21 -0700 [PATCH] drivers/md/raid5.c: remove an unused variable Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d81931d9a2ec3e2e2cd8238b72f20c5fe44ccc7b tree 33a67614c605f2c3635619f977932a3e14a728a7 parent 9dc3885dfbebc76f4461b19e1af15e704ff4fcb0 author Eric Sesterhenn Thu, 29 Jun 2006 02:24:34 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:21 -0700 [PATCH] SKB leak in drivers/isdn/i4l/isdn_x25iface.c Coverity spotted this leak (id #613), when we are not configured, we return without freeing the allocated skb. Signed-off-by: Eric Sesterhenn Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9dc3885dfbebc76f4461b19e1af15e704ff4fcb0 tree 6bdc5c1f00039dbbc94bada9cac215f88fad2f60 parent 699352c30da8525a6224116983dab012689a0a76 author Karsten Keil Thu, 29 Jun 2006 02:24:33 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:21 -0700 [PATCH] i4l: remove unneeded include/linux/isdn/tpam.h The TPAM isdn driver was removed in 2.6.12, but include/linux/isdn/tpam.h was missed. Signed-off-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 699352c30da8525a6224116983dab012689a0a76 tree ab216b6914c785a81ba8a44638bd152587926aa6 parent 8e53cfc8f20345713fab7e290e19514a8032bb06 author Dave Jones Thu, 29 Jun 2006 02:24:32 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:21 -0700 [PATCH] GPIO for SCx200 & PC-8736x: x86-only AFAICT, this is x86 only, so the patch below is needed to stop this new option showing up on PPC, IA64, etc.. Signed-off-by: Dave Jones Cc: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e53cfc8f20345713fab7e290e19514a8032bb06 tree 7e7cdff1f59ac6c1265626ea5d2592e59f41b222 parent 85bd84345f64cb953101ddd8ab1340dde351c579 author Eric Sesterhenn Thu, 29 Jun 2006 02:24:32 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:20 -0700 [PATCH] Deref in drivers/block/paride/pf.c Another possible dereference detected by coverity (id #759). pf_probe() might call pf_identify() which might call get_capacity() which dereferences pf->disk Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85bd84345f64cb953101ddd8ab1340dde351c579 tree a03d111a4140b4513c2258970b363597d841867a parent 1e075d58d667eb919a5df428b593ea7133e13d9c author Dave Jones Thu, 29 Jun 2006 02:24:31 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:20 -0700 [PATCH] remove devinit from ioc4 pci_driver Documention/pci.txt states.. "The struct pci_driver shouldn't be marked with any of these tags." (Referring to __devinit and friends). (akpm: good documentation, that. Link this driver into vmlinux with hotplug CPU disabled and it'll crash). Signed-off-by: Dave Jones Cc: Brent Casavant Cc: Pat Gefre Cc: Jes Sorensen Cc: Tony Luck Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e075d58d667eb919a5df428b593ea7133e13d9c tree 4ab5baae774ae274f0caf64b12336d7bd2601a49 parent 0e41142bf52002d604e16798dc3f1c28f46cc4b6 author Adrian Bunk Thu, 29 Jun 2006 02:24:30 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:20 -0700 [PATCH] re-add CONFIG_SOUND_SSCAPE Due to a regression in the correcponding ALSA driver (ALSA #2234), the OSS driver should stay until it's fixed. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e41142bf52002d604e16798dc3f1c28f46cc4b6 tree df2867213868ebf77486c06903539d80ce3b5f80 parent 7256d819e43f89af6ba30047936c96c683436941 author Adrian Bunk Thu, 29 Jun 2006 02:24:30 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:20 -0700 [PATCH] arch/i386/mach-visws/setup.c: remove dummy function calls Thankfully, these dummy function calls are no longer required to avoid warnings - if they weren't eliminated as dead code but accidentially executed there would be a guaranteed NULL dereference. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7256d819e43f89af6ba30047936c96c683436941 tree a3352cf0fe9089587b5ba0077f8ef0a04e5b319c parent 4e54f08543d05e519e601368571cc3787fefae96 author Andrew Morton Thu, 29 Jun 2006 02:24:29 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:20 -0700 [PATCH] ufs: printk() fix fs/ufs/inode.c: In function `ufs_frag_map': fs/ufs/inode.c:101: warning: long long unsigned int format, u64 arg (arg 4) fs/ufs/inode.c: In function `ufs_getfrag_block': fs/ufs/inode.c:432: warning: long long unsigned int format, u64 arg (arg 2) Cc: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e54f08543d05e519e601368571cc3787fefae96 tree 0cd9d982e5bb25abcb9251d26c36ff11e7dc81a5 parent 94583779e6625154e8d7fce33d097ae7d089e9de author David Howells Thu, 29 Jun 2006 02:24:28 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:20 -0700 [PATCH] Keys: Allow in-kernel key requestor to pass auxiliary data to upcaller The proposed NFS key type uses its own method of passing key requests to userspace (upcalling) rather than invoking /sbin/request-key. This is because the responsible userspace daemon should already be running and will be contacted through rpc_pipefs. This patch permits the NFS filesystem to pass auxiliary data to the upcall operation (struct key_type::request_key) so that the upcaller can use a pre-existing communications channel more easily. Signed-off-by: David Howells Acked-By: Kevin Coffman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94583779e6625154e8d7fce33d097ae7d089e9de tree 90075964afb06058476f28951e3b04f6a7cdbb94 parent cc57637b0b015fb5d70dbbec740de516d33af07d author Andrew Morton Thu, 29 Jun 2006 02:24:27 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:20 -0700 [PATCH] sparc: register_cpu() build fix arch/sparc/kernel/setup.c: In function 'topology_init': arch/sparc/kernel/setup.c:528: error: too many arguments to function 'register_cpu' Cc: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc57637b0b015fb5d70dbbec740de516d33af07d tree eafbfdf6e058194b46f0fe8dcb0e0c5de5b6fd6d parent 81b0c8713385ce1b1b9058e916edcf9561ad76d6 author Yasunori Goto Thu, 29 Jun 2006 02:24:27 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:20 -0700 [PATCH] solve config broken: undefined reference to `online_page' Memory hotplug code of i386 adds memory to only highmem. So, if CONFIG_HIGHMEM is not set, CONFIG_MEMORY_HOTPLUG shouldn't be set. Otherwise, it causes compile error. In addition, many architecture can't use memory hotplug feature yet. So, I introduce CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG. Signed-off-by: Yasunori Goto Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 81b0c8713385ce1b1b9058e916edcf9561ad76d6 tree 4c5e8fde3d15503c609d5c5f74911f95fc528f03 parent 0686cd8fbe3e5fb1441ae84b9cbc813f9297b879 author Andrew Morton Thu, 29 Jun 2006 02:24:26 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:20 -0700 [PATCH] generic_file_buffered_write(): handle zero-length iovec segments The recent generic_file_write() deadlock fix caused generic_file_buffered_write() to loop inifinitely when presented with a zero-length iovec segment. Fix. Note that this fix deliberately avoids calling ->prepare_write(), ->commit_write() etc with a zero-length write. This is because I don't trust all filesystems to get that right. This is a cautious approach, for 2.6.17.x. For 2.6.18 we should just go ahead and call ->prepare_write() and ->commit_write() with the zero length and fix any broken filesystems. So I'll make that change once this code is stabilised and backported into 2.6.17.x. The reason for preferring to call ->prepare_write() and ->commit_write() with the zero-length segment: a zero-length segment _should_ be sufficiently uncommon that this is the correct way of handling it. We don't want to optimise for poorly-written userspace at the expense of well-written userspace. Cc: "Vladimir V. Saveliev" Cc: Neil Brown Cc: Martin Schwidefsky Cc: Chris Wright Cc: Greg KH Cc: Cc: walt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0686cd8fbe3e5fb1441ae84b9cbc813f9297b879 tree b8e218053109fc9062943e08d74cda0b0758c47f parent 0a6047eef1c465c38aacfbdab193161b3f0cd144 author Adrian Bunk Thu, 29 Jun 2006 02:24:25 -0700 committer Linus Torvalds Thu, 29 Jun 2006 10:26:19 -0700 [PATCH] fix sgivwfb compile drivers/built-in.o: In function `sgivwfb_set_par': sgivwfb.c:(.text+0x88583): undefined reference to `sgivwfb_mem_phys' sgivwfb.c:(.text+0x88596): undefined reference to `sgivwfb_mem_phys' sgivwfb.c:(.text+0x885a8): undefined reference to `sgivwfb_mem_phys' drivers/built-in.o: In function `sgivwfb_check_var': sgivwfb.c:(.text+0x88ad0): undefined reference to `sgivwfb_mem_size' drivers/built-in.o: In function `sgivwfb_mmap': sgivwfb.c:(.text+0x88c75): undefined reference to `sgivwfb_mem_size' sgivwfb.c:(.text+0x88c7f): undefined reference to `sgivwfb_mem_phys' drivers/built-in.o: In function `sgivwfb_probe': sgivwfb.c:(.init.text+0x4060): undefined reference to `sgivwfb_mem_size' sgivwfb.c:(.init.text+0x4065): undefined reference to `sgivwfb_mem_phys' sgivwfb.c:(.init.text+0x4076): undefined reference to `sgivwfb_mem_phys' sgivwfb.c:(.init.text+0x409c): undefined reference to `sgivwfb_mem_size' sgivwfb.c:(.init.text+0x410e): undefined reference to `sgivwfb_mem_size' sgivwfb.c:(.init.text+0x4113): undefined reference to `sgivwfb_mem_phys' sgivwfb.c:(.init.text+0x4162): undefined reference to `sgivwfb_mem_size' sgivwfb.c:(.init.text+0x4168): undefined reference to `sgivwfb_mem_phys' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8799ee9f49f6171fd58f4d64f8c067ca49006a5d tree b746b8800bc99633f31505d151624c8ccd75cd47 parent 326764a85b7676388db3ebad6488f312631d7661 author Russell King Thu, 29 Jun 2006 18:24:21 +0100 committer Russell King Thu, 29 Jun 2006 18:24:21 +0100 [ARM] Set bit 4 on section mappings correctly depending on CPU On some CPUs, bit 4 of section mappings means "update the cache when written to". On others, this bit is required to be one, and others it's required to be zero. Finally, on ARMv6 and above, setting it turns on "no execute" and prevents speculative prefetches. With all these combinations, no one value fits all CPUs, so we have to pick a value depending on the CPU type, and the area we're mapping. Signed-off-by: Russell King commit 0f13fc09db68de92585558984bff1c51b87db72f tree 752bb8fa84e731f7877b74a033d1b90e2c060977 parent 53cb8a1f45e06a2627a6d89b151cccb95fa45cbf author James Bottomley Thu, 29 Jun 2006 13:02:11 -0400 committer James Bottomley Thu, 29 Jun 2006 13:15:15 -0400 [SCSI] 53c700: fix breakage caused by the autosense update A bit of a brown paper bag issue. The previous patch to remove the soon to be ripped out fields that were used in autosense actually broke the driver. This patch fixes it and has been tested (honestly). Signed-off-by: James Bottomley commit 326764a85b7676388db3ebad6488f312631d7661 tree 26c0b1e7ce4fe32fcb6ed26258d8532af3eba30f parent a144a5633c1e625c3134c2ce8d549a054468fd98 author Jürgen Schindele Thu, 29 Jun 2006 16:01:43 +0100 committer Russell King Thu, 29 Jun 2006 16:25:37 +0100 [ARM] 3666/1: TRIZEPS4 [1/5] core Patch from Jürgen Schindele This patch adds support for Trizeps4 SoM and ConXS-evalboard from "Keith und Koep" This DIMM-module is based on PXA270. Signed-off-by: Jürgen Schindele Signed-off-by: Russell King commit a144a5633c1e625c3134c2ce8d549a054468fd98 tree 3dcb1d6821ee465bb804c786b59c6dabc5c61da1 parent 8fc5ffa063f6551c9e6dd66cab89c46ad41e59c5 parent 3cbc96050b02d8e5764bd0970067ef294737e324 author Russell King Thu, 29 Jun 2006 16:23:47 +0100 committer Russell King Thu, 29 Jun 2006 16:23:47 +0100 Merge omap tree * master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream: (26 commits) ARM: OMAP: Multiplexing for 24xx GPMC wait pin monitoring ARM: OMAP: Fix SRAM to use MT_MEMORY instead of MT_DEVICE ARM: OMAP: Update dmtimers ARM: OMAP: Make clock variables static ARM: OMAP: Fix GPMC compilation when DEBUG is defined ARM: OMAP: Mux updates for external DMA and GPIO ARM: OMAP: Add OMAP_TAG_CAMERA_SENSOR ARM: OMAP: Add initial 24xx suspend support ARM: OMAP: Update cpufreq support for 24xx ARM: OMAP: Add GPMC support for OMAP2 ARM: OMAP: Fix DMA channel irq handling for omap24xx ARM: OMAP: OMAP2 DMA burst support ARM: OMAP: Fix 32 kHz timer and modify GP timer to use GPT1 ARM: OMAP: Port dmtimers to OMAP2 and implement PWM support ARM: OMAP: Correct two bugs in arch/arm/mach-omap2/clock.c ARM: OMAP: Register the 24xx McSPI device ARM: OMAP: Add bitbank SPI driver for Innovator 1510 touchscreen ARM: OMAP: Aic23 alsa platform driver code for board-innovator ARM: OMAP: Fix GPIO IRQ mask handling ARM: OMAP: DMA transfer parameter configuration fix ... commit 53cb8a1f45e06a2627a6d89b151cccb95fa45cbf tree 272c8bfb7a3e8a9a9af55e2e6b76e0ecd757410b parent 6a8a0d3621745279a131d95f0204dc9ddac60d55 author Mike Christie Wed, 28 Jun 2006 12:00:32 -0500 committer James Bottomley Thu, 29 Jun 2006 11:14:42 -0400 [SCSI] iscsi: add async notification of session events This patch adds or modifies the transport class functions used to notify userspace of session state events. We modify the session addition up event and add a destruction event to notify userspace of session creation, relogin and destruction. And we modify the conn error event to be sent by broadcast since multiple listeners may want to listen for it. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 6a8a0d3621745279a131d95f0204dc9ddac60d55 tree e3e856d0a8b3f0697a1e59492dd840dbd3babb8a parent 8434aa8b6fe5af27a33b8aa830c24e3680356c83 author Mike Christie Wed, 28 Jun 2006 12:00:31 -0500 committer James Bottomley Thu, 29 Jun 2006 11:09:06 -0400 [SCSI] iscsi: pass target nr to session creation So the drivers do not use the channel numbers, but some do use the target numbers. We were just adding some goofy variable that just increases for the target nr. This is useless for software iscsi because it is always zero. And for qla4xxx the target nr is actually the index of the target/session in its FW or FLASH tables. We needed to expose this to userspace so apps could access those numbers so this patch just adds the target nr to the iscsi session creation functions. This way when qla4xxx's Hw thinks a session is at target nr 4 in its hw, it is exposed as that number in sysfs. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 8434aa8b6fe5af27a33b8aa830c24e3680356c83 tree dc8120fddd1d237dd9d47299b90c40874320daaf parent e6f3b63f50b4bb9fdc9025e0c3994acd265ad3a2 author Mike Christie Wed, 28 Jun 2006 12:00:30 -0500 committer James Bottomley Thu, 29 Jun 2006 11:08:46 -0400 [SCSI] iscsi: break up session creation into two stages qla4xxx is initialized in two steps like other HW drivers. It allocates the host, sets up the HW, then adds the host. For iscsi part of HW setup is setting up persistent iscsi sessions. At that time, the interupts are off and the driver is not completely set up so we just want to allocate them. We do not want to add them to sysfs and expose them to userspace because userspace could try to do lots of fun things with them like scanning and at that time the driver is not ready. So this patch breakes up the session creation like other functions that use the driver model in two the alloc and add parts. When the driver is ready, it can then add the sessions and userspace can begin using them. This also fixes a bug in the addition error patch where we forgot to do a get on the session. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit e6f3b63f50b4bb9fdc9025e0c3994acd265ad3a2 tree ec5d681d2b7b203930e6cc1457b4f8aeee91439a parent f53a88da18e3c04c3ade07bc5eff520ee4259c3e author Mike Christie Wed, 28 Jun 2006 12:00:29 -0500 committer James Bottomley Thu, 29 Jun 2006 11:08:31 -0400 [SCSI] iscsi: rm channel usage from iscsi I do not remember what I was thinking when we added the channel as a argument to the session create function. It was probably due to too much cut and paste work from the FC transport class. The channel is meaningless for iscsi drivers so this patch drops its usage everywhere in the iscsi related code. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit f53a88da18e3c04c3ade07bc5eff520ee4259c3e tree a3b89b4d0e621d5dbf051fd7b2191de7f053d312 parent 5c75b7fcf0c0e3921391fd93f5fa58ec9a6c428f author Mike Christie Wed, 28 Jun 2006 12:00:27 -0500 committer James Bottomley Thu, 29 Jun 2006 11:08:10 -0400 [SCSI] iscsi: fix session refcouting iscsi_tcp and iser cannot be rmmod from the kernel when sessions are running because session removal is driven from userspace. For those modules we get a module reference when a session is created then drop it when the session is removed. For qla4xxx, they can jsut remove the sessions from the pci remove function like normal HW drivers, so this patch moves the module reference from the transport class functions shared by all drivers to the libiscsi functions only used be software iscsi modules. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 5c75b7fcf0c0e3921391fd93f5fa58ec9a6c428f tree 2857a1a53fa2c84b7a82fdb19da9fbb1e7c221ae parent 358ff019b89aa530ab6c0dd139d8089c932b103f author Mike Christie Wed, 28 Jun 2006 12:00:26 -0500 committer James Bottomley Thu, 29 Jun 2006 11:07:54 -0400 [SCSI] iscsi: convert iscsi_tcp to new set/get param fns Convert iscsi_tcp to new lib functions. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 358ff019b89aa530ab6c0dd139d8089c932b103f tree ea163e2b5f785fbabd71281cd9fd1683360f909c parent a54a52caad4bd6166cb7fa64e4e93031fa2fda5d author Mike Christie Wed, 28 Jun 2006 12:00:25 -0500 committer James Bottomley Thu, 29 Jun 2006 11:07:41 -0400 [SCSI] iscsi: convert iser to new set/get param fns Convert iser to libiscsi get/set param functions. Fix bugs in it returning old error return values and have it expose exp_statsn. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit a54a52caad4bd6166cb7fa64e4e93031fa2fda5d tree 728672fae35fd344619129e78213043dabacf099 parent 01cb225dad8da2e717356fab03240e2f4a8d01bf author Mike Christie Wed, 28 Jun 2006 12:00:23 -0500 committer James Bottomley Thu, 29 Jun 2006 11:07:14 -0400 [SCSI] iscsi: fixup set/get param functions Reduce duplication in the software iscsi_transport modules by adding a libiscsi function to handle the common grunt work. This also has the drivers return specifc -EXXX values for different errors so userspace can finally handle them in a sane way. Also just pass the sysfs buffers to the drivers so HW iscsi can get/set its string values, like targetname, and initiatorname. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 01cb225dad8da2e717356fab03240e2f4a8d01bf tree 8accf53a998b27b61362aec3fe61e7b72c69bbde parent 332959cb521af6bb0281c7aae797f1f91dcb4c42 author Mike Christie Wed, 28 Jun 2006 12:00:22 -0500 committer James Bottomley Thu, 29 Jun 2006 11:06:59 -0400 [SCSI] iscsi: add target discvery event to transport class Patch from david.somayajulu@qlogic.com: Add target discovery event. We may have a setup where the iscsi traffic is on a different netowrk than the other network traffic. In this case we will want to do discovery though the iscsi card. This patch adds a event to the transport class that can be used by hw iscsi cards that support this. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 8fc5ffa063f6551c9e6dd66cab89c46ad41e59c5 tree ded825f39d05dbf9904ec6175f0f940506311883 parent 1100c257ad11954416df5fcf4bcfcab43de54f57 author Andrew Victor Thu, 29 Jun 2006 16:06:33 +0100 committer Russell King Thu, 29 Jun 2006 16:06:33 +0100 [ARM] 3675/2: Preparing for AT91SAM926 support Patch from Andrew Victor This prepares the way for adding support for the new Atmel AT91SAM926x processors. Major changes: - Rename time.c to at91rm9200_time.c - Rename common.c to at91rm9200.c - Introduce ARCH_AT91, of which ARCH_AT91RM9200, ARCH_AT91SAM9260 and ARCH_AT91SAM9261 are dependent. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 1100c257ad11954416df5fcf4bcfcab43de54f57 tree ef8b1414ed38757fb40bd6026dcef5a88d198be7 parent 656602978e43a4e5d929423d766be0448bdacc1e author Lennert Buytenhek Thu, 29 Jun 2006 16:06:31 +0100 committer Russell King Thu, 29 Jun 2006 16:06:31 +0100 [ARM] 3674/1: ep93xx: add cirrus logic edb9302 support Patch from Lennert Buytenhek This patch adds support for the Cirrus Logic EDB9302, an evaluation board based on the Cirrus Logic EP9302 SoC, with 32M RAM, one USB host port, audio in/out, two serial ports and a 10/100 ethernet interface. George Kashperko submitted the original patch, this patch is a rewrite using the newer physmap platform driver. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 332959cb521af6bb0281c7aae797f1f91dcb4c42 tree a53da8d1f0b7ec2a0118d71590ff9e071919d6aa parent f28e71617ddaf2483e3e5c5237103484a303743f author Martin Habets Wed, 28 Jun 2006 15:40:36 +0100 committer James Bottomley Thu, 29 Jun 2006 11:06:30 -0400 [SCSI] st: remove unused st_buffer.in_use I noticed that in_use in st_buffer is not used. The patch below against 2.6.17-rc3 removes it, assuming there is no future use for it. It was tested in a sparc SS20 with a DLT4000. Signed-off-by: Martin Habets Acked-by: Kai Mäkisara Signed-off-by: James Bottomley commit 656602978e43a4e5d929423d766be0448bdacc1e tree 4267cdee31182359cfff905efbf38c9c484da224 parent 264edb35ce5c85749bfdd2942c74b786ea1cde41 author Lennert Buytenhek Thu, 29 Jun 2006 16:06:30 +0100 committer Russell King Thu, 29 Jun 2006 16:06:30 +0100 [ARM] 3673/1: lpd270: parse lcd= command line parameter Patch from Lennert Buytenhek The bootloader on the LogicPD PXA270 platform informs the kernel of which type of TFT screen is connected via an lcd=$FOO kernel command line parameter. Before this patch, we ignored this parameter and just hardcoded the use of the Sharp lq64d343 display kit. This patch implement parsing of the command line option, and chooses the right pxafb_mach_info to use (six choices) based on this command line option. Also fix the fb settings to correspond with those of the bootloader. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit c6e8c6ccf96e9249805d0e9828b994f4c926ad51 tree 0db9c602c20a94d9afbd555a131805de60e75ed2 parent ea9b6dcc152f09c207117ab121d4fa03d2db282a author KaiGai Kohei Thu, 29 Jun 2006 15:33:02 +0100 committer David Woodhouse Thu, 29 Jun 2006 15:33:02 +0100 [JFFS2][XATTR] Fix xd->refcnt race condition When xd->refcnt is checked whether this xdatum should be released or not, atomic_dec_and_lock() is used to ensure holding the c->erase_completion_lock. This fix change a specification of delete_xattr_datum(). Previously, it's only called when xd->refcnt equals zero. (calling it with positive xd->refcnt cause a BUG()) If you applied this patch, the function checks whether xd->refcnt is zero or not under the spinlock if necessary. Then, it marks xd DEAD flahs and links with xattr_dead_list or releases it immediately when xd->refcnt become zero. Signed-off-by: KaiGai Kohei Signed-off-by: David Woodhouse commit 22b1908610dd7ff68471cd4fbd383dbdfe5e0ecd tree 696d910ef791433a6a6bbd30ae841a106ce78a88 parent 264edb35ce5c85749bfdd2942c74b786ea1cde41 author Russell King Thu, 29 Jun 2006 15:09:57 +0100 committer Russell King Thu, 29 Jun 2006 15:09:57 +0100 [ARM] nommu: provide a way for correct control register value selection Most MMU-based CPUs have a restriction on the setting of the data cache enable and mmu enable bits in the control register, whereby if the data cache is enabled, the MMU must also be enabled. Enabling the data cache without the MMU is an invalid combination. However, there are CPUs where the data cache can be enabled without the MMU. In order to allow these CPUs to take advantage of that, provide a method whereby each proc-*.S file defines the control regsiter value for use with nommu (with the MMU disabled.) Later on, when we add support for enabling the MMU on these devices, we can adjust the "crval" macro to also enable the data cache for nommu. Signed-off-by: Russell King commit 264edb35ce5c85749bfdd2942c74b786ea1cde41 tree a32533144367bbe5f1522da6e4b76f17d4e648b8 parent 0a6047eef1c465c38aacfbdab193161b3f0cd144 author Russell King Thu, 29 Jun 2006 15:03:09 +0100 committer Russell King Thu, 29 Jun 2006 15:03:09 +0100 [ARM] Remove yucky ifdefs to print "id(wb)BRR" suffix on CPU name The "id(wb)BRR" suffix reports which CPU debugging options were (or were not) selected at kernel build time. Rather than have every proc-*.S file implement this, report the control register value, from which this information can be deduced. Signed-off-by: Russell King commit 94bb063312d872d9269deb2e5c0c7c6d5b0318e1 tree bef899fbe742ee31d93ff0e077898d4562086f9e parent 5b5dd21a8e6652fc8b58a32757575cc7fce2b54d author Cornelia Huck Thu, 29 Jun 2006 15:08:41 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 15:08:41 +0200 [S390] rework of channel measurement facility. Fixes for several channel measurement facility bugs: * Blocks copied from the hardware might not be consistent. Solve this by moving the copying into idle state and repeating the copying. * avg_sample_interval changed with every read, even though no new block was available. Solve this by storing a timestamp when the last new block was received. * Several locking issues. * Measurements were not reenabled after a disconnected device became available again. * Remove #defines for ioctls that were never implemented. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 5b5dd21a8e6652fc8b58a32757575cc7fce2b54d tree 96c4981f00020fbbd3577cf459cf59335f716186 parent 585c3047a881d0f54b93a0dd8ab499b07ed25d09 author Gerald Schaefer Thu, 29 Jun 2006 15:08:35 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 15:08:35 +0200 [S390] appldata enhancements. Add CPU ID and steal time, and make OS record size variable. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit 585c3047a881d0f54b93a0dd8ab499b07ed25d09 tree 927b2b4abeb7c9706a958de9917797f2dbbf5445 parent 405455734e1cdec09c37233216f9240cb1a058e5 author Peter Oberparleiter Thu, 29 Jun 2006 15:08:25 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 15:08:25 +0200 [S390] Add vmpanic parameter. Implementation of new kernel parameter vmpanic that provides a means to perform a z/VM CP command after a kernel panic occurred. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 405455734e1cdec09c37233216f9240cb1a058e5 tree 36e88909f646b635117041b19a851031fc8ffb41 parent 8f27766a883149926e7c1f69d9f1d8f68efcd65f author Horst Hummel Thu, 29 Jun 2006 15:08:18 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 15:08:18 +0200 [S390] add PAV support to the dasd driver. Add support for parallel-access-volumes to the dasd driver. This allows concurrent access to dasd devices with multiple channel programs. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky commit 8f27766a883149926e7c1f69d9f1d8f68efcd65f tree 559d9c62c83e27ef75535838defe31e243283cb1 parent 65b73c69c527a295ff3730b0b14e73359a8b4a16 author Martin Schwidefsky Thu, 29 Jun 2006 15:03:54 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 15:03:54 +0200 [S390] remove export of sys_call_table Remove export of the sys_call_table symbol to prevent the misuse of it. Signed-off-by: Martin Schwidefsky commit 65b73c69c527a295ff3730b0b14e73359a8b4a16 tree 59d6b126d96b9df0c3267e5d0d5cf8b94fa417cb parent 8e0474f3b43e8bec1be164006a378e9dbd439b2c author Martin Schwidefsky Thu, 29 Jun 2006 15:03:48 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 15:03:48 +0200 [S390] remove unused macros from binfmt_elf32.c The two macros NEW_TO_OLD_UID and NEW_TO_OLD_GID in binfmt_elf32.c are not used by any code. Remove them. Signed-off-by: Martin Schwidefsky commit 8e0474f3b43e8bec1be164006a378e9dbd439b2c tree 122cb0b87d44f3398c61e629bce3ed4878253dc1 parent b4f7b1ee577857aca467e6825122a3b29d6c3c0e author Serge E. Hallyn Thu, 29 Jun 2006 15:03:42 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 15:03:42 +0200 [S390] fix duplicate export of overflow{ug}id overflowuid and overflowgid were exported twice. Remove the export from s390_ksyms.c Signed-off-by: Serge E. Hallyn Signed-off-by: Martin Schwidefsky commit b4f7b1ee577857aca467e6825122a3b29d6c3c0e tree bb17f4d6bea22b1d5a4c0a927c41f1ba782ef2ae parent 3ee526841ba409f7b23f825f120772a79e7d7bd2 author Cornelia Huck Thu, 29 Jun 2006 15:03:35 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 15:03:35 +0200 [S390] cio chpid offline. After setting a path to a dasd offline at the SE, I/O hangs on that dasd for 5 minutes, then continues. I/O for which an interrupt will not be reported after the channel path has been disabled was not terminated by the common I/O layer, causing the dasd MIH to hit after 5 minutes. Be more aggressive in terminating I/O after setting a channel path offline. Also make sure to generate a fake irb if the device driver issues an I/O request after being notified of the killed I/O and clear residual information from the irb before trying to start the delayed verification. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 3ee526841ba409f7b23f825f120772a79e7d7bd2 tree 7d0f7b44dd6a5bad42c872eee87ec132423d670a parent 84d11c5dcc4cdfe962fcd58a0302711befcdceda author Gerald Schaefer Thu, 29 Jun 2006 15:03:28 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 15:03:28 +0200 [S390] avenrun export in appdata_base.c Remove EXPORT_SYMBOL_GPL(avenrun) from appdata_base.c, since it is already exported in kernel/timer.c Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit 84d11c5dcc4cdfe962fcd58a0302711befcdceda tree e1044aeaf0c18bef3f359fc873489f9ae61a6bf8 parent 774fc4ef718f7343306ba3695e8a2622cbd9764d author Serge E. Hallyn Thu, 29 Jun 2006 15:03:17 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 15:03:17 +0200 Convert s390_collect_crw_info() in s390mach.c from being started as a deprecated kernel_thread to a kthread. Signed-off-by: Serge E. Hallyn Signed-off-by: Martin Schwidefsky commit 774fc4ef718f7343306ba3695e8a2622cbd9764d tree ec16092b99b5e92985faf95bcafb98daf0d0dc06 parent cc43ec1ab0ae67c9cd5b3c2483a731afc98cbc2c author Stefan Weinhuber Thu, 29 Jun 2006 15:02:59 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 15:02:59 +0200 [S390] dasd eer data format. The struct dasd_eer_header needs the packed attribute, or there will be 6 additional bytes of random data between the fixed header and the variable length part of the eer data. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit cc43ec1ab0ae67c9cd5b3c2483a731afc98cbc2c tree 1de98aaf41e746566b6db39778edd3fb22403372 parent b1b70306911a35b3851a73c87e6e9bd45a08b893 author Heiko Carstens Thu, 29 Jun 2006 15:02:47 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 15:02:47 +0200 [S390] preempt_count initialization. The preempt_count in the thread_info structure must be initialized to 1. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit b1b70306911a35b3851a73c87e6e9bd45a08b893 tree 561dc36ff4774bc2936f0391cb1d4d71e3dc7288 parent 138c014dcba74211dc4e835658f34a787c40cf17 author Heiko Carstens Thu, 29 Jun 2006 14:58:17 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:58:17 +0200 [S390] head.S code moving. There is almost no room left for any new code between 0x10000 and 0x10480. Move the code from 0x10000 to 0x11000. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 138c014dcba74211dc4e835658f34a787c40cf17 tree bef8f3f5b4f088d5826553d5876c6d751e23bf33 parent 63b122466484e44d09af12bba33b34019757a3c2 author Horst Hummel Thu, 29 Jun 2006 14:58:12 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:58:12 +0200 [S390] dasd whitespace and other cosmetics. Dasd code cleanup: 1) remove white space, 2) remove the emacs override sections, and 3) use kzalloc instead of kmalloc. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky commit 63b122466484e44d09af12bba33b34019757a3c2 tree d35ecad386c69ddb930adcce352d0d0a8d5d95da parent 9faf06547efe11ccb51678c6805037c7377b85ee author Martin Schwidefsky Thu, 29 Jun 2006 14:58:05 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:58:05 +0200 [S390] virtual cpu accounting vs. machine checks. If a machine checks interrupts the external or the i/o interrupt handler before they have completed the cpu time calculations, the accounting goes wrong. After the cpu returned from the machine check handler to the interrupted interrupt handler, a negative cpu time delta can occur. If the accumulated cpu time in lowcore is small enough this value can get negative as well. The next jiffy interrupt will pick up that negative value, shift it by 12 and add the now huge positive value to the cpu time of the process. To solve this the machine check handler is modified not to change any of the timestamps in the lowcore if the machine check interrupted kernel context. Signed-off-by: Martin Schwidefsky commit 9faf06547efe11ccb51678c6805037c7377b85ee tree dddf7ad3098ba4530841fc31cd368361505e8be3 parent 445b5b499e0ca1584ee3aa8af298c9ef8c84d711 author Gerald Schaefer Thu, 29 Jun 2006 14:57:58 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:57:58 +0200 [S390] add __cpuinit to appldata cpu hotplug notifier. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit 445b5b499e0ca1584ee3aa8af298c9ef8c84d711 tree 8ba190d75ff787f61bca06b59017ffea43b5aeb7 parent f45a43d847c96949d22e702879e52385a1547f6b author Horst Hummel Thu, 29 Jun 2006 14:57:52 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:57:52 +0200 [S390] dasd_eckd_dump_sense bug. The ccw dump function dasd_eckd_dump_ccw_range can crash because it does not take care about the IDAL flag in the ccw. Check for IDALs flag set in CCW and follow the indirect list to print the data that is refered by the ccw. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky commit f45a43d847c96949d22e702879e52385a1547f6b tree 0abad7e8684f5a734fb93611a1bf1effb828527b parent 132fab13635a56a8151641671a2f896be00fd215 author Stefan Weinhuber Thu, 29 Jun 2006 14:57:46 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:57:46 +0200 [S390] missing check in dasd_eer_open. Check the return value of kzalloc in dasd_eer_open. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit 132fab13635a56a8151641671a2f896be00fd215 tree 678424bd1698fd9fd90225c85fee01a68d997284 parent 06fa46a2fcb7e13386707a3eac74f11140a9f818 author Martin Schwidefsky Thu, 29 Jun 2006 14:57:39 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:57:39 +0200 [S390] modular 3270 driver. The initial i/o to a 3270 device is done using the static module variables raw3270_init_data and raw3270_init_request. If the 3270 device driver is built as a module and gets loaded above 2GB, the initial i/o will fail because these variables will get addresses > 2GB. To make it work the two variables are moved to struct raw3270 and the data structure is allocated with GFP_DMA. Signed-off-by: Martin Schwidefsky commit 06fa46a2fcb7e13386707a3eac74f11140a9f818 tree 122423639f15638d04080dd095b939203b9bf645 parent 4980082db1a8aa3ec45aa22cd4a10021955e22ed author Martin Schwidefsky Thu, 29 Jun 2006 14:57:32 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:57:32 +0200 [S390] console_unblank woes. The software watchdog calls machine_restart from a timer function. The s390 machine_restart calls console_unblank to flush the console output. This is needed for panic to get the panic message printed. If console_unblank is called in interrupt a BUG is triggered in acquire_console_sem. That makes the software watchdog panic instead of restarting the machine. To get around this problem the call to console_unblank is made conditionally on !in_interrupt() || oops_in_progress. Signed-off-by: Martin Schwidefsky commit 4980082db1a8aa3ec45aa22cd4a10021955e22ed tree d6254d6bd4a7a62c7ea3195837f0c9ee36e03591 parent 40154b824331cd9c81c06545761338f3d80a36e2 author Heiko Carstens Thu, 29 Jun 2006 14:57:25 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:57:25 +0200 [S390] __syscall_return error check. Fix __syscall_return macro: valid error numbers are in the range of -1..-4095. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 40154b824331cd9c81c06545761338f3d80a36e2 tree da4d06f7b09150e1c34b543d5300c3948e284a70 parent 887ab5992925736ab23985c35f8149739e9de354 author Peter Oberparleiter Thu, 29 Jun 2006 14:57:03 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:57:03 +0200 [S390] cio async subchannel reprobe. Changes in the DASD driver require an asynchronous implementation of the subchannel reprobe loop. This loop was so far only used by the blacklisting mechanism but is now available to all CCW device drivers. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit 887ab5992925736ab23985c35f8149739e9de354 tree 5979c930c1ba34341e04e541f98b0584c58ac62b parent 231caa1cac555bdd5cb64bf91b554b38e8ddf715 author Cornelia Huck Thu, 29 Jun 2006 14:56:52 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:56:52 +0200 [S390] ccwgroup device unregister. Work around the problem that a device cannot be unregistered from driver_for_each_device() because of klist node refcounting: Get device after device owned by the driver to be unregistered with driver_find_device() and then unregister it. This works because driver_get_device() gets us out of the region of the elevated klist node refcount. driver_find_device() will always get the next device in the list after the found one has been unregistered. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 231caa1cac555bdd5cb64bf91b554b38e8ddf715 tree efe8d5567e4a4dcfcfe03fe3ea944be0e332a613 parent da039bd1e872b89e1c92c6c891c43b96d0a1bc41 author Cornelia Huck Thu, 29 Jun 2006 14:56:45 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:56:45 +0200 [S390] channel measurement fix. Specify correct sizeof() in chp_measurement_read() and return correct amount of read data. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit da039bd1e872b89e1c92c6c891c43b96d0a1bc41 tree 80e721d93ef558600c7a513cc20ab50b5ca7b5a9 parent d7d23702554dc13297cff5eaf7a551c802daeab3 author Peter Oberparleiter Thu, 29 Jun 2006 14:56:38 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:56:38 +0200 [S390] cio long busy in read configuration data. Trying to set a DASD root device online can fail under some circumstances with the message "Read configuration data returned error -5". The cause is that read configuration data incorrectly aborts with -EIO when it encounters a temporary busy condition at a storage server. Perform retry when encountering temporary busy conditions. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit d7d23702554dc13297cff5eaf7a551c802daeab3 tree 9d1b588323fffeb712b1c045998e9b1367be3c02 parent 7380534314865528ef080593b291bba32fba60e8 author Heiko Carstens Thu, 29 Jun 2006 14:56:32 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:56:32 +0200 [S390] memory detection. The wrong base register is used to read a value from the sclp data structure. The value is used to calculate the memory size. Use correct register %r4. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 7380534314865528ef080593b291bba32fba60e8 tree d9723ff4d5bdb3533a75eea099df1ded2a95a4b8 parent c406abd3a6d0cf5ce8db4db155a729a28fb98c4f author Heiko Carstens Thu, 29 Jun 2006 14:56:23 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:56:23 +0200 [S390] incomplete stack traces. show_stack() passes a pointer to the current stack frame to show_trace(). Because of tail call optimization the pointer doesn't point to the original stack frame anymory and therefore traces are wrong. Don't pass the pointer of the current stack frame to show_trace(). Instead let show_trace() calculate the pointer on its own. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit c406abd3a6d0cf5ce8db4db155a729a28fb98c4f tree 3b837f54a28a9f9754f8b34fd9cc4847557025e9 parent 0a6047eef1c465c38aacfbdab193161b3f0cd144 author Heiko Carstens Thu, 29 Jun 2006 14:56:13 +0200 committer Martin Schwidefsky Thu, 29 Jun 2006 14:56:13 +0200 [S390] cleanup bitops.h. Encapsulate complete bitops.h with #ifdef __KERNEL__ and remove the now superfluous ALIGN_CS define and its users. This patch is needed for compiling klibc. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit ea9b6dcc152f09c207117ab121d4fa03d2db282a tree 08c3dd58f714d5179240b24a33adc463a89a9054 parent 844d3b427ef1a4f96e54866747bdb6c6cbca4c6a author Randy Dunlap Wed, 28 Jun 2006 21:48:38 -0700 committer David Woodhouse Thu, 29 Jun 2006 08:55:41 +0100 MTD: kernel-doc fixes + additions Fix some kernel-doc typos/spellos. Use kernel-doc syntax in places where it was almost used. Correct/add struct, struct field, and function param names where needed. Signed-off-by: Randy Dunlap Signed-off-by: David Woodhouse commit 844d3b427ef1a4f96e54866747bdb6c6cbca4c6a tree 5720169efd661df4aca6d989ce796df8fdddec1c parent 7f8a894066b826a4baea49c2a3adbba0a56a192f author Randy Dunlap Wed, 28 Jun 2006 21:48:27 -0700 committer David Woodhouse Thu, 29 Jun 2006 08:55:00 +0100 MTD: fix all kernel-doc warnings Fix all kernel-doc warnings in MTD headers and source files: - add some missing struct fields; - correct some function parameter names; - use kernel-doc format for function doc. headers; - nand_ecc.c contains only exported interfaces, no internal ones; Signed-off-by: Randy Dunlap Signed-off-by: David Woodhouse commit 339d76c54336443f5050b00172beb675f35e3be0 tree efda7082ca6bed339472e12694f222d31cb49441 parent 33dbcf72f607f5da791402e161feaf1ccf5d5be4 author Paul Mackerras Thu, 29 Jun 2006 17:12:30 +1000 committer Paul Mackerras Thu, 29 Jun 2006 17:12:30 +1000 [POWERPC] Use little-endian bit from firmware ibm,pa-features property Signed-off-by: Paul Mackerras commit 33dbcf72f607f5da791402e161feaf1ccf5d5be4 tree b7c1b9de64e5855b3d0972e8cfdde862e0de9777 parent feb76c7b23fb660f015583359a4c75a1139c0d36 author Michael Ellerman Wed, 28 Jun 2006 13:18:53 +1000 committer Paul Mackerras Thu, 29 Jun 2006 16:22:47 +1000 [POWERPC] Make sure smp_processor_id works very early in boot There's a small period early in boot where we don't know which cpu we're running on. That's ok, except that it means we have no paca, or more correctly that our paca pointer points somewhere random. So that we can safely call things like smp_processor_id(), we need a paca, so just assume we're on cpu 0. No code should _write_ to the paca before we've set the correct one up. We setup the proper paca after we've scanned the flat device tree in early_setup(), so there's no need to do it again in start_here_common. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit feb76c7b23fb660f015583359a4c75a1139c0d36 tree 67eb60a4140a06c1a73ce97b684450dff3643262 parent c220153654ede57b41900159eb8d1f6029d85642 author Olof Johansson Wed, 28 Jun 2006 02:50:36 -0700 committer Paul Mackerras Thu, 29 Jun 2006 16:22:46 +1000 [POWERPC] U4 DART improvements Better late than never... Respin based on previous comment. Only remaining issue last time was an extra mb() that I've taken out. Signed-off-by: Paul Mackerras commit c220153654ede57b41900159eb8d1f6029d85642 tree 3285d535ec99aa9e96f97cec53bd88344bc6cb0e parent 16e9f994442b599987ce5dd4a5ebe50865e6573d author Mark A. Greer Wed, 28 Jun 2006 14:13:20 -0700 committer Paul Mackerras Thu, 29 Jun 2006 16:22:46 +1000 [POWERPC] todc: add support for Time-Of-Day-Clock This is a resubmit with a proper subject and with all comments addressed. Applies cleanly to powerpc.git 649e85797259162f7fdc696420e7492f20226f2d Mark -- The todc code from arch/ppc supports many todc/rtc chips and is needed in arch/powerpc. This patch adds the todc code to arch/powerpc. Signed-off-by: Mark A. Greer -- arch/powerpc/Kconfig | 7 arch/powerpc/sysdev/Makefile | 1 arch/powerpc/sysdev/todc.c | 392 ++++++++++++++++++++++++++++++++++ include/asm-powerpc/todc.h | 487 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 887 insertions(+) -- Signed-off-by: Paul Mackerras commit 16e9f994442b599987ce5dd4a5ebe50865e6573d tree bec5f383daccafc48e0149c0da05ef87f59db77f parent f86c9747fe1cd72b2c5c6bdf72d17aeb2a3c6cb0 author Stephen Rothwell Thu, 29 Jun 2006 15:07:42 +1000 committer Paul Mackerras Thu, 29 Jun 2006 16:22:46 +1000 [POWERPC] Make lparcfg.c work when both iseries and pseries are selected This also consolidates the initial bits of lparcfg_data() and adds the partition number to the iSeries flattened device tree. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit f86c9747fe1cd72b2c5c6bdf72d17aeb2a3c6cb0 tree c32ef71ff0e535a467e428d3d874b65232f76708 parent 975b365895b638a62da55f9fb180b0a71d05874d author Sonny Rao Tue, 27 Jun 2006 08:46:09 -0400 committer Paul Mackerras Thu, 29 Jun 2006 16:22:46 +1000 [POWERPC] Fix idr locking in init_new_context We always need to serialize accesses to mmu_context_idr. I hit this bug when testing with a small number of mmu contexts. Signed-off-by: Sonny Rao Signed-off-by: Paul Mackerras commit 975b365895b638a62da55f9fb180b0a71d05874d tree 5a60968b25eed109916256f31409626b3d1cc5cc parent 2b9d7467a6dbc41872c605511e105cbde1eda100 author Zang Roy-r61911 Tue, 13 Jun 2006 15:07:29 +0800 committer Paul Mackerras Thu, 29 Jun 2006 16:20:36 +1000 [POWERPC] mpc7448hpc2 (taiga) board config file Add default config for mpc7448 hpc2 (taiga) board. Signed-off-by: Roy Zang Signed-off-by: Paul Mackerras commit 2b9d7467a6dbc41872c605511e105cbde1eda100 tree efdf8f5ee5194ee2ac5c13a196e0910a877f00fd parent c5d56332fd6c2f0c7cf9d1f65416076f2711ea28 author Zang Roy-r61911 Tue, 13 Jun 2006 15:07:23 +0800 committer Paul Mackerras Thu, 29 Jun 2006 16:20:36 +1000 [POWERPC] Add tsi108 pci and platform device data register function Add Tundra Semiconductor tsi108 pci and platform device data register function support. Signed-off-by: Alexandre Bounine Signed-off-by: Roy Zang --- Signed-off-by: Paul Mackerras commit c5d56332fd6c2f0c7cf9d1f65416076f2711ea28 tree bfc43a1c72cbfa01214ab5814d096737b9c53bfe parent 1729dc7833014eaba3520091a673dbdc9242d9f9 author Zang Roy-r61911 Tue, 13 Jun 2006 15:07:15 +0800 committer Paul Mackerras Thu, 29 Jun 2006 16:20:36 +1000 [POWERPC] Add general support for mpc7448hpc2 (Taiga) platform Add support for Freescale mpc7448 (Taiga) board support Signed-off-by: Roy Zang Signed-off-by: Paul Mackerras commit 1729dc7833014eaba3520091a673dbdc9242d9f9 tree a0d72d55ae7bf9c256d7e4ddfea9997a827896fb parent 489244498ec99c949ecbd7105299066cff283dcd author Paul Mackerras Thu, 29 Jun 2006 16:16:15 +1000 committer Paul Mackerras Thu, 29 Jun 2006 16:16:15 +1000 [POWERPC] Correct the MAX_CONTEXT definition When we increased the address space per process to 2^44 bytes, the number of contexts that we could actually use reduced, but we forgot to decrease the MAX_CONTEXT definition. (Fortunately this would only cause problems if we actually had more than 512k user processes running.) This patch corrects the definition. Signed-off-by: Paul Mackerras commit 0a6047eef1c465c38aacfbdab193161b3f0cd144 tree 3347213ad162a9570d6f4c5cffa1f8db7abb7cba parent 27d68a36c4f1ca2fc6be82620843493462c08c51 author Linus Torvalds Wed, 28 Jun 2006 17:09:34 -0700 committer Linus Torvalds Wed, 28 Jun 2006 17:09:34 -0700 Fix vsnprintf off-by-one bug The recent vsnprintf() fix introduced an off-by-one, and it's now possible to overrun the target buffer by one byte. The "end" pointer points to past the end of the buffer, so if we have to truncate the result, it needs to be done though "end[-1]". [ This is just an alternate and simpler patch to one proposed by Andrew and Jeremy, who actually noticed the problem ] Acked-by: Andrew Morton Acked-by: Jeremy Fitzhardinge Signed-off-by: Linus Torvalds commit 27d68a36c4f1ca2fc6be82620843493462c08c51 tree a06b451e19c25a77595c918ca81bbb30f0ec9ebf parent 76a22271fd14e3fe7660f8646db12f0780fa4fd2 parent 583e7f5d36547f0d84caf71d43b71f0530a47766 author Linus Torvalds Wed, 28 Jun 2006 16:20:49 -0700 committer Linus Torvalds Wed, 28 Jun 2006 16:20:49 -0700 Merge branch 'nommu' of master.kernel.org:/home/rmk/linux-2.6-arm * 'nommu' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] nommu: backtrace code must not reference a discarded section [ARM] nommu: Initial uCLinux support for MMU-based CPUs [ARM] nommu: prevent Xscale-based machines being selected [ARM] nommu: export flush_dcache_page() [ARM] nommu: remove fault-armv, mmap and mm-armv files from nommu build [ARM] Remove TABLE_SIZE, and several unused function prototypes [ARM] nommu: Provide a simple flush_dcache_page implementation [ARM] nommu: add arch/arm/Kconfig-nommu to Kconfig files [ARM] nommu: add stubs for ioremap and friends [ARM] nommu: avoid selecting TLB and CPU specific copy code [ARM] nommu: uaccess tweaks [ARM] nommu: adjust headers for !MMU ARM systems [ARM] nommu: we need the TLS register emulation for nommu mode commit 76a22271fd14e3fe7660f8646db12f0780fa4fd2 tree d0cf8ffb69c3d4030fa66c43662285f57bea12cb parent fffcb480e4224f25c965b93fa65541bfc7dd732e parent e033108bf7e585755350b554048229d1fd10a02e author Linus Torvalds Wed, 28 Jun 2006 16:20:26 -0700 committer Linus Torvalds Wed, 28 Jun 2006 16:20:26 -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: [ARM] 3672/1: PXA: don't probe output GPIOs for interrupt [ARM] 3671/1: ep93xx: add cirrus logic edb9315 support [ARM] 3370/2: ep93xx: add crunch support [ARM] 3665/1: crunch: add ptrace support [ARM] 3664/1: crunch: add signal frame save/restore [ARM] 3663/1: fix resource->end off-by-one thinko during physmap conversion [ARM] 3662/1: ixp23xx: don't include asm/hardware.h in uncompress.h [ARM] 3660/1: Remove legacy defines [ARM] 3661/1: S3C2412: Fix compilation if CPU_S3C2410 only [ARM] 3658/1: S3C244X: Change usb-gadget name to s3c2440-usbgadget [ARM] Remove the __arch_* layer from uaccess.h commit fffcb480e4224f25c965b93fa65541bfc7dd732e tree a48383b5487798cdcc0153e342d6d88abe71333d parent b44597906e03d5e2b467c17a3b73585596c0d7be parent 56fb9e5346b99bc6b77def79b3739097bc13ea8a author Linus Torvalds Wed, 28 Jun 2006 16:03:06 -0700 committer Linus Torvalds Wed, 28 Jun 2006 16:03:06 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] Documentation/watchdog update [WATCHDOG] convert AT91RM9200 watchdog to platform driver [WATCHDOG] add WDIOC_GETTIMELEFT ioctl [WATCHDOG] Pre-Timeout flags commit b44597906e03d5e2b467c17a3b73585596c0d7be tree 6628a60c3e168b871880d6fd30b5e283f09f4a3f parent 980a01c9bfb090cb8a991e39e56ac379c30c61b8 author Thomas Gleixner Wed, 28 Jun 2006 17:14:07 +0200 committer Linus Torvalds Wed, 28 Jun 2006 15:54:27 -0700 [PATCH] Fix plist include dependency plist.h uses container_of, which is defined in kernel.h. Include kernel.h in plist.h as the kernel.h include does not longer happen automatically on all architectures. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 980a01c9bfb090cb8a991e39e56ac379c30c61b8 tree 8d14aa685d81abe410ce1842a6498878daf8a04d parent 8f7c58814eb75bf97b8bc18d107b2e26f28b6585 author David Brownell Wed, 28 Jun 2006 07:47:15 -0700 committer Linus Torvalds Wed, 28 Jun 2006 15:51:01 -0700 [PATCH] SPI: infrastructure to initialize spi_device.mode early This patch adds earlier initialization of spi_device.mode, as needed on boards using nondefault chipselect polarity. An example would be ones using the RS5C348 RTC without an external signal inverter between the RTC chipselect and the SPI controller. Without this mechanism, the first setup() call for that chip would wrongly enable chips, corrupting transfers to/from other chips sharing that SPI bus. Signed-off-by: David Brownell Signed-off-by: Linus Torvalds commit 8f7c58814eb75bf97b8bc18d107b2e26f28b6585 tree f871b4c546986e257fcecf57fae31426b9f7ef55 parent 1c952af548012bcf281623dafa2173897bfc6a77 parent 0a3a6d69b7e9f1d7fa5add7db528e7b81cbd422e author Linus Torvalds Wed, 28 Jun 2006 15:12:25 -0700 committer Linus Torvalds Wed, 28 Jun 2006 15:12:25 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input * master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: Input: db9 - fix potential buffer overrun Input: atkbd - fix hardware autorepeat Input: wistron - add mapping for Wistron MS 2111 commit 1c952af548012bcf281623dafa2173897bfc6a77 tree 9427ba34450f4c332c7a531efea7c7ec5365163a parent c750a012da6bc11ca4e49a5e170b417c4b344ffc author Greg Ungerer Wed, 28 Jun 2006 16:44:14 +1000 committer Linus Torvalds Wed, 28 Jun 2006 15:03:47 -0700 [PATCH] m68knommu: remove fixed ROM region setups from linker script Remove the hard coded ROM region setups. Use Kconfig options to specify these in a generic way for platorms that want them. This builds on top of the other recent m68knommu linker script changes to completely remove fixed board configurations. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit c750a012da6bc11ca4e49a5e170b417c4b344ffc tree 836ec4d8780a5f648208f44c90fe87b588f92eae parent 3448ff8967a00067cbc3b6ebe9a3741b4e72f6d0 author Greg Ungerer Wed, 28 Jun 2006 16:39:19 +1000 committer Linus Torvalds Wed, 28 Jun 2006 15:03:47 -0700 [PATCH] m68knommu: configuration options for ROM region Use Kconfig options to setup the optional ROM region used on some platforms. We used to define this in the linker script on a per board basis. The configure options are more flexible and clean up the linker script a lot. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 3448ff8967a00067cbc3b6ebe9a3741b4e72f6d0 tree 3937e24ce189060c0760c978b2b91421fda79300 parent 69614fc66a11222baf61e05a3e5b98ef2e3427be author Greg Ungerer Wed, 28 Jun 2006 16:23:14 +1000 committer Linus Torvalds Wed, 28 Jun 2006 15:03:47 -0700 [PATCH] m68knommu: fix 68EZ328/config.c asm Fix 68EZ328/config.c asm to be clean for new gcc versions. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 69614fc66a11222baf61e05a3e5b98ef2e3427be tree 08bd4d7ba895414bc76e7d7bf78ed12683dad9ec parent bda658382614198714b27581528f9bfb60c05a71 author Greg Ungerer Wed, 28 Jun 2006 16:21:56 +1000 committer Linus Torvalds Wed, 28 Jun 2006 15:03:47 -0700 [PATCH] m68knommu: fix 68VZ328/config.c asm Fix 68VZ328/config.c asm to be clean for new gcc versions. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit bda658382614198714b27581528f9bfb60c05a71 tree ef9a7c3dca45301bcfe7a699a35fc5917be5049f parent 0f7cfcc5bf2a1380f6cb8660f9e0127a5a872cbb author Greg Ungerer Wed, 28 Jun 2006 16:21:38 +1000 committer Linus Torvalds Wed, 28 Jun 2006 15:03:47 -0700 [PATCH] m68knommu: fix 68360/config.c asm Fix 68360/config.c asm to be clean for new gcc versions. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 0f7cfcc5bf2a1380f6cb8660f9e0127a5a872cbb tree 488d22a387323dfce2de828d7c59ac92f1cff139 parent 0aee77b221a68bf8ef5401712bb55c89e36b461c author Greg Ungerer Wed, 28 Jun 2006 16:09:41 +1000 committer Linus Torvalds Wed, 28 Jun 2006 15:03:47 -0700 [PATCH] m68knommu: include irqnode.h in 68360/ints.c The irqnode_t struct has moved to irqnode.h, need to include that 68360 ints.c. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 0aee77b221a68bf8ef5401712bb55c89e36b461c tree 4dc0526de41ec4b3c6913f41e68091acb6badcc2 parent 541960fef7f0bd98be3a27052c8845e9c4b6a2ac author Greg Ungerer Wed, 28 Jun 2006 16:12:45 +1000 committer Linus Torvalds Wed, 28 Jun 2006 15:03:47 -0700 [PATCH] m68knommu: fix clobber list in uCdimm/uCsimm helper asm Fix clobber list in uCsimm/uCdimm boot load helper asm. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 541960fef7f0bd98be3a27052c8845e9c4b6a2ac tree a918a0f68b1ddcaed8082a387f744924a3b0ecfc parent 0d44269e1fb1118473cae36958c96f08cf69905b author Greg Ungerer Wed, 28 Jun 2006 15:59:54 +1000 committer Linus Torvalds Wed, 28 Jun 2006 15:03:47 -0700 [PATCH] m68knommu: build support for 68328 romvec.S Conditionaly compile the 68328 romvec code based on the ROM configuration being enabled. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 0d44269e1fb1118473cae36958c96f08cf69905b tree 6165a5df5ab3e2f70d6923044ea1fbf6adabdda9 parent 727dda800f5076ce6f4653393fab651706959c93 author Greg Ungerer Wed, 28 Jun 2006 15:56:22 +1000 committer Linus Torvalds Wed, 28 Jun 2006 15:03:47 -0700 [PATCH] m68knommu: remove romvec asm code from ints.c Remove the inline 68328 romvec section asm code into its own file. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 727dda800f5076ce6f4653393fab651706959c93 tree 2c3aa7be72c7961f635d9556e4fbdb869e21c5b3 parent 9a9bb6fb343c4ce54cc67d83f77ca52c9d18d01b author Greg Ungerer Wed, 28 Jun 2006 15:54:22 +1000 committer Linus Torvalds Wed, 28 Jun 2006 15:03:47 -0700 [PATCH] m68knommu: fix compilation problems with 68328serial driver Clean out the 68328serial driver: . remove use of cli/sti . fix usage of tty_* calls . remove unused variables Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 9a9bb6fb343c4ce54cc67d83f77ca52c9d18d01b tree e4441cd8adfaa9848e0540e7899a794bdb593607 parent 873d8898b7f6aeb4f2085381dbc201d68a37d02b author Greg Ungerer Wed, 28 Jun 2006 15:58:18 +1000 committer Linus Torvalds Wed, 28 Jun 2006 15:03:46 -0700 [PATCH] m68knommu: create romvec.S for 68328 Create the 68328 romvec section in its own assembler file. It can be compiled in when required. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 873d8898b7f6aeb4f2085381dbc201d68a37d02b tree d32bde1302927f2a2b026d4b03fa77598ac8563e parent d9a5685436b0dd08a6386a2f9423103cb4689dbc parent d3e5e1a1b4f43bcfa1a34516e233911487c67307 author Linus Torvalds Wed, 28 Jun 2006 15:00:49 -0700 committer Linus Torvalds Wed, 28 Jun 2006 15:00:49 -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: [IA64-SGI] fix prom revision checks in SN kernel [IA64] tiger_defconfig s/NR_CPUS=4/NR_CPUS=16/ [IA64-SGI] - Pass OS logical cpu number to the SN prom (bios) [IA64] palinfo.c: s/register_cpu_notifier/register_hotcpu_notifier/ commit d9a5685436b0dd08a6386a2f9423103cb4689dbc tree ffb6af93d79c9504d7fe59bfae6258903dfcf4bb parent 3706a8728bcedfad54ed665e1a144e95b90f1ac7 author Andrew Morton Wed, 28 Jun 2006 04:27:04 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:07 -0700 [PATCH] x86_64: oprofile build fix WARNING: "unset_nmi_callback" [arch/x86_64/oprofile/oprofile.ko] undefined! WARNING: "set_nmi_callback" [arch/x86_64/oprofile/oprofile.ko] undefined! Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3706a8728bcedfad54ed665e1a144e95b90f1ac7 tree 9fa01cb43d79f10c5705714887a9abd7cf5eeaf8 parent 57e834e2fb0590b4bf9ecffa4d5c87b6f44c5b6b author Alan Cox Wed, 28 Jun 2006 04:27:03 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:07 -0700 [PATCH] Set err_stops_fifo for newer Promise as well Signed-off-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Sergei Shtylyov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57e834e2fb0590b4bf9ecffa4d5c87b6f44c5b6b tree d7889213b6275f6da772a8890ac2d0e17e993ee7 parent f201f5046ddaeeccb036bdf6848549bf5cb51bb1 author Alan Cox Wed, 28 Jun 2006 04:27:03 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:07 -0700 [PATCH] ide: clean up pdc202xx_old so its more readable (done so I could work on libata ports) Also sets the new fifo flag so that we don't hang on some errors with this chipset. Signed-off-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Sergei Shtylyov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f201f5046ddaeeccb036bdf6848549bf5cb51bb1 tree 5944310bd67382bbbc6a3998e0d152a194834404 parent da574af755bcb1d604e01feadf2a8c31b364447c author Alan Cox Wed, 28 Jun 2006 04:27:02 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:07 -0700 [PATCH] ide: housekeeping on IDE drivers Move auto arrays to static (const). Clean up using PCI_DEVICE in places, remove unreachable junk and dead code. Fix the serverworks cable detect logic (if ordering is wrong). Backport from libata. Plenty of scope for more cleanup left. Signed-off-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Sergei Shtylyov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da574af755bcb1d604e01feadf2a8c31b364447c tree de8548adf6ea7205314f0813afb3fb83a9e7da6a parent 2930d1bed7ffea3062e43b8acdeb9e0587bfc6a9 author Alan Cox Wed, 28 Jun 2006 04:27:01 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:06 -0700 [PATCH] ide: fix error handling for drives which clear the FIFO on error If the controller FIFO cleared automatically on error we must not try and drain it as this will hang some chips. Based in concept on a broken patch from -mm some while back Signed-off-by: Alan Cox Cc: Sergei Shtylyov Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2930d1bed7ffea3062e43b8acdeb9e0587bfc6a9 tree b876efc02ef1a9520bfd1dd2225575a70c1db970 parent 19c1ef5f671b5793622a7a3d03940ef3f20a3ba0 author Alan Cox Wed, 28 Jun 2006 04:27:00 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:06 -0700 [PATCH] SC1200 debug printk Kill a pair of long escaped debug printk calls Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19c1ef5f671b5793622a7a3d03940ef3f20a3ba0 tree 0eb446fc43390cb680ed5b2cc428d3b7f7724898 parent 1a1276e7b6cba549553285f74e87f702bfff6fac author Alan Cox Wed, 28 Jun 2006 04:26:59 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:06 -0700 [PATCH] ide: clean up siimage Remove all the ifdef preparation for enhanced features that never occcurred and is only in libata. For the SATA chips (but not yet PATA ones) politely suggest to the user that libata may offer more features. Signed-off-by: Alan Cox Cc: Sergei Shtylylov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a1276e7b6cba549553285f74e87f702bfff6fac tree 4765d49634c9c1c0aca565287ba28b6c1b5910f9 parent 1e866f0bf89e829736a12599bb7f476d1c378646 author Alan Cox Wed, 28 Jun 2006 04:26:58 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:06 -0700 [PATCH] Old IDE, fix SATA detection for cabling This is based on the proposed patches flying around but also checks that the device in question is new enough to have word 93 rather thanb blindly assuming word 93 == 0 means SATA (see ATA-5, ATA-7) Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e866f0bf89e829736a12599bb7f476d1c378646 tree 160b564cf86e4c3781659e56d12f3d983f3ef848 parent be6990e7473fcd11becda747c24b94a478413245 author Randy Dunlap Wed, 28 Jun 2006 04:26:58 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:06 -0700 [PATCH] oss/via: make bitfield unsigned Make a 1-bit field unsigned like all of the others near it. sound/oss/via82cxxx_audio.c:311:21: error: dubious one-bit signed bitfield Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be6990e7473fcd11becda747c24b94a478413245 tree 5253251731ae496b228d5b91d6f8840b1435ee7d parent e85f8dcc2750685e50139df4da8bdb68475393fc author Randy Dunlap Wed, 28 Jun 2006 04:26:57 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:06 -0700 [PATCH] ac97_codec: make bitfield unsigned Make a 1-bit bitfield unsigned (no space for sign bit). Removes 24 sparse warnings from this one file: include/linux/ac97_codec.h:262:13: error: dubious one-bit signed bitfield Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e85f8dcc2750685e50139df4da8bdb68475393fc tree 2da11db3037d8d05ea119f09af559cafa5486ef4 parent cab267c65f44337974e4f1eae490b21dce0e9811 author Randy Dunlap Wed, 28 Jun 2006 04:26:56 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:06 -0700 [PATCH] sound: fix cs4232 section mismatch Fix section mismatch: adds __init to probe function, frees some init memory, not critical. WARNING: sound/oss/cs4232.o - Section mismatch: reference to .init.text: from .text after 'cs4232_pnp_probe' (at offset 0x152) Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cab267c65f44337974e4f1eae490b21dce0e9811 tree d752bda111449ae7e9b7c85988f2993a9a068128 parent 96febe9fb7b04f2a078882d08bd6a997dee7cfa3 author Michael Hanselmann Wed, 28 Jun 2006 04:26:55 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:06 -0700 [PATCH] powermac backlight fixes Fix a erroneous calculation of the legacy brightness values as reported by Paul Collins. Additionally, it moves the calculation of the negative value in the radeonfb driver after the value check. Signed-off-by: Michael Hanselmann Acked-by: Benjamin Herrenschmidt Acked-by: Paul Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96febe9fb7b04f2a078882d08bd6a997dee7cfa3 tree 92f587109a90f142201748670ccf857a7af10135 parent 1a245866f8a417250c0f82b16f7a6dcf0b812f58 author Corey Minyard Wed, 28 Jun 2006 04:26:55 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:06 -0700 [PATCH] IPMI: watchdog handle panic properly Modify the watchdog timeout in IPMI to only do things at panic/reboot time if the watchdog timer was already running. Some BIOSes do not disable the watchdog timer at startup, and this led to a reboot a while later if the new OS running didn't start monitoring the watchdog, even if the watchdog was not running before. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a245866f8a417250c0f82b16f7a6dcf0b812f58 tree 706f9da221c05a88d9e5617c21515567155be7fd parent 409035e088ce15178c5aa157cab493bc22096b6d author Corey Minyard Wed, 28 Jun 2006 04:26:54 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:05 -0700 [PATCH] IPMI: remove high res timer code There was some old high-res-timer code in the IPMI driver that is dead. Remove it. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 409035e088ce15178c5aa157cab493bc22096b6d tree d5dd6e7f83a0b23b714516da5f246f724453bd17 parent 4ac4360b95496f4137ee19b54e9f7dfa3946984d author Corey Minyard Wed, 28 Jun 2006 04:26:53 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:05 -0700 [PATCH] IPMI: tidy msghandler timer Tidy up the timer usage in the IPMI driver. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ac4360b95496f4137ee19b54e9f7dfa3946984d tree b32ea69a8d92ee93d90b3accf4713466d113a26d parent effc8b704b48c3c727715abf49592a57547b6818 author Alan Cox Wed, 28 Jun 2006 04:26:52 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:05 -0700 [PATCH] istallion: cleanups Turned out to be rather a monster Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit effc8b704b48c3c727715abf49592a57547b6818 tree 7c375802aa0f36b5498ffa52f74d23c6422ad479 parent 9d7fa40098253a6768cfc3ffbbd5988ba852d364 author Alan Cox Wed, 28 Jun 2006 04:26:51 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:05 -0700 [PATCH] stallion: fix recent SMP locking cleanup Works better on SMP if... Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d7fa40098253a6768cfc3ffbbd5988ba852d364 tree 7bf6829b569462654d11a7cd3429db320bd69177 parent 94374e7cc369b972855cebd13ba942f4eb1be1ac author Latchesar Ionkov Wed, 28 Jun 2006 04:26:51 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:05 -0700 [PATCH] v9fs: fix fid check in v9fs_create Fix an incorrect check whether a fid was allocated in v9fs_create and if it should be freed on error. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94374e7cc369b972855cebd13ba942f4eb1be1ac tree 9f599bd59ccf7f1b5b0e7292940687a73d153998 parent 33b37a33c242542fac2980b8ccd90977388b7a8d author Latchesar Ionkov Wed, 28 Jun 2006 04:26:50 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:05 -0700 [PATCH] v9fs: return the correct error when interrupted by signal If a signal interrupts the user process, v9fs sends a flush request to the file server and waits for its response. It error code is incorrectly set to the error code of the flush message instead of ERESTARTSYS. The patch sets the error code to the correct value. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33b37a33c242542fac2980b8ccd90977388b7a8d tree e3a18605e57e1d1268dd04e9a3e5276f7f0488fe parent 2c3bb20f46709a0adfa7ea408013edbcab945d5a author Paul Fulghum Wed, 28 Jun 2006 04:26:49 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:05 -0700 [PATCH] remove active field from tty buffer structure Remove 'active' field from tty buffer structure. This was added in 2.6.16 as part of a patch to make the new tty buffering SMP safe. This field is unnecessary with the more intelligently written flush_to_ldisc that adds receive_room handling. Removing this field reverts to simpler logic where the tail buffer is always the 'active' buffer, which should not be freed by flush_to_ldisc. (active == buffer being filled with new data) The result is simpler, smaller, and faster tty buffer code. Signed-off-by: Paul Fulghum Cc: Alan Cox Cc: Theodore Ts'o Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c3bb20f46709a0adfa7ea408013edbcab945d5a tree 951dde0a4ea31892635886afb1e3f0f03847b1f0 parent 817d6d3bceaf34c99f5343820f9b9e6021f0655c author Paul Fulghum Wed, 28 Jun 2006 04:26:48 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:05 -0700 [PATCH] add receive_room flow control to flush_to_ldisc Flush data serially to line discipline in blocks no larger than tty->receive_room to avoid losing data if line discipline is busy (such as N_TTY operating at high speed on heavily loaded system) or does not accept data in large blocks (such as N_MOUSE). Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 817d6d3bceaf34c99f5343820f9b9e6021f0655c tree 651104833124262db46c2a372b7adb55289cd8dd parent e0ac4761fa52acda90f9f53819c81474b511e3af author Paul Fulghum Wed, 28 Jun 2006 04:26:47 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:05 -0700 [PATCH] remove TTY_DONT_FLIP Remove TTY_DONT_FLIP tty flag. This flag was introduced in 2.1.X kernels to prevent the N_TTY line discipline functions read_chan() and n_tty_receive_buf() from running at the same time. 2.2.15 introduced tty->read_lock to protect access to the N_TTY read buffer, which is the only state requiring protection between these two functions. The current TTY_DONT_FLIP implementation is broken for SMP, and is not universally honored by drivers that send data directly to the line discipline receive_buf function. Because TTY_DONT_FLIP is not necessary, is broken in implementation, and is not universally honored, it is removed. Signed-off-by: Paul Fulghum Cc: Alan Cox Cc: Theodore Ts'o Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0ac4761fa52acda90f9f53819c81474b511e3af tree 72819aa9b075cd92f228fab57d9cbc05261acb2f parent 84860f9979804cfd97638ce0ec9d583daf338e0d author Atsushi Nemoto Wed, 28 Jun 2006 04:26:47 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:04 -0700 [PATCH] RTC: add rtc-rs5c348 driver Add an SPI driver for the Ricoh RS5C348 RTC chip. Signed-off-by: Atsushi Nemoto Acked-by: Alessandro Zummo Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84860f9979804cfd97638ce0ec9d583daf338e0d tree 81fe1ffa2d7cd2ed4757703dae5fadc40ea01213 parent f71d20e961474dde77e6558396efb93d6ac80a4b author Andrew Morton Wed, 28 Jun 2006 04:26:46 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:04 -0700 [PATCH] load_module() cleanup Undo bizarre declaration in load_module(). Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f71d20e961474dde77e6558396efb93d6ac80a4b tree 669610f79521fd173c28fc47bef39ecd4cdf52ab parent f5e54d6e53a20cef45af7499e86164f0e0d16bb2 author Arjan van de Ven Wed, 28 Jun 2006 04:26:45 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:04 -0700 [PATCH] Add EXPORT_UNUSED_SYMBOL and EXPORT_UNUSED_SYMBOL_GPL Temporarily add EXPORT_UNUSED_SYMBOL and EXPORT_UNUSED_SYMBOL_GPL. These will be used as a transition measure for symbols that aren't used in the kernel and are on the way out. When a module uses such a symbol, a warning is printk'd at modprobe time. The main reason for removing unused exports is size: eacho export takes roughly between 100 and 150 bytes of kernel space in the binary. This patch gives users the option to immediately get this size gain via a config option. Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5e54d6e53a20cef45af7499e86164f0e0d16bb2 tree cb92acbb89b84796261bf5563182261ec5654127 parent a052b68b1e7a31f1e6a721290035e9deb0f6fed9 author Christoph Hellwig Wed, 28 Jun 2006 04:26:44 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:04 -0700 [PATCH] mark address_space_operations const Same as with already do with the file operations: keep them in .rodata and prevents people from doing runtime patching. Signed-off-by: Christoph Hellwig Cc: Steven French Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a052b68b1e7a31f1e6a721290035e9deb0f6fed9 tree cb7ea2ae023d22a49bb609afc74238b21d2e5983 parent 79bc79b07c9c6f8ae9290704e9e503a9327fcbb2 author Andrew Morton Wed, 28 Jun 2006 04:26:43 -0700 committer Linus Torvalds Wed, 28 Jun 2006 14:59:02 -0700 [PATCH] x86: do_IRQ(): check irq number We recently changed x86 to handle more than 256 IRQs. Add a check in do_IRQ() just to make sure that nothing went wrong with that implementation. [chrisw@sous-sol.org: do x86_64 too] Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Rusty Russell Cc: Andi Kleen Cc: Chris Wright Cc: "Protasevich, Natalie" Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56fb9e5346b99bc6b77def79b3739097bc13ea8a tree 157e54d73ade3b65018c809a2f4109cdafeec658 parent dfc7bd9c385a888851a2d009ba272099549f98cc author Randy Dunlap Sun, 21 May 2006 20:58:10 -0700 committer Wim Van Sebroeck Wed, 28 Jun 2006 21:24:11 +0200 [WATCHDOG] Documentation/watchdog update Documentation/watchdog/: Expose example and tool source files in the Documentation/ directory in their own files instead of being buried (almost hidden) in readme/txt files. This will make them more visible/usable to users who may need to use them, to developers who may need to test with them, and to janitors who would update them if they were more visible. Also, if any of these possibly should not be in the kernel tree at all, it will be clearer that they are here and we can discuss if they should be removed. Signed-off-by: Randy Dunlap Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 79bc79b07c9c6f8ae9290704e9e503a9327fcbb2 tree 1e9b72b18d1605e8ea3fe72f9b992867a4697224 parent a39727f212426b9d5f9267b3318a2afaf9922d3b author pageexec@freemail.hu Wed, 28 Jun 2006 20:44:16 +0200 committer Linus Torvalds Wed, 28 Jun 2006 12:05:50 -0700 [PATCH] small fix for not releasing the mmap semaphore in i386/arch_setup_additional_pages the VDSO randomization code on i386 fails to release the mmap semaphore if insert_vm_struct() fails. [ Made the conditional unlikely. -- Linus ] Signed-off-by: Linus Torvalds commit f28e71617ddaf2483e3e5c5237103484a303743f tree 67627d2d8ddbf6a4449371e9261d796c013b1fa1 parent dc6a78f1af10d28fb8c395034ae1e099b85c05b0 parent a39727f212426b9d5f9267b3318a2afaf9922d3b author James Bottomley Wed, 28 Jun 2006 14:06:39 -0400 committer James Bottomley Wed, 28 Jun 2006 14:06:39 -0400 Merge ../linux-2.6/ Conflicts: drivers/scsi/aacraid/comminit.c Fixed up by removing the now renamed CONFIG_IOMMU option from aacraid Signed-off-by: James Bottomley commit adf8a287150667feb5747f8beade62acacc17d4e tree b7f86f4f52d27a7785e3113480f52c1698f71678 parent 4280370efe0e9c527ccd6188d6211a10bcb22b1e author Dave Jones Wed, 28 Jun 2006 13:38:43 -0400 committer Dave Jones Wed, 28 Jun 2006 13:38:43 -0400 [AGPGART] Make AGP depend on PCI Fixes possible compile error in amd64 with pci=n pointed out by Adrian Bunk. Signed-off-by: Dave Jones commit 8caf7aa26e0797e5706043f94c491acd1a08636a tree 62314bffcc4eaf6829668e16fe03af03c80d35b0 parent ccb99eee9c2430ad7ce2e7026fae93d6668d2d27 author Takashi Iwai Wed, 28 Jun 2006 16:39:36 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:31:52 +0200 [ALSA] echoaudio - Remove kfree_nocheck() Remove obsoleted kfree_nochec() (for debug). Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit ccb99eee9c2430ad7ce2e7026fae93d6668d2d27 tree a11906736ac7e8114f462a26f4cd624ed957d049 parent 19039bd0079f282b1023e61212285b5653e3a8ad author Takashi Iwai Wed, 28 Jun 2006 16:35:49 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:31:49 +0200 [ALSA] echoaudio - Fix Makefile Fix missing makefile entries for echoaudio drivers (sorry for cut-n-paste error!) Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 19039bd0079f282b1023e61212285b5653e3a8ad tree 7cc2575dff229387fe682e6159d76774fc49fb6c parent 9c7f852e8b2cc37da5dc5e1ba416238166a37d0f author Takashi Iwai Wed, 28 Jun 2006 15:52:16 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:31:46 +0200 [ALSA] Add Intel D965 board support Added the support for Intel D965 boards with STAC9227 codec. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 9c7f852e8b2cc37da5dc5e1ba416238166a37d0f tree b441419aa9ae275ec016bfbf6d5136452e2be5ba parent 8c42d5bafa08baad5d647dd0b9050086ffe36e15 author Takashi Iwai Wed, 28 Jun 2006 15:08:22 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:31:43 +0200 [ALSA] Fix/add support of Realtek ALC883 / ALC888 and ALC861 codecs Patch from Realtek: - Fix ALC883 support code - Add support of ALC888 codec - Add ALC660 support (ALC861-compatible) - Add HP xw4400/6400/8400/9400 support (model=hp-bpc) - Code clean-up: fix spaces and indentation Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8c42d5bafa08baad5d647dd0b9050086ffe36e15 tree 996ef680e34071fcf31f7687cd92562af5f04258 parent bd66f3bbc369191279d18c21f305341c8bc9cafe author Takashi Iwai Wed, 28 Jun 2006 14:15:09 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:31:39 +0200 [ALSA] Fix a typo in echoaudio/midi.c Fixed a typo in echoaudio/midi.c. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit bd66f3bbc369191279d18c21f305341c8bc9cafe tree f429ea96daa3e120e547af01dda5b18534b0ea6d parent c6feefd03ed12d89af591345fb9c26de7098764d author Johannes Berg Wed, 28 Jun 2006 14:00:58 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:31:35 +0200 [ALSA] snd-aoa: enable dual-edge in GPIOs Apparently some firmware versions forget enabling the dual-edge bit, snd-powermac did that too and even OSX does sometimes. This should fix headphone plug detection on those machines. Signed-off-by: Johannes Berg Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c6feefd03ed12d89af591345fb9c26de7098764d tree 7d8bc48a2601358d72d2e7839b4b331ce36661a7 parent d91c4e8c63a61c2d9ec96fc6a9aa5a65d468befc author Johannes Berg Wed, 28 Jun 2006 13:59:50 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:31:31 +0200 [ALSA] snd-aoa: support iMac G5 iSight This properly adds support for the iMac G5 iSight. Signed-off-by: Johannes Berg Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit d91c4e8c63a61c2d9ec96fc6a9aa5a65d468befc tree b058821028cc994681a9e68e780a2f02e57e314e parent dd7b254d8dd3a9528f423ac3bf875e6f0c8da561 author Johannes Berg Wed, 28 Jun 2006 13:59:19 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:31:27 +0200 [ALSA] snd-aoa: not experimental The dependencies in the soundbus Kconfig were wrong, it isn't experimental any more. This patch fixes that and makes it select SND_PCM too instead of depending on it. Signed-off-by: Johannes Berg Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit dd7b254d8dd3a9528f423ac3bf875e6f0c8da561 tree 923ac13451c796b730f21c7260beba9f74acff63 parent cb9d24e4349013628259b5fee97e692173731b07 author Giuliano Pochini Wed, 28 Jun 2006 13:53:41 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:31:20 +0200 [ALSA] Add echoaudio sound drivers From: Giuliano Pochini Add echoaudio sound drivers (darla20, darla24, echo3g, gina20, gina24, indigo, indigodj, indigoio, layla20, lala24, mia, mona) Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit cb9d24e4349013628259b5fee97e692173731b07 tree d936251fa32f7cbf853a78a3df72cd06a099f24e parent cf1756e9cd7c1d160fe72944af51d87e96285a32 author Takashi Iwai Tue, 27 Jun 2006 17:49:12 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:31:09 +0200 [ALSA] ak4xxx-adda - Code clean-up Fix spaces, fold lines to fit 80 columns in ak4xxx-adda driver codes. Split a long reset function to each codec routine just for better readability. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit cf1756e9cd7c1d160fe72944af51d87e96285a32 tree 4d426411b235afbef86b84f26b8a42d7fb3b63f8 parent c83c0c470565a0aed2f6fcbaa6c80a98ef250586 author Takashi Iwai Tue, 27 Jun 2006 15:05:38 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:31:06 +0200 [ALSA] Remove CONFIG_EXPERIMENTAL from intel8x0m driver Removed CONFIG_EXPERIMENTAL from intel8x0m driver. The driver has been working well without problems. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c83c0c470565a0aed2f6fcbaa6c80a98ef250586 tree 5f6810822c019af78dcb95f67565101cb97198c0 parent be7ee27822975cee5dabb2cfd7f03e7fde38e3f4 author Jani Alinikula Tue, 27 Jun 2006 15:00:55 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:31:03 +0200 [ALSA] Stereo controls for M-Audio Revolution cards This patch adds stereo controls to revo cards by making the ak4xxx driver mixers configurable from the card driver. Signed-off-by: Jani Alinikula Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit be7ee27822975cee5dabb2cfd7f03e7fde38e3f4 tree e8a89665fc2a66ab3710b651e247eff9c164e82d parent b2e1b0cc729ebbf27713a64a32c49e27fa81e600 author Takashi Iwai Tue, 27 Jun 2006 13:07:04 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:31:00 +0200 [ALSA] Fix misuse of __list_add() in seq_ports.c seq_ports.c::snd_seq_delete_all_ports() uses __list_add() to replace the whole list entries. This results in BUG() with recent FC5 kernel due to a sanity check in __list_add(). The patch fixes this misue of __list_add() by using standard macros instead (although a bit more code is needed). Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit b2e1b0cc729ebbf27713a64a32c49e27fa81e600 tree 829ca144e357f45b2b335f1be14a18ef1f14116d parent b10e539129c080486ef08feb2b28dd05ab95ba16 author Takashi Iwai Tue, 27 Jun 2006 12:48:59 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:30:57 +0200 [ALSA] hda-codec - Add model entry for Samsung X60 Chane Added the model entry 'laptop-eapd' for Samsung X60 Chane with AD1986A codec. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit b10e539129c080486ef08feb2b28dd05ab95ba16 tree 1975a695a17f6480e70b75713b63e4ab2f1d59c2 parent e8b98ff428f1c0eb5311d732043c0e4d28ffce8e author Clemens Ladisch Tue, 27 Jun 2006 08:41:26 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:30:54 +0200 [ALSA] make CONFIG_SND_DYNAMIC_MINORS non-experimental The dynamic minors code is mature, has been tested, and seems to work fine. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit e8b98ff428f1c0eb5311d732043c0e4d28ffce8e tree 2f9094d7c91f68419ff99cb67bdb8c988a67e88f parent 30833195ec8d2b8bcc17fb06659e91506edf5b63 author Takashi Iwai Mon, 26 Jun 2006 13:15:07 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:30:51 +0200 [ALSA] Fix wrong dependencies of snd-aoa driver Fixed wrong dependencies of snd-aoa driver. It selects PCM instead. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 30833195ec8d2b8bcc17fb06659e91506edf5b63 tree 0191a0e7297f209bed27b59a4622c9c73d0cfcce parent 02856b5684677b74095069c3be4774c2992e4fdc author Takashi Iwai Mon, 26 Jun 2006 13:11:09 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:30:48 +0200 [ALSA] fix build failure due to snd-aoa When snd-aoa is not built or built as modules, but CONFIG_SND is yes, kernel build fails due to a bug I introduced when adding snd-aoa. This patch fixes it. From: Takashi Iwai Signed-off-by: Johannes Berg Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 02856b5684677b74095069c3be4774c2992e4fdc tree 557b1e5936e025ab7713788156a5a24ae4d8995a parent 02ada9c112eb00ecb9d2c04b6132f48ade534dbf author Jaya Kumar Fri, 23 Jun 2006 15:18:41 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:30:45 +0200 [ALSA] AD1888 mixer controls for DC mode This patch adds two mixer controls. The V_REFOUT enable is a documented register that couples the microphone input lines to the V_REFOUT DC source. The High Pass Filter enable in the AC97_AD_TEST2 (0x5c) is an undocumented register provided by Miller Puckette via Analog Devices that enables the AD codec to apply a high pass filter to the input. Signed-off-by: Jaya Kumar Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 02ada9c112eb00ecb9d2c04b6132f48ade534dbf tree 91560ef758b2301e5fbecefb92b3ed4958113d52 parent e217e30c359edafce3225d2c4fbbda06ae5a408b author Takashi Iwai Fri, 23 Jun 2006 15:13:57 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:30:42 +0200 [ALSA] Suppress irq handler mismatch messages in ALSA ISA drivers Suppress 'irq handler mismatch' messages at auto-probing of irqs in ALSA ISA drivers. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e217e30c359edafce3225d2c4fbbda06ae5a408b tree 5707cdeb4849c1e8a10585f826cd0e208677259a parent a39727f212426b9d5f9267b3318a2afaf9922d3b author Sam Revitch Fri, 23 Jun 2006 15:10:18 +0200 committer Jaroslav Kysela Wed, 28 Jun 2006 19:30:39 +0200 [ALSA] usb-audio support for Turtle Beach Roadie From: Sam Revitch Recently a Turtle Beach Audio Advantage Roadie device ended up in my possession. It seems to work with the snd-usb-audio driver, but only using the headphone jack in 2-channel mode. The device has a DIN connector carrying six more channels that are otherwise silent. C-Media has freely available documentation for the CM106 chip around which this device is based, and enabling 8-channel output, or 6-channel output with the headphone jack following the front pair is a matter of setting one of its registers. Attached is a patch to try to enable 5.1 output mode at probe time. It seems to work correctly with my device. There is quite list of other configurables for this device that might deserve controls. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit d3e5e1a1b4f43bcfa1a34516e233911487c67307 tree f98c62a079e929f2bd8669bfbcf23b2d0d64f06e parent 59e2e6892087ba05101f86309a23c4f5a3ac04a6 author Aaron Young Wed, 28 Jun 2006 08:34:55 -0700 committer Tony Luck Wed, 28 Jun 2006 10:02:42 -0700 [IA64-SGI] fix prom revision checks in SN kernel The following patch fixes two spots in the SN kernel that check a fixed prom revision number to determine prom feature support. These checks are only valid on shub1 systems. They are invalid on shub2 systems which have a different prom with different revision numbers. Signed-off-by: Aaron Young Signed-off-by: Tony Luck commit 583e7f5d36547f0d84caf71d43b71f0530a47766 tree 906e7185aae5d01f0f622df8ad64c002a8e45400 parent d090dddaba7c8da6401bb259340dce05ca32f564 author Russell King Wed, 21 Jun 2006 20:43:55 +0100 committer Russell King Wed, 28 Jun 2006 17:59:57 +0100 [ARM] nommu: backtrace code must not reference a discarded section The code in "1007:" is in the .fixup section, which in the mmuless case is discarded. Since this code is referenced from the .text section, it causes an link error. Move this code into the .text section instead. Signed-off-by: Russell King commit d090dddaba7c8da6401bb259340dce05ca32f564 tree c35d9e22dc09d40144b4a672962269ff60c9ad07 parent a4f7e76367f7775ecf534a37b4623c83d9d7ba74 author Hyok S. Choi Wed, 28 Jun 2006 14:10:01 +0100 committer Russell King Wed, 28 Jun 2006 17:59:56 +0100 [ARM] nommu: Initial uCLinux support for MMU-based CPUs In noMMU mode, various of functions which are defined in mm/proc-*.S is not valid or needed to be avoided. i.g. switch_mm is not needed, just returns and this makes the I & D caches are valid which shows great improvement of performance including task switching and IPC. Signed-off-by: Hyok S. Choi Signed-off-by: Russell King commit a4f7e76367f7775ecf534a37b4623c83d9d7ba74 tree 2f6e916df521a6a7f18f29a2542c773efcbd2b8d parent 3e3612259560abde89615e0df1deb1f2303a0bc4 author Russell King Wed, 28 Jun 2006 12:52:41 +0100 committer Russell King Wed, 28 Jun 2006 17:59:54 +0100 [ARM] nommu: prevent Xscale-based machines being selected Hyok says Intel Xscale is not currently supported by uCLinux. Rather than adding #error statements to the Xscale support files and causing !MMU+Xscale configurations to fail to build, prevent Xscale-based machines from being selected in !MMU mode. Signed-off-by: Russell King commit 3e3612259560abde89615e0df1deb1f2303a0bc4 tree 76463857ebe69c876c51a344997aa490188dbf39 parent 092c1952e18fec06f3a951113fe1d87492d6e840 author Hyok S. Choi Tue, 27 Jun 2006 20:55:43 +0100 committer Russell King Wed, 28 Jun 2006 17:59:53 +0100 [ARM] nommu: export flush_dcache_page() This is a trivial patch to export flush_dcache_page in mm/nommu.c. Signed-off-by: Hyok S. Choi Signed-off-by: Russell King commit 092c1952e18fec06f3a951113fe1d87492d6e840 tree 0ea1447154c822ec3bb5c75138209d306275846b parent 888e7bf166a0059480da137f3bd28dcd51175f3d author Russell King Sat, 24 Jun 2006 17:34:50 +0100 committer Russell King Wed, 28 Jun 2006 17:59:52 +0100 [ARM] nommu: remove fault-armv, mmap and mm-armv files from nommu build Remove fault-armv.o, mmap.o and mm-armv.o from uclinux builds - these are concerned with MMU-ful operations, and as such are redundant for uclinux. Since this also removes iotable_init() and iotable_init() is used extensively in the platform support files, just make it a no-op. Based upon a couple of patches by Hyok. Signed-off-by: Hyok S. Choi Signed-off-by: Russell King commit 888e7bf166a0059480da137f3bd28dcd51175f3d tree c5eb3b691ecf55cfd17b400bb54bd26618481bcf parent e6b1b38c520d85388ab6538001265cc342e81a70 author Russell King Sat, 24 Jun 2006 17:20:13 +0100 committer Russell King Wed, 28 Jun 2006 17:59:51 +0100 [ARM] Remove TABLE_SIZE, and several unused function prototypes TABLE_SIZE is never used in arch/arm/mm/init.c. create_memmap_holes(), memtable_init, and setup_io_desc() no longer exist in the kernel. Signed-off-by: Russell King commit e6b1b38c520d85388ab6538001265cc342e81a70 tree 08bb002ac47da8f90f00dc109eafb371f6933ee3 parent 3b93e7b08fc3e87e5b451ee5e47cfe142779d0cd author Russell King Sat, 24 Jun 2006 10:46:23 +0100 committer Russell King Wed, 28 Jun 2006 17:59:50 +0100 [ARM] nommu: Provide a simple flush_dcache_page implementation nommu doesn't require a complex flush_dcache_page implementation like the MMU-ful CPUs do, so provide a simplified version in nommu.c and omit flush.c from the build as appropriate. Signed-off-by: Russell King commit 3b93e7b08fc3e87e5b451ee5e47cfe142779d0cd tree 8068b08925aeee021370c4082ce756e8cf01946f parent 5924486dc0f205ebc2bbf4c262eec902ff38e802 author Hyok S. Choi Thu, 22 Jun 2006 11:48:56 +0100 committer Russell King Wed, 28 Jun 2006 17:59:49 +0100 [ARM] nommu: add arch/arm/Kconfig-nommu to Kconfig files Include Kconfig-nommu when MMU is not selected. (This is part of a patch from Hyok.) Signed-off-by: Hyok S. Choi Signed-off-by: Russell King commit 5924486dc0f205ebc2bbf4c262eec902ff38e802 tree acde32ec730762ed2d0a742990cfe2dc7f6e5cf0 parent f9c21a6ee7e040be0f623a6b8dcfb5ec4f7532f5 author Russell King Thu, 22 Jun 2006 15:05:36 +0100 committer Russell King Wed, 28 Jun 2006 17:59:48 +0100 [ARM] nommu: add stubs for ioremap and friends nommu doesn't have any form of remapping support, so ioremap, etc become stubs which just return the casted address, doing nothing else. Move ioport_map(), ioport_unmap(), pci_iomap(), pci_iounmap() into a separate file which is always built. Signed-off-by: Russell King commit f9c21a6ee7e040be0f623a6b8dcfb5ec4f7532f5 tree 7369aa796e15bbe068c38afd3a94abc8f3fcd76d parent 9641c7cc5a7f6d5c9dc9b43eea4e5f8c3c08c94e author Hyok S. Choi Wed, 21 Jun 2006 22:26:29 +0100 committer Russell King Wed, 28 Jun 2006 17:59:47 +0100 [ARM] nommu: avoid selecting TLB and CPU specific copy code Since uclinux doesn't make use of the TLB, including the TLB maintainence and CPU-optimised copypage functions does not make sense. Remove them. (This is part of one of Hyok's patches.) Signed-off-by: Hyok S. Choi Signed-off-by: Russell King commit 9641c7cc5a7f6d5c9dc9b43eea4e5f8c3c08c94e tree 5ff57feabe0538d58404ec4918b0d94d75f69846 parent 002547b4f86c27bfac5bae344b723d250857be6b author Russell King Wed, 21 Jun 2006 20:38:17 +0100 committer Russell King Wed, 28 Jun 2006 17:59:46 +0100 [ARM] nommu: uaccess tweaks MMUless systems have only one address space for all threads, so both the usual access_ok() checks, and the exception handling do not make much sense. Hence, discard the fixup and exception tables at link time, use memcpy/memset for the user copy/clearing functions, and define the permission check macros to be constants. Some of this patch was derived from the equivalent patch by Hyok S. Choi. Signed-off-by: Hyok S. Choi Signed-off-by: Russell King commit 002547b4f86c27bfac5bae344b723d250857be6b tree 31fa2cc67091f7db95853ae089dee0261a5e98b5 parent 60b6cf6851d0e12956c109987966f2e7417ce212 author Russell King Tue, 20 Jun 2006 20:46:52 +0100 committer Russell King Wed, 28 Jun 2006 17:59:45 +0100 [ARM] nommu: adjust headers for !MMU ARM systems Majorily based on Hyok Choi's patches, this fixes up the asm-arm header files for mmuless systems. Over and above Hyok's patches: - nommu.h merged into mmu.h (it's only a structure) - nommu_context.h is essentially the same as mmu_context.h, but without the MM switching code. so there's no point having separate files. Also, in memory.h, there's no point #ifndef'ing PHYS_OFFSET and END_MEM - both CONFIG_DRAM_BASE and CONFIG_DRAM_SIZE will always be set by the configuration scripts. Other files have minor formatting changes, but are essentially the same. Hyok's original patches were signed off thusly: Signed-off-by: Hyok S. Choi Signed-off-by: Russell King commit 60b6cf6851d0e12956c109987966f2e7417ce212 tree c9f29b85d5c37d7bad9ea0710d7dd5be226c8e1d parent 02fcb974369d21c3df61d4ac5a2e1a58dce86495 author Russell King Mon, 19 Jun 2006 17:36:43 +0100 committer Russell King Wed, 28 Jun 2006 17:59:43 +0100 [ARM] nommu: we need the TLS register emulation for nommu mode Since there can be no fixed location for the TLS value with nommu systems, we must provide TLS register emulation in order to support TLS binaries on CPUs without the thread register. Part of a patch from Hyok S. Choi, and cleaned up by rmk. Signed-off-by: Hyok S. Choi Signed-off-by: Russell King commit 59e2e6892087ba05101f86309a23c4f5a3ac04a6 tree ee1e4c09159933a51c2c8b3b03f8a7109b39b548 parent 9d56d878ae12dbb9af744cec2858ed35dffde2b2 author Tony Luck Tue, 27 Jun 2006 15:32:24 -0700 committer Tony Luck Wed, 28 Jun 2006 09:57:16 -0700 [IA64] tiger_defconfig s/NR_CPUS=4/NR_CPUS=16/ Montecito is coming with dual core and threading, so this four socket box can now have sixteen logical cpus. Signed-off-by: Tony Luck commit 9d56d878ae12dbb9af744cec2858ed35dffde2b2 tree 4dd6d1709219d16e5ab04bfbb0a9a3f98f3b3ae0 parent f1206641ef4a8cb7a7b15b75e8cfdc7c6bfaf213 author Jack Steiner Thu, 27 Apr 2006 20:01:05 -0500 committer Tony Luck Wed, 28 Jun 2006 09:56:55 -0700 [IA64-SGI] - Pass OS logical cpu number to the SN prom (bios) Pass the OS logical cpu number to the PROM. This allows PROM to log the OS logical cpu number in error records viewed thru POD. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit f1206641ef4a8cb7a7b15b75e8cfdc7c6bfaf213 tree 33bf939ca9024c3eb62452299c6bd69781683baa parent a39727f212426b9d5f9267b3318a2afaf9922d3b author Tony Luck Wed, 28 Jun 2006 09:55:13 -0700 committer Tony Luck Wed, 28 Jun 2006 09:55:13 -0700 [IA64] palinfo.c: s/register_cpu_notifier/register_hotcpu_notifier/ Chandra Seetharaman missed one place in commit: 65edc68c345cbe21d0b0375c3452a3ed5e322868 [but it only shows up when building the ski simulator configuration of ia64, so thats understandable] Signed-off-by: Tony Luck commit e033108bf7e585755350b554048229d1fd10a02e tree df4d6e15667478b7351859b8db576c136d0e253c parent 87c01737b1ccf821b93f74a26a0dc991dba16d19 author Guennadi Liakhovetski Wed, 28 Jun 2006 16:42:02 +0100 committer Russell King Wed, 28 Jun 2006 17:55:03 +0100 [ARM] 3672/1: PXA: don't probe output GPIOs for interrupt Patch from Guennadi Liakhovetski Currently probe_irq_on() on PXA will silently reconfigure all output GPIOs, that are not configured as alternate functions, for input. Avoid that. Upon CPU reset all GPIOs are configured as inputs, so, if a GPIO is configured as output, it has been done so intentionally. Signed-off-by: G. Liakhovetski Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 87c01737b1ccf821b93f74a26a0dc991dba16d19 tree a1833216a0b289842fc832add53287476a653876 parent c17fad11f3105ca4d5bbb2686725aad208f5ead4 author Lennert Buytenhek Tue, 27 Jun 2006 23:03:04 +0100 committer Russell King Wed, 28 Jun 2006 17:55:02 +0100 [ARM] 3671/1: ep93xx: add cirrus logic edb9315 support Patch from Lennert Buytenhek This patch adds support for the Cirrus Logic EDB9315, an evaluation board based on the Cirrus Logic EP9315 SoC, with 64M RAM, two USB host ports, audio in/out, three serial ports, 10/100 ethernet, and IDE, VGA, and LCD interfaces. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit c17fad11f3105ca4d5bbb2686725aad208f5ead4 tree 1b3b07ac36323f9a056fdf0aadafaff6e149c5de parent 5429b060df6d556f396b78364ad017686015bc34 author Lennert Buytenhek Tue, 27 Jun 2006 23:03:03 +0100 committer Russell King Wed, 28 Jun 2006 17:55:01 +0100 [ARM] 3370/2: ep93xx: add crunch support Patch from Lennert Buytenhek Add the necessary kernel bits for crunch task switching. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 5429b060df6d556f396b78364ad017686015bc34 tree 48b088aa6eb65e856df91e296447f6a7ea394644 parent 3bec6ded282b331552587267d67a06ed7fd95ddd author Lennert Buytenhek Tue, 27 Jun 2006 22:56:19 +0100 committer Russell King Wed, 28 Jun 2006 17:55:00 +0100 [ARM] 3665/1: crunch: add ptrace support Patch from Lennert Buytenhek This patch makes it possible to get/set a task's Crunch state via the ptrace(2) system call. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 3bec6ded282b331552587267d67a06ed7fd95ddd tree 5333fa3e3322528e3d8e5074d41ffc7f538f6768 parent 562ca1e32a9c2514551559691db809606502a15a author Lennert Buytenhek Tue, 27 Jun 2006 22:56:18 +0100 committer Russell King Wed, 28 Jun 2006 17:54:59 +0100 [ARM] 3664/1: crunch: add signal frame save/restore Patch from Lennert Buytenhek This patch makes the kernel save Crunch state in userland signal frames, so that any userland signal handler can safely use the Crunch coprocessor without corrupting the Crunch state of the code it preempted. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 562ca1e32a9c2514551559691db809606502a15a tree 31241bf01a144fcada35d7fcc122a1f437178cb0 parent 02c4293194432c7466efe9477126d6179d6fda07 author Lennert Buytenhek Tue, 27 Jun 2006 22:56:17 +0100 committer Russell King Wed, 28 Jun 2006 17:54:58 +0100 [ARM] 3663/1: fix resource->end off-by-one thinko during physmap conversion Patch from Lennert Buytenhek Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 02c4293194432c7466efe9477126d6179d6fda07 tree 53e75380efdd207de95e219fd7882ce95f514bed parent 313f53e3823c00bd0aa3601f01897573f2fc326d author Lennert Buytenhek Tue, 27 Jun 2006 22:56:16 +0100 committer Russell King Wed, 28 Jun 2006 17:54:56 +0100 [ARM] 3662/1: ixp23xx: don't include asm/hardware.h in uncompress.h Patch from Lennert Buytenhek ixp23xx was including asm/hardware.h in its version of uncompress.h, to get at the physical address of the debug UART, but this include was causing various inline functions that are totally unrelated to the decompressor, defined in headers in include/asm-arm/arch-ixp23xx, to be included in the decompressor image. Include asm/arch/ixp23xx.h instead, and move the sole inline function in ixp23xx.h to another header. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 313f53e3823c00bd0aa3601f01897573f2fc326d tree 5ca183d12c392ac6b387e49fc362e0f11ba03156 parent 2b8b4913efa20f76718f524accf40e6d02a3bf0a author Andrew Victor Tue, 27 Jun 2006 22:54:39 +0100 committer Russell King Wed, 28 Jun 2006 17:54:55 +0100 [ARM] 3660/1: Remove legacy defines Patch from Andrew Victor Remove the remaining legacy __virt_to_bus__is_a_macro and __bus_to_virt__is_a_macro defines in some ARM platforms. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 2b8b4913efa20f76718f524accf40e6d02a3bf0a tree 35f2df1ad0169182d8741a5744141c1a66314077 parent b8ccca4a57c91dfd81b0a50e16942699bb01600a author Ben Dooks Tue, 27 Jun 2006 22:53:04 +0100 committer Russell King Wed, 28 Jun 2006 17:54:54 +0100 [ARM] 3661/1: S3C2412: Fix compilation if CPU_S3C2410 only Patch from Ben Dooks If only the S3C2412 based machines are selected, then the regs-dsc.h does not export the S3C2412_DSC registers as it is wrapped in CONFIG_CPU_S3C2440. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit b8ccca4a57c91dfd81b0a50e16942699bb01600a tree d158a841c68cbb30eb75a5400a8a907cfbcd6671 parent 02fcb974369d21c3df61d4ac5a2e1a58dce86495 author Ben Dooks Tue, 27 Jun 2006 22:53:03 +0100 committer Russell King Wed, 28 Jun 2006 17:54:53 +0100 [ARM] 3658/1: S3C244X: Change usb-gadget name to s3c2440-usbgadget Patch from Ben Dooks The S3C2440 and S3C2442 have an extended USB gadget controller, so re-name the platform device to inform the driver that it needs to change some parameters Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 02fcb974369d21c3df61d4ac5a2e1a58dce86495 tree cdf04f4ccdb39049ba4399c21130fc2f663cf2e9 parent a39727f212426b9d5f9267b3318a2afaf9922d3b author Russell King Wed, 21 Jun 2006 14:44:52 +0100 committer Russell King Wed, 28 Jun 2006 17:53:27 +0100 [ARM] Remove the __arch_* layer from uaccess.h Back in the days when we had armo (26-bit) and armv (32-bit) combined, we had an additional layer to the uaccess macros to ensure correct typing. Since we no longer have 26-bit in this tree, we no longer need this layer, so eliminate it. Signed-off-by: Russell King commit 49fee981fa98f3c0a21f3d6c8193eddcc15e84e9 tree 203ebb3fb41dbb14ffdf2ed49f96938535e32b94 parent 95b38b3f453c16de0f8cddcde3e71050bbfb37b9 author Vladimir Lebedev Tue, 20 Jun 2006 16:46:00 -0400 committer Len Brown Wed, 28 Jun 2006 12:44:45 -0400 ACPI: fix battery on HP NX6125 EC problem was cause of both battery and AC issues. http://bugzilla.kernel.org/show_bug.cgi?id=6455 Signed-off-by: Len Brown commit dc6a78f1af10d28fb8c395034ae1e099b85c05b0 tree 531357a95f9dfa3df48d87073d52e7a3d8e25668 parent 87cf89866790a373edcf88c12b64d6d38560acdd author Randy Dunlap Tue, 27 Jun 2006 22:01:28 -0700 committer James Bottomley Wed, 28 Jun 2006 12:43:20 -0400 [SCSI] atp870u: reduce huge stack usage The atp870u driver is the largest stack eater reported by checkstack (on x86_864, allmodconfig). This converts the offending function to kmalloc+kfree struct atp_unit instead of allocating it on the stack. Was: 0x0000164c atp870u_probe [atp870u]: 3176 Now: 0x0000164c atp870u_probe [atp870u]: 408 Signed-off-by: Randy Dunlap Signed-off-by: James Bottomley commit 87cf89866790a373edcf88c12b64d6d38560acdd tree 8ba41c842efdbff03b8753241fa1dd6919a16a33 parent 547f9a218436ea35baf9a52e981753e44d9cff1f author Eric Moore Tue, 27 Jun 2006 16:09:26 -0600 committer James Bottomley Wed, 28 Jun 2006 12:41:52 -0400 [SCSI] mptsas: Adding 1078 ROC support * Adding 1078 ROC (Raid On Chip) Support - New host adapter * Moving all PCI Vendor/Device ids to using internal defines; a request from Christoph/James B. some time ago for when the next chip was added. * Removing SAS 1066/1066E Vendor/Device IDs, as there are no plans to manufacture that controller. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 547f9a218436ea35baf9a52e981753e44d9cff1f tree 59a13af4b90e3f51bf2ca795765161062e44518a parent 65c92b09acf0218b64f1c7ba4fdabeb8b732c876 author Eric Moore Tue, 27 Jun 2006 14:42:12 -0600 committer James Bottomley Wed, 28 Jun 2006 12:41:33 -0400 [SCSI] mptsas: wide port support * Wide port support added - using James Bottomley's new SAS wide port API. (There is a known problem in sas transport layer reported yesterday to James. The Kobject dev.bus_ids for end devices are not unique across expanders. I have added a work around in this patch, where I asigning an unique port identifier for every port within the host - this solves the problem, but I expect a fix from James in the sas transport). * Adding target_alloc and target_destroy entry points, and moving code over from the slave entry points. * The renaming of some mptscsih_xxx functions declared in mptsas.c, to mptsas_xxx. * Target Reset moved from slave_destroy to hotplug work thread handling (with regard to device removal). Also inhibit IO to end device while device is being broken down . Talked to James Smart about this at Linux Expo (with questions of how the fc transport handles this). * Cleaning up the kzalloc's, and kfree's Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 65c92b09acf0218b64f1c7ba4fdabeb8b732c876 tree 16569cf6039b7e4e810c710f91179292a847fd45 parent 2076eb6ab8339bf09620a0160be3607bbbb61a50 author James Bottomley Wed, 28 Jun 2006 12:22:50 -0400 committer James Bottomley Wed, 28 Jun 2006 12:40:54 -0400 [SCSI] scsi_transport_sas: introduce a sas_port entity this patch introduces a port object, separates out ports and phys, with ports becoming the primary objects of the tree. Signed-off-by: James Bottomley commit 2076eb6ab8339bf09620a0160be3607bbbb61a50 tree 00733817a36c0f8f7c355e393c6f57dd754a6fe2 parent 309bd271211caa5a04a8137649cebd7691376351 author Eric Moore Tue, 27 Jun 2006 14:39:06 -0600 committer James Bottomley Wed, 28 Jun 2006 12:40:18 -0400 [SCSI] fusion : mpi header update MPI Header Update Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 309bd271211caa5a04a8137649cebd7691376351 tree d7939cbc549d21e0e8c08c83c9f7001d5d5f116d parent a144c5ae0956fb262e6c82624c82b1110a451437 author Brian King Tue, 27 Jun 2006 11:10:43 -0500 committer James Bottomley Wed, 28 Jun 2006 12:39:56 -0400 [SCSI] scsi: Device scanning oops for offlined devices (resend) If a device gets offlined as a result of the Inquiry sent during scanning, the following oops can occur. After the disk gets put into the SDEV_OFFLINE state, the error handler sends back the failed inquiry, which wakes the thread doing the scan. This starts a race between the scanning thread freeing the scsi device and the error handler calling scsi_run_host_queues to restart the host. Since the disk is in the SDEV_OFFLINE state, scsi_device_get will still work, which results in __scsi_iterate_devices getting a reference to the scsi disk when it shouldn't. The following execution thread causes the oops: CPU 0 (scan) CPU 1 (eh) --------------------------------------------------------- scsi_probe_and_add_lun .... scsi_eh_offline_sdevs scsi_eh_flush_done_q scsi_destroy_sdev scsi_device_dev_release scsi_restart_operations scsi_run_host_queues __scsi_iterate_devices get_device scsi_device_dev_release_usercontext scsi_run_queue <---OOPS---> The patch fixes this by changing the state of the sdev to SDEV_DEL before doing the final put_device, which should prevent the race from occurring. Original oops follows: Badness in kref_get at lib/kref.c:32 Call Trace: [C00000002F4476D0] [C00000000000EE20] .show_stack+0x68/0x1b0 (unreliable) [C00000002F447770] [C00000000037515C] .program_check_exception+0x1cc/0x5a8 [C00000002F447840] [C00000000000446C] program_check_common+0xec/0x100 Exception: 700 at .kref_get+0x10/0x28 LR = .kobject_get+0x20/0x3c [C00000002F447B30] [C00000002F447BC0] 0xc00000002f447bc0 (unreliable) [C00000002F447BB0] [C000000000254BDC] .get_device+0x20/0x3c [C00000002F447C30] [D000000000063188] .scsi_device_get+0x34/0xdc [scsi_mod] [C00000002F447CC0] [D0000000000633EC] .__scsi_iterate_devices+0x50/0xbc [scsi_mod] [C00000002F447D60] [D00000000006A910] .scsi_run_host_queues+0x34/0x5c [scsi_mod] [C00000002F447DF0] [D000000000069054] .scsi_error_handler+0xdb4/0xe44 [scsi_mod] [C00000002F447EE0] [C00000000007B4E0] .kthread+0x128/0x178 [C00000002F447F90] [C000000000025E84] .kernel_thread+0x4c/0x68 Unable to handle kernel paging request for <7>PCI: Enabling device: (0002:41:01.1), cmd 143 data at address 0x000001b8 Faulting instruction address: 0xd0000000000698e4 sym1: <1010-66> rev 0x1 at pci 0002:41:01.1 irq 216 sym1: No NVRAM, ID 7, Fast-80, LVD, parity checking sym1: SCSI BUS has been reset. scsi2 : sym-2.2.2 cpu 0x0: Vector: 300 (Data Access) at [c00000002f447a30] pc: d0000000000698e4: .scsi_run_queue+0x2c/0x218 [scsi_mod] lr: d00000000006a904: .scsi_run_host_queues+0x28/0x5c [scsi_mod] sp: c00000002f447cb0 msr: 9000000000009032 dar: 1b8 dsisr: 40000000 current = 0xc0000000045fecd0 paca = 0xc00000000048ee80 pid = 1123, comm = scsi_eh_1 enter ? for help [c00000002f447d60] d00000000006a904 .scsi_run_host_queues+0x28/0x5c [scsi_mod] [c00000002f447df0] d000000000069054 .scsi_error_handler+0xdb4/0xe44 [scsi_mod] [c00000002f447ee0] c00000000007b4e0 .kthread+0x128/0x178 [c00000002f447f90] c000000000025e84 .kernel_thread+0x4c/0x68 Signed-off-by: Brian King Signed-off-by: James Bottomley commit a144c5ae0956fb262e6c82624c82b1110a451437 tree 5ce95ee7f08af2e2da257a8d7039e5c63b08db38 parent 3bdad7bd253f17ead00b4af2e82f84e9522c95ac author Brian King Tue, 27 Jun 2006 11:10:31 -0500 committer James Bottomley Wed, 28 Jun 2006 12:39:06 -0400 [SCSI] scsi: Add allow_restart sysfs class attribute This is a resend of a patch I generated in response to an email sent by Ruben Faelens . His original email to linux-scsi requested a method in which he could spin down a scsi disk when not in use and have the kernel automatically spin it back up when an I/O was generated to the disk. The infrastructure to automatically spin a disk up has been in the scsi error handler for some time now, but it is not enabled by default. This patch adds an sd sysfs attribute which allows userspace to enable this behavior. Signed-off-by: Brian King Signed-off-by: James Bottomley commit 7f8a894066b826a4baea49c2a3adbba0a56a192f tree 94833927f58f47a2b29b026ed1839b90a3ef29cf parent a39727f212426b9d5f9267b3318a2afaf9922d3b author Thomas Gleixner Wed, 28 Jun 2006 10:11:33 +0200 committer Thomas Gleixner Wed, 28 Jun 2006 10:11:33 +0200 [MTD] DOC: Fixup read functions and do a little cleanup The NAND rework resulted in non ECC based reads. Fix it up and do a bit of cleanup while at it. Pointed out by Adrian Bunk. Signed-off-by: Thomas Gleixner commit f831335d42a9aed26449a264266763fb542dbbe3 tree 16f415f332d060dfcb44b126992dc6ef9252c4fd parent b488f02156d3deb08f5ad7816d565c370a8cc6f1 author Bartlomiej Swiercz Mon, 29 May 2006 07:16:00 -0400 committer Len Brown Wed, 28 Jun 2006 03:34:19 -0400 ACPI: additional blacklist entry for ThinkPad R40e Signed-off-by: Len Brown commit b488f02156d3deb08f5ad7816d565c370a8cc6f1 tree 7ba4c86b66451780a39c28b618dcfa8037584cb2 parent 95b38b3f453c16de0f8cddcde3e71050bbfb37b9 author Andreas Mohr <[andi@rhlx01.fht-esslingen.de]> Mon, 26 Jun 2006 15:58:00 -0400 committer Len Brown Wed, 28 Jun 2006 03:27:02 -0400 ACPI: restore comment justifying 'extra' P_LVLx access While trying to look for superfluous I/O accesses that can be optimized away, I stumbled upon this ACPI sleep I/O access and couldn't figure out why the hell this dummy op was necessary. After more than one hour of internet research, I had collected a sufficient number of documents (among those very old kernel versions) that finally told me what this dummy read was about: STPCLK# doesn't get asserted in time on (some) chipsets, which is why we need to have a dummy I/O read to delay further instruction processing until the CPU is fully stopped. Signed-off-by: Andreas Mohr Signed-off-by: Len Brown commit c4a001b1ea32e09f7556178249b8885418858b5c tree 29abe5b8088968cdc28de3bd6888d05366f2478a parent c5ab81ca01ad4a8870b456f93dd2fb3d815f91d9 author Dominik Brodowski Sat, 24 Jun 2006 19:37:00 -0400 committer Len Brown Wed, 28 Jun 2006 03:14:50 -0400 ACPI: C-States: only demote on current bus mastering activity Only if bus master activity is going on at the present, we should avoid entering C3-type sleep, as it might be a faulty transition. As long as the bm_activity bitmask was based on the number of calls to the ACPI idle function, looking at previous moments made sense. Now, with it being based on what happened this jiffy, looking at this jiffy should be sufficient. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit c5ab81ca01ad4a8870b456f93dd2fb3d815f91d9 tree 7e27bfff185a321b3ac43be660093dece5cec993 parent a3c6598f92cf27d3d201a2a5b052563148156837 author Dominik Brodowski Sat, 24 Jun 2006 19:37:00 -0400 committer Len Brown Wed, 28 Jun 2006 03:14:42 -0400 ACPI: C-States: bm_activity improvements Do not assume there was bus mastering activity if the idle handler didn't get called, as there's only reason to not enter C3-type sleep if there is bus master activity going on. Only for the "promotion" into C3-type sleep bus mastering activity is taken into account, and there only current bus mastering activity, and not pure guessing should lead to the decision on whether to enter C3-type sleep or not. Also, as bm_activity is a jiffy-based bitmask (bit 0: bus mastering activity during this juffy, bit 31: bus mastering activity 31 jiffies ago), fix the setting of bit 0, as it might be called multiple times within one jiffy. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit a3c6598f92cf27d3d201a2a5b052563148156837 tree 3fad66282da16a806139ce46bad2b85175fae43a parent 95b38b3f453c16de0f8cddcde3e71050bbfb37b9 author Dominik Brodowski Sat, 24 Jun 2006 19:37:00 -0400 committer Len Brown Wed, 28 Jun 2006 03:14:31 -0400 ACPI: C-States: accounting of sleep states Track the actual time spent in C-States (C2 upwards, we can't determine this for C1), not only the number of invocations. This is especially useful for dynamic ticks / "tickless systems", but is also of interest on normal systems, as any interrupt activity leads to C-States being exited, not only the timer interrupt. The time is being measured in PM timer ticks, so an increase by one equals 279 nanoseconds. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 967440e3be1af06ad4dc7bb18d2e3c16130fe067 tree c9bbf70475333f4f169838ed88233f8410010677 parent 95b38b3f453c16de0f8cddcde3e71050bbfb37b9 author Bob Moore Fri, 23 Jun 2006 17:04:00 -0400 committer Len Brown Wed, 28 Jun 2006 03:11:38 -0400 ACPI: ACPICA 20060623 Implemented a new acpi_spinlock type for the OSL lock interfaces. This allows the type to be customized to the host OS for improved efficiency (since a spinlock is usually a very small object.) Implemented support for "ignored" bits in the ACPI registers. According to the ACPI specification, these bits should be preserved when writing the registers via a read/modify/write cycle. There are 3 bits preserved in this manner: PM1_CONTROL[0] (SCI_EN), PM1_CONTROL[9], and PM1_STATUS[11]. http://bugzilla.kernel.org/show_bug.cgi?id=3691 Implemented the initial deployment of new OSL mutex interfaces. Since some host operating systems have separate mutex and semaphore objects, this feature was requested. The base code now uses mutexes (and the new mutex interfaces) wherever a binary semaphore was used previously. However, for the current release, the mutex interfaces are defined as macros to map them to the existing semaphore interfaces. Fixed several problems with the support for the control method SyncLevel parameter. The SyncLevel now works according to the ACPI specification and in concert with the Mutex SyncLevel parameter, since the current SyncLevel is a property of the executing thread. Mutual exclusion for control methods is now implemented with a mutex instead of a semaphore. Fixed three instances of the use of the C shift operator in the bitfield support code (exfldio.c) to avoid the use of a shift value larger than the target data width. The behavior of C compilers is undefined in this case and can cause unpredictable results, and therefore the case must be detected and avoided. (Fiodor Suietov) Added an info message whenever an SSDT or OEM table is loaded dynamically via the Load() or LoadTable() ASL operators. This should improve debugging capability since it will show exactly what tables have been loaded (beyond the tables present in the RSDT/XSDT.) Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 95b38b3f453c16de0f8cddcde3e71050bbfb37b9 tree 54893468b8335c88135ab01d580f0d1f87abf2f2 parent 2b85e1307fe3a84eca2e1a21c6c857359908dab4 author Kristen Accardi Wed, 28 Jun 2006 03:09:54 -0400 committer Len Brown Wed, 28 Jun 2006 03:09:54 -0400 ACPIPHP: prevent duplicate slot numbers when no _SUN Dock bridges generally do not implement _SUN, yet show up as ejectable slots. If you have more than one ejectable slot that does not implement SUN, with the current code you will get duplicate slot numbers. So, if there is no _SUN, use the current count of the number of slots found instead. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 2b85e1307fe3a84eca2e1a21c6c857359908dab4 tree 880dfc5c67f096c3e90d06e0d8faa4c182d0abaa parent 4e8662bbd680c54496189ac68f398e847f3ca374 author Len Brown Tue, 27 Jun 2006 01:50:14 -0400 committer Len Brown Wed, 28 Jun 2006 03:08:46 -0400 ACPI: static-ize handle_hotplug_event_func() Signed-off-by: Len Brown commit 4e8662bbd680c54496189ac68f398e847f3ca374 tree 8f9a0be5098b206025cd63fe965ccc37c922753e parent a5e1b94008f2a96abf4a0c0371a55a56b320c13e author Kristen Accardi Wed, 28 Jun 2006 03:08:06 -0400 committer Len Brown Wed, 28 Jun 2006 03:08:06 -0400 ACPIPHP: use ACPI dock driver Modify the acpiphp driver to use the ACPI dock driver for dock notifications. Only load the acpiphp driver if we find we have pci dock devices. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit a5e1b94008f2a96abf4a0c0371a55a56b320c13e tree 3e3a254fdbc565c4f85a66cc6dfaa60319e919a9 parent a6a888b3c20cf559c8a2e6e4d86c570dda2ef0f5 author Kristen Accardi Wed, 28 Jun 2006 03:07:16 -0400 committer Len Brown Wed, 28 Jun 2006 03:07:16 -0400 ACPI: dock driver Create a driver which lives in the acpi subsystem to handle dock events. This driver is not an "ACPI" driver, because acpi drivers require that the object be present when the driver is loaded. Signed-off-by: Kristen Carlson Accardi Cc: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 489244498ec99c949ecbd7105299066cff283dcd tree 003b5637cb8998ca0ab524e436c1a5eff25a9a1c parent 649e85797259162f7fdc696420e7492f20226f2d parent 9ad494f62444ee37209e85173377c67612e66ef1 author Paul Mackerras Wed, 28 Jun 2006 16:10:53 +1000 committer Paul Mackerras Wed, 28 Jun 2006 16:10:53 +1000 Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc commit 9ad494f62444ee37209e85173377c67612e66ef1 tree 7f0cf7697b62120179deda730365f4715947a05a parent fcc18e83e1f6fd9fa6b333735bf0fcd530655511 author Kumar Gala Wed, 28 Jun 2006 00:37:45 -0500 committer Kumar Gala Wed, 28 Jun 2006 00:37:45 -0500 powerpc: minor cleanups for mpc86xx * Remove duplicated cputable entry for 8641 (matches w/7448) * Removed __init from function prototypes in mpc86xx.h * Moved pci fixups into board specific code * Moved mpc86xx_exclude_device to generic mpc86xx pci code * Fixed sparse warnings in mpc86xx_smp.c * Removed board specific header include from asm-powerpc/mpc86xx.h Signed-off-by: Kumar Gala commit 649e85797259162f7fdc696420e7492f20226f2d tree 027fad19525f25707146eb339a4beb8aeebb8664 parent 3965f8c59778b0d37460ec268f92c0c382546b5c author Paul Mackerras Wed, 28 Jun 2006 13:57:16 +1000 committer Paul Mackerras Wed, 28 Jun 2006 15:19:04 +1000 [POWERPC] Make sure we select CONFIG_NEW_LEDS if ADB_PMU_LED is set Signed-off-by: Paul Mackerras commit 3965f8c59778b0d37460ec268f92c0c382546b5c tree d5c508cb20c8702117457cf331a9edd203298754 parent f127a2b5cf542968ea1c428f86ffc780ea929452 author Paul Mackerras Wed, 28 Jun 2006 13:50:39 +1000 committer Paul Mackerras Wed, 28 Jun 2006 15:19:03 +1000 [POWERPC] Simplify the code defining the 64-bit CPU features Signed-off-by: Paul Mackerras commit f127a2b5cf542968ea1c428f86ffc780ea929452 tree 3c59e7249fb65a3659f919833fa831bbb5367e0a parent 127efeb286bb772019236182a1b4fc14ff2ae00c author Andrew Morton Sun, 25 Jun 2006 01:49:07 -0700 committer Paul Mackerras Wed, 28 Jun 2006 15:19:01 +1000 [POWERPC] powerpc: kconfig warning fix arch/powerpc/Kconfig:420:warning: leading whitespace ignored Stop doing that. Cc: Benjamin Herrenschmidt Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras commit 127efeb286bb772019236182a1b4fc14ff2ae00c tree b33c93d9a076ee4d194124b3167f6fbd91b46b61 parent a240da35a1087804cbdc3faba949445e64d1eecb author Stephen Rothwell Wed, 28 Jun 2006 11:55:49 +1000 committer Paul Mackerras Wed, 28 Jun 2006 15:19:00 +1000 [POWERPC] Consolidate some of kernel/misc*.S There were some common functions (mainly i/o). Also some small white space cleanups and remove a couple of small unused functions. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit a240da35a1087804cbdc3faba949445e64d1eecb tree 682cba196837dc7c31513dd53ae51f2c3e98d5ef parent 9b47569a9d410199aea6386917fd0662809c60be author Stephen Rothwell Wed, 28 Jun 2006 11:53:56 +1000 committer Paul Mackerras Wed, 28 Jun 2006 15:18:58 +1000 [POWERPC] Remove unused function call_with_mmu_off Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 9b47569a9d410199aea6386917fd0662809c60be tree d9c59ba3d96db3a17c0356b683e4e7c67b3b2431 parent 612f02d6d6eadd9c5dde5a5b97b55a3a620d28e5 author Stephen Rothwell Wed, 28 Jun 2006 11:51:41 +1000 committer Paul Mackerras Wed, 28 Jun 2006 15:18:56 +1000 [POWERPC] update asm-powerpc/time.h If we ever build a combined kernel including iSeries, then this will be needed. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 612f02d6d6eadd9c5dde5a5b97b55a3a620d28e5 tree 8f6b7474dc4761271459f09d8760fd6d21f2ca73 parent d0b79c54fc14f1f2db64180a21b84146028c598b author Stephen Rothwell Wed, 28 Jun 2006 11:49:10 +1000 committer Paul Mackerras Wed, 28 Jun 2006 15:18:55 +1000 [POWERPC] Clean up it_lp_queue.h No more StudlyCaps. Remove from a couple of places it is no longer needed. Use C style comments. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit d0b79c54fc14f1f2db64180a21b84146028c598b tree 26b3b74d80e96a7d7402723fbed90664147c016a parent c0ce7d0886cf0c2579c604eac41a7e125bc0e96d author Jimi Xenidis Mon, 26 Jun 2006 04:56:58 -0400 committer Paul Mackerras Wed, 28 Jun 2006 15:18:53 +1000 [POWERPC] Skip the "copy down" of the kernel if it is already at zero. This patch allows the kernel to recognized that it was loaded at zero and the copy down of the image is unnecessary. This is useful for Simulators and kexec models. On a typical 3.8 MiB vmlinux.strip this saves about 2.3 million instructions. Signed-off-by: Paul Mackerras commit c0ce7d0886cf0c2579c604eac41a7e125bc0e96d tree f31448371b4295e98753f1551178fdddb8d18b0e parent 2cd90bc8fba8720ef7f3fdfd1e0c1a5397a18271 author David Wilder Fri, 23 Jun 2006 15:29:34 -0700 committer Paul Mackerras Wed, 28 Jun 2006 15:18:52 +1000 [POWERPC] Add the use of the firmware soft-reset-nmi to kdump. With this patch, kdump uses the firmware soft-reset NMI for two purposes: 1) Initiate the kdump (take a crash dump) by issuing a soft-reset. 2) Break a CPU out of a deadlock condition that is detected during kdump processing. When a soft-reset is initiated each CPU will enter system_reset_exception() and set its corresponding bit in the global bit-array cpus_in_sr then call die(). When die() finds the CPU's bit set in cpu_in_sr crash_kexec() is called to initiate a crash dump. The first CPU to enter crash_kexec() is called the "crashing CPU". All other CPUs are "secondary CPUs". The secondary CPU's pass through to crash_kexec_secondary() and sleep. The crashing CPU waits for all CPUs to enter via soft-reset then boots the kdump kernel (see crash_soft_reset_check()) When the system crashes due to a panic or exception, crash_kexec() is called by panic() or die(). The crashing CPU sends an IPI to all other CPUs to notify them of the pending shutdown. If a CPU is in a deadlock or hung state with interrupts disabled, the IPI will not be delivered. The result being, that the kdump kernel is not booted. This problem is solved with the use of a firmware generated soft-reset. After the crashing_cpu has issued the IPI, it waits for 10 sec for all CPUs to enter crash_ipi_callback(). A CPU signifies its entry to crash_ipi_callback() by setting its corresponding bit in the cpus_in_crash bit array. After 10 sec, if one or more CPUs have not set their bit in cpus_in_crash we assume that the CPU(s) is deadlocked. The operator is then prompted to generate a soft-reset to break the deadlock. Each CPU enters the soft reset handler as described above. Two conditions must be handled at this point: 1) The system crashed because the operator generated a soft-reset. See 2) The system had crashed before the soft-reset was generated ( in the case of a Panic or oops). The first CPU to enter crash_kexec() uses the state of the kexec_lock to determine this state. If kexec_lock is already held then condition 2 is true and crash_kexec_secondary() is called, else; this CPU is flagged as the crashing CPU, the kexec_lock is acquired and crash_kexec() proceeds as described above. Each additional CPUs responding to the soft-reset will pass through crash_kexec() to kexec_secondary(). All secondary CPUs call crash_ipi_callback() readying them self's for the shutdown. When ready they clear their bit in cpus_in_sr. The crashing CPU waits in kexec_secondary() until all other CPUs have cleared their bits in cpus_in_sr. The kexec kernel boot is then started. Signed-off-by: Haren Myneni Signed-off-by: David Wilder Signed-off-by: Paul Mackerras commit 2cd90bc8fba8720ef7f3fdfd1e0c1a5397a18271 tree b779ce75a774e3286c39188978e86c0bb047168b parent 4da30d15b6d5036b0d96422d6946ca758111fae3 author Arnd Bergmann Fri, 23 Jun 2006 20:57:50 +0200 committer Paul Mackerras Wed, 28 Jun 2006 15:18:37 +1000 [POWERPC] spufs: fix class0 interrupt assignment The class zero interrupt handling for spus was confusing alignment and error interrupts, so swap them. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 0a3a6d69b7e9f1d7fa5add7db528e7b81cbd422e tree cb99f2f7dd314bcb6506e99cb15f3f126c0c94d4 parent f8b4c46c0c3667a56148a59bca54d945d246a3f3 author Eric Sesterhenn Tue, 27 Jun 2006 23:42:33 -0400 committer Dmitry Torokhov Tue, 27 Jun 2006 23:42:33 -0400 Input: db9 - fix potential buffer overrun Fixes Coverity #id 483 Signed-off-by: Eric Sesterhenn Signed-off-by: Dmitry Torokhov commit f8b4c46c0c3667a56148a59bca54d945d246a3f3 tree 0b145c6c30b16677dbcb9193d112ff6e95babb65 parent 9000195bb7ea959939b1e5fdad336e5bac59c9e9 author Dmitry Torokhov Tue, 27 Jun 2006 23:42:17 -0400 committer Dmitry Torokhov Tue, 27 Jun 2006 23:42:17 -0400 Input: atkbd - fix hardware autorepeat Signed-off-by: Dmitry Torokhov commit a39727f212426b9d5f9267b3318a2afaf9922d3b tree e42d5834dd5b0844552c076c1d264ab0e35396f6 parent 936813a8807c5684c6a97f1081b31027403d4a93 parent 1f1bd5fc326a46d8c49132260f661b7cc954846f author Linus Torvalds Tue, 27 Jun 2006 19:15:50 -0700 committer Linus Torvalds Tue, 27 Jun 2006 19:15:50 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [netdrvr] Remove long-unused bits from Becker template drivers [netdrvr] natsemi: minor cleanups [netdrvr] natsemi: Separate out media initialization code [PATCH] WAN: update info page for a bunch of my drivers [PATCH] drivers/net/hamradio/dmascc.c: fix section mismatch [PATCH] Fix phy id for LXT971A/LXT972A [PATCH] DM9000 - minor code cleanups [PATCH] DM9000 - do no re-init spin lock [PATCH] DM9000 - check for MAC left in by bootloader [PATCH] DM9000 - better checks for platform resources commit 936813a8807c5684c6a97f1081b31027403d4a93 tree bc3a1343ea1548195ab4e5dd11b1830f8b9cc52b parent 73a0e405dce7d720808536b708f7c738b413b1a2 parent 6a93096195305f6f2a39544a034e77e2e74d5799 author Linus Torvalds Tue, 27 Jun 2006 19:13:56 -0700 committer Linus Torvalds Tue, 27 Jun 2006 19:13:56 -0700 Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: [MTD] NAND: Select chip before checking write protect status [MTD] CORE mtdchar.c: fix off-by-one error in lseek() [MTD] NAND: Fix typo in mtd/nand/ts7250.c [JFFS2][XATTR] coexistence between xattr and write buffering support. [JFFS2][XATTR] Fix wrong copyright [JFFS2][XATTR] Re-define xd->refcnt as atomic_t [JFFS2][XATTR] Fix memory leak with jffs2_xattr_ref [JFFS2][XATTR] rid unnecessary writing of delete marker. [JFFS2][XATTR] Fix ACL bug when updating null xattr by null ACL. [JFFS2][XATTR] using 'delete marker' for xdatum/xref deletion [MTD] Fix off-by-one error in physmap.c [MTD] Remove unused 'nr_banks' variable from ixp2000 map driver [MTD NAND] s3c2412 support in s3c2410.c [MTD] Initialize 'writesize' [MTD] NAND: ndfc fix address offset thinko [MTD] NAND: S3C2410 convert prinks to dev_*()s [MTD] NAND: Missing fixups commit 73a0e405dce7d720808536b708f7c738b413b1a2 tree 60cc93e993e89b0c83a549bd65647879ce37d9cc parent 03529d9f66b7995c67ddceb8f83258df3c9915da parent 5493a0fcba8a94baa5c1d80aca21d6ae4b3b573e author Linus Torvalds Tue, 27 Jun 2006 19:09:16 -0700 committer Linus Torvalds Tue, 27 Jun 2006 19:09:16 -0700 Merge git://oss.sgi.com:8090/nathans/xfs-2.6 * git://oss.sgi.com:8090/nathans/xfs-2.6: [XFS] Fixup whitespace damage in log_write, remove final warning. [XFS] Rework code snippets slightly to remove remaining recent-gcc [XFS] Fix realtime subvolume expansion, a porting bug b0rked it. Coverity [XFS] Remove a race condition where a linked inode could BUG_ON in [XFS] Remove redundant directory checks from inode link operation. [XFS] Remove a couple of no-longer-used macros. [XFS] Reduce size of xfs_trans_t structure. * remove ->t_forw, ->t_back -- [XFS] remove unused behaviour lock - shrink XFS vnode as a side effect. [XFS] * There is trivial "inode => vnode => inode" conversion, but only [XFS] link(2) on directory is banned in VFS. commit 03529d9f66b7995c67ddceb8f83258df3c9915da tree c16b506ebbb5644849f094c23976680906d64c1f parent 11bcab9071ac204b1ca2bb0514ad1641bc4c280b parent 2154cfa6ba560401d25f6cc083fe3fb996cbb571 author Linus Torvalds Tue, 27 Jun 2006 19:07:21 -0700 committer Linus Torvalds Tue, 27 Jun 2006 19:07:21 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] ata_piix: add ICH6/7/8 to Kconfig [PATCH] sata_sil: disable hotplug interrupts on two ATI IXPs [PATCH] libata: cosmetic updates [PATCH] ata: add some NVIDIA chipset IDs [PATCH] libata reduce timeouts [PATCH] libata: implement ata_port_max_devices() [PATCH] libata: make two functions global [PATCH] libata: update ata_do_simple_cmd() [PATCH] libata: move ata_do_simple_cmd() below ata_exec_internal() [PATCH] libata: clear EH action on device detach [PATCH] libata: implement and use ata_deh_dev_action() [PATCH] libata: move ata_eh_clear_action() upward [PATCH] libata.h needs scatterlist.h [libata] sata_vsc: partially revert a PCI ID-related commit [libata] Bump versions commit 4da30d15b6d5036b0d96422d6946ca758111fae3 tree 71b847b7c802f88a6ca5a94c01ab945dc3a5f3ce parent 910ab66b1c94a2758725874d389136cf9acdc04c author Geoff Levand Fri, 23 Jun 2006 20:57:49 +0200 committer Paul Mackerras Wed, 28 Jun 2006 11:59:48 +1000 [POWERPC] spufs: fix memory hotplug dependency spufs_base.c calls __add_pages, which depends on CONFIG_MEMORY_HOTPLUG. Moved the selection of CONFIG_MEMORY_HOTPLUG from CONFIG_SPUFS_MMAP to CONFIG_SPU_FS. Signed-off-by: Geoff Levand Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 910ab66b1c94a2758725874d389136cf9acdc04c tree 79d35d7b83af309e13e4e028b72bd893e0433695 parent 23cc770107c2d27dd1f5dee53177ea1163ee9295 author Benjamin Herrenschmidt Fri, 23 Jun 2006 20:57:48 +0200 committer Paul Mackerras Wed, 28 Jun 2006 11:59:48 +1000 [POWERPC] spufs: fix MFC command queue purge In the context save/restore code, the SPU MFC command queue purge code has a bug: static inline void wait_purge_complete(struct spu_state *csa, struct spu *spu) { struct spu_priv2 __iomem *priv2 = spu->priv2; /* Save, Step 28: * Poll MFC_CNTL[Ps] until value '11' is * read * (purge complete). */ POLL_WHILE_FALSE(in_be64(&priv2->mfc_control_RW) & MFC_CNTL_PURGE_DMA_COMPLETE); } This will exit as soon as _one_ of the 2 bits that compose MFC_CNTL_PURGE_DMA_COMPLETE is set, and one of them happens to be "purge in progress"... which means that we'll happily continue restoring the MFC while it's being purged at the same time. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 23cc770107c2d27dd1f5dee53177ea1163ee9295 tree 8f47c88813f548f2efef0e37c9fc8176cbf976dd parent 6b7290be0c045f3978c6b12f0a8aedd21ca6fa9c author Benjamin Herrenschmidt Fri, 23 Jun 2006 20:57:47 +0200 committer Paul Mackerras Wed, 28 Jun 2006 11:59:48 +1000 [POWERPC] spufs: map mmio space as guarded into user space This fixes a bug where we don't properly map SPE MMIO space as guarded, causing various test cases to fail, probably due to write combining and other niceties caused by the lack of the G bit. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 6b7290be0c045f3978c6b12f0a8aedd21ca6fa9c tree d7f4ef49d87cd70b9bf324b63a584d288b5a1bfb parent 94b60ec166bc410d544d7635c9575ea5e53ec052 author Michael Ellerman Fri, 23 Jun 2006 18:20:24 +1000 committer Paul Mackerras Wed, 28 Jun 2006 11:59:48 +1000 [POWERPC] Enable XMON in cell_defconfig Now that we have the udbg callbacks we can enable XMON by default. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 94b60ec166bc410d544d7635c9575ea5e53ec052 tree 0a9f571fb74edd7f6c5cd91468bb9742c7d9e407 parent cc46bb98c0d52695f26c239de701050660f5c79f author Michael Ellerman Fri, 23 Jun 2006 18:20:22 +1000 committer Paul Mackerras Wed, 28 Jun 2006 11:59:48 +1000 [POWERPC] Enable the RTAS udbg console on IBM Cell Blade Enable the RTAS udbg console on IBM Cell Blade, this allows xmon to work. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit cc46bb98c0d52695f26c239de701050660f5c79f tree 1b40e9db66de5c41c0b2fdf1db022f645a46a697 parent 458148c00b97864a27ecf528a1d45a8e5ebd9bbc author Michael Ellerman Fri, 23 Jun 2006 18:20:16 +1000 committer Paul Mackerras Wed, 28 Jun 2006 11:59:48 +1000 [POWERPC] Add udbg support for RTAS console Add udbg hooks for the RTAS console, based on the RTAS put-term-char and get-term-char calls. Along with my previous patches, this should enable debugging as soon as early_init_dt_scan_rtas() is called. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 458148c00b97864a27ecf528a1d45a8e5ebd9bbc tree cd32ceb1cddc32e501a1aeebd0f0f88dbdd950a5 parent ab3ab74d9b6b3920be70f502b40cb3f7f08d23fa author Michael Ellerman Fri, 23 Jun 2006 18:20:13 +1000 committer Paul Mackerras Wed, 28 Jun 2006 11:59:48 +1000 [POWERPC] Setup RTAS values earlier, to enable rtas_call() earlier Althought RTAS is instantiated when we enter the kernel, we can't actually call into it until we know its entry point address. Currently we grab that in rtas_initialize(), however that's quite late in the boot sequence. To enable rtas_call() earlier, we can grab the RTAS entry etc. values while we're scanning the flattened device tree. There's existing code to retrieve the values from /chosen, however we don't store them there anymore, so remove that code. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit ab3ab74d9b6b3920be70f502b40cb3f7f08d23fa tree 83c473f9f0013e3e88e0ba095b7b72622ce54068 parent 24da3dd53430ec07ce9110b1eaaad080c3c7ecf6 author Michael Ellerman Fri, 23 Jun 2006 18:20:11 +1000 committer Paul Mackerras Wed, 28 Jun 2006 11:59:47 +1000 [POWERPC] Move RTAS exports next to their declarations Move RTAS exports next to their declarations. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 24da3dd53430ec07ce9110b1eaaad080c3c7ecf6 tree 1c71b06224549fbc5b4860e7b38a1777ca3fbaea parent 4ba99b97dadd35b9ce1438b2bc7c992a4a14a8b1 author Michael Ellerman Fri, 23 Jun 2006 18:20:10 +1000 committer Paul Mackerras Wed, 28 Jun 2006 11:59:47 +1000 [POWERPC] Make rtas_call() safe if RTAS hasn't been initialised Currently it's unsafe to call rtas_call() prior to rtas_initialize(). This is because the rtas.entry value hasn't been setup and so we don't know where to enter, but we just try anyway. We can't do anything intelligent without rtas.entry, so if it's not set, just return. Code that calls rtas_call() early needs to be aware that the call might fail. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 4ba99b97dadd35b9ce1438b2bc7c992a4a14a8b1 tree 09065f39b2b22e0d29463cb8cea55ccb4b293549 parent aa98c50dcb5d5b85d2a4c26d54fa1e3c31c11e4b author Michael Ellerman Fri, 23 Jun 2006 18:20:09 +1000 committer Paul Mackerras Wed, 28 Jun 2006 11:59:47 +1000 [POWERPC] Setup the boot cpu's paca pointer in C rather than asm There's no need to set the boot cpu paca in asm, so do it in C so us mere mortals can understand it. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit aa98c50dcb5d5b85d2a4c26d54fa1e3c31c11e4b tree 4c0747cace834f0fe75244ccd69c6ff8fc2827cb parent c30a4df3f134f511e8cdf828da429e333753daab author Michael Ellerman Fri, 23 Jun 2006 18:17:32 +1000 committer Paul Mackerras Wed, 28 Jun 2006 11:59:47 +1000 [POWERPC] Make kexec_setup() a regular initcall There's no reason kexec_setup() needs to be called explicitly from setup_system(), it can just be a regular initcall. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit c30a4df3f134f511e8cdf828da429e333753daab tree 16a8565619278bdf980f4fd8a08556eb5117452c parent 7d0daae4ae1a3e80d78b83cddf414a3b98a962f4 author Michael Ellerman Fri, 23 Jun 2006 18:16:39 +1000 committer Paul Mackerras Wed, 28 Jun 2006 11:59:47 +1000 [POWERPC] Use ppc_md.hpte_insert() in htab_bolt_mapping() With the ppc_md htab pointers setup earlier, we can use ppc_md.hpte_insert in htab_bolt_mapping(), rather than deciding which version to call by hand. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 7d0daae4ae1a3e80d78b83cddf414a3b98a962f4 tree f8dcd24a598212b58652c771a5e81c8a167bb3d1 parent 7a4571ae553e2972b7958306fd796a2fd24fd7d1 author Michael Ellerman Fri, 23 Jun 2006 18:16:38 +1000 committer Paul Mackerras Wed, 28 Jun 2006 11:59:47 +1000 [POWERPC] powerpc: Initialise ppc_md htab pointers earlier Initialise the ppc_md htab callbacks earlier, in the probe routines. This allows us to call htab_finish_init() from htab_initialize(), and makes it private to hash_utils_64.c. Move htab_finish_init() and make_bl() above htab_initialize() to avoid forward declarations. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 7a4571ae553e2972b7958306fd796a2fd24fd7d1 tree 62111278b4bf452e1c481a2e662b910758b8d123 parent 1dce0e30471ac863fd141d137c98e3644817975e author Michael Ellerman Fri, 23 Jun 2006 18:16:03 +1000 committer Paul Mackerras Wed, 28 Jun 2006 11:59:46 +1000 [POWERPC] Export flat device tree via debugfs for debugging If DEBUG is turned on in prom.c, export the flat device tree via debugfs. This has been handy on several occasions. To look at it: # mount -t debugfs none /sys/kernel/debug # od -a /sys/kernel/debug/powerpc/flat-device-tree and/or # dtc -fI dtb /sys/kernel/debug/powerpc/flat-device-tree -O dts Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 1dce0e30471ac863fd141d137c98e3644817975e tree a5ee64549f4bf81a24de05ad514614d5e39826ee parent 5f50867b4f1938ab80d249206efbec37bba48c39 author Michael Ellerman Fri, 23 Jun 2006 18:15:37 +1000 committer Paul Mackerras Wed, 28 Jun 2006 11:59:46 +1000 [POWERPC] Remove remaining iSeries debugger cruft None of this seems to be necessary, so let's see if can remove it and not break anything. Booted on iSeries & pSeries here. NB. we don't remove the hvReleaseData, we just move it down so that the file reads more clearly. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 5f50867b4f1938ab80d249206efbec37bba48c39 tree b47656171eb83ebe6eeed7ec190b77924d0fe4b4 parent f93d6d071fdbf27141c5331d6cd988664650bc1f author Haren Myneni Thu, 22 Jun 2006 23:35:10 -0700 committer Paul Mackerras Wed, 28 Jun 2006 11:59:46 +1000 [POWERPC] kdump: Reserve the existing TCE mappings left by the first kernel During kdump boot, noticed some machines checkstop on dma protection fault for ongoing DMA left in the first kernel. Instead of initializing TCE entries in iommu_init() for the kdump boot, this patch fixes this issue by walking through the each TCE table and checks whether the entries are in use by the first kernel. If so, reserve those entries by setting the corresponding bit in tbl->it_map such that these entries will not be available for the kdump boot. However it could be possible that all TCE entries might be used up due to the driver bug that does continuous mapping. My observation is around 1700 TCE entries are used on some systems (Ex: P4) at some point of time during kdump boot and saving dump (either write into the disk or sending to remote machine). Hence, this patch will make sure that minimum of 2048 entries will be available such that kdump boot could be successful in some cases. Signed-off-by: Haren Myneni Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit f93d6d071fdbf27141c5331d6cd988664650bc1f tree e7d47372ffa02381bf712e63ed06599c919eca78 parent 790d427616ae68559b711bf4348003c17249abf4 author Jon Loeliger Thu, 22 Jun 2006 13:02:58 -0500 committer Paul Mackerras Wed, 28 Jun 2006 11:52:22 +1000 [POWERPC] Remove obsolete #include . Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 790d427616ae68559b711bf4348003c17249abf4 tree 6f93a68776b740b681a6ee4f15562c53675f2dd3 parent f17607fb17aabd3a963da39799bde17d81211ab0 author Jon Loeliger Thu, 22 Jun 2006 13:01:48 -0500 committer Paul Mackerras Wed, 28 Jun 2006 11:51:13 +1000 [POWERPC] Remove redundant STD_MMU selection. Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit f17607fb17aabd3a963da39799bde17d81211ab0 tree f62a0df316534b929c2cfc371c98ba7bdaf4f1b7 parent c53b33420a2e0ed1eb86be1c00b2dc21bb92bd6e author Jon Loeliger Thu, 22 Jun 2006 13:00:46 -0500 committer Paul Mackerras Wed, 28 Jun 2006 11:51:12 +1000 [POWERPC] Move I8259 selection under MPC8641HPCN board Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit c53b33420a2e0ed1eb86be1c00b2dc21bb92bd6e tree 1c6efef77610df567b42642677c7e33e19ded527 parent 6d7c466292fc7c90bb160c1c7df74035c7c12595 author Jon Loeliger Thu, 22 Jun 2006 12:59:25 -0500 committer Paul Mackerras Wed, 28 Jun 2006 11:51:12 +1000 [POWERPC] Remove redundant PPC_86XX check. Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 6d7c466292fc7c90bb160c1c7df74035c7c12595 tree ea1def4bb391060da2a3c4ebad9e3ad281f8a09e parent 70c3967d4f8029f3d53323a9f0490df61d8cb77d author Jimi Xenidis Wed, 21 Jun 2006 19:15:55 -0400 committer Paul Mackerras Wed, 28 Jun 2006 11:51:12 +1000 [POWERPC] Don't access HID registers if running on a Hypervisor. The following patch avoids accessing Hypervisor privilege HID registers when running on a Hypervisor (MSR[HV]=0). Signed-off-by: Jimi Xenidis Signed-off-by: Paul Mackerras commit 70c3967d4f8029f3d53323a9f0490df61d8cb77d tree 378a2f245db566c5197792c8be11e60deccf82dc parent 266bee88699ddbde42ab303bbc426a105cc49809 author Johannes Berg Wed, 21 Jun 2006 12:11:16 +0200 committer Paul Mackerras Wed, 28 Jun 2006 11:51:12 +1000 [POWERPC] Convert powermac ide blink to new led infrastructure This patch removes the old pmac ide led blink code and adds generic LED subsystem support for the LED. It maintains backward compatibility with the old BLK_DEV_IDE_PMAC_BLINK Kconfig option which now simply selects the new code and influences the default trigger. Signed-off-by: Johannes Berg Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 11bcab9071ac204b1ca2bb0514ad1641bc4c280b tree 987d3a1b9f5b28d56317723e70aa16587c2aa729 parent d6fcb3b9cf776e3f748709cd3091a72cb3855c29 author Linus Torvalds Tue, 27 Jun 2006 18:47:18 -0700 committer Linus Torvalds Tue, 27 Jun 2006 18:47:50 -0700 Properly delete sound/ppc/toonie.c The previous "delete" had actually just truncated it to a zero size, something that can easily happen if you just apply a patch. Signed-off-by: Linus Torvalds commit d6fcb3b9cf776e3f748709cd3091a72cb3855c29 tree 1b60436804d31c9500662e3b84f4b33a0d9dac6d parent f17a2686b11453680e9662ef8bdc8d948d0dce18 author Daniel Ritz Tue, 27 Jun 2006 18:40:54 +0200 committer Linus Torvalds Tue, 27 Jun 2006 18:36:39 -0700 [PATCH] i2c-i801.c: don't pci_disable_device() after it was just enabled Commit 02dd7ae2892e5ceff111d032769c78d3377df970 ("[PATCH] i2c-i801: Merge setup function") has a missing return 0 in the _probe() function. This means the error path is always executed and pci_disable_device() is called even when the device just got successfully enabled. Having the SMBus device disabled makes some systems (eg. Fujitsu-Siemens Lifebook E8010) hang hard during power-off. Intead of reverting the whole commit this patch fixes it up: - don't ever call pci_disable_device(), also not in the _remove() function to avoid hangs - fix missing pci_release_region() in error path Signed-off-by: Daniel Ritz Signed-off-by: Linus Torvalds commit f17a2686b11453680e9662ef8bdc8d948d0dce18 tree 8dc0dda0afe880fbd263825e2e07fe1d814f732e parent 01f7e67367f75257ea5e8e5a21eddba9fa660f17 parent f40c562855294bf4e7268274d7461dc32c1e6b25 author Linus Torvalds Tue, 27 Jun 2006 18:31:57 -0700 committer Linus Torvalds Tue, 27 Jun 2006 18:31:57 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (25 commits) [CIFS] Fix authentication choice so we do not force NTLMv2 unless the [CIFS] Fix alignment of unicode strings in previous patch [CIFS] Fix allocation of buffers for new session setup routine to allow [CIFS] Remove calls to to take f_owner.lock [CIFS] remove some redundant null pointer checks [CIFS] Fix compile warning when CONFIG_CIFS_EXPERIMENTAL is off [CIFS] Enable sec flags on mount for cifs (part one) [CIFS] Fix suspend/resume problem which causes EIO on subsequent access to [CIFS] fix minor compile warning when config_cifs_weak_security is off [CIFS] NTLMv2 support part 5 [CIFS] Add support for readdir to legacy servers [CIFS] NTLMv2 support part 4 [CIFS] NTLMv2 support part 3 [CIFS] NTLMv2 support part 2 [CIFS] Fix mask so can set new cifs security flags properly CIFS] Support for older servers which require plaintext passwords - part 2 [CIFS] Support for older servers which require plaintext passwords [CIFS] Fix mapping of old SMB return code Invalid Net Name so it is [CIFS] Missing brace [CIFS] Do not overwrite aops ... commit 01f7e67367f75257ea5e8e5a21eddba9fa660f17 tree 14e399438b86a86240c0d374ffb740e25ae9752a parent f5c7726ffc994f1826415852e7196bcb6c664d44 author Greg Ungerer Tue, 27 Jun 2006 13:27:02 +1000 committer Linus Torvalds Tue, 27 Jun 2006 18:30:14 -0700 [PATCH] m68knommu: use Kconfig RAM config options in 68328 startup code Switch to using the new RAM Kconfig settings, instead of linker defined regions in ROM specific 68328 startup code. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit f5c7726ffc994f1826415852e7196bcb6c664d44 tree 6037de0c9992db2b206892c56e7d5d354303b2a4 parent d046f6118bb2a207870e35db1411b958199a3750 author Greg Ungerer Tue, 27 Jun 2006 13:27:13 +1000 committer Linus Torvalds Tue, 27 Jun 2006 18:30:14 -0700 [PATCH] m68knommu: use Kconfig RAM config options in 68360 ROM startup code Switch to using the new RAM Kconfig settings, instead of linker defined regions in ROM specific 68360 startup code. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit d046f6118bb2a207870e35db1411b958199a3750 tree b4eb3db716ff957c9805904dca4c3c3fb11cead7 parent 999567d829b191b2cb7fd8dee31d5bccc81d7c55 author Greg Ungerer Tue, 27 Jun 2006 13:27:08 +1000 committer Linus Torvalds Tue, 27 Jun 2006 18:30:14 -0700 [PATCH] m68knommu: use Kconfig RAM config options in 68360 RAM startup code Switch to using the new RAM Kconfig settings, instead of linker defined regions in RAM specific 68360 startup code. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 999567d829b191b2cb7fd8dee31d5bccc81d7c55 tree f684df92c99b85bace4ae5875b608c01a3fd181f parent 0e702ab38b0eed1ea5968f3b60b352e814172c27 author Greg Ungerer Tue, 27 Jun 2006 13:22:07 +1000 committer Linus Torvalds Tue, 27 Jun 2006 18:30:14 -0700 [PATCH] m68knommu: remove NO_FORMAT_VECi from ptrace.h header Remove NO_FORMAT_VEC conditional check. It is not used or defined anywhere. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 0e702ab38b0eed1ea5968f3b60b352e814172c27 tree 98971ffff39b5b8e2bd630bcc81987468fceb455 parent 83901fc1c786c642c576f51302d79df849ad7d71 author Greg Ungerer Tue, 27 Jun 2006 13:19:33 +1000 committer Linus Torvalds Tue, 27 Jun 2006 18:30:14 -0700 [PATCH] m68knommu: FEC driver event/irq fixes Collection of fixes for the ColdFire FEC ethernet driver: . reworked event setting so that it occurs after the MII setup. roucaries bastien . Do not read cbd_sc in memory for each bit we test. Once per buffer is enough. . Overrun errors must increase `rx_fifo_errors', not `rx_crc_errors' . No need for a special value to activate rx or tx. Only write access matters. . Simplify parameter of eth_copy_and_sum : `data' has already the right value. . Some spelling fixes. Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 83901fc1c786c642c576f51302d79df849ad7d71 tree f8ea78c635f2ecdf495efff1172c715904556844 parent 6b2652936b9e61df47664a8dde46872a74d7dba2 author Willson Callan Tue, 27 Jun 2006 13:13:44 +1000 committer Linus Torvalds Tue, 27 Jun 2006 18:26:37 -0700 [PATCH] m68knommu: FEC driver set different priority/level on each IRQ Set different irq priority levels for each IRQ requested. According to the Freescale ColdFire documentation each separate IRQ must have its own unique priority/level combination. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 6b2652936b9e61df47664a8dde46872a74d7dba2 tree b36ac6dc08719436b3dc3b8aecf0e0bd1b821d60 parent 677177c5319f7079c22d04926c23b31166d7d405 author Matt Waddel Tue, 27 Jun 2006 13:10:56 +1000 committer Linus Torvalds Tue, 27 Jun 2006 18:26:37 -0700 [PATCH] m68knommu: FEC driver support for the ColdFire 523x CPU family Add support for the FEC module in the ColdFire 532x CPU family. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 677177c5319f7079c22d04926c23b31166d7d405 tree 52fcf3e4c656dcbc6b2a1b0856ad8aaffb084f40 parent 67bdd9842430f946213d0482862aae1ed8fd3ad0 author Philippe De Muyter Tue, 27 Jun 2006 13:05:33 +1000 committer Linus Torvalds Tue, 27 Jun 2006 18:26:37 -0700 [PATCH] m68knommu: avoid fec driver hang when link disappears Avoid requesting a `Graceful Transmit Stop' when link has disappeared, because that request cannot complete without link. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 67bdd9842430f946213d0482862aae1ed8fd3ad0 tree d3c693bf9eb63ee70e9b7e060d99b4bbeb72acc0 parent 9a6404b4d96aa82d05d8ed57e9eabea2b7920c7a author Greg Ungerer Tue, 27 Jun 2006 12:59:35 +1000 committer Linus Torvalds Tue, 27 Jun 2006 18:26:37 -0700 [PATCH] m68knommu: update m68knommu defconfnig Updated defconfig for m68knommu arch. Includes recent changes to the clock and RAM configuration options. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 9a6404b4d96aa82d05d8ed57e9eabea2b7920c7a tree bcbed8e6650d8ec8953d85202c7eeab39be79fe8 parent 121036e5c57dbf03882cce9eb810d6042683c925 author Matt Waddel Tue, 27 Jun 2006 12:50:53 +1000 committer Linus Torvalds Tue, 27 Jun 2006 18:26:36 -0700 [PATCH] m68knommu: build support for the Freescale 532x CPU family Add build support for the M523x ColdFire CPU family. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 121036e5c57dbf03882cce9eb810d6042683c925 tree 96164d755afc227964cf5e668e9789090ca28062 parent 3f787bff45e1880044e6ab3900b6a40214ae905f author Daniel Alomar Tue, 27 Jun 2006 12:49:11 +1000 committer Linus Torvalds Tue, 27 Jun 2006 18:26:36 -0700 [PATCH] m68knommu: build support for the Avnet/5282 board Add support for the Avnet/5282 board. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 3f787bff45e1880044e6ab3900b6a40214ae905f tree ea34ecc7c9e3cd8a704dca0e8769fed8189c6410 parent 3c101cf024c3f126e174bf0d8946c587127e3c30 author Philipe De Muyter Tue, 27 Jun 2006 12:47:00 +1000 committer Linus Torvalds Tue, 27 Jun 2006 18:26:36 -0700 [PATCH] m68knommu: remove useless compiler args Here is a small patch that made my kernel .text segment shrink by 8k IIRC on my 5272-based board, by removing `-Wa,-S' from CFLAGS. The `-Wa,-S' option prevents `gas' from using short forms of jsr. Without it, `gas' replaces `jsr xxx.l' (6 bytes) by `jsr xxx@pc' (4 bytes) when possible. On 5272, both forms are equally fast. The `-Wa,-m5307' option is useless, because gcc already gives it to `gas' from the `-m5307' option. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 3c101cf024c3f126e174bf0d8946c587127e3c30 tree 3cdf3532e9abfa0d48ad210a4a3a6671ad498458 parent 12e56b601f66a415f88e7d60f6b6707a19c430c9 author James Bottomley Mon, 26 Jun 2006 21:33:09 -0500 committer Linus Torvalds Tue, 27 Jun 2006 18:25:03 -0700 [PATCH] voyager: add cpu_present_map Voyager stopped booting some time in the 2.6.16-2.6.17 timeframe; the reason was that it doesn't have a cpu_present_map, so add one. Signed-off-by: James Bottomley Signed-off-by: Linus Torvalds commit 12e56b601f66a415f88e7d60f6b6707a19c430c9 tree c294adb1c5c1f80bbb2de82e6e41da97b3f5800f parent ca6f8792bd5281ebaf04bf23a43ed486e5e453a9 parent c78059f0a948404fb515db6be4bca5ec93eecd2a author Linus Torvalds Tue, 27 Jun 2006 18:22:13 -0700 committer Linus Torvalds Tue, 27 Jun 2006 18:22:13 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (26 commits) V4L/DVB (4263): Fix warning when compiling on 64 bit machines V4L/DVB (4261): Included required header for in-kernel compilation V4L/DVB (4260): Stradis.c: make 2 functions static V4L/DVB (4259): Pass an explicit log prefix to cx2341x_log_status V4L/DVB (4257): Fix 64-bit compile warnings. V4L/DVB (4255): Tda9887 default TOP value is 0x10 V4L/DVB (4254): Remove obsoleted tuner_debug option. V4L/DVB (4253): IVTV VBI format description too long. V4L/DVB (4252): Remove duplicate 'tda9887' in info messages. V4L/DVB (4245): Reduce the amount of pvrusb2-sourced noise going into the system log V4L/DVB (4244): Implement use of cx2341x module in pvrusb2 driver V4L/DVB (4243): Exploit new V4L control features in pvrusb2 V4L/DVB (4242): Don't suspend encoder when changing its attributes (in pvrusb2) V4L/DVB (4241): Fix faulty encoder error recovery in pvrusb2 V4L/DVB (4240): Various V4L control enhancements in pvrusb2 V4L/DVB (4239): Handle boolean controls in pvrusb2 V4L/DVB (4238): Make sure flags field is initialized when quering a control in pvrusb2 V4L/DVB (4237): Move LOG_STATUS bracketing to a different part of the pvrusb2 driver V4L/DVB (4236): Rearrange things in pvrusb2 driver in preparation for using cx2341x module V4L/DVB (4235): Increase the maximum number of controls that pvrusb2-sysfs.c can handle. ... commit 5493a0fcba8a94baa5c1d80aca21d6ae4b3b573e tree e376a3e935506c2bd7aba69c710739de4474e832 parent 6fdf8ccc09fd764a9cce11006aa3fca53ac1c895 author Nathan Scott Wed, 28 Jun 2006 11:17:28 +1000 committer Nathan Scott Wed, 28 Jun 2006 11:17:28 +1000 [XFS] Fixup whitespace damage in log_write, remove final warning. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26366a Signed-off-by: Nathan Scott commit ca6f8792bd5281ebaf04bf23a43ed486e5e453a9 tree 55bbda39e65175a5a272cacbdfb537d8d7df4c65 parent 91bf46026966926f3b63539db423144b8c66eab4 author Karsten Keil Tue, 27 Jun 2006 13:01:27 +0200 committer Linus Torvalds Tue, 27 Jun 2006 18:00:36 -0700 [PATCH] i4l fix DLE masking in isdn_tty_try_read DLE masking was non-functional since the new tty handling. Found by Peter Evertz Signed-off-by: Karsten Keil Signed-off-by: Linus Torvalds commit 91bf46026966926f3b63539db423144b8c66eab4 tree 6e132eb0d3b87e959db8e84a045ba28f33739923 parent 775d584c63818595dd6ba635438753cf3c18e4b1 author Andrew Morton Tue, 27 Jun 2006 02:55:09 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:48 -0700 [PATCH] do_IRQ() warning fix arch/i386/kernel/irq.c: In function 'do_IRQ': arch/i386/kernel/irq.c:104: warning: suggest parentheses around arithmetic in operand of | Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 775d584c63818595dd6ba635438753cf3c18e4b1 tree 0e90b1dcc2d86bc831ff47c92dfd53afd28cc3b9 parent 456229a91d2bdf884f0c01b33f1ecee762abba7d author Adrian Bunk Tue, 27 Jun 2006 02:55:08 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:48 -0700 [PATCH] drivers/message/i2o/iop.c: unexport i2o_msg_nop() It's available in a header as a static inline - there's no need to export it. Signed-off-by: Adrian Bunk Cc: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 456229a91d2bdf884f0c01b33f1ecee762abba7d tree 5efb884b98f785a684eebf481d1c99fbbc41e482 parent 8f7607803717e9d045965b210cd16a25d80cd04b author Adrian Bunk Tue, 27 Jun 2006 02:55:07 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:48 -0700 [PATCH] drivers/char/ipmi/ipmi_msghandler.c: make proc_ipmi_root static Make struct proc_ipmi_root static. Besides this, tremove removes an unused #ifdef CONFIG_PROC_FS from include/linux/ipmi.h. Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f7607803717e9d045965b210cd16a25d80cd04b tree 1e8af970aa305be5e229a86b3ccc2525f3936d3b parent 9a66a53f558efc2619a438278d2919b3c9a7f673 author Jesper Juhl Tue, 27 Jun 2006 02:55:06 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:48 -0700 [PATCH] Remove redundant NULL checks before [kv]free - in drivers/ Remove redundant NULL chck before kfree + tiny CodingStyle cleanup for drivers/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a66a53f558efc2619a438278d2919b3c9a7f673 tree c3d20628f1d688f6099556995b597ef629970f7f parent 4ad98457aa545bc4d03d417da86325507aa586ec author Jesper Juhl Tue, 27 Jun 2006 02:55:05 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:48 -0700 [PATCH] Remove redundant NULL checks before [kv]free - in kernel/ Remove redundant kfree NULL checks from kernel/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ad98457aa545bc4d03d417da86325507aa586ec tree 212fe02cff7b38c27e8bbaf3136f05e452531c0b parent 59e0e0ace7d33e8c0c125042f153f80fcc56b39e author Jesper Juhl Tue, 27 Jun 2006 02:55:04 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:48 -0700 [PATCH] Remove redundant NULL checks before [kv]free - in fs/ Remove redundant NULL checks before kfree for fs/ Signed-off-by: Jesper Juhl Acked-by: Mark Fasheh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59e0e0ace7d33e8c0c125042f153f80fcc56b39e tree e73a795bd99b39a886fe3f9b46f85dbf53db5316 parent 95e02ca9bb5324360e7dea1ea1c563036d84a5e6 author Sebastien Dugue Tue, 27 Jun 2006 02:55:03 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:48 -0700 [PATCH] futex_requeue() optimization In futex_requeue(), when the 2 futexes keys hash to the same bucket, there is no need to move the futex_q to the end of the bucket list. Signed-off-by: Sebastien Dugue Cc: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 95e02ca9bb5324360e7dea1ea1c563036d84a5e6 tree 0336dd808abe113b42f53a8f700d50ea6ba674ff parent 0bafd214e4ba55dc1fb81a3031d0249292f1bc05 author Thomas Gleixner Tue, 27 Jun 2006 02:55:02 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:48 -0700 [PATCH] rtmutex: Propagate priority settings into PI lock chains When the priority of a task, which is blocked on a lock, changes we must propagate this change into the PI lock chain. Therefor the chain walk code is changed to get rid of the references to current to avoid false positives in the deadlock detector, as setscheduler might be called by a task which holds the lock on which the task whose priority is changed is blocked. Also add some comments about the get/put_task_struct usage to avoid confusion. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Cc: Steven Rostedt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0bafd214e4ba55dc1fb81a3031d0249292f1bc05 tree 754b3ad381078c57061515549642889b19aaf86d parent e74c69f46d93d29eea0ad8647863d1c6488f0f55 author Thomas Gleixner Tue, 27 Jun 2006 02:55:01 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:47 -0700 [PATCH] rtmutex: Modify rtmutex-tester to test the setscheduler propagation Make test suite setscheduler calls asynchronously. Remove the waits in the test cases and add a new testcase to verify the correctness of the setscheduler priority propagation. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e74c69f46d93d29eea0ad8647863d1c6488f0f55 tree 5537d5a60eec3985de11cad4476ed95025051721 parent a1583d3e83cae1c58870602efc6328c34b644c01 author Thomas Gleixner Tue, 27 Jun 2006 02:55:00 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:47 -0700 [PATCH] Drop tasklist lock in do_sched_setscheduler There is no need to hold tasklist_lock across the setscheduler call, when we pin the task structure with get_task_struct(). Interrupts are disabled in setscheduler anyway and the permission checks do not need interrupts disabled. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Cc: Steven Rostedt Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1583d3e83cae1c58870602efc6328c34b644c01 tree 4f26fb4e482d295ef7670143ddf7a86e58e1973a parent c87e2837be82df479a6bae9f155c43516d2feebc author Roman Zippel Tue, 27 Jun 2006 02:55:00 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:47 -0700 [PATCH] fix rt-mutex defaults and dependencies Fix defaults and dependencies. Signed-off-by: Roman Zippel Cc: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c87e2837be82df479a6bae9f155c43516d2feebc tree ad6ab35f0b78f71abaa7b05185e9e3f97809c6de parent 0cdbee9920fb37eb2dc49b860c2b28862d647adc author Ingo Molnar Tue, 27 Jun 2006 02:54:58 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:47 -0700 [PATCH] pi-futex: futex_lock_pi/futex_unlock_pi support This adds the actual pi-futex implementation, based on rt-mutexes. [dino@in.ibm.com: fix an oops-causing race] Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Arjan van de Ven Signed-off-by: Dinakar Guniguntala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0cdbee9920fb37eb2dc49b860c2b28862d647adc tree df33dadb52979d7fadd1b464b14ae797d3838181 parent 61a87122869b6340a63b6f9f84097d3688604b90 author Ingo Molnar Tue, 27 Jun 2006 02:54:57 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:47 -0700 [PATCH] pi-futex: rt mutex futex api Add proxy-locking rt-mutex functionality needed by pi-futexes. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61a87122869b6340a63b6f9f84097d3688604b90 tree 11d60d29763a42abd66453a920cc06bebc852427 parent e7eebaf6a81b956c989f184ee4b27277c88f8afe author Thomas Gleixner Tue, 27 Jun 2006 02:54:56 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:47 -0700 [PATCH] pi-futex: rt mutex tester RT-mutex tester: scriptable tester for rt mutexes, which allows userspace scripting of mutex unit-tests (and dynamic tests as well), using the actual rt-mutex implementation of the kernel. [akpm@osdl.org: fixlet] Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7eebaf6a81b956c989f184ee4b27277c88f8afe tree 25adcfb17ec5f857791557a874cc1cced390ca9f parent a6537be9324c67b41f6d98f5a60a1bd5a8e02861 author Ingo Molnar Tue, 27 Jun 2006 02:54:55 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:47 -0700 [PATCH] pi-futex: rt mutex debug Runtime debugging functionality for rt-mutexes. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6537be9324c67b41f6d98f5a60a1bd5a8e02861 tree 73d430a911b56f0f4e4def80d0af47409f9db6c8 parent 23f78d4a03c53cbd75d87a795378ea540aa08c86 author Steven Rostedt Tue, 27 Jun 2006 02:54:54 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:47 -0700 [PATCH] pi-futex: rt mutex docs Add rt-mutex documentation. [rostedt@goodmis.org: Update rt-mutex-design.txt as per Randy Dunlap suggestions] Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Arjan van de Ven Signed-off-by: Steven Rostedt Signed-off-by: Steven Rostedt Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23f78d4a03c53cbd75d87a795378ea540aa08c86 tree 27dfe06337990911380fe8c5949ae9acd8e9568a parent b29739f902ee76a05493fb7d2303490fc75364f4 author Ingo Molnar Tue, 27 Jun 2006 02:54:53 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:47 -0700 [PATCH] pi-futex: rt mutex core Core functions for the rt-mutex subsystem. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b29739f902ee76a05493fb7d2303490fc75364f4 tree 1bf48dfb74752a7ef24a2a4a74c45da0aaec754b parent 77ba89c5cf28d5d98a3cae17f67a3e42b102cc25 author Ingo Molnar Tue, 27 Jun 2006 02:54:51 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:46 -0700 [PATCH] pi-futex: scheduler support for pi Add framework to boost/unboost the priority of RT tasks. This consists of: - caching the 'normal' priority in ->normal_prio - providing a functions to set/get the priority of the task - make sched_setscheduler() aware of boosting The effective_prio() cleanups also fix a priority-calculation bug pointed out by Andrey Gelman, in set_user_nice(). has_rt_policy() fix: Peter Williams Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Arjan van de Ven Cc: Andrey Gelman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77ba89c5cf28d5d98a3cae17f67a3e42b102cc25 tree d487b536522574ab183cc600b62008c60db85b59 parent 8eb94f80dd2da5977c35cd094f0802c1501a12cd author Ingo Molnar Tue, 27 Jun 2006 02:54:51 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:46 -0700 [PATCH] pi-futex: add plist implementation Add the priority-sorted list (plist) implementation. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8eb94f80dd2da5977c35cd094f0802c1501a12cd tree ff2ff8f89fb04359aaf3dbe6ea3ca60cec4879f0 parent f9b8404cf8f8456dfa83459510762b700dc00385 author Ingo Molnar Tue, 27 Jun 2006 02:54:50 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:46 -0700 [PATCH] pi-futex: introduce WARN_ON_SMP Introduce a new WARN_ON variant: WARN_ON_SMP(cond). Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9b8404cf8f8456dfa83459510762b700dc00385 tree f74b54c79ee3913d587644195d8af7ba13b6cc2a parent 6abdce7680e3e8436b3292b345d77b67d5ec9ea8 author Ingo Molnar Tue, 27 Jun 2006 02:54:49 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:46 -0700 [PATCH] pi-futex: introduce debug_check_no_locks_freed() Add debug_check_no_locks_freed(), as a central inline to add bad-lock-free-debugging functionality to. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6abdce7680e3e8436b3292b345d77b67d5ec9ea8 tree a242d780c2d1ea9214d33dcba54064d8fb2b500c parent e2970f2fb6950183a34e8545faa093eb49d186e1 author Ingo Molnar Tue, 27 Jun 2006 02:54:48 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:46 -0700 [PATCH] pi-futex: robust futex docs fix Fix typo in Documentation/robust-futexes.txt. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2970f2fb6950183a34e8545faa093eb49d186e1 tree a4035274368d846488a3b0152925502c06b064b0 parent 66e5393a78b3fcca63e7748e38221dcca61c4aab author Ingo Molnar Tue, 27 Jun 2006 02:54:47 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:46 -0700 [PATCH] pi-futex: futex code cleanups We are pleased to announce "lightweight userspace priority inheritance" (PI) support for futexes. The following patchset and glibc patch implements it, ontop of the robust-futexes patchset which is included in 2.6.16-mm1. We are calling it lightweight for 3 reasons: - in the user-space fastpath a PI-enabled futex involves no kernel work (or any other PI complexity) at all. No registration, no extra kernel calls - just pure fast atomic ops in userspace. - in the slowpath (in the lock-contention case), the system call and scheduling pattern is in fact better than that of normal futexes, due to the 'integrated' nature of FUTEX_LOCK_PI. [more about that further down] - the in-kernel PI implementation is streamlined around the mutex abstraction, with strict rules that keep the implementation relatively simple: only a single owner may own a lock (i.e. no read-write lock support), only the owner may unlock a lock, no recursive locking, etc. Priority Inheritance - why, oh why??? ------------------------------------- Many of you heard the horror stories about the evil PI code circling Linux for years, which makes no real sense at all and is only used by buggy applications and which has horrible overhead. Some of you have dreaded this very moment, when someone actually submits working PI code ;-) So why would we like to see PI support for futexes? We'd like to see it done purely for technological reasons. We dont think it's a buggy concept, we think it's useful functionality to offer to applications, which functionality cannot be achieved in other ways. We also think it's the right thing to do, and we think we've got the right arguments and the right numbers to prove that. We also believe that we can address all the counter-arguments as well. For these reasons (and the reasons outlined below) we are submitting this patch-set for upstream kernel inclusion. What are the benefits of PI? The short reply: ---------------- User-space PI helps achieving/improving determinism for user-space applications. In the best-case, it can help achieve determinism and well-bound latencies. Even in the worst-case, PI will improve the statistical distribution of locking related application delays. The longer reply: ----------------- Firstly, sharing locks between multiple tasks is a common programming technique that often cannot be replaced with lockless algorithms. As we can see it in the kernel [which is a quite complex program in itself], lockless structures are rather the exception than the norm - the current ratio of lockless vs. locky code for shared data structures is somewhere between 1:10 and 1:100. Lockless is hard, and the complexity of lockless algorithms often endangers to ability to do robust reviews of said code. I.e. critical RT apps often choose lock structures to protect critical data structures, instead of lockless algorithms. Furthermore, there are cases (like shared hardware, or other resource limits) where lockless access is mathematically impossible. Media players (such as Jack) are an example of reasonable application design with multiple tasks (with multiple priority levels) sharing short-held locks: for example, a highprio audio playback thread is combined with medium-prio construct-audio-data threads and low-prio display-colory-stuff threads. Add video and decoding to the mix and we've got even more priority levels. So once we accept that synchronization objects (locks) are an unavoidable fact of life, and once we accept that multi-task userspace apps have a very fair expectation of being able to use locks, we've got to think about how to offer the option of a deterministic locking implementation to user-space. Most of the technical counter-arguments against doing priority inheritance only apply to kernel-space locks. But user-space locks are different, there we cannot disable interrupts or make the task non-preemptible in a critical section, so the 'use spinlocks' argument does not apply (user-space spinlocks have the same priority inversion problems as other user-space locking constructs). Fact is, pretty much the only technique that currently enables good determinism for userspace locks (such as futex-based pthread mutexes) is priority inheritance: Currently (without PI), if a high-prio and a low-prio task shares a lock [this is a quite common scenario for most non-trivial RT applications], even if all critical sections are coded carefully to be deterministic (i.e. all critical sections are short in duration and only execute a limited number of instructions), the kernel cannot guarantee any deterministic execution of the high-prio task: any medium-priority task could preempt the low-prio task while it holds the shared lock and executes the critical section, and could delay it indefinitely. Implementation: --------------- As mentioned before, the userspace fastpath of PI-enabled pthread mutexes involves no kernel work at all - they behave quite similarly to normal futex-based locks: a 0 value means unlocked, and a value==TID means locked. (This is the same method as used by list-based robust futexes.) Userspace uses atomic ops to lock/unlock these mutexes without entering the kernel. To handle the slowpath, we have added two new futex ops: FUTEX_LOCK_PI FUTEX_UNLOCK_PI If the lock-acquire fastpath fails, [i.e. an atomic transition from 0 to TID fails], then FUTEX_LOCK_PI is called. The kernel does all the remaining work: if there is no futex-queue attached to the futex address yet then the code looks up the task that owns the futex [it has put its own TID into the futex value], and attaches a 'PI state' structure to the futex-queue. The pi_state includes an rt-mutex, which is a PI-aware, kernel-based synchronization object. The 'other' task is made the owner of the rt-mutex, and the FUTEX_WAITERS bit is atomically set in the futex value. Then this task tries to lock the rt-mutex, on which it blocks. Once it returns, it has the mutex acquired, and it sets the futex value to its own TID and returns. Userspace has no other work to perform - it now owns the lock, and futex value contains FUTEX_WAITERS|TID. If the unlock side fastpath succeeds, [i.e. userspace manages to do a TID -> 0 atomic transition of the futex value], then no kernel work is triggered. If the unlock fastpath fails (because the FUTEX_WAITERS bit is set), then FUTEX_UNLOCK_PI is called, and the kernel unlocks the futex on the behalf of userspace - and it also unlocks the attached pi_state->rt_mutex and thus wakes up any potential waiters. Note that under this approach, contrary to other PI-futex approaches, there is no prior 'registration' of a PI-futex. [which is not quite possible anyway, due to existing ABI properties of pthread mutexes.] Also, under this scheme, 'robustness' and 'PI' are two orthogonal properties of futexes, and all four combinations are possible: futex, robust-futex, PI-futex, robust+PI-futex. glibc support: -------------- Ulrich Drepper and Jakub Jelinek have written glibc support for PI-futexes (and robust futexes), enabling robust and PI (PTHREAD_PRIO_INHERIT) POSIX mutexes. (PTHREAD_PRIO_PROTECT support will be added later on too, no additional kernel changes are needed for that). [NOTE: The glibc patch is obviously inofficial and unsupported without matching upstream kernel functionality.] the patch-queue and the glibc patch can also be downloaded from: http://redhat.com/~mingo/PI-futex-patches/ Many thanks go to the people who helped us create this kernel feature: Steven Rostedt, Esben Nielsen, Benedikt Spranger, Daniel Walker, John Cooper, Arjan van de Ven, Oleg Nesterov and others. Credits for related prior projects goes to Dirk Grambow, Inaky Perez-Gonzalez, Bill Huey and many others. Clean up the futex code, before adding more features to it: - use u32 as the futex field type - that's the ABI - use __user and pointers to u32 instead of unsigned long - code style / comment style cleanups - rename hash-bucket name from 'bh' to 'hb'. I checked the pre and post futex.o object files to make sure this patch has no code effects. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Arjan van de Ven Cc: Ulrich Drepper Cc: Jakub Jelinek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66e5393a78b3fcca63e7748e38221dcca61c4aab tree 57c5408e8e5596863f4abbe1c822bb0c1c7ff059 parent 9fea80e4d984d411aa188baa31225c273ebe0fe6 author Steven Rostedt Tue, 27 Jun 2006 02:54:44 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:46 -0700 [PATCH] BUG() if setscheduler is called from interrupt context Thomas Gleixner is adding the call to a rtmutex function in setscheduler. This call grabs a spin_lock that is not always protected by interrupts disabled. So this means that setscheduler cant be called from interrupt context. To prevent this from happening in the future, this patch adds a BUG_ON(in_interrupt()) in that function. (Thanks to akpm for this suggestion). Signed-off-by: Steven Rostedt Cc: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9fea80e4d984d411aa188baa31225c273ebe0fe6 tree da48ffcb1b5a502d72645e55ade9c6588e784cd4 parent 5c45bf279d378d436ce45825c0f136696c7b6109 author Oleg Nesterov Tue, 27 Jun 2006 02:54:42 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:45 -0700 [PATCH] sched: uninline task_rq_lock() Saves 543 bytes from sched.o (gcc 3.3.3). Signed-off-by: Oleg Nesterov Cc: Ingo Molnar Cc: Nick Piggin Cc: Con Kolivas Cc: Peter Williams Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c45bf279d378d436ce45825c0f136696c7b6109 tree 80e2fcf4866b84fccb787562e1a83b16f4bc8850 parent 369381694ddcf03f1de403501c8b97099b5109ec author Siddha, Suresh B Tue, 27 Jun 2006 02:54:42 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:45 -0700 [PATCH] sched: mc/smt power savings sched policy sysfs entries 'sched_mc_power_savings' and 'sched_smt_power_savings' in /sys/devices/system/cpu/ control the MC/SMT power savings policy for the scheduler. Based on the values (1-enable, 0-disable) for these controls, sched groups cpu power will be determined for different domains. When power savings policy is enabled and under light load conditions, scheduler will minimize the physical packages/cpu cores carrying the load and thus conserving power(with a perf impact based on the workload characteristics... see OLS 2005 CMP kernel scheduler paper for more details..) Signed-off-by: Suresh Siddha Cc: Ingo Molnar Cc: Nick Piggin Cc: Con Kolivas Cc: "Chen, Kenneth W" Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 369381694ddcf03f1de403501c8b97099b5109ec tree 3945620740cc1687c8487356bf4be90394695702 parent 15f0b676a482fb4067cfe25de417c417dda3440a author Srivatsa Vaddagiri Tue, 27 Jun 2006 02:54:41 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:45 -0700 [PATCH] sched_domai: Allocate sched_group structures dynamically As explained here: http://marc.theaimsgroup.com/?l=linux-kernel&m=114327539012323&w=2 there is a problem with sharing sched_group structures between two separate sched_group structures for different sched_domains. The patch has been tested and found to avoid the kernel lockup problem described in above URL. Signed-off-by: Srivatsa Vaddagiri Cc: Nick Piggin Cc: Ingo Molnar Cc: "Siddha, Suresh B" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15f0b676a482fb4067cfe25de417c417dda3440a tree 29426196953a41d9cca0d81d501e76514ce820b2 parent d3a5aa9858cc9cecc3aadac7311d376c7c9e101a author Srivatsa Vaddagiri Tue, 27 Jun 2006 02:54:40 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:45 -0700 [PATCH] sched_domai: Use kmalloc_node The sched group structures used to represent various nodes need to be allocated from respective nodes (as suggested here also: http://uwsg.ucs.indiana.edu/hypermail/linux/kernel/0603.3/0051.html) Signed-off-by: Srivatsa Vaddagiri Cc: Nick Piggin Cc: Ingo Molnar Cc: "Siddha, Suresh B" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3a5aa9858cc9cecc3aadac7311d376c7c9e101a tree 2d753b1cfacdfe399aaa39c30d5f94623bc728e4 parent 51888ca25a03125e742ef84d4ddfd74e139707a0 author Srivatsa Vaddagiri Tue, 27 Jun 2006 02:54:39 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:45 -0700 [PATCH] sched_domai: Don't use GFP_ATOMIC Replace GFP_ATOMIC allocation for sched_group_nodes with GFP_KERNEL based allocation. Signed-off-by: Srivatsa Vaddagiri Cc: Ingo Molnar Cc: "Siddha, Suresh B" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51888ca25a03125e742ef84d4ddfd74e139707a0 tree b15e50f3b67f6e2b94b783fce603d4a1f54a8189 parent 615052dc3bf96278a843a64d3d1eea03532028c3 author Srivatsa Vaddagiri Tue, 27 Jun 2006 02:54:38 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:45 -0700 [PATCH] sched_domain: handle kmalloc failure Try to handle mem allocation failures in build_sched_domains by bailing out and cleaning up thus-far allocated memory. The patch has a direct consequence that we disable load balancing completely (even at sibling level) upon *any* memory allocation failure. [Lee.Schermerhorn@hp.com: bugfix] Signed-off-by: Srivatsa Vaddagir Cc: Nick Piggin Cc: Ingo Molnar Cc: "Siddha, Suresh B" Signed-off-by: Lee Schermerhorn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 615052dc3bf96278a843a64d3d1eea03532028c3 tree e7d5c61bd244e5fbde4ada9ae2ef1ebe7923fb53 parent 50ddd96917e4548b3813bfb5dd6f97f052b652bd author Peter Williams Tue, 27 Jun 2006 02:54:37 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:44 -0700 [PATCH] sched: Avoid unnecessarily moving highest priority task move_tasks() Problem: To help distribute high priority tasks evenly across the available CPUs move_tasks() does not, under some circumstances, skip tasks whose load weight is bigger than the designated amount. Because the highest priority task on the busiest queue may be on the expired array it may be moved as a result of this mechanism. Apart from not being the most desirable way to redistribute the high priority tasks (we'd rather move the second highest priority task), there is a risk that this could set up a loop with this task bouncing backwards and forwards between the two queues. (This latter possibility can be demonstrated by running a nice==-20 CPU bound task on an otherwise quiet 2 CPU system.) Solution: Modify the mechanism so that it does not override skip for the highest priority task on the CPU. Of course, if there are more than one tasks at the highest priority then it will allow the override for one of them as this is a desirable redistribution of high priority tasks. Signed-off-by: Peter Williams Cc: Ingo Molnar Cc: "Siddha, Suresh B" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50ddd96917e4548b3813bfb5dd6f97f052b652bd tree f8e62672b35ebdefee048e042a54e8ceaeab0cf0 parent 2dd73a4f09beacadde827a032cf15fd8b1fa3d48 author Peter Williams Tue, 27 Jun 2006 02:54:36 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:44 -0700 [PATCH] sched: modify move_tasks() to improve load balancing outcomes Problem: The move_tasks() function is designed to move UP TO the amount of load it is asked to move and in doing this it skips over tasks looking for ones whose load weights are less than or equal to the remaining load to be moved. This is (in general) a good thing but it has the unfortunate result of breaking one of the original load balancer's good points: namely, that (within the limits imposed by the active/expired array model and the fact the expired is processed first) it moves high priority tasks before low priority ones and this means there's a good chance (see active/expired problem for why it's only a chance) that the highest priority task on the queue but not actually on the CPU will be moved to the other CPU where (as a high priority task) it may preempt the current task. Solution: Modify move_tasks() so that high priority tasks are not skipped when moving them will make them the highest priority task on their new run queue. Signed-off-by: Peter Williams Cc: Ingo Molnar Cc: "Siddha, Suresh B" Cc: "Chen, Kenneth W" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2dd73a4f09beacadde827a032cf15fd8b1fa3d48 tree f81752d44e68240231518d6a3f05ac9ff6410a2d parent efc30814a88bdbe2bfe4ac94de2eb089ad80bee3 author Peter Williams Tue, 27 Jun 2006 02:54:34 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:44 -0700 [PATCH] sched: implement smpnice Problem: The introduction of separate run queues per CPU has brought with it "nice" enforcement problems that are best described by a simple example. For the sake of argument suppose that on a single CPU machine with a nice==19 hard spinner and a nice==0 hard spinner running that the nice==0 task gets 95% of the CPU and the nice==19 task gets 5% of the CPU. Now suppose that there is a system with 2 CPUs and 2 nice==19 hard spinners and 2 nice==0 hard spinners running. The user of this system would be entitled to expect that the nice==0 tasks each get 95% of a CPU and the nice==19 tasks only get 5% each. However, whether this expectation is met is pretty much down to luck as there are four equally likely distributions of the tasks to the CPUs that the load balancing code will consider to be balanced with loads of 2.0 for each CPU. Two of these distributions involve one nice==0 and one nice==19 task per CPU and in these circumstances the users expectations will be met. The other two distributions both involve both nice==0 tasks being on one CPU and both nice==19 being on the other CPU and each task will get 50% of a CPU and the user's expectations will not be met. Solution: The solution to this problem that is implemented in the attached patch is to use weighted loads when determining if the system is balanced and, when an imbalance is detected, to move an amount of weighted load between run queues (as opposed to a number of tasks) to restore the balance. Once again, the easiest way to explain why both of these measures are necessary is to use a simple example. Suppose that (in a slight variation of the above example) that we have a two CPU system with 4 nice==0 and 4 nice=19 hard spinning tasks running and that the 4 nice==0 tasks are on one CPU and the 4 nice==19 tasks are on the other CPU. The weighted loads for the two CPUs would be 4.0 and 0.2 respectively and the load balancing code would move 2 tasks resulting in one CPU with a load of 2.0 and the other with load of 2.2. If this was considered to be a big enough imbalance to justify moving a task and that task was moved using the current move_tasks() then it would move the highest priority task that it found and this would result in one CPU with a load of 3.0 and the other with a load of 1.2 which would result in the movement of a task in the opposite direction and so on -- infinite loop. If, on the other hand, an amount of load to be moved is calculated from the imbalance (in this case 0.1) and move_tasks() skips tasks until it find ones whose contributions to the weighted load are less than this amount it would move two of the nice==19 tasks resulting in a system with 2 nice==0 and 2 nice=19 on each CPU with loads of 2.1 for each CPU. One of the advantages of this mechanism is that on a system where all tasks have nice==0 the load balancing calculations would be mathematically identical to the current load balancing code. Notes: struct task_struct: has a new field load_weight which (in a trade off of space for speed) stores the contribution that this task makes to a CPU's weighted load when it is runnable. struct runqueue: has a new field raw_weighted_load which is the sum of the load_weight values for the currently runnable tasks on this run queue. This field always needs to be updated when nr_running is updated so two new inline functions inc_nr_running() and dec_nr_running() have been created to make sure that this happens. This also offers a convenient way to optimize away this part of the smpnice mechanism when CONFIG_SMP is not defined. int try_to_wake_up(): in this function the value SCHED_LOAD_BALANCE is used to represent the load contribution of a single task in various calculations in the code that decides which CPU to put the waking task on. While this would be a valid on a system where the nice values for the runnable tasks were distributed evenly around zero it will lead to anomalous load balancing if the distribution is skewed in either direction. To overcome this problem SCHED_LOAD_SCALE has been replaced by the load_weight for the relevant task or by the average load_weight per task for the queue in question (as appropriate). int move_tasks(): The modifications to this function were complicated by the fact that active_load_balance() uses it to move exactly one task without checking whether an imbalance actually exists. This precluded the simple overloading of max_nr_move with max_load_move and necessitated the addition of the latter as an extra argument to the function. The internal implementation is then modified to move up to max_nr_move tasks and max_load_move of weighted load. This slightly complicates the code where move_tasks() is called and if ever active_load_balance() is changed to not use move_tasks() the implementation of move_tasks() should be simplified accordingly. struct sched_group *find_busiest_group(): Similar to try_to_wake_up(), there are places in this function where SCHED_LOAD_SCALE is used to represent the load contribution of a single task and the same issues are created. A similar solution is adopted except that it is now the average per task contribution to a group's load (as opposed to a run queue) that is required. As this value is not directly available from the group it is calculated on the fly as the queues in the groups are visited when determining the busiest group. A key change to this function is that it is no longer to scale down *imbalance on exit as move_tasks() uses the load in its scaled form. void set_user_nice(): has been modified to update the task's load_weight field when it's nice value and also to ensure that its run queue's raw_weighted_load field is updated if it was runnable. From: "Siddha, Suresh B" With smpnice, sched groups with highest priority tasks can mask the imbalance between the other sched groups with in the same domain. This patch fixes some of the listed down scenarios by not considering the sched groups which are lightly loaded. a) on a simple 4-way MP system, if we have one high priority and 4 normal priority tasks, with smpnice we would like to see the high priority task scheduled on one cpu, two other cpus getting one normal task each and the fourth cpu getting the remaining two normal tasks. but with current smpnice extra normal priority task keeps jumping from one cpu to another cpu having the normal priority task. This is because of the busiest_has_loaded_cpus, nr_loaded_cpus logic.. We are not including the cpu with high priority task in max_load calculations but including that in total and avg_load calcuations.. leading to max_load < avg_load and load balance between cpus running normal priority tasks(2 Vs 1) will always show imbalanace as one normal priority and the extra normal priority task will keep moving from one cpu to another cpu having normal priority task.. b) 4-way system with HT (8 logical processors). Package-P0 T0 has a highest priority task, T1 is idle. Package-P1 Both T0 and T1 have 1 normal priority task each.. P2 and P3 are idle. With this patch, one of the normal priority tasks on P1 will be moved to P2 or P3.. c) With the current weighted smp nice calculations, it doesn't always make sense to look at the highest weighted runqueue in the busy group.. Consider a load balance scenario on a DP with HT system, with Package-0 containing one high priority and one low priority, Package-1 containing one low priority(with other thread being idle).. Package-1 thinks that it need to take the low priority thread from Package-0. And find_busiest_queue() returns the cpu thread with highest priority task.. And ultimately(with help of active load balance) we move high priority task to Package-1. And same continues with Package-0 now, moving high priority task from package-1 to package-0.. Even without the presence of active load balance, load balance will fail to balance the above scenario.. Fix find_busiest_queue to use "imbalance" when it is lightly loaded. [kernel@kolivas.org: sched: store weighted load on up] [kernel@kolivas.org: sched: add discrete weighted cpu load function] [suresh.b.siddha@intel.com: sched: remove dead code] Signed-off-by: Peter Williams Cc: "Siddha, Suresh B" Cc: "Chen, Kenneth W" Acked-by: Ingo Molnar Cc: Nick Piggin Signed-off-by: Con Kolivas Cc: John Hawkes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit efc30814a88bdbe2bfe4ac94de2eb089ad80bee3 tree 1134d7ccda13c09cf426af0524c13633292eac5b parent cc94abfcbc9fed0048365ce1fb8dc81353408bf8 author Kirill Korotaev Tue, 27 Jun 2006 02:54:32 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:44 -0700 [PATCH] sched: CPU hotplug race vs. set_cpus_allowed() There is a race between set_cpus_allowed() and move_task_off_dead_cpu(). __migrate_task() doesn't report any err code, so task can be left on its runqueue if its cpus_allowed mask changed so that dest_cpu is not longer a possible target. Also, chaning cpus_allowed mask requires rq->lock being held. Signed-off-by: Kirill Korotaev Acked-By: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc94abfcbc9fed0048365ce1fb8dc81353408bf8 tree d7e40f7a9e710f220f1bf5f7514ac7eba2fc70c2 parent 72d2854d4ebf5faf086ebccb2ed575c6b68a05dc author Steven Rostedt Tue, 27 Jun 2006 02:54:31 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:44 -0700 [PATCH] unnecessary long index i in sched Unless we expect to have more than 2G CPUs, there's no reason to have 'i' as a long long here. Signed-off-by: Steven Rostedt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72d2854d4ebf5faf086ebccb2ed575c6b68a05dc tree 2a0b00a32a810b76ff29bde7d269998561408f8b parent d444886e149a8413159da8b43ada2bc287e69b0c author Con Kolivas Tue, 27 Jun 2006 02:54:30 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:44 -0700 [PATCH] sched: fix interactive ceiling code The relationship between INTERACTIVE_SLEEP and the ceiling is not perfect and not explicit enough. The sleep boost is not supposed to be any larger than without this code and the comment is not clear enough about what exactly it does, just the reason it does it. Fix it. There is a ceiling to the priority beyond which tasks that only ever sleep for very long periods cannot surpass. Fix it. Prevent the on-runqueue bonus logic from defeating the idle sleep logic. Opportunity to micro-optimise. Signed-off-by: Con Kolivas Signed-off-by: Mike Galbraith Acked-by: Ingo Molnar Signed-off-by: Ken Chen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d444886e149a8413159da8b43ada2bc287e69b0c tree aa977a3b4e2a045df964b5ca2a9cddf50f978b85 parent c96d145e71c5c84601322d85748512e09d7b325f author Steven Rostedt Tue, 27 Jun 2006 02:54:29 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:44 -0700 [PATCH] sched: simplify bitmap definition Signed-off-by: Steven Rostedt Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c96d145e71c5c84601322d85748512e09d7b325f tree 4762f8aa4c970295a33afbc4ee506c72d7216073 parent 7a8e2a5ea4cf43c0edd6db56a156549edb0eee98 author Chen, Kenneth W Tue, 27 Jun 2006 02:54:28 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:44 -0700 [PATCH] sched: fix smt nice lock contention and optimization Initial report and lock contention fix from Chris Mason: Recent benchmarks showed some performance regressions between 2.6.16 and 2.6.5. We tracked down one of the regressions to lock contention in schedule heavy workloads (~70,000 context switches per second) kernel/sched.c:dependent_sleeper() was responsible for most of the lock contention, hammering on the run queue locks. The patch below is more of a discussion point than a suggested fix (although it does reduce lock contention significantly). The dependent_sleeper code looks very expensive to me, especially for using a spinlock to bounce control between two different siblings in the same cpu. It is further optimized: * perform dependent_sleeper check after next task is determined * convert wake_sleeping_dependent to use trylock * skip smt runqueue check if trylock fails * optimize double_rq_lock now that smt nice is converted to trylock * early exit in searching first SD_SHARE_CPUPOWER domain * speedup fast path of dependent_sleeper [akpm@osdl.org: cleanup] Signed-off-by: Ken Chen Acked-by: Ingo Molnar Acked-by: Con Kolivas Signed-off-by: Nick Piggin Acked-by: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a8e2a5ea4cf43c0edd6db56a156549edb0eee98 tree 42a88e7f8de0c22011b8e75fb96255e5360380d8 parent 23916a8e3d8f41aa91474e834ac99808b197c39e author Jim Cromie Tue, 27 Jun 2006 02:54:27 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:43 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: add proper Kconfig, Makefile entries Replace the temp makefile hacks with proper CONFIG entries, which are also added to Kconfig. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23916a8e3d8f41aa91474e834ac99808b197c39e tree d5d08172500e1b7bca0317bf29f6dd917b034200 parent ec312310e43acd5bb8b49314c6d472bb60d2d30c author Jim Cromie Tue, 27 Jun 2006 02:54:26 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:43 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: display pin values in/out in gpio_dump Add current pin settings to gpio_dump() output. This adds the last 'word' to the syslog lines, which displays the input and output values that the pin is set to. pc8736x_gpio.0: io00: 0x0044 TS OD PUE EDGE LO DEBOUNCE io:1/1 The 2 values may differ for a number of reasons: 1- the pin output circuitry is diaabled, (as the above 'TS' indicates) 2- it needs a pullup resistor to drive the attached circuit, 3- the external circuit needs a pullup so the open-drain has something to pull-down 4- the pin is wired to Vcc or Ground It might be appropriate to add a WARN for 2,3,4, since they could damage the chip and/or circuit, esp if misconfig goes unnoticed. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec312310e43acd5bb8b49314c6d472bb60d2d30c tree 6cb7101d9150b32b9d06446554a6e870eeb75c04 parent 8bcf6135c3e8cdfab375f4041a48721483519eee author Jim Cromie Tue, 27 Jun 2006 02:54:25 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:43 -0700 [PATCH] gpio-patchset-fixups: include linux/io.h Hmm. Im somewhat ambivalent about this patch, since with it, driver wont build for vanilla 17 or older. Its also only 1/2 of your suggestion - when I tried it, I was building against vanilla 17, and asm/uaccess.h cause compilation failure. Looking back, Im perplexed as to why linux/io.h didnt cause same failure ?!? use linux/io.h rather than asm/io.h Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bcf6135c3e8cdfab375f4041a48721483519eee tree 06658c8beb4a8e0e3808ca962fced3166a0eb22b parent 6cad56fd884b7eb85ae193c94b688fe76680fcbf author Jim Cromie Tue, 27 Jun 2006 02:54:25 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:43 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: replace spinlocks w mutexes Replace spinlocks guarding gpio config ops with mutexes. This is a me-too patch, and is justifiable insofar as mutexes have stricter semantics and better debugging support, so are preferred where they are applicable. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6cad56fd884b7eb85ae193c94b688fe76680fcbf tree 41f8abbc17063604501a529290c66059638fe2f7 parent f31000e573da052b6b8bcc21faff520b4e2eda7a author Jim Cromie Tue, 27 Jun 2006 02:54:24 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:43 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: fix gpio_current, use shadow regs Add a working gpio_current() to pc8736x_gpio.c (the previous implementation just threw a dev_warn), and fix gpio_change() to use gpio_current() rather than the incorrect (and temporary) gpio_get(). Initialize shadow-regs so this all works. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f31000e573da052b6b8bcc21faff520b4e2eda7a tree 670d5e6e00da615f70d99a950cfe7b8603edad26 parent 58b087cda1e9e46c7061c2282f92bd8e1970bfe7 author Jim Cromie Tue, 27 Jun 2006 02:54:23 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:43 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: use dev_dbg in common module Use of dev_dbg() and friends is considered good practice. dev_dbg() needs a struct device *devp, but nsc_gpio is only a helper module, so it doesnt have/need its own. To provide devp to the user-modules (scx200 & pc8736x _gpio), we add it to the vtable, and set it during init. Also squeeze nsc_gpio_dump()'s format a little. [ 199.259879] pc8736x_gpio.0: io09: 0x0044 TS OD PUE EDGE LO DEBOUNCE Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58b087cda1e9e46c7061c2282f92bd8e1970bfe7 tree cfc7e0df87fd0f27d3d0da04a3136d7104ab10a4 parent 681a3e7dab868a8c390724494e8b79dc596b9e0f author Jim Cromie Tue, 27 Jun 2006 02:54:22 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:43 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: add platform_device for use w dev_dbg Adds platform-device to (just introduced) driver, and uses it to replace many printks with dev_dbg() etc. This could trivially be merged into previous patch, but this way matches better with the corresponding patch that does the same change to scx200_gpio. Signed-off-by: Jim Cromie Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 681a3e7dab868a8c390724494e8b79dc596b9e0f tree d59157ed468a5e5ad7baa9b749c1b6b61274eab9 parent 0e41ef3c51ea7dbb764616f60a90700647fc8518 author Jim Cromie Tue, 27 Jun 2006 02:54:21 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:43 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: add new pc8736x_gpio module Add the brand new pc8736x_gpio driver. This is mostly based upon scx200_gpio.c, but the platform_dev is treated separately, since its fairly big too. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e41ef3c51ea7dbb764616f60a90700647fc8518 tree fc55403cca82ed01da9d6a7fadbaf4329cf9beb2 parent 1a66fdf083bf2b60c4d12feb970bc7373b59e33a author Jim Cromie Tue, 27 Jun 2006 02:54:20 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:43 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: migrate gpio_dump to common module Since the meaning of config-bits is the same for scx200 and pc8736x _gpios, we can share a function to deliver this to user. Since it is called via the vtable, its also completely replaceable. For now, we keep using printk... Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a66fdf083bf2b60c4d12feb970bc7373b59e33a tree f1e9d67e5c2fb3f9e7e575a6a9c44db3af6f6c22 parent 1ca5df0a4cbd17a9536e63c5f69d4717c6538eb0 author Jim Cromie Tue, 27 Jun 2006 02:54:20 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:43 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: migrate file-ops to common module Now that the read(), write() file-ops are dispatching gpio-ops via the vtable, they are generic, and can be moved 'verbatim' to the nsc_gpio common-support module. After the move, various symbols are renamed to update 'scx200_' to 'nsc_', and headers are adjusted accordingly. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ca5df0a4cbd17a9536e63c5f69d4717c6538eb0 tree 8986bbadc721599a0751b8ec6488f22bac2ce4a6 parent c3dc8071eedaac8c8a05c30fe20b78452a818dd9 author Jim Cromie Tue, 27 Jun 2006 02:54:19 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:42 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: add empty common-module Add the nsc_gpio common-support module as an empty shell. Next patch starts the migration of the common gpio support routines. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3dc8071eedaac8c8a05c30fe20b78452a818dd9 tree 8cd247bf39b47273b7a1a7aa06cc0fc4c16dd7cd parent fe3a168a2ce1c93837cdf8fe27a3e67795155f90 author Jim Cromie Tue, 27 Jun 2006 02:54:18 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:42 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: dispatch via vtable Now actually call the gpio operations thru the vtable. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe3a168a2ce1c93837cdf8fe27a3e67795155f90 tree 798eaa66b5e95756e800132602ace5f5c00aa3b0 parent 9b170b8fdbd14a197ad26b4354f3810c65a96602 author Jim Cromie Tue, 27 Jun 2006 02:54:18 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:42 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: add gpio-ops vtable Abstract the gpio operations into a new nsc_gpio_ops vtable. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b170b8fdbd14a197ad26b4354f3810c65a96602 tree 087cea45b78d6091410729ecd94083833231ea72 parent 9550a339e1ab1709dd53d92a1b76eecae2df9f3c author Jim Cromie Tue, 27 Jun 2006 02:54:17 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:42 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: refactor scx200_probe to better segregate _gpio initialization Pull shadow-reg initialization into separate function now, rather than doing it 2x later (scx200, pc8736x). When we revisit 2nd drvr below, it will be to reimplement an init function, rather than another refactor. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9550a339e1ab1709dd53d92a1b76eecae2df9f3c tree a5bea006ebb482c6f4468816486254c401803282 parent d424aa8744b7b7db1d32476ae6c8015d10eebe1c author Jim Cromie Tue, 27 Jun 2006 02:54:16 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:42 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: add 'v' command to device-file Add a new driver command: 'v' which calls gpio_dump() on the pin. The output goes to the log, like all other INFO messages in the original driver. Giving the user control over the feedback they 'need' is construed to be a user-friendly feature, and allows us (later) to dial down many INFO messages to DEBUG log-level. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d424aa8744b7b7db1d32476ae6c8015d10eebe1c tree b0bd0cf7dbb571a3639abffac6307cd8ff693c34 parent 55b8c0455b8aeb80f94183fa3aa42e3fa62b1705 author Jim Cromie Tue, 27 Jun 2006 02:54:16 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:42 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: put gpio_dump on a diet Shrink scx200_gpio_dump() to a single printk with ternary ops. The function is still ifdef'd out, this is corrected in next patch, when it is actually used. The patch 'inadvertently' changed loglevel from DEBUG to INFO. This is Good, because in next patch, its wired to a 'command' which the user can invoke when they want. When they do so, its because they want INFO to support their developement effort, and we want to give it to them without compiling a DEBUG version of the driver. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55b8c0455b8aeb80f94183fa3aa42e3fa62b1705 tree ec8f219a8518f32c1d7aef9546410f074cfb352e parent 979b5ec3a7055d35b212f657e80257ec1346aa0e author Jim Cromie Tue, 27 Jun 2006 02:54:15 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:42 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: device minor numbers are unsigned ints Per kernel headers, device minor numbers are unsigned ints. Do the same in this driver. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 979b5ec3a7055d35b212f657e80257ec1346aa0e tree 41c47b988d6302218fa71a7d8ca7f21b9fa95826 parent 7d7f212661d68d231fdfaead03dda0dd44d5bbbb author Jim Cromie Tue, 27 Jun 2006 02:54:14 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:42 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: add platforn_device for use w dev_dbg Add a platform-device to scx200_gpio, and use its struct device dev member (ie: devp) in dev_dbg() once. There are 2 alternatives here (Im soliciting guidance/commentary): - use isa_device, if/when its added to the kernel. - alter scx200.c to EXPORT_GPL its private devp so that both scx200_gpio, and the (to be added) nsc_gpio module can use it. Since the available devp is in 'grandparent', this seems like too much 'action at a distance'. Signed-off-by: Jim Cromie Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d7f212661d68d231fdfaead03dda0dd44d5bbbb tree 8f89786dc3a34c8511a63e9916027ed5b7b0f91b parent 62c83cde9282a9580994a12b3063e677181b5ebe author Jim Cromie Tue, 27 Jun 2006 02:54:14 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:42 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: modernize driver init to 2.6 api Adopt many modern 2.6 coding practices, ala LDD3, chapter 3. Changes are limited to initialization calls from module init, ie: cdev_init, cdev_add, *_chrdev_region, mkdev. Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62c83cde9282a9580994a12b3063e677181b5ebe tree f8f2843475d0c13cdc9dc64b09b5249f31449183 parent 5a67e4c5b6faaccf31740a07d93704166405d880 author Jim Cromie Tue, 27 Jun 2006 02:54:13 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:42 -0700 [PATCH] chardev: GPIO for SCx200 & PC-8736x: whitespace pre-clean GPIO SUPPORT FOR SCx200 & PC8736x The patch-set reworks the 2.4 vintage scx200_gpio driver for modern 2.6, and refactors GPIO support to reuse it in a new driver for the GPIO on PC-8736x chips. Its handy for the Soekris.com net-4801, which has both chips. These patches have been seen recently on Kernel-Mentors, and then Kernel-Newbies ML, where Jesper Juhl kindly reviewed it. His feedback has been incorporated. Thanks Jesper ! Its also gone to soekris-tech@soekris.com for possible testing by linux folks, I've gotten 1 promise so far. Theyre mostly BSD folk over there, but we'll see.. Device-file & Sysfs The driver preserves the existing device-file interface, including the write/cmd set, but adds v to 'view' the pin-settings & configs by inducing, via gpio_dump(), a dev_info() call. Its a fairly crappy way to get status, but it sticks to the syslog approach, conservatively. Allowing users to voluntarily trigger logging is good, it gives them a familiar way to confirm their app's control & use of the pins, and I've thus reduced the pin-mode-updates from dev_info to dev_dbg. I've recently bolted on a proto sysfs interface for both new drivers. Im not including those patches here; they (the patch + doc-pre-patch) are still quite raw (and unreviewed on KNML), and since they 'invent' a convention for GPIO, a proper vetting is needed. Since this patchset is much bigger than my previous ones, Id like to keep things simpler, and address it 1st, before bolting on more stuff. The driver-split The Geode CPU and the PC-87366 Super-IO chip have GPIO units which share a common pin-architecture (same pin features, with same bits controlling), but with different addressing mechanics and port organizations. The vintage driver expresses the pin capabilities with pin-mode commands [OoPpTt],etc that change the pin configurations, and since the 2 chips share pin-arch, we can reuse the read(), write() commands, once the implementation is suitably adjusted. The patchset adds a vtable: struct nsc_gpio_ops, to abstract the existing gpio operations, then adjusts fileops.write() code to invoke operations via that vtable. Driver specific open()s set private_data to the vtable so its available for use by write(). The vtable gets the gpio_dump() too, since its user-friendly, and (could be construed as) part of the current device-file interface. To support use of dev_dbg() in write() & _dump(), the vtable gets a dev ptr too, set by both scx200 & pc8736x _gpio drivers. heres how the pins are presented in syslog: [ 1890.176223] scx200_gpio.0: io00: 0x0044 TS OD PUE EDGE LO DEBOUNCE [ 1890.287223] scx200_gpio.0: io01: 0x0003 OE PP PUD EDGE LO nsc_gpio.c: new file is new home of several file-ops methods, which are modified to get their vtable from filp->private_data, and use it where needed. scx200_gpio.c: keeps some of its existing gpio routines, but now wires them up via the vtable (they're invoked by nsc_gpio.c:nsc_gpio_write() thru this vtable). A driver-spcific open() initializes filp->private_data with the vtable. Once the split is clean, and the scx200_gpio driver is working, we copy and modify the function and variable names, and rework the access-method bodies for the different addressing scheme. Heres a working overview of the patchset: # series file for GPIO # Spring Cleaning gpio-scx/patch.preclean # scripts/Lindent fixes, editor-ctrl comments # API Modernization gpio-scx/patch.api26 # what I learned from LDD3 gpio-scx/patch.platform-dev-2 # get pdev, support for dev_dbg() gpio-scx/patch.unsigned-minor # fix to match std practice # Debuggability gpio-scx/patch.dump-diet # shrink gpio_dump() gpio-scx/patch.viewpins # add new 'command' to call dump() gpio-scx/patch.init-refactor # pull shadow-register init to sub # Access-Abstraction (add vtable) gpio-scx/patch.access-vtable # introduce nsg_gpio_ops vtable, w dump gpio-scx/patch.vtable-calls # add & use the vtable in scx200_gpio gpio-scx/patch.nscgpio-shell # add empty driver for common-fops # move code under abstraction gpio-scx/patch.migrate-fops # move file-ops methods from scx200_gpio gpio-scx/patch.common-dump # mv scx200.c:scx200_gpio_dump() to nsc_gpio.c gpio-scx/patch.add-pc8736x-gpio # add new driver, like old, w chip adapt # gpio-scx/patch.add-DEBUG # enable all dev_dbg()s # Cleanups # finish printk -> dev_dbg() etc gpio-scx/patch.pdev-pc8736x # new drvr needs pdev too, gpio-scx/patch.devdbg-nscgpio # add device to 'vtable', use in dev_dbg() # gpio-scx/patch.pin-config-view # another 'c' 'command' # gpio-scx/quiet-getset # take out excess dbg stuff (pretty quiet now) gpio-scx/patch.shadow-current # imitate scx200_gpio's shadow regs in pc87* # post KMentors-post patches .. gpio-scx/patch.mutexes # use mutexes for config-locks gpio-scx/patch.viewpins-values # extend dump to obsolete separate 'c' cmd gpio-scx/patch.kconfig # add stuff for kbuild # TBC # combine api26 with pdev, which is just one step. # merge c&v commands to single do-all-fn # delay viewpins, dump-diet should also un-ifdef it too. diff.sys-gpio-rollup-1 This patch: Removed editor format-control comments, and used scripts/Lindent to clean up whitespace, then deleted the bogus chunks :-( Signed-off-by: Jim Cromie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a67e4c5b6faaccf31740a07d93704166405d880 tree a302ac0dae12f3e430ff485242bc0a85ddfbc00d parent 39f4885c56073ecafd482d7e10dd7b17900fa312 author Chandra Seetharaman Tue, 27 Jun 2006 02:54:11 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:41 -0700 [PATCH] cpu hotplug: use hotplug version of cpu notifier in appropriate places Make use the of newly defined hotplug version of cpu_notifier functionality wherever appropriate. Signed-off-by: Chandra Seetharaman Cc: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39f4885c56073ecafd482d7e10dd7b17900fa312 tree 81a90a4b7bc4dae71613cce3e27da361b08ecb0a parent 26c2143b63b8078d08d562733716de142927e17a author Chandra Seetharaman Tue, 27 Jun 2006 02:54:10 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:41 -0700 [PATCH] cpu hotplug: add hotplug versions of cpu_notifier Define new macros register_hotcpu_notifier() and unregister_hotcpu_notifier() that redefines register_cpu_notifier() and unregister_cpu_notifier() for use only when HOTPLUG_CPU is defined. Signed-off-by: Chandra Seetharaman Cc: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 26c2143b63b8078d08d562733716de142927e17a tree 6a2add2bca5bffbd33a0465fd934fffa34a695e9 parent 74b85f3790aa2550c617fe14439482e13e615fa0 author Chandra Seetharaman Tue, 27 Jun 2006 02:54:10 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:41 -0700 [PATCH] cpu hotplug: make cpu_notifier related notifier calls __cpuinit only Make notifier_calls associated with cpu_notifier as __cpuinit. __cpuinit makes sure that the function is init time only unless CONFIG_HOTPLUG_CPU is defined. [akpm@osdl.org: section fix] Signed-off-by: Chandra Seetharaman Cc: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74b85f3790aa2550c617fe14439482e13e615fa0 tree 125e9c503d483c304e111ca825358bd81e0610cd parent 65edc68c345cbe21d0b0375c3452a3ed5e322868 author Chandra Seetharaman Tue, 27 Jun 2006 02:54:09 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:41 -0700 [PATCH] cpu hotplug: make cpu_notifier related notifier blocks __cpuinit only Make notifier_blocks associated with cpu_notifier as __cpuinitdata. __cpuinitdata makes sure that the data is init time only unless CONFIG_HOTPLUG_CPU is defined. Signed-off-by: Chandra Seetharaman Cc: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 65edc68c345cbe21d0b0375c3452a3ed5e322868 tree 07961d63cdacf95355a8db471c6ff4e321ca94fd parent 054cc8a2d808822dadf488a61729e3e550f114c4 author Chandra Seetharaman Tue, 27 Jun 2006 02:54:08 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:41 -0700 [PATCH] cpu hotplug: make [un]register_cpu_notifier init time only CPUs come online only at init time (unless CONFIG_HOTPLUG_CPU is defined). So, cpu_notifier functionality need to be available only at init time. This patch makes register_cpu_notifier() available only at init time, unless CONFIG_HOTPLUG_CPU is defined. This patch exports register_cpu_notifier() and unregister_cpu_notifier() only if CONFIG_HOTPLUG_CPU is defined. Signed-off-by: Chandra Seetharaman Cc: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 054cc8a2d808822dadf488a61729e3e550f114c4 tree da7e5ecce06d1898263da9b47714b0b0fa972397 parent 9c7b216d23e820e0e148d5be01bbb5bd2d8378fe author Chandra Seetharaman Tue, 27 Jun 2006 02:54:07 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:41 -0700 [PATCH] cpu hotplug: revert initdata patch submitted for 2.6.17 This patch reverts notifier_block changes made in 2.6.17 Signed-off-by: Chandra Seetharaman Cc: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c7b216d23e820e0e148d5be01bbb5bd2d8378fe tree 53e6c1e4870db49b4999b4053862d3f63375773f parent 6ac12dfe9c2027cd3c5ed603f11d1bb4f04906fe author Chandra Seetharaman Tue, 27 Jun 2006 02:54:07 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:40 -0700 [PATCH] cpu hotplug: revert init patch submitted for 2.6.17 In 2.6.17, there was a problem with cpu_notifiers and XFS. I provided a band-aid solution to solve that problem. In the process, i undid all the changes you both were making to ensure that these notifiers were available only at init time (unless CONFIG_HOTPLUG_CPU is defined). We deferred the real fix to 2.6.18. Here is a set of patches that fixes the XFS problem cleanly and makes the cpu notifiers available only at init time (unless CONFIG_HOTPLUG_CPU is defined). If CONFIG_HOTPLUG_CPU is defined then cpu notifiers are available at run time. This patch reverts the notifier_call changes made in 2.6.17 Signed-off-by: Chandra Seetharaman Cc: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ac12dfe9c2027cd3c5ed603f11d1bb4f04906fe tree 7c1cb6d405dcaf959d9b1f67f62991775722fcde parent b65b5b59f98aa317df399318b0b2770f50732d3c author Sonny Rao Tue, 27 Jun 2006 02:54:06 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:40 -0700 [PATCH] rtc: fix idr locking We need to serialize access to the global rtc_idr even in this error path. Signed-off-by: Sonny Rao Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b65b5b59f98aa317df399318b0b2770f50732d3c tree dff57f7773b54b3336e56ab84aa8b4d820797572 parent 33979734cd35ae0624337cdbc529921e4350d96f author Alan Cox Tue, 27 Jun 2006 02:54:05 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:40 -0700 [PATCH] stallion clean up There are two locking sets involved. One locks the board mappings and the other is the tty open/close locking. The low level code was clearly designed to be ported to OS's with spin locks already so pretty much comes out in the wash Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33979734cd35ae0624337cdbc529921e4350d96f tree 7ad765559cf485247591160bad7e704a000a439b parent c32e066057fe0914da262c94e52cefb142f965b4 author akpm@osdl.org Tue, 27 Jun 2006 02:54:04 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:40 -0700 [PATCH] IPMI: use schedule in kthread Corey Minyard The kthread used to speed up polling for IPMI was using udelay in its busy-wait polling loop when the lower-level state machine told it to do a short delay. This just used CPU and didn't help scheduling, thus causing bad problems with other tasks. Call schedule() instead. Signed-off-by: Corey Minyard Acked-by: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c32e066057fe0914da262c94e52cefb142f965b4 tree c429649e39af7925a443c72f180349a451c7acbe parent 72e9bb549280b354311af30640c9433474f3a32c author Paul E. McKenney Tue, 27 Jun 2006 02:54:04 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:40 -0700 [PATCH] rcutorture: add call_rcu_bh() operations Add operations for the call_rcu_bh() variant of RCU. Also add an rcu_batches_completed_bh() function, which is needed by rcutorture. Signed-off-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72e9bb549280b354311af30640c9433474f3a32c tree 5f35cb787f758f29f7853b9e1d96a9e5ab02eaed parent 29766f1eb3d8d6cfaf1d6623fb4c3f7e5a822fe4 author Paul E. McKenney Tue, 27 Jun 2006 02:54:03 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:40 -0700 [PATCH] rcutorture: add ops vector and Classic RCU ops Add an ops vector to rcutorture, and add the ops for Classic RCU. Update the rcutorture documentation to reflect slight change to the dmesg formats. Signed-off-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29766f1eb3d8d6cfaf1d6623fb4c3f7e5a822fe4 tree e356c483e332f2a688d5d9e8edfb7e7a6729af44 parent 1dbe83c3445a1604546620a60888cf26b63f8782 author Paul E. McKenney Tue, 27 Jun 2006 02:54:02 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:40 -0700 [PATCH] rcutorture: catchup doc fixes for idle-hz tests This just catches the RCU torture documentation up with the recent fixes that test RCU for architectures that turn of the scheduling-clock interrupt for idle CPUs and the addition of a SUCCESS/FAILURE indication, fixing up an obsolete comment as well. Signed-off-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1dbe83c3445a1604546620a60888cf26b63f8782 tree c4113aeb6a2beaff433ffddd19121f37e119b444 parent 283fef59d6e934e8da11631446ea8e2e93fce14c author Randy Dunlap Tue, 27 Jun 2006 02:54:01 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:39 -0700 [PATCH] fix kernel-doc in kernel/ dir Fix kernel-doc parameters in kernel/ Warning(/var/linsrc/linux-2617-g9//kernel/auditsc.c:1376): No description found for parameter 'u_abs_timeout' Warning(/var/linsrc/linux-2617-g9//kernel/auditsc.c:1420): No description found for parameter 'u_msg_prio' Warning(/var/linsrc/linux-2617-g9//kernel/auditsc.c:1420): No description found for parameter 'u_abs_timeout' Warning(/var/linsrc/linux-2617-g9//kernel/acct.c:526): No description found for parameter 'pacct' Signed-off-by: Randy Dunlap Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 283fef59d6e934e8da11631446ea8e2e93fce14c tree 6617b7b3a492e9a1b9d0e34c24ae725c9c5fa0b6 parent 05f225dc8729d3e5703b8c34e750fdca67bcefe6 author Paul Fulghum Tue, 27 Jun 2006 02:54:00 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:39 -0700 [PATCH] tty: fix TCSBRK comment Fix TCSBRK comment to prevent confusion or accidental removal. Signed-off-by: Paul Fulghum Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05f225dc8729d3e5703b8c34e750fdca67bcefe6 tree d0ac17e47cafb73e38962ded785301aa01dab020 parent 0ca06664902d82ff0cb962cc4a72f63ab4bf4991 author Evgeniy Dushistov Tue, 27 Jun 2006 02:53:59 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:39 -0700 [PATCH] ufs: ufs_read_inode cleanup Add missed ufsi->i_dir_start_lookup initialization in ufs_read_inode in UFS2 case. Also it cleans ufs_read_inode function to prevent such kind of situation in the future: it move depend on UFS type parts of code into separate functions and leaves in ufs_read_inode only generic code. It cleans code and avoids duplication. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ca06664902d82ff0cb962cc4a72f63ab4bf4991 tree d2ee0c36e1984a34f13636548ff1432b54addf88 parent 6527c2bdf1f833cc18e8f42bd97973d583e4aa83 author Atsushi Nemoto Tue, 27 Jun 2006 02:53:58 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:39 -0700 [PATCH] RTC: Add a comment for ENOIOCTLCMD in ds1553_rtc_ioctl Signed-off-by: Atsushi Nemoto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6527c2bdf1f833cc18e8f42bd97973d583e4aa83 tree 737055ae276cdfa75e7b3e55a3ebdd1f88105606 parent 1c0f16e5cdff59f3b132a1b0c0d44a941f8813d2 author Vladimir V. Saveliev Tue, 27 Jun 2006 02:53:57 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:39 -0700 [PATCH] generic_file_buffered_write(): deadlock on vectored write generic_file_buffered_write() prefaults in user pages in order to avoid deadlock on copying from the same page as write goes to. However, it looks like there is a problem when write is vectored: fault_in_pages_readable brings in current segment or its part (maxlen). OTOH, filemap_copy_from_user_iovec is called to copy number of bytes (bytes) which may exceed current segment, so filemap_copy_from_user_iovec switches to the next segment which is not brought in yet. Pagefault is generated. That causes the deadlock if pagefault is for the same page write goes to: page being written is locked and not uptodate, pagefault will deadlock trying to lock locked page. [akpm@osdl.org: somewhat rewritten] Cc: Neil Brown Cc: Martin Schwidefsky Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c0f16e5cdff59f3b132a1b0c0d44a941f8813d2 tree b2693f9e481381ae3e703afa3b68ad3531ea6645 parent 34af946a22724c4e2b204957f2b24b22a0fb121c author David Woodhouse Tue, 27 Jun 2006 02:53:56 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:39 -0700 [PATCH] Remove gratuitous inclusion of from We include config.h on the compiler command line. There's no need for it to be included again. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34af946a22724c4e2b204957f2b24b22a0fb121c tree 7881dcbd0a698257c126198cdb6d97d4e45ee51e parent b6cd0b772dcc5dc9b4c03d53946474dee399fa72 author Ingo Molnar Tue, 27 Jun 2006 02:53:55 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:39 -0700 [PATCH] spin/rwlock init cleanups locking init cleanups: - convert " = SPIN_LOCK_UNLOCKED" to spin_lock_init() or DEFINE_SPINLOCK() - convert rwlocks in a similar manner this patch was generated automatically. Motivation: - cleanliness - lockdep needs control of lock initialization, which the open-coded variants do not give - it's also useful for -rt and for lock debugging in general Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6cd0b772dcc5dc9b4c03d53946474dee399fa72 tree 09ef125f7595f73ba256177f894d6c341074ff5b parent a7807a32bbb027ab9955b96734fdc7f1e6497a9f author Adrian Bunk Tue, 27 Jun 2006 02:53:54 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:38 -0700 [PATCH] fs/buffer.c: cleanups - add a proper prototype for the following global function: - buffer_init() - make the following needlessly global function static: - end_buffer_async_write() Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7807a32bbb027ab9955b96734fdc7f1e6497a9f tree 8ed62e305638e1b853f1c80b5bb7ed818418765c parent b3c681e09193559ba15f6c9562bd37045f120a96 author Randy Dunlap Tue, 27 Jun 2006 02:53:54 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:38 -0700 [PATCH] poison: add & use more constants Add more poison values to include/linux/poison.h. It's not clear to me whether some others should be added or not, so I haven't added any of these: ./include/linux/libata.h:#define ATA_TAG_POISON 0xfafbfcfdU ./arch/ppc/8260_io/fcc_enet.c:1918: memset((char *)(&(immap->im_dprambase[(mem_addr+64)])), 0x88, 32); ./drivers/usb/mon/mon_text.c:429: memset(mem, 0xe5, sizeof(struct mon_event_text)); ./drivers/char/ftape/lowlevel/ftape-ctl.c:738: memset(ft_buffer[i]->address, 0xAA, FT_BUFF_SIZE); ./drivers/block/sx8.c:/* 0xf is just arbitrary, non-zero noise; this is sorta like poisoning */ Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3c681e09193559ba15f6c9562bd37045f120a96 tree 8c70d20988e6b04171cb1f60b0da34978bca5f36 parent c9cf55285e87ac423c45d9efca750d3f50234d10 author Randy Dunlap Tue, 27 Jun 2006 02:53:53 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:38 -0700 [PATCH] update two drivers for poison.h Update two drivers to use poison.h. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9cf55285e87ac423c45d9efca750d3f50234d10 tree d46f3e90fbb38115c25b3315f6280ad65f83a14f parent e6e5494cb23d1933735ee47cc674ffe1c4afed6f author Randy Dunlap Tue, 27 Jun 2006 02:53:52 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:38 -0700 [PATCH] add poison.h and patch primary users Localize poison values into one header file for better documentation and easier/quicker debugging and so that the same values won't be used for multiple purposes. Use these constants in core arch., mm, driver, and fs code. Signed-off-by: Randy Dunlap Acked-by: Matt Mackall Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: "David S. Miller" Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6e5494cb23d1933735ee47cc674ffe1c4afed6f tree c8945bb3ae5bec38693d801fb589d22d48d6f8eb parent d5fb34261dcd32c9cb3b28121fdc46308db513a1 author Ingo Molnar Tue, 27 Jun 2006 02:53:50 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:38 -0700 [PATCH] vdso: randomize the i386 vDSO by moving it into a vma Move the i386 VDSO down into a vma and thus randomize it. Besides the security implications, this feature also helps debuggers, which can COW a vma-backed VDSO just like a normal DSO and can thus do single-stepping and other debugging features. It's good for hypervisors (Xen, VMWare) too, which typically live in the same high-mapped address space as the VDSO, hence whenever the VDSO is used, they get lots of guest pagefaults and have to fix such guest accesses up - which slows things down instead of speeding things up (the primary purpose of the VDSO). There's a new CONFIG_COMPAT_VDSO (default=y) option, which provides support for older glibcs that still rely on a prelinked high-mapped VDSO. Newer distributions (using glibc 2.3.3 or later) can turn this option off. Turning it off is also recommended for security reasons: attackers cannot use the predictable high-mapped VDSO page as syscall trampoline anymore. There is a new vdso=[0|1] boot option as well, and a runtime /proc/sys/vm/vdso_enabled sysctl switch, that allows the VDSO to be turned on/off. (This version of the VDSO-randomization patch also has working ELF coredumping, the previous patch crashed in the coredumping code.) This code is a combined work of the exec-shield VDSO randomization code and Gerd Hoffmann's hypervisor-centric VDSO patch. Rusty Russell started this patch and i completed it. [akpm@osdl.org: cleanups] [akpm@osdl.org: compile fix] [akpm@osdl.org: compile fix 2] [akpm@osdl.org: compile fix 3] [akpm@osdl.org: revernt MAXMEM change] Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Cc: Gerd Hoffmann Cc: Rusty Russell Cc: Zachary Amsden Cc: Andi Kleen Cc: Jan Beulich Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d5fb34261dcd32c9cb3b28121fdc46308db513a1 tree 640ff0e6b5c7422ba4295a4140849553dcaa57c5 parent 96c52749036eca2b131f435d3895a3c6aba92e76 author James Bottomley Tue, 27 Jun 2006 02:53:50 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:38 -0700 [PATCH] voyager: fix compile after setup rework The following [PATCH] Clean up and refactor i386 sub-architecture setup Doesn't quite work, since it leaves out an include of asm/io.h, without which the use of inb/outb in the setup file won.t work. This corrects that and also removes a spurious acpi reference that apparently crept in ages ago but should never have been there. Signed-off-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96c52749036eca2b131f435d3895a3c6aba92e76 tree 77b92dfa86d4d81b3ee11f2517e118c6025026c6 parent 4031ff388138b58e5cd472dccce38828bcb8c706 author James Bottomley Tue, 27 Jun 2006 02:53:49 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:38 -0700 [PATCH] fix subarchitecture breakage with CONFIG_SCHED_SMT Commit 1e9f28fa1eb9773bf65bae08288c6a0a38eef4a7 ("[PATCH] sched: new sched domain for representing multi-core") incorrectly made SCHED_SMT and some of the structures it uses dependent on SMP. However, this is wrong, the structures are only defined if X86_HT, so SCHED_SMT has to depend on that as well. The patch broke voyager, since it doesn't provide any of the multi-core or hyperthreading structures. Signed-off-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4031ff388138b58e5cd472dccce38828bcb8c706 tree f2c88fdcdef3ec9880d23ce271f14e95f7aa1cf5 parent c723e084606ca1c81e91b80b2c0c44bde7bbc4df author Aleksey Gorelov Tue, 27 Jun 2006 02:53:48 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:38 -0700 [PATCH] fix broken vm86 interrupt/signal handling Commit c3ff8ec31c1249d268cd11390649768a12bec1b9 ("[PATCH] i386: Don't miss pending signals returning to user mode after signal processing") meant that vm86 interrupt/signal handling got broken for the case when vm86 is called from kernel space. In this scenario, if signal is pending because of vm86 interrupt, do_notify_resume/do_signal exits immediately due to user_mode() check, without processing any signals. Thus, resume_userspace handler is spinning in a tight loop with signal pending and TIF_SIGPENDING is set. Previously everything worked Ok. No in-tree usage of vm86() from kernel space exists, but I've heard about a number of projects out there which use vm86 calls from kernel, one of them being this, for instance: http://dev.gentoo.org/~spock/projects/vesafb-tng/ The following patch fixes the issue. Signed-off-by: Aleksey Gorelov Cc: Atsushi Nemoto Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c723e084606ca1c81e91b80b2c0c44bde7bbc4df tree c338f62586978093d7c6b85c3f783cb65879c1f1 parent 4b89aff930d632be10d557d08d1b60dee7163dbe author Chuck Ebbert <76306.1226@compuserve.com> Tue, 27 Jun 2006 02:53:47 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:37 -0700 [PATCH] i386: use C code for current_thread_info() Using C code for current_thread_info() lets the compiler optimize it. With gcc 4.0.2, kernel is smaller: text data bss dec hex filename 3645212 555556 312024 4512792 44dc18 2.6.17-rc6-nb-post/vmlinux 3647276 555556 312024 4514856 44e428 2.6.17-rc6-nb/vmlinux ------- -2064 Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b89aff930d632be10d557d08d1b60dee7163dbe tree f7d854a81b9c5b1b4e6df01cb78ce9ff34684309 parent 7f35bf929ffe2b3967c8f398880fcb78fcd2ab5c author Rohit Seth Tue, 27 Jun 2006 02:53:46 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:37 -0700 [PATCH] i386: move phys_proc_id and cpu_core_id to cpuinfo_x86 Move the phys_core_id and cpu_core_id to cpuinfo_x86 structure. Similar patch for x86_64 is already accepted by Andi earlier this week. [akpm@osdl.org: fix warning] Signed-off-by: Rohit Seth Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f35bf929ffe2b3967c8f398880fcb78fcd2ab5c tree 4000118f8b7c188676ac824214ad5226a616c6bc parent 19eadf98c8167eac843580683317b99572e2abf0 author Andreas Mohr Tue, 27 Jun 2006 02:53:45 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:37 -0700 [PATCH] x86: constify some parts of arch/i386/kernel/cpu/ Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19eadf98c8167eac843580683317b99572e2abf0 tree a5625f7834f0f06fc28a605c3cdb8debe2218498 parent bd9e0b74f52dbac6241643fadca2393808b14c7a author Rusty Russell Tue, 27 Jun 2006 02:53:44 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:37 -0700 [PATCH] x86: increase interrupt vector range Remove the limit of 256 interrupt vectors by changing the value stored in orig_{e,r}ax to be the complemented interrupt vector. The orig_{e,r}ax needs to be < 0 to allow the signal code to distinguish between return from interrupt and return from syscall. With this change applied, NR_IRQS can be > 256. Xen extends the IRQ numbering space to include room for dynamically allocated virtual interrupts (in the range 256-511), which requires a more permissive interface to do_IRQ. Signed-off-by: Ian Pratt Signed-off-by: Christian Limpach Signed-off-by: Chris Wright Signed-off-by: Rusty Russell Cc: "Protasevich, Natalie" Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd9e0b74f52dbac6241643fadca2393808b14c7a tree af2c479782edbeca009cf195401d82abb61b1ac7 parent 28eba5bf9d4bf3ba4d58d985abf3a2903b7f2125 author Shaohua Li Tue, 27 Jun 2006 02:53:43 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:37 -0700 [PATCH] x86: cpu_init(): avoid GFP_KERNEL allocation while atomic The patch fixes two issues: 1. cpu_init is called with interrupt disabled. Allocating gdt table there isn't good at runtime. 2. gdt table page cause memory leak in CPU hotplug case. Signed-off-by: Shaohua Li Cc: Ashok Raj Cc: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28eba5bf9d4bf3ba4d58d985abf3a2903b7f2125 tree e825fc3fb6bdd81ae0aa146572406eb69bc5404b parent 76b67ed9dce69a6a329cdd66f94af1787f417b62 author Michael LeMay Tue, 27 Jun 2006 02:53:42 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:37 -0700 [PATCH] selinux: inherit /proc/self/attr/keycreate across fork Update SELinux to cause the keycreate process attribute held in /proc/self/attr/keycreate to be inherited across a fork and reset upon execve. This is consistent with the handling of the other process attributes provided by SELinux and also makes it simpler to adapt logon programs to properly handle the keycreate attribute. Signed-off-by: Michael LeMay Signed-off-by: David Howells Acked-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76b67ed9dce69a6a329cdd66f94af1787f417b62 tree 4d80993e607ae4a870f98ad3441795737570b012 parent dd0932d9d4301bd58a4d5a634a3a8298c4fc5e24 author KAMEZAWA Hiroyuki Tue, 27 Jun 2006 02:53:41 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:37 -0700 [PATCH] node hotplug: register cpu: remove node struct With Goto-san's patch, we can add new pgdat/node at runtime. I'm now considering node-hot-add with cpu + memory on ACPI. I found acpi container, which describes node, could evaluate cpu before memory. This means cpu-hot-add occurs before memory hot add. In most part, cpu-hot-add doesn't depend on node hot add. But register_cpu(), which creates symbolic link from node to cpu, requires that node should be onlined before register_cpu(). When a node is onlined, its pgdat should be there. This patch-set holds off creating symbolic link from node to cpu until node is onlined. This removes node arguments from register_cpu(). Now, register_cpu() requires 'struct node' as its argument. But the array of struct node is now unified in driver/base/node.c now (By Goto's node hotplug patch). We can get struct node in generic way. So, this argument is not necessary now. This patch also guarantees add cpu under node only when node is onlined. It is necessary for node-hot-add vs. cpu-hot-add patch following this. Moreover, register_cpu calculates cpu->node_id by cpu_to_node() without regard to its 'struct node *root' argument. This patch removes it. Also modify callers of register_cpu()/unregister_cpu, whose args are changed by register-cpu-remove-node-struct patch. [Brice.Goglin@ens-lyon.org: fix it] Signed-off-by: KAMEZAWA Hiroyuki Cc: Yasunori Goto Cc: Ashok Raj Cc: Dave Hansen Signed-off-by: Brice Goglin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd0932d9d4301bd58a4d5a634a3a8298c4fc5e24 tree 864da70354875dadfcaebd51571122462959530a parent 7049027c6f0098eb6b23b8f6ca65a905541faf81 author Yasunori Goto Tue, 27 Jun 2006 02:53:40 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:37 -0700 [PATCH] pgdat allocation and update for ia64 of memory hotplug: allocate pgdat and per node data This is a patch to allocate pgdat and per node data area for ia64. The size for them can be calculated by compute_pernodesize(). Signed-off-by: Yasunori Goto Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7049027c6f0098eb6b23b8f6ca65a905541faf81 tree ab5528625be6e79c02767c6d9444599c1980cf0e parent ae5a2c1c9b2bc3633032f97d02e60ae547a6047c author Yasunori Goto Tue, 27 Jun 2006 02:53:39 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:37 -0700 [PATCH] pgdat allocation and update for ia64 of memory hotplug: update pgdat address array This is to refresh node_data[] array for ia64. As I mentioned previous patches, ia64 has copies of information of pgdat address array on each node as per node data. At v2 of node_add, this function used stop_machine_run() to update them. (I wished that they were copied safety as much as possible.) But, in this patch, this arrays are just copied simply, and set node_online_map bit after completion of pgdat initialization. So, kernel must touch NODE_DATA() macro after checking node_online_map(). (Current code has already done it.) This is more simple way for just hot-add..... Note : It will be problem when hot-remove will occur, because, even if online_map bit is set, kernel may touch NODE_DATA() due to race condition. :-( Signed-off-by: Yasunori Goto Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae5a2c1c9b2bc3633032f97d02e60ae547a6047c tree 51244762aca6ff087d4934f184c3877888b198c3 parent 0fc44159bfcb5b0afa178f9c3f50db23aebc76ff author Yasunori Goto Tue, 27 Jun 2006 02:53:38 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:36 -0700 [PATCH] pgdat allocation and update for ia64 of memory hotplug: hold pgdat address at system running This is a preparatory patch to make common code for updating of NODE_DATA() of ia64 between boottime and hotplug. Current code remembers pgdat address in mem_data which is used at just boot time. But its information can be used at hotplug time by moving to global value. The next patch uses this array. Signed-off-by: Yasunori Goto Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fc44159bfcb5b0afa178f9c3f50db23aebc76ff tree d87e47c0f5e6b2eff1d9113d3495d185924734d9 parent 1f04bbd2d396a701c5af2e5b92bad896c2550c16 author Yasunori Goto Tue, 27 Jun 2006 02:53:38 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:36 -0700 [PATCH] Register sysfs file for hotplugged new node When new node becomes enable by hot-add, new sysfs file must be created for new node. So, if new node is enabled by add_memory(), register_one_node() is called to create it. In addition, I386's arch_register_node() and a part of register_nodes() of powerpc are consolidated to register_one_node() as a generic_code(). This is tested by Tiger4(IPF) with node hot-plug emulation. Signed-off-by: Keiichiro Tokunaga Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f04bbd2d396a701c5af2e5b92bad896c2550c16 tree ec84c99b1259361bc0878ebe78f1acadb30dad25 parent 2842f11419704f8707fffc82e10d2263427fc130 author Yasunori Goto Tue, 27 Jun 2006 02:53:37 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:36 -0700 [PATCH] sparc64: support sparsemem and !memory hotplug Fix "undefined reference to `arch_add_memory'" on sparc64 allmodconfig. sparc64 doesn't support memory hotplug. But we want it to support sparsemem. Signed-off-by: Yasunori Goto Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2842f11419704f8707fffc82e10d2263427fc130 tree 9bc86163ba7b2fa842b3aff2f087be6419f246bb parent 0a54703904a4a206686b4e8c3f5a6927b60747aa author KAMEZAWA Hiroyuki Tue, 27 Jun 2006 02:53:36 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:36 -0700 [PATCH] catch valid mem range at onlining memory This patch allows hot-add memory which is not aligned to section. Now, hot-added memory has to be aligned to section size. Considering big section sized archs, this is not useful. When hot-added memory is registerd as iomem resoruce by iomem resource patch, we can make use of that information to detect valid memory range. Note: With this, not-aligned memory can be registerd. To allow hot-add memory with holes, we have to do more work around add_memory(). (It doesn't allows add memory to already existing mem section.) Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a54703904a4a206686b4e8c3f5a6927b60747aa tree 2aa373cdd78094666d9cdf526391235a65afaee8 parent 9af3c2dea3a3ae4248d81a70b556adfe1dc65d55 author KAMEZAWA Hiroyuki Tue, 27 Jun 2006 02:53:35 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:36 -0700 [PATCH] register hot-added memory to iomem resource Register hot-added memory to iomem_resource. With this, /proc/iomem can show hot-added memory. Note: kdump uses /proc/iomem to catch memory range when it is installed. So, kdump should be re-installed after /proc/iomem change. Signed-off-by: KAMEZAWA Hiroyuki Cc: Vivek Goyal Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9af3c2dea3a3ae4248d81a70b556adfe1dc65d55 tree d39b4f7bd082d8a64ef31f6cf34a3b535f594fd0 parent 3218ae14b1e3ee2ab81df30ed690c8e864d23316 author Yasunori Goto Tue, 27 Jun 2006 02:53:34 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:36 -0700 [PATCH] pgdat allocation for new node add (call pgdat allocation) Add node-hot-add support to add_memory(). node hotadd uses this sequence. 1. allocate pgdat. 2. refresh NODE_DATA() 3. call free_area_init_node() to initialize 4. create sysfs entry 5. add memory (old add_memory()) 6. set node online 7. run kswapd for new node. (8). update zonelist after pages are onlined. (This is already merged in -mm due to update phase is difference.) Note: To make common function as much as possible, there is 2 changes from v2. - The old add_memory(), which is defiend by each archs, is renamed to arch_add_memory(). New add_memory becomes caller of arch dependent function as a common code. - This patch changes add_memory()'s interface From: add_memory(start, end) TO : add_memory(nid, start, end). It was cause of similar code that finding node id from physical address is inside of old add_memory() on each arch. In addition, acpi memory hotplug driver can find node id easier. In v2, it must walk DSDT'S _CRS by matching physical address to get the handle of its memory device, then get _PXM and node id. Because input is just physical address. However, in v3, the acpi driver can use handle to get _PXM and node id for the new memory device. It can pass just node id to add_memory(). Fix interface of arch_add_memory() is in next patche. Signed-off-by: Yasunori Goto Signed-off-by: KAMEZAWA Hiroyuki Cc: Dave Hansen Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3218ae14b1e3ee2ab81df30ed690c8e864d23316 tree 91933138cb7c32dad2246ed39baa8ea4e6f98cd8 parent 10ad400b49aca15ecf83b0fde7e35e4064b15c85 author Yasunori Goto Tue, 27 Jun 2006 02:53:33 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:36 -0700 [PATCH] pgdat allocation for new node add (export kswapd start func) When node is hot-added, kswapd for the node should start. This export kswapd start function as kswapd_run() to use at add_memory(). [akpm@osdl.org: daemonize() isn't needed when using the kthread API] Signed-off-by: Yasunori Goto Signed-off-by: KAMEZAWA Hiroyuki Cc: Dave Hansen Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10ad400b49aca15ecf83b0fde7e35e4064b15c85 tree 336de747d6839add8ab3a7f70367e87ddbc7d155 parent 306d6cbe86e2e6603ac3162e1294d5c75cfdeca6 author Yasunori Goto Tue, 27 Jun 2006 02:53:33 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:36 -0700 [PATCH] pgdat allocation for new node add (refresh node_data[]) Refresh NODE_DATA() for generic archs. In this case, NODE_DATA(nid) == node_data[nid]. node_data[] is array of address of pgdat. So, refresh is quite simple. Signed-off-by: Yasunori Goto Signed-off-by: KAMEZAWA Hiroyuki Cc: Dave Hansen Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 306d6cbe86e2e6603ac3162e1294d5c75cfdeca6 tree 66f4b807c47eca11c272c154670ed3f8f468e11f parent 1e3590e2e4a38e8390fdac5bda23330bf2801838 author Yasunori Goto Tue, 27 Jun 2006 02:53:32 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:36 -0700 [PATCH] pgdat allocation for new node add (generic alloc node_data) For node hotplug, basically we have to allocate new pgdat. But, there are several types of implementations of pgdat. 1. Allocate only pgdat. This style allocate only pgdat area. And its address is recorded in node_data[]. It is most popular style. 2. Static array of pgdat In this case, all of pgdats are static array. Some archs use this style. 3. Allocate not only pgdat, but also per node data. To increase performance, each node has copy of some data as a per node data. So, this area must be allocated too. Ia64 is this style. Ia64 has the copies of node_data[] array on each per node data to increase performance. In this series of patches, treat (1) as generic arch. generic archs can use generic function. (2) and (3) should have its own if necessary. This patch defines pgdat allocator. Updating NODE_DATA() macro function is in other patch. Signed-off-by: Yasonori Goto Signed-off-by: KAMEZAWA Hiroyuki Cc: Dave Hansen Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e3590e2e4a38e8390fdac5bda23330bf2801838 tree 528591e9db601af913756b11d37e451202584cd2 parent bc02af93dd2bbddce1b55e0a493f833a1b7cf140 author Yasunori Goto Tue, 27 Jun 2006 02:53:31 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:36 -0700 [PATCH] pgdat allocation for new node add (get node id by acpi) This is to find node id from acpi's handle of memory_device in DSDT. _PXM for the new node can be found by acpi_get_pxm() by using new memory's handle. So, node id can be found by pxm_to_nid_map[]. This patch becomes simpler than v2 of node hot-add patch. Because old add_memory() function doesn't have node id parameter. So, kernel must find its handle by physical address via DSDT again. But, v3 just give node id to add_memory() now. Signed-off-by: Yasunori Goto Cc: Dave Hansen Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc02af93dd2bbddce1b55e0a493f833a1b7cf140 tree bda7998531b9c612c5597be9158f082d1cb5ab26 parent dd56a8e36f91f63c0a31e8a118d87b7cf01526b8 author Yasunori Goto Tue, 27 Jun 2006 02:53:30 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:35 -0700 [PATCH] pgdat allocation for new node add (specify node id) Change the name of old add_memory() to arch_add_memory. And use node id to get pgdat for the node at NODE_DATA(). Note: Powerpc's old add_memory() is defined as __devinit. However, add_memory() is usually called only after bootup. I suppose it may be redundant. But, I'm not well known about powerpc. So, I keep it. (But, __meminit is better at least.) Signed-off-by: Yasunori Goto Cc: Dave Hansen Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd56a8e36f91f63c0a31e8a118d87b7cf01526b8 tree 70e70c16e460df0b8da151bfff09e6b637c97b10 parent 1f425994f96d85540d47eee98daabc1e211b454e author Yasunori Goto Tue, 27 Jun 2006 02:53:29 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:35 -0700 [PATCH] Catch notification of memory add event of ACPI via container driver. (avoid redundant call add_memory) When acpi_memory_device_init() is called at boottime to register struct memory acpi_memory_device, acpi_bus_add() are called via acpi_driver_attach(). But it also calls ops->start() function. It is called even if the memory blocks are initialized at early boottime. In this case add_memory() return -EEXIST, and the memory blocks becomes INVALID state even if it is normal. This is patch to avoid calling add_memory() for already available memory. [akpm@osdl.org: coding cleanups] Signed-off-by: Yasunori Goto Cc: "Brown, Len" Cc: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f425994f96d85540d47eee98daabc1e211b454e tree 820fc7856da7a751bf91ed25fdc294319297d74e parent 9ac023989e6dd1b97140b47fb942a7940d0b2af2 author Yasunori Goto Tue, 27 Jun 2006 02:53:28 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:35 -0700 [PATCH] Catch notification of memory add event of ACPI via container driver. (register start func for memory device) This is a patch to call add_memroy() when notify reaches for new node's add event. When new node is added, notify of ACPI reaches container device which means the node. Container device driver calls acpi_bus_scan() to find and add belonging devices (which means cpu, memory and so on). Its function calls add and start function of belonging devices's driver. Howevever, current memory hotplug driver just register add function to create sysfs file for its memory. But, acpi_memory_enable_device() is not called because it is considered just the case that notify reaches memory device directly. So, if notify reaches container device nothing can call add_memory(). This is a patch to create start function which calls add_memory(). add_memory() can be called by this when notify reaches container device. [akpm@osdl.org: coding cleanups] Signed-off-by: Yasunori Goto Cc: "Brown, Len" Cc: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ac023989e6dd1b97140b47fb942a7940d0b2af2 tree ba7a242235d2c7d4632d8e0a413ccb28684a7180 parent 5c31f2738ab124ebc1f8948a5fc17dd7a08ed1ec author KAMEZAWA Hiroyuki Tue, 27 Jun 2006 02:53:27 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:35 -0700 [PATCH] acpi memory hotplug cannot manage _CRS with plural resoureces Current acpi memory hotplug just looks into the first entry of resources in _CRS. But, _CRS can contain plural resources. So, if _CRS contains plural resoureces, acpi memory hot add cannot add all memory. With this patch, acpi memory hotplug can deal with Memory Device, whose _CRS contains plural resources. Tested on ia64 memory hotplug test envrionment (not emulation, uses alpha version firmware which supports dynamic reconfiguration of NUMA.) Note: Microsoft's Windows Server 2003 requires big (>4G)resoureces to be divided into small (<4G) resources. looks crazy, but not invalid. (See http://www.microsoft.com/whdc/system/pnppwr/hotadd/hotaddmem.mspx) For this reason, a firmware vendor who supports Windows writes plural resources in a _CRS even if they are contiguous. Signed-off-by: Kenji Kaneshige Signed-off-by: KAMEZAWA Hiroyuki Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c31f2738ab124ebc1f8948a5fc17dd7a08ed1ec tree 87b8f11652781ee6c50422ba42976f634ca2cd89 parent b762450e84e20a179ee5993b065caaad99a65fbf author Andrew Morton Tue, 27 Jun 2006 02:53:26 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:35 -0700 [PATCH] pm_trace is dangerous CONFIG_PM_TRACES scrogs your RTC. Mark it as experimental, and defaulting to `off'. Also beef up the help message a bit. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b762450e84e20a179ee5993b065caaad99a65fbf tree 0b172aaa409d69d1947cc01a87415df717f08562 parent 7f32a25f63358aa993a3403c047f3ecfa6d96367 author Randy Dunlap Tue, 27 Jun 2006 02:53:26 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:35 -0700 [PATCH] zlib inflate: fix function definitions Fix function definitions to be ANSI-compliant: lib/zlib_inflate/inffast.c:68:1: warning: non-ANSI definition of function 'inflate_fast' lib/zlib_inflate/inftrees.c:33:1: warning: non-ANSI definition of function 'zlib_inflate_table' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f32a25f63358aa993a3403c047f3ecfa6d96367 tree 59e26d49f6b242b5218e63cdb9b5e2f2e97f38e4 parent 266bee88699ddbde42ab303bbc426a105cc49809 author Randy Dunlap Tue, 27 Jun 2006 02:53:25 -0700 committer Linus Torvalds Tue, 27 Jun 2006 17:32:35 -0700 [PATCH] kernel/acct: fix function definition kernel/acct.c:579:19: warning: non-ANSI function declaration of function 'acct_process' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fdf8ccc09fd764a9cce11006aa3fca53ac1c895 tree 0826433cc788979489ba1a2cc0df9cdad4cee9c5 parent 73024cf11522c0233228453984b2a2b37885e336 author Nathan Scott Wed, 28 Jun 2006 10:13:52 +1000 committer Nathan Scott Wed, 28 Jun 2006 10:13:52 +1000 [XFS] Rework code snippets slightly to remove remaining recent-gcc warnings. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26364a Signed-off-by: Nathan Scott commit f40c562855294bf4e7268274d7461dc32c1e6b25 tree 23259eb48ddd99b080014937781e363993d21624 parent 0223cf0b10bdb3b557d8884b1a957cc64be843c3 author Steve French Wed, 28 Jun 2006 00:13:38 +0000 committer Steve French Wed, 28 Jun 2006 00:13:38 +0000 [CIFS] Fix authentication choice so we do not force NTLMv2 unless the user specifies it is required or turns of ntlm Signed-off-by: Steve French commit c1a7a755be26f68d7f21ee769584149a96185ea8 tree 886d9fb0e9000f261e8e7a77c274a5c970ba9b54 parent 61c340166d8c62086b6de00afc7670eea27eb2ab author Kyle McMartin Mon, 26 Jun 2006 11:28:09 -0400 committer Kyle McMartin Tue, 27 Jun 2006 23:28:45 +0000 [PARISC] Move os_id_to_string() inside #ifndef __ASSEMBLY__ Assembly files should be protected from os_id_to_string()... Pass me a brown paper bag, please. Signed-off-by: Kyle McMartin commit 61c340166d8c62086b6de00afc7670eea27eb2ab tree 2f7b635d242d2a83e1d6c8d94199259dace30d55 parent 6e1b9585aaae2fa4f9590f363b32c5d3b6339ba6 author James Bottomley Sat, 24 Jun 2006 16:05:18 +0000 committer Kyle McMartin Tue, 27 Jun 2006 23:28:45 +0000 [PARISC] Fix do_gettimeofday() hang Apparently gettimeoffset can return small negative values (usually in the 100us range). If xtime.tv_nsec is accidentally less than this, though (a fortunately unlikely event) it triggers the loop forever. I've added a test and correct adjustment for this case. It has a warning printk in there which I'd like to leave for the time being just in case this problem implicates some other part of the kernel. Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit 6e1b9585aaae2fa4f9590f363b32c5d3b6339ba6 tree da55d4de827dd63998fcc8b6abd154dea0db0dde parent 1c63b4b8474700f3fb5e3442a78897766f153437 author James Bottomley Fri, 23 Jun 2006 14:15:20 -0600 committer Kyle McMartin Tue, 27 Jun 2006 23:28:44 +0000 [PARISC] Fix PCREL22F relocation problem for most modules The new problem, which has been affecting many more modules was that our new ioremap really takes chunks out of our vmalloc space. The net result being that any two kernel vmalloc's now have to slot into the chunked up space. So the vmallocs for a modules init and core sectons are no longer necessarily contiguous. Unfortunately, the module loader thinks that any internal symbol references should be satisfiable using the jump instruction, which isn't true if the symbol is referenced from init to core and vmalloc placed them a long way apart. Fix this by introducing a new stub type for intra module inter sectional jumps and using it. Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit 1c63b4b8474700f3fb5e3442a78897766f153437 tree 90a32c95e88a3efce329e62e923fa4b989608b9d parent 67a061a191017f984a1ef0ff73ae988b9b15f6d3 author Kyle McMartin Wed, 21 Jun 2006 16:49:38 +0000 committer Kyle McMartin Tue, 27 Jun 2006 23:28:44 +0000 [PARISC] Refactor show_regs in traps.c show_regs() was one bloaty function. Split it into a few cleaner functions and define a clean macro to print a line of registers. [And from Thibaut, only print fprs on a usermode trap.] Signed-off-by: Kyle McMartin commit 67a061a191017f984a1ef0ff73ae988b9b15f6d3 tree f7f84d047dbeafe40711386bd6a8a4ae50bd80de parent ec1fdc24c2ae012b078ba0187ceef208e08a3aec author Kyle McMartin Sun, 25 Jun 2006 16:58:57 +0000 committer Kyle McMartin Tue, 27 Jun 2006 23:28:43 +0000 [PARISC] Add os_id_to_string helper Add a helper to asm/pdc.h to translate OS_ID values to strings and use it in the pdc_stable driver. Signed-off-by: Kyle McMartin commit ec1fdc24c2ae012b078ba0187ceef208e08a3aec tree e615b4d1fe299ff835d9c21d6ae93214d22d67b3 parent a9d2d386c42b816a81eb1d02dfb7b502ba8cea82 author Kyle McMartin Wed, 21 Jun 2006 19:27:29 +0000 committer Kyle McMartin Tue, 27 Jun 2006 23:28:42 +0000 [PARISC] OS_ID_LINUX == 0x0006 We were assigned an OS_ID of 0x0006. Consistently use OS_ID_LINUX instead of using the magic number. Also update the OS_ID_ defines in asm/pdc.h to reflect this. Signed-off-by: Kyle McMartin commit a9d2d386c42b816a81eb1d02dfb7b502ba8cea82 tree 0c01caa8a470713dc8a68db0ed584cfe3142392d parent e5a2e7fdb53028ce187c0ce0ae0d45ca7546fd5e author Kyle McMartin Fri, 16 Jun 2006 18:20:00 -0400 committer Kyle McMartin Tue, 27 Jun 2006 23:28:42 +0000 [PARISC] Ensure Space ID hashing is turned off Check PDC_CACHE to see if spaceid hashing is turned on, and fail to boot if that is the case. However, some old machines do not implement the PDC_CACHE_RET_SPID firmware call, so continue to boot if the call fails because of PDC_BAD_OPTION (but fail in all other error returns). Signed-off-by: Kyle McMartin commit e5a2e7fdb53028ce187c0ce0ae0d45ca7546fd5e tree 5e2f7766397b8131a74638690e8a0cbe71f5af69 parent 667baef53fcd5b839ca8e74ed65811d9df22bd7b author Kyle McMartin Wed, 14 Jun 2006 20:26:25 +0000 committer Kyle McMartin Tue, 27 Jun 2006 23:28:41 +0000 [PARISC] Match show_cache_info with reality show_cache_info and struct pdc_cache_cf were out of sync with published documentation. Fix the reporting of cache associativity and update the pdc_cache_cf bitfields to match documentation. Signed-off-by: Kyle McMartin commit 667baef53fcd5b839ca8e74ed65811d9df22bd7b tree eaaee3beb9611477d670261754af7b9f247b4a55 parent a3ea84fabacd9cc5bcc3fda67c35e692ca10dc8c author Kyle McMartin Sat, 17 Jun 2006 17:53:43 +0000 committer Kyle McMartin Tue, 27 Jun 2006 23:28:40 +0000 [PARISC] Remove unused macro fixup_branch in syscall.S Signed-off-by: Kyle McMartin commit a3ea84fabacd9cc5bcc3fda67c35e692ca10dc8c tree 4de45b002abf5873fc5b19b90f2637e97b663899 parent d71624c95a231873ec3727ee9bff7b68e692de70 author Kyle McMartin Fri, 16 Jun 2006 19:10:02 +0000 committer Kyle McMartin Tue, 27 Jun 2006 23:28:40 +0000 [PARISC] Add is_compat_task() helper ... And convert signal.c and ptrace.c to use it instead of open coded equivalents. Signed-off-by: Kyle McMartin commit d71624c95a231873ec3727ee9bff7b68e692de70 tree fd5da1bd3aacf60db62a011b509c328b167b6d5b parent b0e8bfca2f6cdef6145e377ff0797fc42473b659 author Thibaut Varene Sun, 07 May 2006 04:54:28 -0600 committer Kyle McMartin Tue, 27 Jun 2006 23:28:39 +0000 [PARISC] Update Thibaut Varene's CREDITS entry Signed-off-by: Thibaut VARENE Signed-off-by: Kyle McMartin commit b0e8bfca2f6cdef6145e377ff0797fc42473b659 tree b5b2baa64f9ca893a7320b054f26d036b1136cea parent 3f9edb53f74b4e18f92783da7b6f5ad1d36e05b2 author Thibaut Varene Thu, 04 May 2006 18:43:34 -0600 committer Kyle McMartin Tue, 27 Jun 2006 23:28:39 +0000 [PARISC] Reduce data footprint in pdc_stable.c No code change - reduce data footprint. Signed-off-by: Thibaut VARENE Signed-off-by: Kyle McMartin commit 3f9edb53f74b4e18f92783da7b6f5ad1d36e05b2 tree 7cb0b21f835122d0de3c25e49c770cb0694cfb26 parent 9b0703fed7ca1af95d4454f45e2f25733f0afa76 author Thibaut Varene Thu, 04 May 2006 18:43:34 -0600 committer Kyle McMartin Tue, 27 Jun 2006 23:28:38 +0000 [PARISC] pdc_stable version 0.30 pdc_stable v0.30: This patch introduces 3 more files to the /sys/firmware/stable tree: - diagnostic, which contains a cryptic hex string - osdep1, a 16 bytes os-dependent storage area always available - osdep2, another os-dependent storage area which existence/size depends on hversion. This patch also adds code to setup the "Linux" signature in stable storage. That is to say that starting with this patch, the kernel will now sign its OSID (0x0006, thx LaMont) in Stable Storage upon boot, whether pdc_stable is enabled or not. Signed-off-by: Thibaut VARENE Signed-off-by: Kyle McMartin commit 9b0703fed7ca1af95d4454f45e2f25733f0afa76 tree 28a9dff1a9747e4f58fbe25dc99d85c9fa86c54d parent 8ffaeaf42e91930888df09d696a8a6ebe056d0e0 author Thibaut Varene Thu, 04 May 2006 09:29:32 -0600 committer Kyle McMartin Tue, 27 Jun 2006 23:28:37 +0000 [PARISC] Work around machines which do not support chassis warnings pdc_chassis v0.05: Some machines seems not to implement Chassis warn support. Work around these. Also cleanup a bit of the code. Signed-off-by: Thibaut VARENE Signed-off-by: Kyle McMartin commit 8ffaeaf42e91930888df09d696a8a6ebe056d0e0 tree 7b1785ccab10b69c06f91184e382f8d96b1cc04d parent c95f2e5f2f6f61d734a025414c9eb81872a5c831 author Thibaut Varene Wed, 03 May 2006 17:27:35 -0600 committer Kyle McMartin Tue, 27 Jun 2006 23:28:37 +0000 [PARISC] PDC_CHASSIS is implemented on all machines This patch removes a limitation of the original code, so that CHASSIS codes can be sent to all machines. On machines with a LCD panel, this code displays "INI" during bootup, "RUN" when the system is booted and running, "FLT" when a panic occurs, etc. This part of the code can be enabled/disabled through CONFIG_PDC_CHASSIS This patch also adds minimalistic support for Chassis warnings, through a proc entry '/proc/chassis', which will reflect the warnings status (PSU or fans failure when they happen, NVRAM battery level and temperature thresholds overflows). This part of the code can be enabled/disabled through CONFIG_PDC_CHASSIS_WARN Signed-off-by: Thibaut VARENE Signed-off-by: Kyle McMartin commit c95f2e5f2f6f61d734a025414c9eb81872a5c831 tree 3431b931557f10cf41da491bdd3833ea0eb9e6da parent 1b6d1b5e073ad9313ad64da49dff649f5c06e546 author Carlos O'Donell Wed, 21 Jun 2006 03:43:52 +0000 committer Kyle McMartin Tue, 27 Jun 2006 23:28:36 +0000 [PARISC] Remove unconditional #define PIC in syscall macros Signed-off-by: Carlos O'Donell Signed-off-by: Kyle McMartin commit 1b6d1b5e073ad9313ad64da49dff649f5c06e546 tree 2f459aedd9ef3b11f8c54816ddc172828b5bbb7a parent 7514b7a500411faa1c2ff1d5dc3198b855f5cdcc author Kyle McMartin Fri, 19 May 2006 20:18:17 +0000 committer Kyle McMartin Tue, 27 Jun 2006 23:28:36 +0000 [PARISC] Use MFIA in current_text_addr on pa2.0 processors Signed-off-by: Kyle McMartin commit 7514b7a500411faa1c2ff1d5dc3198b855f5cdcc tree 3477927b8ee8dfffabe97b9ccda52b32cc2df482 parent 692086e0b3ca9a6cb876b901bfa87717044cb20f author Kyle McMartin Thu, 25 May 2006 16:22:30 +0000 committer Kyle McMartin Tue, 27 Jun 2006 23:28:35 +0000 [PARISC] Remove dead function pc_in_user_space This code has been crufting up the file without any use for quite a long time, so let's kill it. Signed-off-by: Kyle McMartin commit 692086e0b3ca9a6cb876b901bfa87717044cb20f tree 5710c05d97ae0a097b38d1c8aeb91f16ff516b22 parent 40d78de1aced7e0f3ce112698d847adcc643efdf author Kyle McMartin Tue, 30 May 2006 17:50:29 +0000 committer Kyle McMartin Tue, 27 Jun 2006 23:28:35 +0000 [PARISC] Test ioc_needs_fdc variable instead of open coding Some debugging code in sba_iommu.c should be testing ioc_needs_fdc, not directly testing boot_cpu_data. Signed-off-by: Kyle McMartin commit 40d78de1aced7e0f3ce112698d847adcc643efdf tree 74d06a5cf453da3dd414e6ea5578d6e94e389df8 parent 3fd3a74f45c935f7d6d5c2fb48f06324b18826b7 author Grant Grundler Thu, 11 May 2006 00:31:31 -0600 committer Kyle McMartin Tue, 27 Jun 2006 23:28:34 +0000 [PARISC] Fix gcc 4.1 warnings in sba_iommu.c Clean up gcc 4.1 warnings noted by Joel Soete. Kyle McMartin gets kudos for pointing out the issues. Matthew Wilcox noticed sba_iommu was using open coded versions of (read|write)X. Signed-off-by: Grant Grundler Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 3fd3a74f45c935f7d6d5c2fb48f06324b18826b7 tree 552033cbdc4e19b667a25c55e642a172a1ec3b2e parent c8224e0074f1dce12e95e53ca469f6fe49cc9101 author Carlos O'Donell Sat, 22 Apr 2006 14:47:21 -0600 committer Kyle McMartin Tue, 27 Jun 2006 23:28:33 +0000 [PARISC] Use FIXUP_BRANCH_CLOBBER to asm clobber list Joel Soete noticed correctly that the fixup's clobbers must be listed as the ASM clobbers. FIXUP_BRANCH in unaligned.c has a new macro which lists all the clobbers in the fixup, we use this throughout the file to simplify the process of listing clobbers in the future. A missing "r1" clobber is added to our uaccess.h for the 64-bit __put_kernel_asm. Interestingly this is a pretty serious bug since gcc generates pretty good use of r1 as a temporary and the uses of __put_kernel_asm are varied and dangerous if r1 is scratched during an invalid write. Signed-off-by: Joel Soete Signed-off-by: Carlos O'Donell Signed-off-by: Kyle McMartin commit c8224e0074f1dce12e95e53ca469f6fe49cc9101 tree c9a3298edf7b43699a5e1a517c6e648efc5695a5 parent 64f495323c9a902b3e59fe0a588585102bb3b13e author Kyle McMartin Fri, 21 Apr 2006 02:20:37 +0000 committer Kyle McMartin Tue, 27 Jun 2006 23:28:33 +0000 [PARISC] Whitespace clean up in asm/pgtable.h Signed-off-by: Kyle McMartin commit 64f495323c9a902b3e59fe0a588585102bb3b13e tree 202d6c0105b0348aadfa8761e7c3cf27a5e98db9 parent f36f44de721db44b4c2944133c3c5c2e06f633f0 author Kyle McMartin Sat, 22 Apr 2006 00:48:22 -0600 committer Kyle McMartin Tue, 27 Jun 2006 23:28:32 +0000 [PARISC] Ensure all ldcw uses are ldcw,co on pa2.0 ldcw,co should always be used on pa2.0, otherwise the strict cache width alignment requirement is not relaxed. Signed-off-by: Kyle McMartin commit 73024cf11522c0233228453984b2a2b37885e336 tree a779d55555711b23459510f99e321e36e1e69e3c parent 97dfd70c8958a634157e0b35711cca01ff6f959b author Eric Sesterhenn Wed, 28 Jun 2006 08:42:26 +1000 committer Nathan Scott Wed, 28 Jun 2006 08:42:26 +1000 [XFS] Fix realtime subvolume expansion, a porting bug b0rked it. Coverity made me look at this code (bug id #344). We only return with XFS_ERROR(EINVAL) if mp->m_rtdev_targp is valid and pass it otherwise to xfs_read_buf() where some function calls later it gets dereferenced by an assert. SGI-PV: 954266 SGI-Modid: xfs-linux-melb:xfs-kern:26363a Signed-off-by: Eric Sesterhenn Signed-off-by: Nathan Scott commit 6a93096195305f6f2a39544a034e77e2e74d5799 tree 06d9354fd539aaf581c7e57bfbd92160e6210dff parent 1887f517e3cdf5f1e9c0e4daaa864450415a8f61 author Thomas Gleixner Wed, 28 Jun 2006 00:11:45 +0200 committer David Woodhouse Tue, 27 Jun 2006 23:24:09 +0100 [MTD] NAND: Select chip before checking write protect status The other way round works not really well with boards which have a static NAND chipselect. Signed-off-by: Thomas Gleixner Signed-off-by: David Woodhouse commit 1887f517e3cdf5f1e9c0e4daaa864450415a8f61 tree 1f86e7ef7c98283e451ad053c321bea551224cb6 parent 0e4ced59de7c0c23588d2b3f6d302592545cd12e author Herbert Valerio Riedel Sat, 24 Jun 2006 00:03:36 +0200 committer David Woodhouse Tue, 27 Jun 2006 23:22:07 +0100 [MTD] CORE mtdchar.c: fix off-by-one error in lseek() Allow lseek(mtdchar_fd, 0, SEEK_END) to succeed, which currently fails with EINVAL. lseek(fd, 0, SEEK_END) should result into the same fileposition as lseek(fd, 0, SEEK_SET) + read(fd, buf, length(fd)) Furthermore, lseek(fd, 0, SEEK_CUR) should return the current file position, which in case of an encountered EOF should not result in EINVAL Signed-off-by: Herbert Valerio Riedel Signed-off-by: Thomas Gleixner Signed-off-by: David Woodhouse commit 0e4ced59de7c0c23588d2b3f6d302592545cd12e tree 7893eebaa3a3c532313b5dc3b3f6b1c9cc31811d parent 04510dee3c21ac208351cc6de7b70a5459ab3029 author Petr Stetiar Fri, 23 Jun 2006 19:17:03 +0200 committer David Woodhouse Tue, 27 Jun 2006 23:20:48 +0100 [MTD] NAND: Fix typo in mtd/nand/ts7250.c I was unable to compile ts7250.c after your refactor commit, it's a typo probably. -- ynezz From: Petr Stetiar Signed-off-by: Thomas Gleixner commit 266bee88699ddbde42ab303bbc426a105cc49809 tree 2d2b57f869321e177caf173af8d43b5d88c4a79d parent e7374e48009a15a680d53bd1f9828b9b79a8aac9 author David Brownell Tue, 27 Jun 2006 12:59:15 -0700 committer Linus Torvalds Tue, 27 Jun 2006 14:07:19 -0700 [PATCH] fix static linking of NFS Builds on ARM report link problems with common configurations like statically linked NFS (for nfsroot). The symptom is that __init section code references __exit section code; that won't work since the exit sections are discarded (since they can never be called). The best fix for these particular cases would be an "__init_or_exit" section annotation. Signed-off-by: David Brownell Acked-by: Trond Myklebust Signed-off-by: Linus Torvalds commit e7374e48009a15a680d53bd1f9828b9b79a8aac9 tree dd3344add0056eb8f33fde2c3ffeb4fecd0f2baa parent d38b69689c349f35502b92e20dafb30c62d49d63 author Dmitry Torokhov Tue, 27 Jun 2006 08:30:31 -0400 committer Linus Torvalds Tue, 27 Jun 2006 14:05:06 -0700 Input: fix resetting name, phys and uniq when unregistering device It should be done before calling class_device_unregister() because it will destroy the device and free memory if there are no other references to the device. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit 0223cf0b10bdb3b557d8884b1a957cc64be843c3 tree fb4247a30b8df1fd00e9cab04132795e826fa83a parent 750d1151a6c95ef9b9a188bb7cff6b80ee30da17 author Steve French Tue, 27 Jun 2006 19:50:57 +0000 committer Steve French Tue, 27 Jun 2006 19:50:57 +0000 [CIFS] Fix alignment of unicode strings in previous patch Signed-off-by: Steve French commit 87937472ff8e34ad5c7b798a8a52e4368af216df tree aac98d01aa5395da04243c53b0983eb104df08a2 parent 6550e07f41ce8473ed684dac54fbfbd42183ffda author Vivek Goyal Thu, 01 Jun 2006 20:39:02 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:24:00 -0700 [PATCH] i386: export memory more than 4G through /proc/iomem Currently /proc/iomem exports physical memory also apart from io device memory. But on i386, it truncates any memory more than 4GB. This leads to problems for kexec/kdump. Kexec reads /proc/iomem to determine the system memory layout and prepares a memory map based on that and passes it to the kernel being kexeced. Given the fact that memory more than 4GB has been truncated, new kernel never gets to see and use that memory. Kdump also reads /proc/iomem to determine the physical memory layout of the system and encodes this informaiton in ELF headers. After a crash new kernel parses these ELF headers being used by previous kernel and vmcore is prepared accordingly. As memory more than 4GB has been truncated, kdump never sees that memory and never prepares ELF headers for it. Hence vmcore is truncated and limited to 4GB even if there is more physical memory in the system. This patch exports memory more than 4GB through /proc/iomem on i386. Cc: Maneesh Soni Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 6550e07f41ce8473ed684dac54fbfbd42183ffda tree d8ed394175785e9b28333d7ae130b725e176dfb5 parent 2427ddd8fae2febe3f5ac1ba76b092541304d9f0 author Greg Kroah-Hartman Mon, 12 Jun 2006 17:11:31 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:24:00 -0700 [PATCH] 64bit Resource: finally enable 64bit resource sizes Introduce the Kconfig entry and actually switch to a 64bit value, if wanted, for resource_size_t. Based on a patch series originally from Vivek Goyal Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 2427ddd8fae2febe3f5ac1ba76b092541304d9f0 tree 29d98aa03b1331fb1d1a9aaf3a6dddcc7eb48b11 parent b60ba8343b78b182c03cf239d4342785376c1ad1 author Greg Kroah-Hartman Mon, 12 Jun 2006 17:07:52 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:24:00 -0700 [PATCH] 64bit Resource: convert a few remaining drivers to use resource_size_t where needed Based on a patch series originally from Vivek Goyal Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit b60ba8343b78b182c03cf239d4342785376c1ad1 tree 4285a89db0427674a51b76107321bfa95a63ddbd parent e31dd6e4520439ceae4753f32dd2da2c345e929a author Greg Kroah-Hartman Mon, 12 Jun 2006 17:07:07 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:24:00 -0700 [PATCH] 64bit resource: change pnp core to use resource_size_t Based on a patch series originally from Vivek Goyal Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit e31dd6e4520439ceae4753f32dd2da2c345e929a tree fea87cfb0077135c6dcaf7849e518ee31733b0fc parent d75fc8bbccf7c019994bcfd6255d5b56335ed21d author Greg Kroah-Hartman Mon, 12 Jun 2006 17:06:02 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:24:00 -0700 [PATCH] 64bit resource: change pci core and arch code to use resource_size_t Based on a patch series originally from Vivek Goyal Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit d75fc8bbccf7c019994bcfd6255d5b56335ed21d tree 51eee480485d640e2b7b1efd9e98eadb683fadcd parent cf7c712c11fb881842534efe98a07f36f1c86c65 author Greg Kroah-Hartman Mon, 12 Jun 2006 16:09:23 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:23:59 -0700 [PATCH] 64bit resource: change resource core to use resource_size_t Based on a patch series originally from Vivek Goyal Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit cf7c712c11fb881842534efe98a07f36f1c86c65 tree ff300bef11d0dd251aba9038d1b750c84edf4237 parent e29419fffceb8ec36def3c922040e1ca7bcd3de5 author Greg Kroah-Hartman Mon, 12 Jun 2006 15:49:31 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:23:59 -0700 [PATCH] 64bit resource: introduce resource_size_t for the start and end of struct resource But do not change it from what it currently is (unsigned long) Based on a patch series originally from Vivek Goyal Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit e29419fffceb8ec36def3c922040e1ca7bcd3de5 tree c4e51cdee86dec7c859b1e7c7929c8bb2e85f36d parent 685143ac1f7a579a3fac9c7f2ac8f82e95af6864 author Greg Kroah-Hartman Mon, 12 Jun 2006 15:20:16 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:23:59 -0700 [PATCH] 64bit resource: fix up printks for resources in misc drivers This is needed if we wish to change the size of the resource structures. Based on an original patch from Vivek Goyal Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 685143ac1f7a579a3fac9c7f2ac8f82e95af6864 tree 0fb1ff8fecb7e21593c022ff458b8db6096d6da5 parent 490ab72af6a7a74b1d77e8f1b67fdfad04371876 author Greg Kroah-Hartman Mon, 12 Jun 2006 15:18:31 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:23:59 -0700 [PATCH] 64bit resource: fix up printks for resources in arch and core code This is needed if we wish to change the size of the resource structures. Based on an original patch from Vivek Goyal and Andrew Morton. (tweaked by Andy Isaacson ) Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Andy Isaacson Signed-off-by: Greg Kroah-Hartman commit 490ab72af6a7a74b1d77e8f1b67fdfad04371876 tree b48f8c7fd60564367a7affd488b84d1417eab509 parent 228aef63d9a5f4ddc9cc9213215e789f35f2cd00 author Greg Kroah-Hartman Mon, 12 Jun 2006 15:17:34 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:23:59 -0700 [PATCH] 64bit resource: fix up printks for resources in pcmcia drivers This is needed if we wish to change the size of the resource structures. Based on an original patch from Vivek Goyal Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 228aef63d9a5f4ddc9cc9213215e789f35f2cd00 tree b300c995e20f93ff03d9cc8a99f21e5cc44b8be6 parent 08f46de9a0e7c293db34cf44f9451d18ef609770 author Greg Kroah-Hartman Mon, 12 Jun 2006 15:16:52 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:23:59 -0700 [PATCH] 64bit resource: fix up printks for resources in video drivers This is needed if we wish to change the size of the resource structures. Based on an original patch from Vivek Goyal Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 08f46de9a0e7c293db34cf44f9451d18ef609770 tree 83c28b79165adee350aad8cb9d4e2e59486acf56 parent 176dfc633bbe4e03f4557d2beeefb4f0cc7f0efa author Greg Kroah-Hartman Mon, 12 Jun 2006 15:15:59 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:23:59 -0700 [PATCH] 64bit resource: fix up printks for resources in ide drivers This is needed if we wish to change the size of the resource structures. Based on an original patch from Vivek Goyal Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 176dfc633bbe4e03f4557d2beeefb4f0cc7f0efa tree a0229be4a8f8c8cc2a5c244825a693611acad21d parent 1396a8c3f7cec9f5e0d00bd089be21fc468f0f1c author Greg Kroah-Hartman Mon, 12 Jun 2006 15:15:17 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:23:58 -0700 [PATCH] 64bit resource: fix up printks for resources in mtd drivers This is needed if we wish to change the size of the resource structures. Based on an original patch from Vivek Goyal Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 1396a8c3f7cec9f5e0d00bd089be21fc468f0f1c tree b96018459e26a24e20221f0bb7d5bb25d6608147 parent 7c7459d1f91abdf1e31ef80cad526e83e8b8ba4e author Greg Kroah-Hartman Mon, 12 Jun 2006 15:14:29 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:23:58 -0700 [PATCH] 64bit resource: fix up printks for resources in pci core and hotplug drivers This is needed if we wish to change the size of the resource structures. Based on an original patch from Vivek Goyal Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 7c7459d1f91abdf1e31ef80cad526e83e8b8ba4e tree 032c2e1b947b36f2dced3090d3cdf757b147bce6 parent aa0a2ddc54fa8a22060d17a9ca7bbc4bcc51f260 author Greg Kroah-Hartman Mon, 12 Jun 2006 15:13:08 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:23:58 -0700 [PATCH] 64bit resource: fix up printks for resources in networks drivers This is needed if we wish to change the size of the resource structures. Based on an original patch from Vivek Goyal Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit aa0a2ddc54fa8a22060d17a9ca7bbc4bcc51f260 tree e1d9495b2a21663330e2e02dcc4a038b48e65c49 parent 740e518efcd84ce5e53ecf3c4c9be08cf8f3747c author Greg Kroah-Hartman Mon, 12 Jun 2006 14:50:27 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:23:58 -0700 [PATCH] 64bit resource: fix up printks for resources in sound drivers This is needed if we wish to change the size of the resource structures. Based on an original patch from Vivek Goyal Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 740e518efcd84ce5e53ecf3c4c9be08cf8f3747c tree a383e3a2bb4fa724fdd7d6a52424027b2fc881c8 parent d38b69689c349f35502b92e20dafb30c62d49d63 author Greg Kroah-Hartman Mon, 12 Jun 2006 14:47:06 -0700 committer Greg Kroah-Hartman Tue, 27 Jun 2006 09:23:58 -0700 [PATCH] 64bit resource: C99 changes for struct resource declarations Based on an original patch from Ralf Baechle and Vivek Goyal . This is needed in order to prepare for changing the size of resources. Cc: Ralf Baechle Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 3bdad7bd253f17ead00b4af2e82f84e9522c95ac tree 2f25e9ec91e76a19ceb939552ef21ee9713fb4b5 parent 1c9e16e47a22c61d99aabb1c154e5106ddbf3575 author James Smart Mon, 26 Jun 2006 14:19:59 -0400 committer James Bottomley Tue, 27 Jun 2006 11:01:46 -0500 [SCSI] fc transport: bug fix: correct references Original post was incorrect as it didn't realize that we already had a self-referenc due to device_initialize(), and we were really only missing the put on our own reference. This was hidden by the other bug which had the midlayer reusing stargets after they were already free, which was doing too many puts on our rport. Updating FC transport for: - Add put in fc_rport_final_delete(), to release the rport. Prior, we were leaving the rport with a reference, thus the shost with references, etc. If the driver was unloaded, shosts and rports remained, along with work threads, etc - Fix fc_rport_create failure path - too many put's on parent - Add commenting to easily track ref taking. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 1c9e16e47a22c61d99aabb1c154e5106ddbf3575 tree 174f537f7048f0eec7c1591dc17b440312c091a9 parent a0785edff7b316cad566bdc369d3d034c4c1a39c author James Smart Tue, 16 May 2006 16:13:36 -0400 committer James Bottomley Tue, 27 Jun 2006 10:53:55 -0500 [SCSI] update max sdev block limit Updated patch to address comments from Pat Mansfield and Michael Reed: Bumped max to 600 (10mins). Set default dev_loss_tmo to a value other than the max (30s). Signed-off-by: James Smart Signed-off-by: James Bottomley commit a0785edff7b316cad566bdc369d3d034c4c1a39c tree 5a0b143118c2bb5bb1f9bc8938d8568f7215f562 parent 79ac6745e4d95cd583bca744d313a323deb4adc2 author James Smart Thu, 11 May 2006 13:27:09 -0400 committer James Bottomley Tue, 27 Jun 2006 10:52:49 -0500 [SCSI] fc transport: resolve scan vs delete deadlocks In a prior posting to linux-scsi on the fc transport and workq deadlocks, we noted a second error that did not have a patch: http://marc.theaimsgroup.com/?l=linux-scsi&m=114467847711383&w=2 - There's a deadlock where scsi_remove_target() has to sit behind scsi_scan_target() due to contention over the scan_lock(). Subsequently we posted a request for comments about the deadlock: http://marc.theaimsgroup.com/?l=linux-scsi&m=114469358829500&w=2 This posting resolves the second error. Here's what we now understand, and are implementing: If the lldd deletes the rport while a scan is active, the sdev's queue is blocked which stops the issuing of commands associated with the scan. At this point, the scan stalls, and does so with the shost->scan_mutex held. If, at this point, if any scan or delete request is made on the host, it will stall waiting for the scan_mutex. For the FC transport, we queue all delete work to a single workq. So, things worked fine when competing with the scan, as long as the target blocking the scan was the same target at the top of our delete workq, as the delete workq routine always unblocked just prior to requesting the delete. Unfortunately, if the top of our delete workq was for a different target, we deadlock. Additionally, if the target blocking scan returned, we were unblocking it in the scan workq routine, which really won't execute until the existing stalled scan workq completes (e.g. we're re-scheduling it while it is in the midst of its execution). This patch moves the unblock out of the workq routines and moves it to the context that is scheduling the work. This ensures that at some point, we will unblock the target that is blocking scan. Please note, however, that the deadlock condition may still occur while it waits for the transport to timeout an unblock on a target. Worst case, this is bounded by the transport dev_loss_tmo (default: 30 seconds). Finally, Michael Reed deserves the credit for the bulk of this patch, analysis, and it's testing. Thank you for your help. Note: The request for comments statements about the gross-ness of the scan_mutex still stand. Signed-off-by: Michael Reed Signed-off-by: James Smart Signed-off-by: James Bottomley commit 79ac6745e4d95cd583bca744d313a323deb4adc2 tree 3910f0a6b7d8f83ffb5986389e0805477c56a1e0 parent d7a1bb0a04ca835bffc0a91e64ab827dfba7d8f5 author James Smart Wed, 08 Mar 2006 14:50:18 -0500 committer James Bottomley Tue, 27 Jun 2006 10:51:12 -0500 [SCSI] Block I/O while SG reset operation in progress - lpfc portion This removes the duplicate functionality which had been added to the lpfc driver. Signed-off-by: James Smart Signed-off-by: James Bottomley commit d7a1bb0a04ca835bffc0a91e64ab827dfba7d8f5 tree f944d6ed6ecf23c59054b7f459e88f31f8da4235 parent 12e9b5fb96028aab26af65bb06d2dee56c428a6e author James Smart Wed, 08 Mar 2006 14:50:12 -0500 committer James Bottomley Tue, 27 Jun 2006 10:48:11 -0500 [SCSI] Block I/O while SG reset operation in progress - the midlayer patch The scsi midlayer portion of the patch Signed-off-by: James Smart Signed-off-by: James Bottomley commit 04510dee3c21ac208351cc6de7b70a5459ab3029 tree 99700a71d28b012bbc94e8d4779001515cce184f parent 332a6b99c587161a972eaa1b00ae0e0dc49fbbfd author KaiGai Kohei Sat, 24 Jun 2006 09:21:13 +0900 committer David Woodhouse Tue, 27 Jun 2006 16:20:06 +0100 [JFFS2][XATTR] coexistence between xattr and write buffering support. Drop '&& !JFFS2_FS_WRITEBUFFER' from fs/Kconfig. The series of previous patches enables to use those functionality at same time. Signed-off-by: KaiGai Kohei Signed-off-by: David Woodhouse commit 332a6b99c587161a972eaa1b00ae0e0dc49fbbfd tree b07d13f950050601a541ad3a8e8af3e21ced1ea3 parent 2c887e2359f6e7217cdaa17994ca94ef328b658f author KaiGai Kohei Sat, 24 Jun 2006 09:17:42 +0900 committer David Woodhouse Tue, 27 Jun 2006 16:19:39 +0100 [JFFS2][XATTR] Fix wrong copyright summary.c was modified at 2006. Signed-off-by: KaiGai Kohei Signed-off-by: David Woodhouse commit 2c887e2359f6e7217cdaa17994ca94ef328b658f tree 4af246384893ec0b18380aacb97cc0f2a0226ec8 parent 355ed4e141203fd7266ef9d90d57be0c61bd1aa4 author KaiGai Kohei Sat, 24 Jun 2006 09:16:50 +0900 committer David Woodhouse Tue, 27 Jun 2006 16:19:06 +0100 [JFFS2][XATTR] Re-define xd->refcnt as atomic_t In jffs2_release_xattr_datum(), it refers xd->refcnt to ensure whether releasing xd is allowed or not. But we can't hold xattr_sem since this function is called under spin_lock(&c->erase_completion_lock). Thus we have to refer it without any locking. This patch redefine xd->refcnt as atomic_t. It enables to refer xd->refcnt without any locking. Signed-off-by: KaiGai Kohei Signed-off-by: David Woodhouse commit 355ed4e141203fd7266ef9d90d57be0c61bd1aa4 tree 24abb6d9ee1ae95e41d7db13f90200adf734eb4e parent 8a13695cbe4e8311b363f9bd25162904b984ca74 author KaiGai Kohei Sat, 24 Jun 2006 09:15:36 +0900 committer David Woodhouse Tue, 27 Jun 2006 16:18:30 +0100 [JFFS2][XATTR] Fix memory leak with jffs2_xattr_ref If xattr_ref is associated with an orphan inode_cache on filesystem mounting, those xattr_refs are not released even if this inode_cache is released. This patch enables to call jffs2_xattr_delete_inode() for such a irregular inode_cachde too. Signed-off-by: KaiGai Kohei Signed-off-by: David Woodhouse commit 8a13695cbe4e8311b363f9bd25162904b984ca74 tree 2ff6ecca99d5b6185e1b3df0f3ab1447a3fdff9b parent a1ae76e96a18edf4b8a4d4e102762060c26d1c6a author KaiGai Kohei Sat, 24 Jun 2006 09:14:13 +0900 committer David Woodhouse Tue, 27 Jun 2006 16:18:02 +0100 [JFFS2][XATTR] rid unnecessary writing of delete marker. In the followinf situation, an explicit delete marker is not necessary, because we can certainlly detect those obsolete xattr_datum or xattr_ref on next mounting. - When to delete xattr_datum node. - When to delete xattr_ref node on removing inode. - When to delete xattr_ref node on updating xattr. This patch rids writing delete marker in those situations. Signed-off-by: KaiGai Kohei Signed-off-by: David Woodhouse commit a1ae76e96a18edf4b8a4d4e102762060c26d1c6a tree f99d85e26f618556898ed0775bf2fc4b71555d37 parent c9f700f840bd481b3e01fcad1ba8da01794a6726 author KaiGai Kohei Sun, 11 Jun 2006 10:45:22 +0900 committer David Woodhouse Tue, 27 Jun 2006 16:17:04 +0100 [JFFS2][XATTR] Fix ACL bug when updating null xattr by null ACL. This patch enable to handle the case when updating null xattr by null ACL. When we try to set NULL into NULL xattr, xattr subsystem returns -ENODATA. This patch enables to handle this error code. [2/3] jffs2-xattr-v6-02-fix_posixacl_bug.patch Signed-off-by: KaiGai Kohei Signed-off-by: David Woodhouse commit c9f700f840bd481b3e01fcad1ba8da01794a6726 tree 786f4a6a3f3a2d619ae4230a62f95361fcd3245a parent 6d4f8224d4ee065e0e3186cc554468d735e6015d author KaiGai Kohei Sun, 11 Jun 2006 10:35:15 +0900 committer David Woodhouse Tue, 27 Jun 2006 16:16:26 +0100 [JFFS2][XATTR] using 'delete marker' for xdatum/xref deletion - When xdatum is removed, a new xdatum with 'delete marker' is written. (version==0xffffffff means 'delete marker') - When xref is removed, a new xref with 'delete marker' is written. (odd-numbered xseqno means 'delete marker') - delete_xattr_(datum/xref)_delay() are new deletion functions are added. We can only use them if we can detect the target obsolete xdatum/xref as a orphan or errir one. (e.g when inode deletion, or detecting crc error) [1/3] jffs2-xattr-v6-01-delete_marker.patch Signed-off-by: KaiGai Kohei Signed-off-by: David Woodhouse commit 6d4f8224d4ee065e0e3186cc554468d735e6015d tree c0b4107954701c9f34d638b7ec5e59b4bb279e89 parent ce5b0968b1caa6b93e366e88a3c5fa2fd59029ce author Sascha Hauer Tue, 27 Jun 2006 14:38:15 +0100 committer David Woodhouse Tue, 27 Jun 2006 14:38:15 +0100 [MTD] Fix off-by-one error in physmap.c This patch fixes a simple off-by-one error in the mtd physmap driver. Signed-off-by: Sascha Hauer Signed-off-by: Lennert Buytenhek Signed-off-by: David Woodhouse commit ce5b0968b1caa6b93e366e88a3c5fa2fd59029ce tree 3502ad533b17f29014439ec50b44a40d9e87a9a1 parent 2c06a0821711a53d51a3d0492a9be0671b7152e5 author Lennert Buytenhek Tue, 27 Jun 2006 14:36:20 +0100 committer David Woodhouse Tue, 27 Jun 2006 14:36:20 +0100 [MTD] Remove unused 'nr_banks' variable from ixp2000 map driver Signed-off-by: Lennert Buytenhek Signed-off-by: David Woodhouse commit 2c06a0821711a53d51a3d0492a9be0671b7152e5 tree 1ea68bac6653f454c712046976ec5d552a8bff1c parent 62ed948cb1405fe95d61d8c6445c102e0c9da0a6 author Ben Dooks Tue, 27 Jun 2006 14:35:46 +0100 committer David Woodhouse Tue, 27 Jun 2006 14:35:46 +0100 [MTD NAND] s3c2412 support in s3c2410.c Add support for both the S3C2412 and S3C2412 Samsung SoCs to the increasingly mis-named s3c2410.c driver. This currently only supports SLC ECCs, and a chip on nFCE0. Signed-off-by: Ben Dooks Signed-off-by: David Woodhouse commit 750d1151a6c95ef9b9a188bb7cff6b80ee30da17 tree 1a69d1e42ffebefa13842372c97d505e37159f7e parent 124a27fe32398a69d16bae374aeb17ad67a0ebbf author Steve French Tue, 27 Jun 2006 06:28:30 +0000 committer Steve French Tue, 27 Jun 2006 06:28:30 +0000 [CIFS] Fix allocation of buffers for new session setup routine to allow longer user and domain names and allow passing sec options on mount Signed-off-by: Steve French commit 97dfd70c8958a634157e0b35711cca01ff6f959b tree a4e47392e35a04b71ff180fa4a681731e3d03a14 parent 05a3332885dd143496694bcecff223339880d7c9 author Nathan Scott Tue, 27 Jun 2006 16:13:46 +1000 committer Nathan Scott Tue, 27 Jun 2006 16:13:46 +1000 [XFS] Remove a race condition where a linked inode could BUG_ON in d_instantiate, due to fast transaction committal removing the last remaining reference before we were all done. SGI-PV: 953287 SGI-Modid: xfs-linux-melb:xfs-kern:26347a Signed-off-by: Nathan Scott commit 05a3332885dd143496694bcecff223339880d7c9 tree 99b5080f4b6681fd4aaa8eb44ce7d7cf374ce955 parent ebe1090549a7821faac09c467fc80b2245d0d30e author Alexey Dobriyan Tue, 27 Jun 2006 16:13:29 +1000 committer Nathan Scott Tue, 27 Jun 2006 16:13:29 +1000 [XFS] Remove redundant directory checks from inode link operation. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26343a Signed-off-by: Alexey Dobriyan Signed-off-by: Nathan Scott commit ebe1090549a7821faac09c467fc80b2245d0d30e tree 6f4d98a818840dacead704a7390975a41b25a9c7 parent 1998764e5a1700ffad2cab29b7b2a175364e5b70 author Nathan Scott Tue, 27 Jun 2006 16:13:02 +1000 committer Nathan Scott Tue, 27 Jun 2006 16:13:02 +1000 [XFS] Remove a couple of no-longer-used macros. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26339a Signed-off-by: Nathan Scott commit 1998764e5a1700ffad2cab29b7b2a175364e5b70 tree 0537711d87e512d3e90a52610dc89269b13288f3 parent b3bbed1d08e925a12ebbe6326d17554902b3d9ab author Alexey Dobriyan Tue, 27 Jun 2006 16:12:40 +1000 committer Nathan Scott Tue, 27 Jun 2006 16:12:40 +1000 [XFS] Reduce size of xfs_trans_t structure. * remove ->t_forw, ->t_back -- unused * ->t_ag_freeblks_delta, ->t_ag_flist_delta, ->t_ag_btree_delta are debugging aid -- wrap them in everyone's favourite way. As a result, cut "xfs_trans" slab object size from 592 to 572 bytes here. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26319a Signed-off-by: Alexey Dobriyan Signed-off-by: Nathan Scott commit b3bbed1d08e925a12ebbe6326d17554902b3d9ab tree b7dc0cc850da8cb53e7780c5b5a6a66e6465e9c5 parent 71306f3b880539fb4c579fbd16da552ebb10f29b author Alexey Dobriyan Tue, 27 Jun 2006 16:12:15 +1000 committer Nathan Scott Tue, 27 Jun 2006 16:12:15 +1000 [XFS] remove unused behaviour lock - shrink XFS vnode as a side effect. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26299a Signed-off-by: Alexey Dobriyan Signed-off-by: Nathan Scott commit 9000195bb7ea959939b1e5fdad336e5bac59c9e9 tree 0c40773e59d2ee6a3f1854655ec3bedc4ae92c38 parent e2e8115b54aa6f159ac3dfec8d3d23b0af5fbfa0 author Frank de Lange Tue, 27 Jun 2006 01:48:24 -0400 committer Dmitry Torokhov Tue, 27 Jun 2006 01:48:24 -0400 Input: wistron - add mapping for Wistron MS 2111 Wistron MS 2111 (aka Medion 'Titanium' MD 9783, aka ALDI PC, aka Fujitsu-Siemens AMILO D7800, aka ...) has 5 extra buttons, map them. Unfortunately we only have DMI data for the Medion box. Signed-off-by: Dmitry Torokhov commit a6a888b3c20cf559c8a2e6e4d86c570dda2ef0f5 tree eab2875166d1a7fd95a8bb2554f48963a38d06be parent 5e7d8818114f08ad9078d2c1a8a88d78d49de8dc author Kristen Accardi Sat, 24 Jun 2006 19:36:00 -0400 committer Len Brown Tue, 27 Jun 2006 01:24:15 -0400 KEVENT: add new uevent for dock so that userspace can be notified of dock and undock events. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 5e7d8818114f08ad9078d2c1a8a88d78d49de8dc tree 4778138c86f7da27341ab95df251d52a854d9cc6 parent e8406b4485730031d91872086456bd052948686b author Andrew Morton Sat, 24 Jun 2006 19:36:00 -0400 committer Len Brown Tue, 27 Jun 2006 01:07:16 -0400 ACPI: asus_acpi_init: propagate correct return value Cc: Bjorn Helgaas Acked-by: Francois Romieu Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit e8406b4485730031d91872086456bd052948686b tree be5a62931928098fb87d5df4d23279991b3fa4f7 parent d550d98d3317378d93a4869db204725d270ec812 author Thomas Renninger Fri, 02 Jun 2006 15:58:00 -0400 committer Len Brown Tue, 27 Jun 2006 00:56:56 -0400 [ACPI] Print error message if remove/install notify handler fails Signed-off-by: Thomas Renniger Signed-off-by: Len Brown commit d550d98d3317378d93a4869db204725d270ec812 tree 958a8578babc6f9955f91e21253d1d1b847985ff parent d7fa2589bbe7ab53fd5eb20e8c7e388d5aff6f16 author Patrick Mochel Tue, 27 Jun 2006 00:41:40 -0400 committer Len Brown Tue, 27 Jun 2006 00:41:40 -0400 ACPI: delete tracing macros from drivers/acpi/*.c Signed-off-by: Len Brown commit 71306f3b880539fb4c579fbd16da552ebb10f29b tree 936fa23a03d1b9e3003a032e38fff69bd3c74f04 parent b71d300c8bc0f3617eef4a9c96aebbadeb259177 author Alexey Dobriyan Tue, 27 Jun 2006 14:10:29 +1000 committer Nathan Scott Tue, 27 Jun 2006 14:10:29 +1000 [XFS] * There is trivial "inode => vnode => inode" conversion, but only flags and mode of final inode are looked at. Pass original inode instead. * Two occurences of bhv_vnode_t go out. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26298a Signed-off-by: Alexey Dobriyan Signed-off-by: Nathan Scott commit d7fa2589bbe7ab53fd5eb20e8c7e388d5aff6f16 tree e3481b52e4d950ffa4580680b11d9815d5c7e60b parent 6468463abd7051fcc29f3ee7c931f9bbbb26f5a4 parent 46f18e3a28295a9e11a6ffa4478241c19bc93735 author Thomas Renninger Tue, 27 Jun 2006 00:06:37 -0400 committer Len Brown Tue, 27 Jun 2006 00:06:37 -0400 Pull bugzilla-5737 into release branch commit 6468463abd7051fcc29f3ee7c931f9bbbb26f5a4 tree d18eae04fe6c8f7d257077cc6056cd9c6f424e0d parent cece92969762b8ed7930d4e23008b76b06411dee author Len Brown Mon, 26 Jun 2006 23:41:38 -0400 committer Len Brown Tue, 27 Jun 2006 00:01:06 -0400 ACPI: un-export ACPI_ERROR() -- use printk(KERN_ERR...) Signed-off-by: Len Brown commit cece92969762b8ed7930d4e23008b76b06411dee tree ab3d84b71971f0405ab2b1b36d9fdd39b0bda55e parent 64dedfb8fdbbc4fabb8c131e4b597cd4bc7f3881 author Len Brown Mon, 26 Jun 2006 23:04:31 -0400 committer Len Brown Tue, 27 Jun 2006 00:00:54 -0400 ACPI: un-export ACPI_WARNING() -- use printk(KERN_WARNING...) Signed-off-by: Len Brown commit 64dedfb8fdbbc4fabb8c131e4b597cd4bc7f3881 tree 7ef0c5e0574bc94fe4d25bb5994b31938205e7cf parent 9e7e2c047503db5a094ab30c7b4b8a5a0a324915 author Jae-hyeon Park Mon, 26 Jun 2006 22:34:03 -0400 committer Len Brown Tue, 27 Jun 2006 00:00:40 -0400 ACPI: Device [kobj-name] is not power manageable print kobj name in this message. lenb changed to use printk. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 9e7e2c047503db5a094ab30c7b4b8a5a0a324915 tree 2dbdd695431265a580e730035514ac6ece22afe5 parent be63c925a123b492fc05063c98ca7e9f7453a58a author Bjorn Helgaas Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Tue, 27 Jun 2006 00:00:21 -0400 ACPI: acpi_os_wait_semaphore(): silence complaint The ASL Acquire operator (17.5.1 in ACPI 3.0 spec) is allowed to time out and return True without acquiring the semaphore. There's no indication in the spec that this is an actual error, so this message should be debug-only, as the message for successful acquisition is. This used to be an ACPI_DEBUG_PRINT, but it was mis-classified as ACPI_DB_ERROR rather than ACPI_DB_MUTEX, so it got swept up in Thomas' recent patch to enable ACPI error messages even without CONFIG_ACPI_DEBUG. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit be63c925a123b492fc05063c98ca7e9f7453a58a tree c90d64729993d0e274676ba8a22fbf44fb69f9a1 parent a6fc67202e0224e6c9d1d285cc0b444bce887ed5 author Thomas Renninger Fri, 02 Jun 2006 15:58:00 -0400 committer Len Brown Mon, 26 Jun 2006 23:59:51 -0400 ACPI: Export symbols for ACPI_ERROR/EXCEPTION/WARNING macros Signed-off-by: Thomas Renninger Signed-off-by: Len Brown commit a6fc67202e0224e6c9d1d285cc0b444bce887ed5 tree cb2d422f65c0ab0a95f452f6bac80e2bfdd547de parent eb99adde31b7d85c67a5e1c2fa5e098e1056dd79 author Thomas Renninger Mon, 26 Jun 2006 23:58:43 -0400 committer Len Brown Mon, 26 Jun 2006 23:58:43 -0400 ACPI: Enable ACPI error messages w/o CONFIG_ACPI_DEBUG Signed-off-by: Thomas Renninger Signed-off-by: Len Brown commit 1f1bd5fc326a46d8c49132260f661b7cc954846f tree b564551c3f47ebdff46a348e7ca80bf02b79df4a parent a2b524b2ec6caa0499aea56a58fdb67a6d10db90 author Jeff Garzik Mon, 26 Jun 2006 23:47:50 -0400 committer Jeff Garzik Mon, 26 Jun 2006 23:47:50 -0400 [netdrvr] Remove long-unused bits from Becker template drivers Symbols such as PCI_USES_IO, PCI_ADDR0, etc. originated from Donald Becker's net driver template, but have been long unused. Remove. In a few drivers, this allows the further eliminate of the pci_flags (or just plain flags) member in the template driver probe structure. Most of this logic is simply open-coded in most drivers, since it never changes. Made a few other cleanups while I was in there, too: * constify, __devinitdata several PCI ID tables * replace table terminating entries such as "{0,}," and "{NULL}," with a more-clean "{ }". Signed-off-by: Jeff Garzik commit c78059f0a948404fb515db6be4bca5ec93eecd2a tree 6c1fc7cc3a57db60414863bbd38bfce674c540bb parent ce4260c39d7e6d97aad525e5ce726b755ee0dcb2 author Mauro Carvalho Chehab Tue, 27 Jun 2006 00:03:43 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:43 -0300 V4L/DVB (4263): Fix warning when compiling on 64 bit machines Signed-off-by: Mauro Carvalho Chehab commit ce4260c39d7e6d97aad525e5ce726b755ee0dcb2 tree 14bf65d8a011a9f4e1cdcca6b6c8177398d6a62a parent b9553d7b0cd51b89dc078ffc42cad51a2c4258bc author Mauro Carvalho Chehab Mon, 26 Jun 2006 22:26:08 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:42 -0300 V4L/DVB (4261): Included required header for in-kernel compilation Signed-off-by: Mauro Carvalho Chehab commit b9553d7b0cd51b89dc078ffc42cad51a2c4258bc tree fb34d8ad73e1f5e08994995f4b2d0ce6d18a50a3 parent 99eb44fe941b35b28914881774515005fa2ab7f6 author Adrian Bunk Mon, 26 Jun 2006 22:40:20 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:41 -0300 V4L/DVB (4260): Stradis.c: make 2 functions static This patch makes two needlessly global functions static. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 99eb44fe941b35b28914881774515005fa2ab7f6 tree d76716309716fcb5be999a956d546349d02b866f parent 4d6b5aee9d19d1a982d9db0b5ffea20ee94816c6 author Hans Verkuil Mon, 26 Jun 2006 18:24:05 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:40 -0300 V4L/DVB (4259): Pass an explicit log prefix to cx2341x_log_status A card number is not unique enough. Instead, let the caller specify the prefix of the status messages. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4d6b5aee9d19d1a982d9db0b5ffea20ee94816c6 tree c466ecf92c86b32eb982bddbe1b88f324f76a11d parent f5b0142ad683a96d7c8d64cbdb95f255da8fd151 author Hans Verkuil Mon, 26 Jun 2006 09:31:18 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:39 -0300 V4L/DVB (4257): Fix 64-bit compile warnings. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f5b0142ad683a96d7c8d64cbdb95f255da8fd151 tree bbdf1f17e29e93023738f288a633f71987391826 parent 1b58841aa7011670d8a32f53554e21b3fae9c047 author Hans Verkuil Sun, 25 Jun 2006 15:37:29 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:38 -0300 V4L/DVB (4255): Tda9887 default TOP value is 0x10 For most tuners the default TOP value is 0x10, regardless of TV norm. So revert earlier change that sets the TOP value to 0x14 for PAL/SECAM. This is incorrect. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1b58841aa7011670d8a32f53554e21b3fae9c047 tree 1c9baea38f49126adbd3320fe4baa29346669f2b parent 995235118ee7eaab7d9e9a1a661b12ef44e2a224 author Hans Verkuil Sun, 25 Jun 2006 15:33:12 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:37 -0300 V4L/DVB (4254): Remove obsoleted tuner_debug option. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 995235118ee7eaab7d9e9a1a661b12ef44e2a224 tree c81e2f4eca2dfc63ba0a7a377fba8a89d7a23e54 parent 343f92c293af979ddf6070b167306e96c776187b author Hans Verkuil Sun, 25 Jun 2006 11:18:54 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:35 -0300 V4L/DVB (4253): IVTV VBI format description too long. Format description was cut off. It's been shortened. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 343f92c293af979ddf6070b167306e96c776187b tree 890477062afdf8425963cb6d3b1713e185fd2c06 parent 0885ba1d5ebd5a526993e7329ca4fb6c866f3315 author Hans Verkuil Sun, 25 Jun 2006 11:02:02 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:34 -0300 V4L/DVB (4252): Remove duplicate 'tda9887' in info messages. Remove the duplicate '(tda9887)' in these messages: tda9887 8-0043 (tda9887): tda988[5/6/7] found @ 0x43 (tuner) The same string is already printed as the prefix in this line. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0885ba1d5ebd5a526993e7329ca4fb6c866f3315 tree 44bea0826be3b88197fa58235f03e6d6fa1526c9 parent b30d244176846de3480ae17097a5f7831ec6aaf6 author Mike Isely Sun, 25 Jun 2006 21:30:47 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:33 -0300 V4L/DVB (4245): Reduce the amount of pvrusb2-sourced noise going into the system log Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit b30d244176846de3480ae17097a5f7831ec6aaf6 tree fba5650757a84032802b87635b7fe41d77c8e3cd parent 1d9f8461f1a870571f9403a312c26deec3305be5 author Mike Isely Sun, 25 Jun 2006 20:05:01 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:32 -0300 V4L/DVB (4244): Implement use of cx2341x module in pvrusb2 driver Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 1d9f8461f1a870571f9403a312c26deec3305be5 tree c677a3577f88655f872ee0f96b741ebfd1807b49 parent b46cfa805ed12c11fea0adc8e4058000c2e67314 author Mike Isely Sun, 25 Jun 2006 20:04:58 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:31 -0300 V4L/DVB (4243): Exploit new V4L control features in pvrusb2 Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit b46cfa805ed12c11fea0adc8e4058000c2e67314 tree 01750efb4f7fb3007c5cbf271bd8606ad639715e parent eb8e0ee4f51a89d569c01d5b09a8cbc935c72a4c author Mike Isely Sun, 25 Jun 2006 20:04:53 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:30 -0300 V4L/DVB (4242): Don't suspend encoder when changing its attributes (in pvrusb2) Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit eb8e0ee4f51a89d569c01d5b09a8cbc935c72a4c tree 9436985b03e477a471eb731bafe51866ee3508cc parent a761f4311b3e31008c7d168c3a8c254a9c7e35ac author Mike Isely Sun, 25 Jun 2006 20:04:47 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:29 -0300 V4L/DVB (4241): Fix faulty encoder error recovery in pvrusb2 Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit a761f4311b3e31008c7d168c3a8c254a9c7e35ac tree 03817e0334a6e019251a3483dc8147a418caabb5 parent 332139635a8c0431cc2eb67adf1e983eb96728e3 author Mike Isely Sun, 25 Jun 2006 20:04:44 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:28 -0300 V4L/DVB (4240): Various V4L control enhancements in pvrusb2 Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 332139635a8c0431cc2eb67adf1e983eb96728e3 tree e7646bc367486fd1b52bd80bc789fe26307ed9fe parent 077203a7d464f6ea7c94b4f3ea4b5bd246285fcd author Mike Isely Sun, 25 Jun 2006 20:04:40 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:27 -0300 V4L/DVB (4239): Handle boolean controls in pvrusb2 Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 077203a7d464f6ea7c94b4f3ea4b5bd246285fcd tree 632a2a3b98d087205a5cd8063b4444700ee99fdb parent 4f1a3e5bc4e541477729c2ab888c761342329920 author Mike Isely Sun, 25 Jun 2006 20:04:37 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:25 -0300 V4L/DVB (4238): Make sure flags field is initialized when quering a control in pvrusb2 Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 4f1a3e5bc4e541477729c2ab888c761342329920 tree b4a2d48ae4a80f977e833ba30e6623475c9df196 parent c05c0462da0e3aac70ec5316ea500f9a7499cca7 author Mike Isely Sun, 25 Jun 2006 20:04:31 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:24 -0300 V4L/DVB (4237): Move LOG_STATUS bracketing to a different part of the pvrusb2 driver Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit c05c0462da0e3aac70ec5316ea500f9a7499cca7 tree 2879ef0856de3301cbb4bdc1ada44e433f7100cc parent 3948199e8aff71b1ebe3c1ff2749f42add17a41e author Mike Isely Sun, 25 Jun 2006 20:04:25 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:23 -0300 V4L/DVB (4236): Rearrange things in pvrusb2 driver in preparation for using cx2341x module Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 3948199e8aff71b1ebe3c1ff2749f42add17a41e tree d2b4f06ed1af4b115b3719ad02be5cf3bd630b27 parent 039c430f896640f77bc073f9e8ac71018721aab0 author Mike Isely Sun, 25 Jun 2006 20:04:20 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:22 -0300 V4L/DVB (4235): Increase the maximum number of controls that pvrusb2-sysfs.c can handle. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 039c430f896640f77bc073f9e8ac71018721aab0 tree 31b2f735ffc92ad434650bcbe04cde29ed46995f parent 4588677121d894ec989e938129da4ae02d332b6c author Mike Isely Sun, 25 Jun 2006 20:04:16 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:21 -0300 V4L/DVB (4234): Clean up long-standing video format handling mess in pvrusb2-v4l2.c Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 4588677121d894ec989e938129da4ae02d332b6c tree ddcdeddb8d5cc40d318693ebb7b48ab2164d2232 parent eacbe7c51f0fe770252e03ef2433a1ed4c990a17 author Mike Isely Sun, 25 Jun 2006 20:04:13 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:19 -0300 V4L/DVB (4233): Don't print empty enum values in pvrusb2-sysfs.c Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit eacbe7c51f0fe770252e03ef2433a1ed4c990a17 tree 26d360b470bcba63a25a0d5c936ddb821477a4a7 parent b2bbaa93940627aec1d92191cf28a36e6048de6e author Mike Isely Sun, 25 Jun 2006 20:04:06 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:18 -0300 V4L/DVB (4232): Rearrange things in pvrusb2-encoder in preparation for use of cx2341x module Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit b2bbaa93940627aec1d92191cf28a36e6048de6e tree 44dfecb69f8ca0653dab41a38d785222e0c7bb89 parent 4656fb63716af240452adf7b1aab3a9573452fd9 author Mike Isely Sun, 25 Jun 2006 20:03:59 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:17 -0300 V4L/DVB (4231): Include some extra headers that we need. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 4656fb63716af240452adf7b1aab3a9573452fd9 tree b09e4f8577917f05208a11fc545fddee5362ad8d parent d855497edbfbf9e19a17f4a1154bca69cb4bd9ba author Michael Krufky Sun, 25 Jun 2006 18:35:24 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:16 -0300 V4L/DVB (4229): Cx88-blackbird: implement VIDIOC_LOG_STATUS implemented VIDIOC_LOG_STATUS in the cx88-blackbird driver to show the status of i2c clients and the cx23416 mpeg encoder. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit d855497edbfbf9e19a17f4a1154bca69cb4bd9ba tree b39bef23fc00c91dac73ae171ad6ba7261170918 parent eb99adde31b7d85c67a5e1c2fa5e098e1056dd79 author Mike Isely Mon, 26 Jun 2006 20:58:46 -0300 committer Mauro Carvalho Chehab Tue, 27 Jun 2006 00:17:15 -0300 V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 Implement V4L2 driver for the Hauppauge PVR USB2 TV tuner. The Hauppauge PVR USB2 is a USB connected TV tuner with an embedded cx23416 hardware MPEG2 encoder. There are two major variants of this device; this driver handles both. Any V4L2 application which understands MPEG2 video stream data should be able to work with this device. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit a2b524b2ec6caa0499aea56a58fdb67a6d10db90 tree 4297b0a3e27688ef30a627dc062303a378897452 parent 5a40f09baa3d74e9e6f1bd86a9998a10fbba012a author Jeff Garzik Mon, 26 Jun 2006 22:48:38 -0400 committer Jeff Garzik Mon, 26 Jun 2006 22:48:38 -0400 [netdrvr] natsemi: minor cleanups * make eeprom size a variable, prepping for future patch * eliminate unused PCI_xxx stuff left over from Becker driver template * convert a few #defines to enum * mark PCI table const, __devinitdata * don't bother with named constant for PCI device id Signed-off-by: Jeff Garzik commit b71d300c8bc0f3617eef4a9c96aebbadeb259177 tree 5ebb60087ed46a878a82dfcd1707f1c0232a4493 parent eb99adde31b7d85c67a5e1c2fa5e098e1056dd79 author Alexey Dobriyan Tue, 27 Jun 2006 12:45:17 +1000 committer Nathan Scott Tue, 27 Jun 2006 12:45:17 +1000 [XFS] link(2) on directory is banned in VFS. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26293a Signed-off-by: Alexey Dobriyan Signed-off-by: Nathan Scott commit 5a40f09baa3d74e9e6f1bd86a9998a10fbba012a tree 08a8943bc42fe54d1bf12ea945587377b9559371 parent 467c432a4d63349025d92f5dbdd0b9ba8ff40fd5 author Jeff Garzik Mon, 26 Jun 2006 22:24:03 -0400 committer Jeff Garzik Mon, 26 Jun 2006 22:24:03 -0400 [netdrvr] natsemi: Separate out media initialization code This makes it easier to merge an upcoming patch, and overall makes the code a bit more clean. Signed-off-by: Jeff Garzik commit 467c432a4d63349025d92f5dbdd0b9ba8ff40fd5 tree 4c3e6592b8072c604e56c161aeb79b30183ca29a parent e2fdbc039aeac4ce614ee29f4b14bcef5ba000dd author Krzysztof Halasa Mon, 26 Jun 2006 21:36:52 +0200 committer Jeff Garzik Mon, 26 Jun 2006 22:03:24 -0400 [PATCH] WAN: update info page for a bunch of my drivers Updates generic HDLC info page address, I should have done it long time ago. Signed-off-by: Krzysztof Halasa Signed-off-by: Jeff Garzik commit e2fdbc039aeac4ce614ee29f4b14bcef5ba000dd tree e93ede959c7f42d6aa34a00abdc9d378d9ed6832 parent 600991b003039bd86d89aed0a88de89987ccbcd1 author Adrian Bunk Mon, 26 Jun 2006 12:31:46 +0200 committer Jeff Garzik Mon, 26 Jun 2006 22:03:24 -0400 [PATCH] drivers/net/hamradio/dmascc.c: fix section mismatch dev_setup() is using the __initdata variables ax25_broadcast and ax25_test. Since the only caller of dev_setup() (setup_adapter()) is already __init, the solution is to make dev_setup() __init, too. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 600991b003039bd86d89aed0a88de89987ccbcd1 tree 175067c44f1220def4ba0cdb219b7b798a8d6062 parent 5d22a312b7afddaed3cbb2fffb3cceb0c22a6cf5 author Uwe Zeisberger Sun, 25 Jun 2006 01:44:37 -0700 committer Jeff Garzik Mon, 26 Jun 2006 22:03:07 -0400 [PATCH] Fix phy id for LXT971A/LXT972A From: Uwe Zeisberger The phy ids used are taken from an driver that used a right shift of 4 to chop off the revision number. This driver does not shift, so the id and mask values are wrong and must be left shifted by 4 to actually detect the chips. Signed-off-by: Uwe Zeisberger Acked-by: Andy Fleming [akpm: this is a previously-nacked patch, but the problem is real] Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 5d22a312b7afddaed3cbb2fffb3cceb0c22a6cf5 tree 94f752c56f7673283fc1a6e18f3d02d8facf1315 parent 19af5a8b2b3fcf2a65e3077deafe95706a1d4282 author Ben Dooks Wed, 14 Jun 2006 00:09:17 +0100 committer Jeff Garzik Mon, 26 Jun 2006 22:01:53 -0400 [PATCH] DM9000 - minor code cleanups Ensure the driver's module owner field is initialised for when this is being built and loaded as a module. Also change make the dm9000_tx_done function static, as it is not exported elsewhere. Signed-off-by: Ben Dooks Signed-off-by: Jeff Garzik commit 19af5a8b2b3fcf2a65e3077deafe95706a1d4282 tree 858cef9cebe5ce940c6e907d8bb06461c084aa1b parent 5b55dda6f40c46e93006b3c88f75550e0d3b3032 author Ben Dooks Wed, 14 Jun 2006 00:05:50 +0100 committer Jeff Garzik Mon, 26 Jun 2006 22:01:53 -0400 [PATCH] DM9000 - do no re-init spin lock The DM9000 initialisation sequence for the hardware re-initialise the board spin-lock, which is in my view wrong. This patch removes the extra spin lock initialisation Signed-off-by: Ben Dooks Signed-off-by: Jeff Garzik commit 5b55dda6f40c46e93006b3c88f75550e0d3b3032 tree 408d1795bff1b55f54c07bf52570172fc4dfcd84 parent b4ed03ff12e4bf228aaf15b2a364134348ebe8a9 author Ben Dooks Tue, 13 Jun 2006 23:50:15 +0100 committer Jeff Garzik Mon, 26 Jun 2006 22:01:53 -0400 [PATCH] DM9000 - check for MAC left in by bootloader The DM9000 driver does not deal with the case where there is no serial EEPROM to store the configuration, and the bootloader has placed an MAC address into the device already. If there is no valid MAC in the EEPROM, read the one already in the chip and check to see if that one is valid. Signed-off-by: Ben Dooks Signed-off-by: Jeff Garzik commit b4ed03ff12e4bf228aaf15b2a364134348ebe8a9 tree c7b678d6be2e316064aa505fed0352f994454d89 parent eb99adde31b7d85c67a5e1c2fa5e098e1056dd79 author Ben Dooks Tue, 13 Jun 2006 23:47:19 +0100 committer Jeff Garzik Mon, 26 Jun 2006 22:01:53 -0400 [PATCH] DM9000 - better checks for platform resources The current DM9000 driver cannot cope if it is given more than 3 resources (for example, if it is being passed an wake-up irq that it is not using yet). Check that we have been given at-least one IRQ resource. Also fix the minor type-casting for the case of 2 resources. Signed-off-by: Ben Dooks Signed-off-by: Jeff Garzik commit 2154cfa6ba560401d25f6cc083fe3fb996cbb571 tree 36cb420dcd303fe2d10a7e068e63b303560c64bc parent 201ce85946504ea0e6bd9a365de26684b437121e author Auke Kok Mon, 26 Jun 2006 07:51:28 -0700 committer Jeff Garzik Mon, 26 Jun 2006 21:02:37 -0400 [PATCH] ata_piix: add ICH6/7/8 to Kconfig Ata_piix's Kconfig entry still refers only to ICH5, while it supports ICH6 through 8. This creates confusion with people who are looking to see if their newer SATA enabled motherboards are supported. The following patch makes this clear. Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit 201ce85946504ea0e6bd9a365de26684b437121e tree ae3eb625c5327f0c34c94fcb0bf9d0230670eb44 parent 88574551b46ba69b0f145d2775006f2e7dfebc84 author Tejun Heo Mon, 26 Jun 2006 21:23:52 +0900 committer Jeff Garzik Mon, 26 Jun 2006 21:02:36 -0400 [PATCH] sata_sil: disable hotplug interrupts on two ATI IXPs Some SATA controllers embedded in ATI IXPs seem to have broken SATA_IRQ bit in their bmdma2 registers which is always stuck at 1. This makes the driver believe that there has been a hotplug event and freeze the port whenever there's an interrupt thus failing all commands. This patch disables SATA_IRQ for those controllers. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 88574551b46ba69b0f145d2775006f2e7dfebc84 tree 45babd6f6376aef60b515d79ebd5a0355ee7d13c parent 353dcf7c89519a2cb9b7699f3bcf70bb685f22e1 author Tejun Heo Sun, 25 Jun 2006 20:00:35 +0900 committer Jeff Garzik Mon, 26 Jun 2006 21:01:21 -0400 [PATCH] libata: cosmetic updates Cosmetic updates in libata-core.c. * trim trailing whitespaces * break lines which are over 80 column * kill unnecessary braces * make indentation consistent Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 353dcf7c89519a2cb9b7699f3bcf70bb685f22e1 tree 4b8623b202a34a80a06e01522029332a00da5f3b parent a8601e5f6b77aa4f223058a93bc5f77e1ee45638 author Randy Dunlap Sun, 25 Jun 2006 01:36:55 -0700 committer Jeff Garzik Mon, 26 Jun 2006 20:59:28 -0400 [PATCH] ata: add some NVIDIA chipset IDs From: Randy Dunlap Add some nVidia chipset ID's support. http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=b407680553280f9999a20706d5ab2a3be65312c1;hp=ce4cb48010ab2cca537432b5ccb47d4b1fb489e5 Snagged from lkml. Cc: Jeff Garzik Cc: Alan Cox Cc: Tejun Heo Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit a8601e5f6b77aa4f223058a93bc5f77e1ee45638 tree 19d01b0b7fc9825471223fbe3d072dbc58827041 parent 5806db22cffc7557b675d3c9229f327980aee797 author Andrew Morton Sun, 25 Jun 2006 01:36:52 -0700 committer Jeff Garzik Mon, 26 Jun 2006 20:59:28 -0400 [PATCH] libata reduce timeouts From: Andrew Morton Provide a module parameter to override the default 30-second-per-device SATA probing timeout. Cc: Tejun Heo Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 5806db22cffc7557b675d3c9229f327980aee797 tree e3ad9b2b89ad0525a29ba2e94eb4002ee30035ef parent 77b08fb56a41e84b5e78b14f24d79879235e3337 author Tejun Heo Sat, 24 Jun 2006 20:30:19 +0900 committer Jeff Garzik Mon, 26 Jun 2006 20:59:27 -0400 [PATCH] libata: implement ata_port_max_devices() Implement ata_port_max_devices(). This function returns the number of possible devices on a port. This will be used by new PM implementation. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 77b08fb56a41e84b5e78b14f24d79879235e3337 tree fd91513aa74ea2d87bb5352b533a6985595778c7 parent 977e6b9f3a9b17f1c608a9d1e5a7b5c46a5f7d4a author Tejun Heo Sat, 24 Jun 2006 20:30:19 +0900 committer Jeff Garzik Mon, 26 Jun 2006 20:59:27 -0400 [PATCH] libata: make two functions global Make ata_do_simple_cmd() and ata_flush_cache() global. These will be used from libata-eh.c. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 977e6b9f3a9b17f1c608a9d1e5a7b5c46a5f7d4a tree 1fd0d589a3588cf8fb204b47d811272e9793d454 parent e58eb583969ff662c8c337e9b3b50ab5ef37e27e author Tejun Heo Sat, 24 Jun 2006 20:30:19 +0900 committer Jeff Garzik Mon, 26 Jun 2006 20:59:27 -0400 [PATCH] libata: update ata_do_simple_cmd() * the function has always returned AC_ERR_* masks not -errno but its return type was int. Make return type unsigned int. * don't print error message automatically. it's the caller's responsibility. * add header comment Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e58eb583969ff662c8c337e9b3b50ab5ef37e27e tree f29ff3adf6882cfa1065eef15502be0ff86028fd parent beb07c1a56e2cff3842e22c473bd1aaaea08e532 author Tejun Heo Sat, 24 Jun 2006 20:30:19 +0900 committer Jeff Garzik Mon, 26 Jun 2006 20:59:27 -0400 [PATCH] libata: move ata_do_simple_cmd() below ata_exec_internal() Move ata_do_simple_cmd() below ata_exec_internal() for consistency. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit beb07c1a56e2cff3842e22c473bd1aaaea08e532 tree a78fc940254de778c96988876001504ab9c945c9 parent 64f65ca6e7a5a42df22ff29dadfff389dc388f65 author Tejun Heo Sat, 24 Jun 2006 20:30:19 +0900 committer Jeff Garzik Mon, 26 Jun 2006 20:59:27 -0400 [PATCH] libata: clear EH action on device detach Clear related EH action on device detach such that new device doesn't receive EH actions scheduled for the old one. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 64f65ca6e7a5a42df22ff29dadfff389dc388f65 tree 207c8f6957691c2da3ea54529a29b256b48dc6a9 parent af181c2d765ec9735356bc313ab9e844ec2c7a24 author Tejun Heo Sat, 24 Jun 2006 20:30:18 +0900 committer Jeff Garzik Mon, 26 Jun 2006 20:59:27 -0400 [PATCH] libata: implement and use ata_deh_dev_action() Implement and use ata_eh_dev_action() which returns EH action mask for a device. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit af181c2d765ec9735356bc313ab9e844ec2c7a24 tree efc014ff6e83c895f477abb100a2c8f8c65d1c46 parent 41542dbe12e34165e586de1e3fe0a245707aa39e author Tejun Heo Sat, 24 Jun 2006 20:30:18 +0900 committer Jeff Garzik Mon, 26 Jun 2006 20:59:27 -0400 [PATCH] libata: move ata_eh_clear_action() upward Move ata_eh_clear_action() upward. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 41542dbe12e34165e586de1e3fe0a245707aa39e tree 4084584a2d417b898c944c053b4ae9a911b8c6c3 parent 438bc9c3dec27ab37f0ff78471d0b8b91addd2dd author Andrew Morton Fri, 23 Jun 2006 04:18:31 -0700 committer Jeff Garzik Mon, 26 Jun 2006 20:59:27 -0400 [PATCH] libata.h needs scatterlist.h From: Andrew Morton s390: In file included from drivers/scsi/libata-bmdma.c:39: include/linux/libata.h:391: error: field 'sgent' has incomplete type include/linux/libata.h:392: error: field 'pad_sgent' has incomplete type include/linux/libata.h: In function 'ata_sg_is_last': include/linux/libata.h:849: error: arithmetic on pointer to an incomplete type include/linux/libata.h:849: error: arithmetic on pointer to an incomplete type include/linux/libata.h: In function 'ata_qc_next_sg': include/linux/libata.h:869: error: increment of pointer to unknown structure include/linux/libata.h:869: error: arithmetic on pointer to an incomplete type include/linux/libata.h:869: error: arithmetic on pointer to an incomplete type include/linux/libata.h:869: error: arithmetic on pointer to an incomplete type Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 438bc9c3dec27ab37f0ff78471d0b8b91addd2dd tree b0fdf3fe89cf884c8c28de20fe3977f01571a109 parent 8676ce07d38a09e0f41497d178357a314c4620cf author Jeff Garzik Mon, 26 Jun 2006 20:52:17 -0400 committer Jeff Garzik Mon, 26 Jun 2006 20:52:17 -0400 [libata] sata_vsc: partially revert a PCI ID-related commit Partially revert 74d0a988d3aa359b6b8a8536c8cb92cce02ca5d5: [PATCH] PCI: Move various PCI IDs to header file libata policy is to avoid use of named PCI device ID constants. These are often single-use constants, which have little value over direct numeric constants save for constant include/linux/pci_ids.h patching/merging headaches. Signed-off-by: Jeff Garzik commit 8676ce07d38a09e0f41497d178357a314c4620cf tree c9fd591510e54d7d555bc431df9c49dfdf18fdd1 parent eb99adde31b7d85c67a5e1c2fa5e098e1056dd79 author Jeff Garzik Mon, 26 Jun 2006 20:41:33 -0400 committer Jeff Garzik Mon, 26 Jun 2006 20:41:33 -0400 [libata] Bump versions Update major version for libata, and several drivers. Signed-off-by: Jeff Garzik commit d38b69689c349f35502b92e20dafb30c62d49d63 tree 3f996dd032b6ad9a6010cea76bf0908e5814e240 parent eb99adde31b7d85c67a5e1c2fa5e098e1056dd79 author Linus Torvalds Mon, 26 Jun 2006 16:59:26 -0700 committer Linus Torvalds Mon, 26 Jun 2006 16:59:26 -0700 Revert "kbuild: fix make -rR breakage" This reverts commit e5c44fd88c146755da6941d047de4d97651404a9. Thanks to Daniel Ritz and Michal Piotrowski for noticing the problem. Daniel says: "[The] reason is a recent change that made modules always shows as module.mod. it breaks modprobe and probably many scripts..besides lsmod looking horrible stuff like this in modprobe.conf: install pcmcia_core /sbin/modprobe --ignore-install pcmcia_core; /sbin/modprobe pcmcia makes modprobe fork/exec endlessly calling itself...until oom interrupts it" Signed-off-by: Linus Torvalds commit 3cbc96050b02d8e5764bd0970067ef294737e324 tree 2ef09d214242a4dc1f2cc063b0859e362d03225d parent ce2deca27acc761ab90a0e79bd31d6816df38960 author Tony Lindgren Mon, 26 Jun 2006 16:16:25 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:25 -0700 ARM: OMAP: Multiplexing for 24xx GPMC wait pin monitoring Multiplexing for 24xx GPMC wait pin monitoring Signed-off-by: Tony Lindgren commit ce2deca27acc761ab90a0e79bd31d6816df38960 tree c5c6e2c6b192592593c4787c42d6320671cc2fc3 parent 83379c81f6f05a6e80db66ae33378feb4cbca6b3 author Tony Lindgren Mon, 26 Jun 2006 16:16:24 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:24 -0700 ARM: OMAP: Fix SRAM to use MT_MEMORY instead of MT_DEVICE MT_MEMORY is needed in order to execute code in SRAM. Also need to use section mapping. Based on a patch by Richard Woodruff. Signed-off-by: Tony Lindgren commit 83379c81f6f05a6e80db66ae33378feb4cbca6b3 tree 77d1c1b535ec0708df1325ddb0474aa878aba332 parent 7df3450e5c22ba3969e4253dce0d7807dd210bf0 author Timo Teras Mon, 26 Jun 2006 16:16:23 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:23 -0700 ARM: OMAP: Update dmtimers - Initialize timer outside of spinlock to reduce the time the spinlock is held - Do clk_get to the source clocks during initialization to avoid sleeping later - New function to set counter register Signed-off-by: Timo Teras Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren commit 7df3450e5c22ba3969e4253dce0d7807dd210bf0 tree 2fca1bc751392583f4e7c4396f1e93e024c7933b parent 2aab6468b7f88df60828f8e07cfdf8c87338ed8d author Juha Yrjola Mon, 26 Jun 2006 16:16:22 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:22 -0700 ARM: OMAP: Make clock variables static Since the mutex protecting the clock list is static, the list itself should be too. Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren commit 2aab6468b7f88df60828f8e07cfdf8c87338ed8d tree 89aabc1255c785fc49b1ad38e84186953250af14 parent 5ac4215349163baa66c9a26a94e220dcb6c44050 author Juha Yrjola Mon, 26 Jun 2006 16:16:21 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:21 -0700 ARM: OMAP: Fix GPMC compilation when DEBUG is defined Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren commit 5ac4215349163baa66c9a26a94e220dcb6c44050 tree 8943a44a2fd82309f73a4372fca1dc528368ae3d parent c6e5980e565d6c2457e28ecd41ed31c28d33bc8a author Tony Lindgren Mon, 26 Jun 2006 16:16:20 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:20 -0700 ARM: OMAP: Mux updates for external DMA and GPIO Mux updates for external DMA and GPIO. GPIO updates by Igor Stoppa. Signed-off-by: Tony Lindgren commit c6e5980e565d6c2457e28ecd41ed31c28d33bc8a tree e1d458a398a24daa82cc0721524c10ba7fe6c42f parent 22a16f39e36e62f7bd221e5b279ea02fb3c43425 author Samuel Ortiz Mon, 26 Jun 2006 16:16:19 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:19 -0700 ARM: OMAP: Add OMAP_TAG_CAMERA_SENSOR Add platform config data for camera sensors. Since it includes pointers, it should not be passed from the bootloader. Signed-off-by: Samuel Ortiz Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren commit 22a16f39e36e62f7bd221e5b279ea02fb3c43425 tree 53921cd85f8a351363cecc790f40e4fd9b5770ef parent a7ca9d2b0199f79480800e18f643328bb43f521d author Tony Lindgren Mon, 26 Jun 2006 16:16:18 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:18 -0700 ARM: OMAP: Add initial 24xx suspend support This patch adds support for omap24xx power domains and allows suspend to work. Please note that for some reason core power domain still does not seem to idle. Signed-off-by: Tony Lindgren commit a7ca9d2b0199f79480800e18f643328bb43f521d tree 23e50178c0b55f1329f7c622f100c563a9e55070 parent 4bbbc1adc2095c6504a556819dd8842135df300b author Tony Lindgren Mon, 26 Jun 2006 16:16:17 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:17 -0700 ARM: OMAP: Update cpufreq support for 24xx Update cpufreq support for 24xx Signed-off-by: Tony Lindgren commit 4bbbc1adc2095c6504a556819dd8842135df300b tree 79fa777108427b2bc824ca2b2b5c4eefb7fc2e90 parent 7ff879dbcd2083c95933a56bce65ae45ecab3f35 author Juha Yrjola Mon, 26 Jun 2006 16:16:16 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:16 -0700 ARM: OMAP: Add GPMC support for OMAP2 Implement basic support for General-Purpose Memory Controller as found on OMAP2420. Dynamic CS address space allocation still needs to be done. Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren commit 7ff879dbcd2083c95933a56bce65ae45ecab3f35 tree ba34240578d5d8cebf58ad9e5f23d22d3eed2d5a parent 6dc3c8f20159530d5553d0f8decc9454916d7495 author Tony Lindgren Mon, 26 Jun 2006 16:16:15 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:15 -0700 ARM: OMAP: Fix DMA channel irq handling for omap24xx - DMA CSR register is cleared by reading on omap1, but on omap2 it is cleard by writing to it. - DMA TOUT interrupt does not exist on omap24xx, rename it - Add SECURE and MISALIGNED errors by default for omap24xx - Add defines for external DMA request lines Signed-off-by: Tony Lindgren commit 6dc3c8f20159530d5553d0f8decc9454916d7495 tree aee8f14a8a327ee7cbe6106916e3bb5742d21db2 parent e32f7ec2e8bf00756c74a5e6a80bc59e949dd81d author Kyungmin Park Mon, 26 Jun 2006 16:16:14 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:14 -0700 ARM: OMAP: OMAP2 DMA burst support OMAP2 DMA burst setting support Signed-off-by: Kyungmin Park Signed-off-by: Tony Lindgren commit e32f7ec2e8bf00756c74a5e6a80bc59e949dd81d tree 1b1e7d588c520ddad11c7ab036c4a50a5e92a49e parent 77900a2fc3bfb1eb6eaa6d43eef4591e1f7c600d author Timo Teras Mon, 26 Jun 2006 16:16:13 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:13 -0700 ARM: OMAP: Fix 32 kHz timer and modify GP timer to use GPT1 The dmtimer framework update broke 32 kHz timer as udelay() does not work before system timer is started (and GPT1 should not be reset). This also makes the GP timer use GPT1. This requires a fix in clock framework. Signed-off-by: Timo Teras Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren commit 77900a2fc3bfb1eb6eaa6d43eef4591e1f7c600d tree 6d6278f833a6057b1b951e4e9bded234aa6459e2 parent 6e711ec6d249c0d3f8bc225066738d064ed90032 author Timo Teras Mon, 26 Jun 2006 16:16:12 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:12 -0700 ARM: OMAP: Port dmtimers to OMAP2 and implement PWM support Port dmtimer framework to OMAP2. Modify the dmtimers API to support setting of PWM configuration and prescaler. Convert 32 kHz timer and GP timer to use the dmtimer framework. Signed-off-by: Timo Teras Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren commit 6e711ec6d249c0d3f8bc225066738d064ed90032 tree 21e8c8e704eac0f2ccf4d00045aaa82546be4661 parent ed7eb9d90a24bbe93fa47e19b61528bd5cfe584c author Jarkko Nikula Mon, 26 Jun 2006 16:16:11 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:11 -0700 ARM: OMAP: Correct two bugs in arch/arm/mach-omap2/clock.c omap2_clk_set_rate: dif_off must use clk->rate_offset, not clk->src_off. omap2_get_src_field: for the case CM_SYSCLKOUT_SEL1, val must be 2 for 96MHz and 3 for 54MHz. Signed-off-by: Jarkko Nikula Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren commit ed7eb9d90a24bbe93fa47e19b61528bd5cfe584c tree 2b014f49aacbef4ce7cb266ef980a46f98389cf1 parent c15e5d10b160ca0fe71f5865c771bf4ad0e7ed85 author Juha Yrjola Mon, 26 Jun 2006 16:16:10 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:10 -0700 ARM: OMAP: Register the 24xx McSPI device Register the 24xx McSPI device as an OMAP2 platform device. The driver module and Kconfig option were merged already some time ago. Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren commit c15e5d10b160ca0fe71f5865c771bf4ad0e7ed85 tree 5eca5f4cab3c63025656824e468f4ea0e06db854 parent 284185c73d3156f4438d5599ae69793b44d825ab author David Brownell Mon, 26 Jun 2006 16:16:09 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:09 -0700 ARM: OMAP: Add bitbank SPI driver for Innovator 1510 touchscreen Add bitbang SPI driver for Innovator 1510 touchscreen, using the new framework. Compile-tested only. Signed-off-by: David Brownell Signed-off-by: Tony Lindgren commit 284185c73d3156f4438d5599ae69793b44d825ab tree 3c608778c8e281f9d011b157a480a4e05ffe8419 parent 99c477074de4a91a388aff863646dc3e2eb783e2 author lamikr Mon, 26 Jun 2006 16:16:08 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:08 -0700 ARM: OMAP: Aic23 alsa platform driver code for board-innovator Add platform driver init-code required by the aic23-alsa driver to omap-innovator. Signed-off-by: Mika Laitio Signed-off-by: Tony Lindgren commit 99c477074de4a91a388aff863646dc3e2eb783e2 tree d3cd4f913d4c7a2113167a6007fd33397335dac6 parent eca9e56eb8dfcf2b8b966c1c49e4622196f0586d author Imre Deak Mon, 26 Jun 2006 16:16:07 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:07 -0700 ARM: OMAP: Fix GPIO IRQ mask handling The GPIO IRQ mask was retrieved incorrectly in cases where we have a mask register instead of an enable register. Also we should only return the valid bits depending on the bank size. This fixes a bug on 1510/1610 based OMAPs where GPIO IRQs are not delivered. Signed-off-by: Imre Deak Signed-off-by: Tony Lindgren commit eca9e56eb8dfcf2b8b966c1c49e4622196f0586d tree 09dfd83d3e56f1dfc52475f8e539b86b382d468b parent e8cdf7bdf3efbb1e285fd82a86a3f8fae5ae2665 author Peter Ujfalusi Mon, 26 Jun 2006 16:16:06 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:06 -0700 ARM: OMAP: DMA transfer parameter configuration fix Fix for re-using OMAP DMA channel with different transfer parameters. Bits in the CCR register need to be cleaned as well in some cases. Signed-off-by: Peter Ujfalusi Signed-off-by: Tony Lindgren commit e8cdf7bdf3efbb1e285fd82a86a3f8fae5ae2665 tree cceb1d88948fa987b3e6f2724ab451b9a1b36324 parent 495f71db30e279a5a696fa6622fc75451caa8366 author David Brownell Mon, 26 Jun 2006 16:16:04 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:04 -0700 ARM: OMAP: Mistral ads7846 pendown state Syncing the ads7846 code with mainstream means that the Mistral support needs to include a callback to read the pendown state. Signed-off-by: David Brownell Signed-off-by: Tony Lindgren commit 495f71db30e279a5a696fa6622fc75451caa8366 tree 84c923fe4688dc88ecf696885a13b7ad42695100 parent ffb7a80f932550590ef54791b60db7e6ffce63f3 author Brian Swetland Mon, 26 Jun 2006 16:16:03 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:03 -0700 ARM: OMAP: Add core fsample support This patch adds core support for the TI F-Sample Board (OMAP 850). Signed-off-by: Brian Swetland Signed-off-by: Tony Lindgren commit ffb7a80f932550590ef54791b60db7e6ffce63f3 tree 074d69b47d7b4ef672307a9f7a36b42331137eb4 parent 0711615290510bfba11c3f4eabcde6ac92c0766e author Tony Lindgren Mon, 26 Jun 2006 16:16:02 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:02 -0700 ARM: OMAP: Fix gpt2_ick clock bit CM_ICLKEN1_CORE bit should be 4, not 0 as noted by Richard Woodruff. Signed-off-by: Tony Lindgren commit 0711615290510bfba11c3f4eabcde6ac92c0766e tree 7fe8fa6d719211656d8cb96bba92a2d2c6f3bef4 parent ea6dedd7fbd0f760ebf37eb0bcc8c64856475a13 author Jonathan McDowell Mon, 26 Jun 2006 16:16:01 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:01 -0700 ARM: OMAP: Readd Amstrad Delta USB support One of the recent merges from mainline removed the Amstrad Delta USB support. This patch adds it back in; it's the same as was in 2.6.16-omap2. Signed-off-by: Jonathan McDowell Signed-off-by: Tony Lindgren commit ea6dedd7fbd0f760ebf37eb0bcc8c64856475a13 tree 01d4dc723a6fa3fb567dc2d0ce497e69af4d7721 parent 7876284178b386ab6e97f96733ccbc19eda743a3 author Imre Deak Mon, 26 Jun 2006 16:16:00 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:16:00 -0700 ARM: OMAP: GPIO IRQ lazy IRQ disable fix - The current OMAP GPIO IRQ framework doesn't use the do_edge_IRQ, do_level_IRQ handlers, but instead calls do_simple_IRQ. This doesn't handle disabled interrupts properly, so drivers will still get interrupts after calling disable_irq. The patch solves this by respecting the irq_desc.disable_depth and irq_desc.running counters. When one of these is non-zero the handler is not called, the interrupt is masked and marked as pending. The pending interrupt will be serviced when the running handler returns. This is according to the same semantics as the standard do_edge_IRQ and do_level_IRQ handlers have, so one day we should use them instead of do_simple_IRQ. - Process only interrupts that are not masked. The ISR may contain pending interrupts that are masked these shouldn't be processed. - Move the bank IRQ unmasking out of the IRQ dispatch loop. If there are further iterations we shouldn't unmask it if there are level triggered interrupts pending. Signed-off-by: Imre Deak Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren commit 7876284178b386ab6e97f96733ccbc19eda743a3 tree 122105739bf5775d3aaaa1f568fdaa17956cbe1b parent eb99adde31b7d85c67a5e1c2fa5e098e1056dd79 author David Brownell Mon, 26 Jun 2006 16:15:59 -0700 committer Tony Lindgren Mon, 26 Jun 2006 16:15:59 -0700 ARM: OMAP: Mistral board updates (spi, ...) This adds the OSK/Mistral specific glue for the omap_uwire driver and its ADS 7846 touchscreen. It also moves the lcd and keypad setup so it's grouped with the other Mistral-specific setup code, and provides comments about which switch maps to which reported key. Signed-off-by: David Brownell Signed-off-by: Tony Lindgren commit eb99adde31b7d85c67a5e1c2fa5e098e1056dd79 tree 05d61251361c04f3afa64c5b1fe162558724d345 parent f6e6e883730aff2718610d3eba7608fcf73328ed parent 3fb5a9891dbb553dda96783dbc0dc4e77cbb2529 author Linus Torvalds Mon, 26 Jun 2006 16:06:08 -0700 committer Linus Torvalds Mon, 26 Jun 2006 16:06:08 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (56 commits) [PATCH] fs/ocfs2/dlm/: cleanups ocfs2: fix compiler warnings in dlm_convert_lock_handler() ocfs2: dlm_print_one_mle() needs to be defined ocfs2: remove whitespace in dlmunlock.c ocfs2: move dlm work to a private work queue ocfs2: fix incorrect error returns ocfs2: tune down some noisy messages during dlm recovery ocfs2: display message before waiting for recovery to complete ocfs2: mlog in dlm_convert_lock_handler() should be ML_ERROR ocfs2: retry operations when a lock is marked in recovery ocfs2: use cond_resched() in dlm_thread() ocfs2: use GFP_NOFS in some dlm operations ocfs2: wait for recovery when starting lock mastery ocfs2: continue recovery when a dead node is encountered ocfs2: remove unneccesary spin_unlock() in dlm_remaster_locks() ocfs2: dlm_remaster_locks() should never exit without completing ocfs2: special case recovery lock in dlmlock_remote() ocfs2: pending mastery asserts and migrations should block each other ocfs2: temporarily disable automatic lock migration ocfs2: do not unconditionally purge the lockres in dlmlock_remote() ... commit f6e6e883730aff2718610d3eba7608fcf73328ed tree ec595db5e2454ac5f505a2ce971e45d674f8d6b3 parent ba262e4a4d4c23b5e6c15dbb3a99696b562e8035 parent f964c303fe33b0d2ee563349bc8bea4d57d7a265 author Linus Torvalds Mon, 26 Jun 2006 15:01:05 -0700 committer Linus Torvalds Mon, 26 Jun 2006 15:01:05 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3657/1: S3C24XX: Documentation update of Overview.txt [ARM] Update mach-types [ARM] 3656/1: S3C2412: Add S3C2412 and S3C2413 documenation [ARM] 3654/1: add ajeco 1arm sbc support [ARM] fix drivers/mfd/ucb1x00-core.c IRQ probing bug [ARM] 3651/1: S3C24XX: Make arch list more detailed [ARM] 3650/1: S3C2412: Update s3c2410_defconfig [ARM] 3649/1: S3C24XX: Fix capitalisation of CPU on SMDK2440 [ARM] 3612/1: make pci bus optional for ixp4xx platform [ARM] Remove MODE_(SVC|IRQ|FIQ|USR) and DEFAULT_FIQ [ARM] Remove save_lr/restore_pc macros [ARM] Remove partial non-v6 binutils compatibility [ARM] Remove LOADREGS macro [ARM] Remove RETINSTR macro commit ba262e4a4d4c23b5e6c15dbb3a99696b562e8035 tree 4deb000854a1b3509f703c393ebd2ec1ad0887c0 parent a09ab7e2fcd22f0490a270bb310536c651d53cb9 parent b07076e6173a2593e369c3375f07c1cd7d78c36f author Linus Torvalds Mon, 26 Jun 2006 15:00:33 -0700 committer Linus Torvalds Mon, 26 Jun 2006 15:00:33 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-serial * master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] 8250_pnp: add support for other Wacom tablets commit f964c303fe33b0d2ee563349bc8bea4d57d7a265 tree 6ea66e68e2c0b37b38de2173a576bb672869ee16 parent 18555656de7268c7af77ea2b99a2fc984e7a23fb author Ben Dooks Mon, 26 Jun 2006 22:51:08 +0100 committer Russell King Mon, 26 Jun 2006 22:51:08 +0100 [ARM] 3657/1: S3C24XX: Documentation update of Overview.txt Patch from Ben Dooks Update the list of supported devices, and remove the changelog. Add SMDK2413 information.-- Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 18555656de7268c7af77ea2b99a2fc984e7a23fb tree 831336ae8614d49606c46f9965969ee1591210c8 parent 6e58f5c9a841e59233c5997df082e93329ea61e0 author Russell King Mon, 26 Jun 2006 22:50:21 +0100 committer Russell King Mon, 26 Jun 2006 22:50:21 +0100 [ARM] Update mach-types Usual mach-types update. Signed-off-by: Russell King commit 12e9b5fb96028aab26af65bb06d2dee56c428a6e tree 02208162fa852b78fc1908e8d97a1d866089b503 parent 99d19bb75b88cc997d3cd611903908714c735981 author Salyzyn, Mark Mon, 26 Jun 2006 08:37:39 -0400 committer James Bottomley Mon, 26 Jun 2006 16:47:46 -0500 [SCSI] aacraid: remove x86_64 IOMMU dependent code This may seem like a DILLIGAF, but after chatting with the F/W folks, there is no harm in dropping the page calculation as denoted in the enclosed patch for these older adapters in this new age of 4GB+ memory sticks. Any resource optimization within the old-old-old adapters for systems with less than 4G of memory is of little consequence. The existing AAC_QUIRK_31BIT flag in linit.c should look after the rest of the legacy hardware DMA limitations. Signed-off-by: Mark Salyzyn Signed-off-by: James Bottomley commit 3fb5a9891dbb553dda96783dbc0dc4e77cbb2529 tree 2635f3567c9e22c51e159926a7bc96ed7cf04fb5 parent 43dee336c903fae15783b90983dfdedd2c7ffefc author Adrian Bunk Tue, 16 May 2006 17:26:41 +0200 committer Mark Fasheh Mon, 26 Jun 2006 14:43:21 -0700 [PATCH] fs/ocfs2/dlm/: cleanups This patch #if 0's the no longer used dlm_dump_lock_resources(). Since this makes dlmdebug.h empty, this patch also removes this header. Additionally, the needlessly global dlm_is_node_recovered() is made static. Signed-off-by: Adrian Bunk Signed-off-by: Mark Fasheh commit 43dee336c903fae15783b90983dfdedd2c7ffefc tree 75a39e684c02811046bbaf9851f7c5695396a9d2 parent 8a9343fa24d8d3fcb189bed2b7afcf4b8a8c1c8d author Mark Fasheh Mon, 01 May 2006 14:56:57 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:20 -0700 ocfs2: fix compiler warnings in dlm_convert_lock_handler() We need to cast to unsigned long long. Signed-off-by: Mark Fasheh commit 8a9343fa24d8d3fcb189bed2b7afcf4b8a8c1c8d tree a800d299e2324ce21d6ae150cedf33d79f578304 parent 0032abd674a606c3cf2d9961c8119f5d72c411d0 author Mark Fasheh Mon, 01 May 2006 14:55:10 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:19 -0700 ocfs2: dlm_print_one_mle() needs to be defined Fixes compile breakage. Signed-off-by: Mark Fasheh commit 0032abd674a606c3cf2d9961c8119f5d72c411d0 tree 9e13077afdc811dd45d707df3e8256259b97aaa2 parent 3156d267016627fe427a6b0d4ed8a9678557e91e author Kurt Hackel Mon, 01 May 2006 14:39:57 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:19 -0700 ocfs2: remove whitespace in dlmunlock.c Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 3156d267016627fe427a6b0d4ed8a9678557e91e tree fec0545da2e9593d1b5a2db4dd0d7360203cee4d parent 495ac96e638cb0ad33baa7113531d742bfb328d4 author Kurt Hackel Mon, 01 May 2006 14:39:29 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:18 -0700 ocfs2: move dlm work to a private work queue The work that is done can block for long periods of time and so is not appropriate for keventd. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 495ac96e638cb0ad33baa7113531d742bfb328d4 tree 0a8289606d1bbe7b7aff552d61a7ba24216c1110 parent 3b3b84a892d37ba336391e411eb5f8b013b9a669 author Kurt Hackel Mon, 01 May 2006 14:34:08 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:17 -0700 ocfs2: fix incorrect error returns Use DLM_REJECTED instead of DLM_RECOVERING. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 3b3b84a892d37ba336391e411eb5f8b013b9a669 tree 8766af23fa8f40003f41cd34eda5c5e3641f279c parent 56a7c104bc91b4a5f970d7372ebb04eebc633c68 author Kurt Hackel Mon, 01 May 2006 14:31:37 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:16 -0700 ocfs2: tune down some noisy messages during dlm recovery Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 56a7c104bc91b4a5f970d7372ebb04eebc633c68 tree e423c8250cf78af4d29fcdbfdd56a43ff4fea191 parent 44a7f1d063bbe45773353903f36d9d88fb73d82a author Kurt Hackel Mon, 01 May 2006 14:30:39 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:15 -0700 ocfs2: display message before waiting for recovery to complete Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 44a7f1d063bbe45773353903f36d9d88fb73d82a tree e92f4508054957263eed55e0cf8621174888f18a parent b220532a71adf65d45c3aa8a284bfa7ec57957bd author Kurt Hackel Mon, 01 May 2006 14:29:59 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:15 -0700 ocfs2: mlog in dlm_convert_lock_handler() should be ML_ERROR Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit b220532a71adf65d45c3aa8a284bfa7ec57957bd tree c9aa6167aed4e2e7357e467f7b91957b5c114c53 parent f85cd47a5825b77a146bad6870b2ddcf08415c13 author Kurt Hackel Mon, 01 May 2006 14:29:28 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:14 -0700 ocfs2: retry operations when a lock is marked in recovery Before checking for a nonexistent lock, make sure the lockres is not marked RECOVERING. The caller will just retry and the state should be fixed up when recovery completes. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit f85cd47a5825b77a146bad6870b2ddcf08415c13 tree ac27e5c432e30d296769071b5f7c88b9af970593 parent ad8100e0d20e0123def9f83c040b68c96c8638f0 author Kurt Hackel Mon, 01 May 2006 14:27:41 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:13 -0700 ocfs2: use cond_resched() in dlm_thread() yield() does not yield. cond_resched() does. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit ad8100e0d20e0123def9f83c040b68c96c8638f0 tree 67488f9e1ad5cb9dc0eee3b59df760ddf8f1e0ff parent b7084ab538ac2bd71ce494cf1cbbea9fe9db2c07 author Kurt Hackel Mon, 01 May 2006 14:25:21 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:12 -0700 ocfs2: use GFP_NOFS in some dlm operations Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit b7084ab538ac2bd71ce494cf1cbbea9fe9db2c07 tree b1d19839e9e7795fb1d86270c90008058e8860f7 parent c27069e6cfa242a3b84eb3442934c6fe51ee9066 author Kurt Hackel Mon, 01 May 2006 13:54:07 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:12 -0700 ocfs2: wait for recovery when starting lock mastery Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit c27069e6cfa242a3b84eb3442934c6fe51ee9066 tree 87d7613528c8df4c265ffab09f3d911cb793529c parent 67a187412baa84dfff2d423961d86663b7fc7d3c author Kurt Hackel Mon, 01 May 2006 13:51:49 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:11 -0700 ocfs2: continue recovery when a dead node is encountered Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 67a187412baa84dfff2d423961d86663b7fc7d3c tree bd1b0b6f2a0b90e830ceb831a7d83896ef765c8a parent 6a41321121ee2af33b8ac55c87657603df480b25 author Kurt Hackel Mon, 01 May 2006 13:50:12 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:10 -0700 ocfs2: remove unneccesary spin_unlock() in dlm_remaster_locks() Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 6a41321121ee2af33b8ac55c87657603df480b25 tree 648abdd1bf2ede54a3e9759bd4b989587381dcc4 parent c8df412e1c746dd21094966d04b3a79aad0f4d08 author Kurt Hackel Mon, 01 May 2006 13:49:20 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:09 -0700 ocfs2: dlm_remaster_locks() should never exit without completing We cannot restart recovery. Once we begin to recover a node, keep the state of the recovery intact and follow through, regardless of any other node deaths that may occur. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit c8df412e1c746dd21094966d04b3a79aad0f4d08 tree b662c0c5b9ff4e5a607d53adb92a8c38acce940e parent 36407488b1cbc4d84bc2bd14e03f3f9b768090d9 author Kurt Hackel Mon, 01 May 2006 13:47:50 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:08 -0700 ocfs2: special case recovery lock in dlmlock_remote() If the previous master of the recovery lock dies, let calc_usage take it down completely and let the caller completely redo the dlmlock() call. Otherwise, there will never be an opportunity to re-master the lockres and recovery wont be able to progress. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 36407488b1cbc4d84bc2bd14e03f3f9b768090d9 tree c3b010ef79b59e531f34c7fdf7c8d3575c62a405 parent c87a9ae7059f718bf1bb87a702fcbef535e32111 author Kurt Hackel Mon, 01 May 2006 13:32:27 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:08 -0700 ocfs2: pending mastery asserts and migrations should block each other Use the existing structure for blocking migrations when ASTs are pending to achieve the same result. If we can catch the assert before it goes on the wire, just cancel it and let the migration continue. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit c87a9ae7059f718bf1bb87a702fcbef535e32111 tree 9e1a1604843b8dcde97ce392f2dc6bf50d8e70c0 parent 2abaf97e62e51fdd09d5a46703b3b680f24bdd8b author Kurt Hackel Mon, 01 May 2006 13:30:49 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:07 -0700 ocfs2: temporarily disable automatic lock migration Now we never change the owner of a lock resource until unmount or node death. This will be re-enabled once some issues in the algorithm used have been resolved. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 2abaf97e62e51fdd09d5a46703b3b680f24bdd8b tree 0934722ce8d7a4372758c61acdda3b37d4f8a7a4 parent aa087b84977173395c0e3a1e0c1773314958f277 author Kurt Hackel Mon, 01 May 2006 13:27:10 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:06 -0700 ocfs2: do not unconditionally purge the lockres in dlmlock_remote() In dlmlock_remote(), do not call purge_lockres until the lock resource actually changes. otherwise, the mastery info on the lockres will go away underneath the caller. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit aa087b84977173395c0e3a1e0c1773314958f277 tree 6041ab7fc9adf9f4ca89894a5416847a26187f49 parent f42a100b2272bc5cb44fb2aa03526b436b1d6833 author Kurt Hackel Mon, 01 May 2006 12:02:07 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:05 -0700 ocfs2: increase backoff before waiting for recovery When mastering non-recovery lock resources, additional time was frequently needed to allow the disk heartbeat to catch up with the network timeout. the recovery lock resource is time critical and avoids this path. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit f42a100b2272bc5cb44fb2aa03526b436b1d6833 tree 37ca994cefc97bcfbf14491e1538fd2672df566a parent 6ff06a93916b3f95e83c346f7530cf2f5c68ae0c author Kurt Hackel Mon, 01 May 2006 11:53:33 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:05 -0700 ocfs2: have dlm_pre_master_reco_lockres() ignore dead nodes Recovery will spin in dlm_pre_master_reco_lockres if we do not ignore timed-out network responses from dead nodes. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 6ff06a93916b3f95e83c346f7530cf2f5c68ae0c tree 7708dbb53baf65d58aa5af259b5360abf0e11d14 parent e7e69eb38946ebef86e27442d01514fcf9c854ee author Kurt Hackel Mon, 01 May 2006 11:51:45 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:04 -0700 ocfs2: give the dlm dirty list a reference on the lockres Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit e7e69eb38946ebef86e27442d01514fcf9c854ee tree a17cfb1edba8e3c897778808eec641a97c51005c parent e4eb03681a8313168d99c2f93175331a898a2c16 author Kurt Hackel Mon, 01 May 2006 11:49:52 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:03 -0700 ocfs2: teach dlm_restart_lock_mastery() to wait on recovery Change behavior of dlm_restart_lock_mastery() when a node goes down. Dump all responses that have been collected and start over. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit e4eb03681a8313168d99c2f93175331a898a2c16 tree 37d2f18b8a60f672a84330725c32bcdd2f768b49 parent ccd8b1f916bc5e4b2156f03ccd3546be7f65f6b3 author Kurt Hackel Mon, 01 May 2006 11:46:59 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:02 -0700 ocfs2: gracefully handle stale create_lock messages. This is an error on the sending side, so gracefully error out on the receiving end. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit ccd8b1f916bc5e4b2156f03ccd3546be7f65f6b3 tree 4d3467728b13c254e9544532f147f4f84446c1b4 parent 588e00902b06528c476eed38019dba4a087def01 author Kurt Hackel Mon, 01 May 2006 11:32:14 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:02 -0700 ocfs2: update lvb immediately during recovery Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 588e00902b06528c476eed38019dba4a087def01 tree 4858ca07112760940fe82d7f808eeb3fc0f54fd5 parent 8b2198097ae6a5b54ed92345989ec343070f916b author Kurt Hackel Mon, 01 May 2006 11:22:06 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:01 -0700 ocfs2: do not send master requests to localhost Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 8b2198097ae6a5b54ed92345989ec343070f916b tree 625f267987dfdb06f8ddfdec684c85d6d19cc6fa parent 343e26a4007d14c2154c1d13d1209797dce5c535 author Kurt Hackel Mon, 01 May 2006 11:16:45 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:43:00 -0700 ocfs2: purge lockres' sooner Immediately purge a lockress that the local node is not the master of. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 343e26a4007d14c2154c1d13d1209797dce5c535 tree 3b83264cc38dbd3151a80704db4c0ecda4c5cf6b parent 466d1a4591c4e1bc3affd5c0cf3df5ad20338fb9 author Kurt Hackel Mon, 01 May 2006 11:15:04 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:59 -0700 ocfs2: dump mismatching migrated lvbs before BUG() Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 466d1a4591c4e1bc3affd5c0cf3df5ad20338fb9 tree ef7eef15780bfdaf339967be320b6a74146dbec5 parent 69d72b066cc5971318d9e29e34289b74cf8a9d22 author Kurt Hackel Mon, 01 May 2006 11:11:13 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:58 -0700 ocfs2: make dlm recovery finalization 2 stage Makes it easier for the recovery process to deal with node death. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 69d72b066cc5971318d9e29e34289b74cf8a9d22 tree f8d27fbce0fac31969ff09cdf3c8faa9c9abc56e parent a9ee4c8a67b962db0208addf0e32935aa571af6b author Kurt Hackel Mon, 01 May 2006 10:57:51 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:58 -0700 ocfs2: dlm recovery / lockres reference count fix Take a reference on lockres structures while they are on the recovery list. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit a9ee4c8a67b962db0208addf0e32935aa571af6b tree eec80824fba4b87dcf940533ab8dac87d25ed5f0 parent a7f90d83ea8dc8b0999ab7c1c0539af9a6ed69d2 author Kurt Hackel Thu, 27 Apr 2006 19:26:15 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:57 -0700 ocfs2: better error handling during assert master message handle errors during lock assert master by either killing self or other node Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit a7f90d83ea8dc8b0999ab7c1c0539af9a6ed69d2 tree cd9ec7e46c8ab6a863c1d152a755a78be8e31b73 parent c0a8520c7333dd62624683772f31864c7f9c46d9 author Kurt Hackel Thu, 27 Apr 2006 19:24:21 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:56 -0700 ocfs2: dump lockres info before we BUG() on a bad reference Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit c0a8520c7333dd62624683772f31864c7f9c46d9 tree 104c77f335821202518dcfb22ba76e7736e55187 parent aa85235427992b8d3040297d9174d69dd1d8a675 author Mark Fasheh Thu, 27 Apr 2006 19:07:45 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:55 -0700 ocfs2: do LVB puts in place Don't wait until the AST will be fired to do the LVB copy into the lock resource. Signed-off-by: Mark Fasheh commit aa85235427992b8d3040297d9174d69dd1d8a675 tree b5ff7ae2f76b8d0fd66c6094f6c563c299ad50e7 parent dc2ed195dda848c8e4b24f3f0e1952fa74f74f6b author Kurt Hackel Thu, 27 Apr 2006 19:04:49 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:55 -0700 ocfs2: mle ref count debugging Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit dc2ed195dda848c8e4b24f3f0e1952fa74f74f6b tree 708a2ed9f07ab36658735943890ce38f0fa51ebd parent 2d1a868c563f07c07c681836d273d69efb7c5ad8 author Kurt Hackel Thu, 27 Apr 2006 19:03:18 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:54 -0700 ocfs2: allow for an assert message during lock mastery Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 2d1a868c563f07c07c681836d273d69efb7c5ad8 tree d17fd8d6ce075d70b4f8813f6571af634c0d0ba0 parent 41b8c8a101ba77f59d9a4b3cac6c846cb8a34840 author Kurt Hackel Thu, 27 Apr 2006 19:01:35 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:53 -0700 ocfs2: take mle reference during migration Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 41b8c8a101ba77f59d9a4b3cac6c846cb8a34840 tree 26100fca5f5772f06055607b9c0868c24c4ca30e parent da01ad05528bf6f6bcb286329b14225a71713325 author Kurt Hackel Thu, 27 Apr 2006 19:00:26 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:52 -0700 ocfs2: properly initialize the mle structure Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit da01ad05528bf6f6bcb286329b14225a71713325 tree 0a3cf2161c9880cd6e6ffadf105878f0441bc35c parent a2bf04774bf4aa0a75036c1e92e3d2fd1cce2aff author Kurt Hackel Thu, 27 Apr 2006 18:53:04 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:52 -0700 ocfs2: detach mle from heartbeat events Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit a2bf04774bf4aa0a75036c1e92e3d2fd1cce2aff tree 73be61253ed046cdc61f429bee645cc5731c2d12 parent 958837197e6415009cba0f31bbb5aacdb936ef09 author Kurt Hackel Thu, 27 Apr 2006 18:51:26 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:51 -0700 ocfs2: mle ref counting fixes Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 958837197e6415009cba0f31bbb5aacdb936ef09 tree 56c32cb8e4c3c419edaf1a7b1a44e2127930f406 parent d6dea6e9732f5319b723e14f7adbc5f99cd69aec author Kurt Hackel Thu, 27 Apr 2006 18:47:41 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:50 -0700 ocfs2: better mle debugging Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit d6dea6e9732f5319b723e14f7adbc5f99cd69aec tree fdc506e919d510b38ca831f64844de3f5175764c parent 29c0fa0f56f20b4512f65b0f3e55bc8af50485b7 author Kurt Hackel Thu, 27 Apr 2006 18:08:51 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:49 -0700 ocfs2: clean up recovery related messages Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 29c0fa0f56f20b4512f65b0f3e55bc8af50485b7 tree da16efa4c6c70f6ea01f84f2eb3c2899cf00654c parent c3187ce5e335cf8e06391236cc1ad7d1b1e193ed author Kurt Hackel Thu, 27 Apr 2006 18:06:58 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:49 -0700 ocfs2: handle network errors during recovery Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit c3187ce5e335cf8e06391236cc1ad7d1b1e193ed tree 2e7ec4cafda7a3c62b93eab72166f6c98811d64c parent ab27eb6f47092923a92f7c164dcf9be3b76f3944 author Kurt Hackel Thu, 27 Apr 2006 18:05:41 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:48 -0700 ocfs2: only recover one dead node at a time Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit ab27eb6f47092923a92f7c164dcf9be3b76f3944 tree 2ac759bb499bb30c76f3b85e815c7c75da7281ef parent 8bc674cb4834fb25206b7f7f5e37fe571aa76b34 author Kurt Hackel Thu, 27 Apr 2006 18:03:49 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:47 -0700 ocfs2: Better tracking for recovery state changes Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 8bc674cb4834fb25206b7f7f5e37fe571aa76b34 tree 9c9ba3801669e66a30bac121846153879a19dfd6 parent aba9aac78817d88aa2b223f1aedf1e9815ae97b8 author Kurt Hackel Thu, 27 Apr 2006 18:02:10 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:46 -0700 ocfs2: Fix empty lvb check The check for an empty lvb should check the entire buffer not just the first byte. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit aba9aac78817d88aa2b223f1aedf1e9815ae97b8 tree c796e9d34514fa96eae26f360296720c504c0766 parent 2580a580e029f9a59a66cd230b1fd7e2d9ee339d author Kurt Hackel Thu, 27 Apr 2006 18:00:21 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:45 -0700 ocfs2: fix inverted logic in dlm_is_node_dead Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 2580a580e029f9a59a66cd230b1fd7e2d9ee339d tree 320baf22e8a0ee1d03d256edadd37a49aef39ae1 parent 8d79d088e88198d5456861ee9e6a8226dcd08799 author Kurt Hackel Thu, 27 Apr 2006 17:59:46 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:45 -0700 ocfs2: recheck lockres master before sending an unlock request. Recovery may have happened and it may now be mastered locally. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 8d79d088e88198d5456861ee9e6a8226dcd08799 tree 7d171192afc3bdd679d78a3841392ae5858bd3db parent 685f1adb3872d904e08e22fab699f34432d5068a author Kurt Hackel Thu, 27 Apr 2006 17:58:23 -0700 committer Mark Fasheh Mon, 26 Jun 2006 14:42:44 -0700 ocfs2: add a small delay after a failed migration Otherwise we risk starving other threads. Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 685f1adb3872d904e08e22fab699f34432d5068a tree 351bfb28a72601250f70553d8eef4edc542fcf31 parent c8f33b6e86af74ee7b800f57cac7b3c8559318fe author Mark Fasheh Thu, 23 Mar 2006 11:23:29 -0800 committer Mark Fasheh Mon, 26 Jun 2006 14:42:43 -0700 ocfs2: silence a compile warning in dlm_alloc_pagevec() Reported by Andrew Morton. Signed-off-by: Mark Fasheh commit c8f33b6e86af74ee7b800f57cac7b3c8559318fe tree 8806647e8f7a6525539d0a7ecdbe8f375b8f91a3 parent 03d864c02c3ea803b1718940ac6953a257182d7a author Joel Becker Thu, 16 Mar 2006 17:40:37 -0800 committer Mark Fasheh Mon, 26 Jun 2006 14:42:42 -0700 [PATCH] ocfs2: Alloc at least a page for the DLM hash The OCFS2 DLM allocates a number of pages for a hash to lookup locks. There was a bug where a PAGE_SIZE bigger than the hash size (eg, 64K pages) would result in zero pages allocated. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 03d864c02c3ea803b1718940ac6953a257182d7a tree 2678c34a75654693ee875d20194830429886ec58 parent 95c4f581d6551de55cf5b8693db98b01ce07021b author Daniel Phillips Fri, 10 Mar 2006 18:08:16 -0800 committer Mark Fasheh Mon, 26 Jun 2006 14:42:42 -0700 ocfs2: allocate lockres hash pages in an array This allows us to have a hash table greater than a single page which greatly improves dlm performance on some tests. Signed-off-by: Daniel Phillips Signed-off-by: Mark Fasheh commit 95c4f581d6551de55cf5b8693db98b01ce07021b tree d453b4b25c4bb66f58e2671fec8c36394875bef8 parent 4198985f7ae119a23f83503a692dd822bd574080 author Mark Fasheh Fri, 10 Mar 2006 13:44:00 -0800 committer Mark Fasheh Mon, 26 Jun 2006 14:42:41 -0700 ocfs2: inline dlm_lockres_get() It's called on every lookup so this might help performance a bit. Signed-off-by: Mark Fasheh commit 4198985f7ae119a23f83503a692dd822bd574080 tree 83c810ea0c492296dae76b59547700db4161806f parent a3d3329159ea76bae0b3b8680691a1c3ecf5801f author Daniel Phillips Fri, 10 Mar 2006 13:31:47 -0800 committer Mark Fasheh Mon, 26 Jun 2006 14:42:40 -0700 [PATCH] Clean up ocfs2 hash probe and make it faster Signed-Off-By: Daniel Phillips Signed-off-by: Mark Fasheh commit a3d3329159ea76bae0b3b8680691a1c3ecf5801f tree a4521103c45190ff340f918d131649a20b414b27 parent 65c491d833a06fd0d1383297590772c75d28155c author Mark Fasheh Thu, 09 Mar 2006 17:55:56 -0800 committer Mark Fasheh Mon, 26 Jun 2006 14:42:39 -0700 ocfs2: calculate lockid hash values outside of the spinlock Fixes a performance bug - pointed out by Andrew. Signed-off-by: Mark Fasheh commit 65c491d833a06fd0d1383297590772c75d28155c tree d9b4d9697525ef89a6e9c2489a005a584e471abf parent da206c9e68cb93fcab43592d46276c02889c1250 author Mark Fasheh Mon, 06 Mar 2006 15:36:17 -0800 committer Mark Fasheh Mon, 26 Jun 2006 14:42:39 -0700 ocfs2: move lockres qstr next to hlist_node structure Gains us a bit of performance on loads which heavily hit the lockres hash. Patch suggested by Daniel Phillips . Signed-off-by: Mark Fasheh commit 99d19bb75b88cc997d3cd611903908714c735981 tree 19a2c563eaf41dffefa7e62906a698f2fe1431df parent 8d55a786febd077f3a0db9f0672dfa1288b452af author Matt Mackall Sun, 25 Jun 2006 01:58:54 -0700 committer James Bottomley Mon, 26 Jun 2006 16:33:45 -0500 [SCSI] random: remove redundant SA_SAMPLE_RANDOM from NinjaSCSI The scsi layer is already calling add_disk_randomness in scsi_end_request. Signed-off-by: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 8d55a786febd077f3a0db9f0672dfa1288b452af tree 8894c46d5d177eebec1474ac2426cdfc0561c1e7 parent 3e7196cf6070821ff8246b15dfd219ffa6409062 author Alan Cox Sun, 25 Jun 2006 01:58:58 -0700 committer James Bottomley Mon, 26 Jun 2006 16:33:10 -0500 [SCSI] Bogus disk geometry on large disks We currently stuff a truncated size into the geometry logic and return the result which can produce bizarre reports for a 4Tb array. Since that mapping logic isn't useful for disks that big don't try and map this way at all. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 3e7196cf6070821ff8246b15dfd219ffa6409062 tree 3421b231842340b0cb45b19878c8aa64ecb8e8d7 parent 041976fb6ae851cd18d96584a5d6361b564c9974 author GOTO Masanori Sun, 25 Jun 2006 01:58:56 -0700 committer James Bottomley Mon, 26 Jun 2006 16:31:01 -0500 [SCSI] Add scsi_add_host() failure handling for nsp32 Add scsi_add_host() failure handling for nsp32 and silence warning. drivers/scsi/nsp32.c:2888: warning: ignoring return value of 'Scsi_add_host', declared with attribute warn_unused_result Signed-off-by: Jesper Juhl Signed-off-by: GOTO Masanori Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 041976fb6ae851cd18d96584a5d6361b564c9974 tree 5010cfddb38893d8ea65190f1d31e79f0f7db8d7 parent 76c1534e0bd78e9a7662edcf5c994bac63d939fd author Randy Dunlap Sun, 25 Jun 2006 01:58:51 -0700 committer James Bottomley Mon, 26 Jun 2006 16:29:52 -0500 [SCSI] lpfc: sparse NULL warnings From: Randy Dunlap Fix sparse warnings: use NULL instead of 0 for pointers: drivers/scsi/lpfc/lpfc_els.c:827:56: warning: Using plain integer as NULL pointer drivers/scsi/lpfc/lpfc_els.c:2781:18: warning: Using plain integer as NULL pointer drivers/scsi/lpfc/lpfc_els.c:2782:18: warning: Using plain integer as NULL pointer drivers/scsi/lpfc/lpfc_init.c:951:21: warning: Using plain integer as NULL pointer drivers/scsi/lpfc/lpfc_init.c:956:20: warning: Using plain integer as NULL pointer Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Acked-by: James Smart Signed-off-by: James Bottomley commit 76c1534e0bd78e9a7662edcf5c994bac63d939fd tree 024be09445d2364d53c99c1684869d4b58ffacbe parent 3ea66e28c20e3b23749c9001c58b37ad44263442 author Andrew Vasquez Fri, 23 Jun 2006 16:11:32 -0700 committer James Bottomley Mon, 26 Jun 2006 16:25:52 -0500 [SCSI] qla2xxx: Update version number to 8.01.05-k3. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 3ea66e28c20e3b23749c9001c58b37ad44263442 tree ec6c2874af2e24ff9289ba845fff1a866eb12f07 parent 7ee613970947bdf5f722bb01547c97f4fc80fe9f author Andrew Vasquez Fri, 23 Jun 2006 16:11:27 -0700 committer James Bottomley Mon, 26 Jun 2006 16:25:34 -0500 [SCSI] qla2xxx: Correctly set the firmware NOS/OLS timeout during initialization. Original code incorrectly assigned it to the driver's link-down-timeout value (a value in seconds). Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 7ee613970947bdf5f722bb01547c97f4fc80fe9f tree 5cb0c4b3a7b216a689a81aa8583c2e28e6fef056 parent 7d7abc77cc469ff41dde8eea606e1dab88d4ba86 author Andrew Vasquez Fri, 23 Jun 2006 16:11:22 -0700 committer James Bottomley Mon, 26 Jun 2006 16:25:18 -0500 [SCSI] qla2xxx: Convert from pci_module_init() to pci_register_driver(). Also remove qla2xxx_probe_one/qla2xxx_remove_one stubs previously used with external firmware module loaders. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 7d7abc77cc469ff41dde8eea606e1dab88d4ba86 tree d1839ee53f595b8d44e0ad953129ddf5bc092c0f parent 0181944fe647cae18d545ac1167df3d15d393701 author Andrew Vasquez Fri, 23 Jun 2006 16:11:17 -0700 committer James Bottomley Mon, 26 Jun 2006 16:25:00 -0500 [SCSI] qla2xxx: Correct 'loop-down' determination logic in qla2x00_fw_ready(). As there is no point in failing the initialization process when firmware informs the host software that it could not transition beyond a CONFIG_WAIT nor WAIT_FOR_LOGIN state. Previous logic would mark such conditions as a general *failure* and subsequently tear-down the scsi-host during initialization. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 0181944fe647cae18d545ac1167df3d15d393701 tree 6889c9782bf1ce84345a3d128e82797a732f4cf9 parent 744f11fdb1118c9306303529263e5ed09b463a0f author Andrew Vasquez Fri, 23 Jun 2006 16:11:10 -0700 committer James Bottomley Mon, 26 Jun 2006 16:24:36 -0500 [SCSI] qla2xxx: Add support for extended error logging. Similar in form to QLogic's standard offering -- via the 'extended_error_logging' module parameter. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 744f11fdb1118c9306303529263e5ed09b463a0f tree d6a865da1e83cc9b892eaa328d1102e18e73f899 parent 7469059d52c5f762890cc060ef3f0452c097b91e author Andrew Vasquez Fri, 23 Jun 2006 16:11:05 -0700 committer James Bottomley Mon, 26 Jun 2006 16:24:07 -0500 [SCSI] qla2xxx: Cleanup DEBUG macro usage. - macro usage statements should terminate with a ';' - remove unused macros. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 7469059d52c5f762890cc060ef3f0452c097b91e tree 9795a6bbf0a48d78d9e59aa6bff611073bb8a974 parent 7914d004bcff3e59ca7c0d628f9862fe6655429c author Andrew Vasquez Fri, 23 Jun 2006 16:11:00 -0700 committer James Bottomley Mon, 26 Jun 2006 16:23:49 -0500 [SCSI] qla2xxx: Remove no-op IOCTL codes and macros. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 7914d004bcff3e59ca7c0d628f9862fe6655429c tree afc3ec14807b8367e06b2565859c751d84eca0f8 parent 88729e53a4798df20e7a7ef68e0a816f4a268da4 author Andrew Vasquez Fri, 23 Jun 2006 16:10:55 -0700 committer James Bottomley Mon, 26 Jun 2006 16:22:57 -0500 [SCSI] qla2xxx: Create an VPD sysfs entry for supported ISPs only. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 88729e53a4798df20e7a7ef68e0a816f4a268da4 tree 23635e817ed3385167c3ee73ce4bafbabdb33848 parent 8baa51a6f027a2f581930da12f867d8054907656 author Andrew Vasquez Fri, 23 Jun 2006 16:10:50 -0700 committer James Bottomley Mon, 26 Jun 2006 16:22:40 -0500 [SCSI] qla2xxx: Add DMI (Diagnostics Monitoring Interface) support. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 8baa51a6f027a2f581930da12f867d8054907656 tree 6e130e7e9d87b552fd07f7a9794916b3327b7c67 parent d4c760c2119fca982f335d83ff9095479c5d6737 author Andrew Vasquez Fri, 23 Jun 2006 16:10:44 -0700 committer James Bottomley Mon, 26 Jun 2006 16:22:16 -0500 [SCSI] qla2xxx: Honour 'skip process-login' option during fabric-login IOCB. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit d4c760c2119fca982f335d83ff9095479c5d6737 tree 63aad21ecfd0deb720e1367df4e87035cf6fc435 parent 395e0808fad28b08b982dd9f299fe4723e7c579b author Andrew Vasquez Fri, 23 Jun 2006 16:10:39 -0700 committer James Bottomley Mon, 26 Jun 2006 16:21:55 -0500 [SCSI] qla2xxx: Add NVRAM 'Disable Serdes' bit support. The host section of ISP24xx NVRAMs contain a new bit which allows a user to selectively disable ports of an HBA. These ports (hosts) will not be presented to the midlayer. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 395e0808fad28b08b982dd9f299fe4723e7c579b tree 1c377c4439b3360f9f7c57e7e41f8bfe4beaf6d0 parent a7a167bf7e2d196fc33f292e7b02e90fee03bc9a author Andrew Vasquez Fri, 23 Jun 2006 16:10:34 -0700 committer James Bottomley Mon, 26 Jun 2006 16:21:25 -0500 [SCSI] qla2xxx: Resync with latest HBA SSID specification -- 2.2j. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit a7a167bf7e2d196fc33f292e7b02e90fee03bc9a tree 1e62085065440e012a7cd2d48cd161bfac408adc parent 9ea7290902abcf22f796e9aeae4dc2e71d3f7e67 author Andrew Vasquez Fri, 23 Jun 2006 16:10:29 -0700 committer James Bottomley Mon, 26 Jun 2006 16:20:44 -0500 [SCSI] qla2xxx: Rework firmware-trace facilities. - Defer firmware dump-data raw-to-textual conversion to user-space. - Add module parameter (ql2xallocfwdump) to allow for per-HBA allocations of firmware dump memory. - Dump request and response queue data as per firmware group request. - Add extended firmware trace support for ISP24XX/ISP54XX chips. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit a09ab7e2fcd22f0490a270bb310536c651d53cb9 tree 3463977fac2c1ad0adf8a1b3cfe05a67d05d8093 parent da206c9e68cb93fcab43592d46276c02889c1250 author mark gross Fri, 23 Jun 2006 15:13:07 -0700 committer Linus Torvalds Mon, 26 Jun 2006 14:12:02 -0700 [PATCH] type-oh bug in tlclk.c Mark Bellon found a bug in my tlclk driver. Thanks! I botch the register mask for store_received_ref_clk3a. See http://download.intel.com/design/network/manuals/30412001.pdf tables 124 and 136 for details. Signed-off-by: Mark Gross Signed-off-by: Linus Torvalds commit da206c9e68cb93fcab43592d46276c02889c1250 tree 21264cc26fa0322d668b398808f10bd93558d25f parent 916d15445f4ad2a9018e5451760734f36083be77 parent 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c author Linus Torvalds Mon, 26 Jun 2006 13:33:14 -0700 committer Linus Torvalds Mon, 26 Jun 2006 13:33:14 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: typo fixes Clean up 'inline is not at beginning' warnings for usb storage Storage class should be first i386: Trivial typo fixes ixj: make ixj_set_tone_off() static spelling fixes fix paniced->panicked typos Spelling fixes for Documentation/atomic_ops.txt move acknowledgment for Mark Adler to CREDITS remove the bouncing email address of David Campbell commit 916d15445f4ad2a9018e5451760734f36083be77 tree cd86d73ec501537fc202fbc2f90381b56ea0bc1d parent 5fd571cbc13db113bda26c20673e1ec54bfd26b4 author Karsten Keil Mon, 26 Jun 2006 20:21:01 +0200 committer Linus Torvalds Mon, 26 Jun 2006 12:41:54 -0700 [PATCH] fix processing of the last byte in isdn_readbchan_tty() The changes in the tty handling contain a bug while accessing the last byte in the skb. Since special sequence for control of DTMF and FAX via ttyI* devices handled via this path, these services do not work anymore. Signed-off-by: Karsten Keil Signed-off-by: Linus Torvalds commit fee68d1cc0d9bd863e51c16cdcd707737b16bb38 tree bf8361559f55bc24aeb463f45589432dcc22656b parent 890fbae2818a045350b8d1e3bda61ceb88ff1d17 author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:10 -0700 [PATCH] devfs: Remove it from the feature_removal.txt file This file was created due to the issue regarding how to notify people that devfs was going to be removed. Finally remove the entry as it has served its purpose. Signed-off-by: Greg Kroah-Hartman commit 890fbae2818a045350b8d1e3bda61ceb88ff1d17 tree cf57a61841780ed1ab6bffa3ea0bf7d8cdd999d0 parent 331b831983f9d706f4a40d08a996d5c2c7a6ea7b author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:09 -0700 [PATCH] devfs: Last little devfs cleanups throughout the kernel tree. Just removes a few unused #defines and fixes some comments due to devfs now being gone. Signed-off-by: Greg Kroah-Hartman commit 331b831983f9d706f4a40d08a996d5c2c7a6ea7b tree 9d47d5f8d6f882d26c8deade0e44442cebf2e288 parent f4eaa37017a5a68f67ef86729508022c13fb8e6d author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:09 -0700 [PATCH] devfs: Rename TTY_DRIVER_NO_DEVFS to TTY_DRIVER_DYNAMIC_DEV I've always found this flag confusing. Now that devfs is no longer around, it has been renamed, and the documentation for when this flag should be used has been updated. Also fixes all drivers that use this flag. Signed-off-by: Greg Kroah-Hartman commit f4eaa37017a5a68f67ef86729508022c13fb8e6d tree 7a2b03b575d77922c1e0bf1da7b74e87451462c6 parent 264f48646e6829b4d00a0e058452578318e6fb15 author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:09 -0700 [PATCH] devfs: Remove the tty_driver devfs_name field as it's no longer needed Also fixes all drivers that set this field. Signed-off-by: Greg Kroah-Hartman commit 264f48646e6829b4d00a0e058452578318e6fb15 tree a5a21554e26ae59e7b3a5af3e8c76e7daa8af9f3 parent 5e483075a1f9862a65af648d1d939499969c7b5d author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:09 -0700 [PATCH] devfs: Remove the line_driver devfs_name field as it's no longer needed Also fixes all drivers that set this field. Signed-off-by: Greg Kroah-Hartman commit 5e483075a1f9862a65af648d1d939499969c7b5d tree a510b8051e026ccf3fdbcff437cbe724700c96bf parent ce7b0f46bbf4bff8daab2dd3d878b9e72a623d09 author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:08 -0700 [PATCH] devfs: Remove the videodevice devfs_name field as it's no longer needed Also fixes all drivers that set this field. Signed-off-by: Greg Kroah-Hartman commit ce7b0f46bbf4bff8daab2dd3d878b9e72a623d09 tree 7a860cf52fbf1ff768197702af60a8329d296dff parent 96192ff1a9d0c6ef365d21667080259d83ea2f5b author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:08 -0700 [PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed And remove the now unneeded number field. Also fixes all drivers that set these fields. Signed-off-by: Greg Kroah-Hartman commit 96192ff1a9d0c6ef365d21667080259d83ea2f5b tree b13caa3bedb3cde8bd1beecfc3c76bac894df42a parent ff23eca3e8f613034e0d20ff86f6a89b62f5a14e author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:08 -0700 [PATCH] devfs: Remove the miscdevice devfs_name field as it's no longer needed Also fixes all drivers that set this field. Signed-off-by: Greg Kroah-Hartman commit ff23eca3e8f613034e0d20ff86f6a89b62f5a14e tree 826285f5daa660001d38cac6baaf34411fd40131 parent 8ab5e4c15b53e147c08031a959d9f776823dbe73 author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:08 -0700 [PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree Also fixes up all files that #include it. Signed-off-by: Greg Kroah-Hartman commit 8ab5e4c15b53e147c08031a959d9f776823dbe73 tree b851d4c1fdbd396379279e4475f7f778a667a208 parent 7c69ef79741910883d5543caafa06aca3ebadbd1 author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:07 -0700 [PATCH] devfs: Remove devfs_remove() function from the kernel tree Removes the devfs_remove() function and all callers of it. Signed-off-by: Greg Kroah-Hartman commit 7c69ef79741910883d5543caafa06aca3ebadbd1 tree 655d3f60abee0195d0aadb2c86ab04ccca89a307 parent 1a715c5cf917326a285533d1116d725f5f2593c2 author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:07 -0700 [PATCH] devfs: Remove devfs_mk_cdev() function from the kernel tree Removes the devfs_mk_cdev() function and all callers of it. Signed-off-by: Greg Kroah-Hartman commit 1a715c5cf917326a285533d1116d725f5f2593c2 tree 23833b5463940023bd4074a3a465c245adaff9fa parent 79021a625c36162d24c852bbbdb04f0c1cb32db3 author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:06 -0700 [PATCH] devfs: Remove devfs_mk_bdev() function from the kernel tree Removes the devfs_mk_bdev() function and all callers of it. Signed-off-by: Greg Kroah-Hartman commit 79021a625c36162d24c852bbbdb04f0c1cb32db3 tree ca495cf7e6f9821a8cebdaaad81575015b8a8635 parent 95dc112a5770dc670a1b45a3d9ee346fdd2b2697 author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:06 -0700 [PATCH] devfs: Remove devfs_mk_symlink() function from the kernel tree Removes the devfs_mk_symlink() function and all callers of it. Signed-off-by: Greg Kroah-Hartman commit 95dc112a5770dc670a1b45a3d9ee346fdd2b2697 tree 899cd99bdc928ade94ddc7b003b0de7d275cac48 parent 0e6c62da7cd929b0389fc4a7e41464bb738647dc author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:06 -0700 [PATCH] devfs: Remove devfs_mk_dir() function from the kernel tree Removes the devfs_mk_dir() function and all callers of it. Signed-off-by: Greg Kroah-Hartman commit 0e6c62da7cd929b0389fc4a7e41464bb738647dc tree cbd5814050756d66f880baa8559fc3867cc37c2a parent 0936f26f55918af595b108208e64c37a0a481722 author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:06 -0700 [PATCH] devfs: Remove devfs_*_tape() functions from the kernel tree Removes the devfs_register_tape() and devfs_unregister_tape() functions and all callers of them. Signed-off-by: Greg Kroah-Hartman commit 0936f26f55918af595b108208e64c37a0a481722 tree b9bbefd4d57b474a349f31e0d3d9de5a239251bf parent 94f6c59dcf16f10a20fbe3d1f098b159433f94bd author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:06 -0700 [PATCH] devfs: Remove devfs support from the sound subsystem Signed-off-by: Greg Kroah-Hartman commit 94f6c59dcf16f10a20fbe3d1f098b159433f94bd tree 06ec8cdb07de07389aa80fb394724ac07615a887 parent aa4148cfc7b3b93eeaf755a7d14f10afaffe9a96 author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:06 -0700 [PATCH] devfs: Remove devfs support from the ide subsystem. Also removes the ide drive devfs_name field as it's no longer needed Signed-off-by: Greg Kroah-Hartman commit aa4148cfc7b3b93eeaf755a7d14f10afaffe9a96 tree 7f1c84f3cf7c0c79ccdb94a62a3543ee19e5edc2 parent bdaf8529385d5126ef791e8f1914afff8cd59bcf author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:05 -0700 [PATCH] devfs: Remove devfs support from the serial subsystem Also fixes all serial drivers. Signed-off-by: Greg Kroah-Hartman commit bdaf8529385d5126ef791e8f1914afff8cd59bcf tree aa9e917703526ad034a19cf1b16002aba486cd17 parent a29641883f57f36424e3219ae9ff48dd6cd34de0 author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:05 -0700 [PATCH] devfs: Remove devfs from the init code This patch removes the devfs code from the init/ directory. Signed-off-by: Greg Kroah-Hartman commit a29641883f57f36424e3219ae9ff48dd6cd34de0 tree de70437649f87064f378b513003d3e4691d178e4 parent 5c3927dc3468f47b803c9e1bb82cbed2bbd411ab author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:05 -0700 [PATCH] devfs: Remove devfs from the partition code This patch removes the devfs code from the fs/partitions/ directory. Signed-off-by: Greg Kroah-Hartman commit 5c3927dc3468f47b803c9e1bb82cbed2bbd411ab tree b8a5a2abe3a2be9f35606fcbee2698a44af2cb37 parent d8deac5094988c7ad1127ee61f52c59a952fcabb author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:05 -0700 [PATCH] devfs: Remove devfs documentation from the kernel tree Removes the Documentaiton/filesystems/devfs/ directory Signed-off-by: Greg Kroah-Hartman commit d8deac5094988c7ad1127ee61f52c59a952fcabb tree 95285444a6e65f2e43d9bc62d13a726277cd91f2 parent 5fd571cbc13db113bda26c20673e1ec54bfd26b4 author Greg Kroah-Hartman Mon, 20 Jun 2005 21:15:16 -0700 committer Greg Kroah-Hartman Mon, 26 Jun 2006 12:25:05 -0700 [PATCH] devfs: Remove devfs from the kernel tree This is the first patch in a series of patches that removes devfs support from the kernel. This patch removes the core devfs code, and its private header file. Signed-off-by: Greg Kroah-Hartman commit 5fd571cbc13db113bda26c20673e1ec54bfd26b4 tree 9201d13d9cabe8e06497fe22f2d0243f0f054f90 parent 09c0dc68625c06f5b1e786aad0d5369b592179e6 author Eric Sesterhenn Wed, 21 Jun 2006 20:56:26 +0200 committer Linus Torvalds Mon, 26 Jun 2006 11:57:28 -0700 [PATCH] Array overrun in drivers/infiniband/core/cma.c This was spotted by coverity #id 1300. Since the array has only four elements, we should just use those four. Signed-off-by: Eric Sesterhenn Acked-by: Sean Hefty Signed-off-by: Linus Torvalds commit 09c0dc68625c06f5b1e786aad0d5369b592179e6 tree 19fd06de08792a4c07ee8b61e5615ee35e8ccec0 parent 2a2ed2db353d949c06b6ef8b6913f65b39111eab author Linus Torvalds Mon, 26 Jun 2006 11:55:42 -0700 committer Linus Torvalds Mon, 26 Jun 2006 11:55:42 -0700 Revert "[PATCH] kthread: update loop.c to use kthread" This reverts commit c7b2eff059fcc2d1b7085ee3d84b79fd657a537b. Hugh Dickins explains: "It seems too little tested: "losetup -d /dev/loop0" fails with EINVAL because nothing sets lo_thread; but even when you patch loop_thread() to set lo->lo_thread = current, it can't survive more than a few dozen iterations of the loop below (with a tmpfs mounted on /tst): j=0 cp /dev/zero /tst while : do let j=j+1 echo "Doing pass $j" losetup /dev/loop0 /tst/zero mkfs -t ext2 -b 1024 /dev/loop0 >/dev/null 2>&1 mount -t ext2 /dev/loop0 /mnt umount /mnt losetup -d /dev/loop0 done it collapses with failed ioctl then BUG_ON(!bio). I think the original lo_done completion was more subtle and safe than the kthread conversion has allowed for." Signed-off-by: Linus Torvalds commit 6e58f5c9a841e59233c5997df082e93329ea61e0 tree 3b9e545a716d2191f62b02f25fcf3c915cc6a4ed parent b184a4c9a4e542890265b4cdd3ff7908f4adc9c4 author Ben Dooks Mon, 26 Jun 2006 19:46:39 +0100 committer Russell King Mon, 26 Jun 2006 19:46:39 +0100 [ARM] 3656/1: S3C2412: Add S3C2412 and S3C2413 documenation Patch from Ben Dooks Add some basic documentation about the support for the S3C2412 and S3C2413 CPUs-- Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 2a2ed2db353d949c06b6ef8b6913f65b39111eab tree d835c3dd101da91089c3bdf51c8632e84be37232 parent 972d19e837833b93466c6f6a8ef2a7d653000aa3 parent 070b98bfda3d27269519067c1c67eaef695f3e0c author Linus Torvalds Mon, 26 Jun 2006 11:05:15 -0700 committer Linus Torvalds Mon, 26 Jun 2006 11:05:15 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits) kbuild: trivial fixes in Makefile kbuild: adding symbols in Kconfig and defconfig to TAGS kbuild: replace abort() with exit(1) kbuild: support for %.symtypes files kbuild: fix silentoldconfig recursion kbuild: add option for stripping modules while installing them kbuild: kill some false positives from modpost kbuild: export-symbol usage report generator kbuild: fix make -rR breakage kbuild: append -dirty for updated but uncommited changes kbuild: append git revision for all untagged commits kbuild: fix module.symvers parsing in modpost kbuild: ignore make's built-in rules & variables kbuild: bugfix with initramfs kbuild: modpost build fix kbuild: check license compatibility when building modules kbuild: export-type enhancement to modpost.c kbuild: add dependency on kernel.release to the package targets kbuild: `make kernelrelease' speedup kconfig: KCONFIG_OVERWRITECONFIG ... commit 972d19e837833b93466c6f6a8ef2a7d653000aa3 tree 069258492d5347cf440b8240dadfa20621f54842 parent cdf4f383a4b0ffbf458f65380ecffbeee1f79841 parent b9d0a25a484a90c1d60b974d115eff2fe580ce16 author Linus Torvalds Mon, 26 Jun 2006 11:03:29 -0700 committer Linus Torvalds Mon, 26 Jun 2006 11:03:29 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] tcrypt: Forbid tcrypt from being built-in [CRYPTO] aes: Add wrappers for assembly routines [CRYPTO] tcrypt: Speed benchmark support for digest algorithms [CRYPTO] tcrypt: Return -EAGAIN from module_init() [CRYPTO] api: Allow replacement when registering new algorithms [CRYPTO] api: Removed const from cra_name/cra_driver_name [CRYPTO] api: Added cra_init/cra_exit [CRYPTO] api: Fixed incorrect passing of context instead of tfm [CRYPTO] padlock: Rearrange context structure to reduce code size [CRYPTO] all: Pass tfm instead of ctx to algorithms [CRYPTO] digest: Remove unnecessary zeroing during init [CRYPTO] aes-i586: Get rid of useless function wrappers [CRYPTO] digest: Add alignment handling [CRYPTO] khazad: Use 32-bit reads on key commit cdf4f383a4b0ffbf458f65380ecffbeee1f79841 tree 8093cb3dbeda8827ca8b782f29474af523439c55 parent 954b36d48b495afed2880320750858a2eae312c9 parent e2e8115b54aa6f159ac3dfec8d3d23b0af5fbfa0 author Linus Torvalds Mon, 26 Jun 2006 11:01:58 -0700 committer Linus Torvalds Mon, 26 Jun 2006 11:01:58 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input * master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: Input: iforce - remove some pointless casts Input: psmouse - add support for Intellimouse 4.0 Input: atkbd - fix HANGEUL/HANJA keys Input: fix misspelling of Hangeul key Input: via-pmu - add input device support Input: rearrange exports Input: fix formatting to better follow CodingStyle Input: reset name, phys and uniq when unregistering Input: return correct size when reading modalias attribute Input: change my e-mail address in MAINTAINERS file Input: fix potential overflows in driver/input/keyboard Input: fix potential overflows in driver/input/touchscreen Input: fix potential overflows in driver/input/joystick Input: fix potential overflows in driver/input/mouse Input: fix accuracy of fixp-arith.h Input: iforce - use ENOSPC instead of ENOMEM Input: constify drivers/char/keyboard.c commit 954b36d48b495afed2880320750858a2eae312c9 tree 0c756f15e9a2941b99b03ecf1db518b89a1e7f78 parent 12ddae3348def8808fb755b23225b18fc4adfbe3 author Greg Ungerer Mon, 26 Jun 2006 16:33:15 +1000 committer Linus Torvalds Mon, 26 Jun 2006 10:59:44 -0700 [PATCH] m68knommu: use configurable RAM setup page_offset.h Remove board specific base RAM conditionals from page_offset.h With the Kconfig time configurable RAM setup none of this is required. It is all based on the Kconfig (CONFIG_RAMBASE) option now. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 12ddae3348def8808fb755b23225b18fc4adfbe3 tree 616d10e9ae82b0507d69b34b33565c518d0648b6 parent 73e2fba8dc1e0a686073a5183be1a99e9285d2ac author Greg Ungerer Mon, 26 Jun 2006 16:33:09 +1000 committer Linus Torvalds Mon, 26 Jun 2006 10:59:07 -0700 [PATCH] m68knommu: use configurable RAM setup in start up code Change to using a configurable RAM setup in startup code. This cleans up the whole RAM base/sizing issue, and removes a lot of board specific code. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 73e2fba8dc1e0a686073a5183be1a99e9285d2ac tree 5b7f3da77c830e6ece66786a53b34634589c63e9 parent 63e413d19db0018e443a43c6c7a482993edf79cf author Greg Ungerer Mon, 26 Jun 2006 16:33:05 +1000 committer Linus Torvalds Mon, 26 Jun 2006 10:59:07 -0700 [PATCH] m68knommu: use configurable RAM setup in linker script Remove the fixed RAM configurations for each board type from the linker script. Replace with simple defines usng the flexible RAM configuration options. This cleans out of lot of board specific munging of addresses. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 63e413d19db0018e443a43c6c7a482993edf79cf tree bdfa632a14dbdf1057974787147e1328a7683eaf parent d2f386d7c182c1420f797093d67bb09a7251f113 author Greg Ungerer Mon, 26 Jun 2006 16:32:59 +1000 committer Linus Torvalds Mon, 26 Jun 2006 10:59:07 -0700 [PATCH] m68knommu: create configurable RAM setup Reworked the way RAM regions are defined. Instead of coding all the variations for each board type we now just configure RAM base and size in the usual Kconfig setup. This much simplifies the code, and makes it a lot more flexible when setting up new boards or board varients. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit d2f386d7c182c1420f797093d67bb09a7251f113 tree e815c24291da5eb402f7bc269a79c388ca55b074 parent 2ae9cb6bd4c23616b229b135ea57a93a6a24e13a author Greg Ungerer Mon, 26 Jun 2006 16:34:09 +1000 committer Linus Torvalds Mon, 26 Jun 2006 10:59:07 -0700 [PATCH] m68knommu: remove unused vars from generic 68328 start code Clean out unused variable definitions from 68328 start up code. Also use a more appropriate start address for the case of relocating the kernel code to RAM (from ROM/flash). Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 2ae9cb6bd4c23616b229b135ea57a93a6a24e13a tree bf68a68c16a39224c82790070b96d4d5ab5c5d70 parent 5f2f444136abdb13dbd2094555aa65fc252aef6c author Greg Ungerer Mon, 26 Jun 2006 16:34:04 +1000 committer Linus Torvalds Mon, 26 Jun 2006 10:59:07 -0700 [PATCH] m68knommu: remove __ramvec from 68328/pilot start code __ramvec has been removed from the linker script. The vector base address is defined as a configurable option, use that. Remove its use from the 68328/pilot startup code. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 5f2f444136abdb13dbd2094555aa65fc252aef6c tree eb7ff532050c76319ba9d0c190a19f10a101e844 parent 81a07d7588d376c530d006e24d7981304ce96e16 parent 33f40b3b023b9f00b40ecfb3a39286de13516b33 author Linus Torvalds Mon, 26 Jun 2006 10:54:02 -0700 committer Linus Torvalds Mon, 26 Jun 2006 10:54:02 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (4227): Update this driver for recent header file movement. V4L/DVB (4223): Add V4L2_CID_MPEG_STREAM_VBI_FMT control V4L/DVB (4222): Always switch tuner mode when calling VIDIOC_S_FREQUENCY. V4L/DVB (4221): Add HM12 YUV format define. V4L/DVB (4219): Av7110: analog sound output of DVB-C rev 2.3 V4L/DVB (4217): Fix a misplaced closing bracket/else, which caused swzigzag not to be called V4L/DVB (4215): Make VIDEO_CX88_BLACKBIRD a separate build option V4L/DVB (4214): Make VIDEO_CX2341X a selectable build option V4L/DVB (4213): Cx88: cleanups V4L/DVB (4211): Fix an Oops for all fe that have get_frontend_algo == NULL commit 81a07d7588d376c530d006e24d7981304ce96e16 tree 1608e094c88b9702c86cf2e6f65339aab9ea3f3f parent 8871e73fdbde07d0a41393f7ee30787b65387b36 parent 8501a2fbe762b21d2504ed3aca3b52be61b5e6e4 author Linus Torvalds Mon, 26 Jun 2006 10:51:09 -0700 committer Linus Torvalds Mon, 26 Jun 2006 10:51:09 -0700 Merge branch 'x86-64' * x86-64: (83 commits) [PATCH] x86_64: x86_64 stack usage debugging [PATCH] x86_64: (resend) x86_64 stack overflow debugging [PATCH] x86_64: msi_apic.c build fix [PATCH] x86_64: i386/x86-64 Add nmi watchdog support for new Intel CPUs [PATCH] x86_64: Avoid broadcasting NMI IPIs [PATCH] x86_64: fix apic error on bootup [PATCH] x86_64: enlarge window for stack growth [PATCH] x86_64: Minor string functions optimizations [PATCH] x86_64: Move export symbols to their C functions [PATCH] x86_64: Standardize i386/x86_64 handling of NMI_VECTOR [PATCH] x86_64: Fix modular pc speaker [PATCH] x86_64: remove sys32_ni_syscall() [PATCH] x86_64: Do not use -ffunction-sections for modules [PATCH] x86_64: Add cpu_relax to apic_wait_icr_idle [PATCH] x86_64: adjust kstack_depth_to_print default [PATCH] i386/x86-64: adjust /proc/interrupts column headings [PATCH] x86_64: Fix race in cpu_local_* on preemptible kernels [PATCH] x86_64: Fix fast check in safe_smp_processor_id [PATCH] x86_64: x86_64 setup.c - printing cmp related boottime information [PATCH] i386/x86-64/ia64: Move polling flag into thread_info_status ... Manual resolve of trivial conflict in arch/i386/kernel/Makefile commit 8501a2fbe762b21d2504ed3aca3b52be61b5e6e4 tree 899bf4085bb29927a71dd90b3ed1fb444ed4b0ea parent 4961f10e2205d0ededa291e12ec634efc58aa93c author Eric Sandeen Mon, 26 Jun 2006 14:00:08 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:22 -0700 [PATCH] x86_64: x86_64 stack usage debugging Applies to git & 2.6.17-rc6 after CONFIG_DEBUG_STACKOVERFLOW patch uses same stack-zeroing mechanism as on i386 to discover maximum stack excursions. Signed-off-by: Eric Sandeen Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4961f10e2205d0ededa291e12ec634efc58aa93c tree 12aec4e392f3cbbdca69ab65fc41816430cb3b37 parent a4cffb6444c327677f901323ecf1a13d6bd2df3f author Eric Sandeen Mon, 26 Jun 2006 14:00:05 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:22 -0700 [PATCH] x86_64: (resend) x86_64 stack overflow debugging Take two, now without spurious whitespace :( Applies to git & 2.6.17-rc6 CONFIG_DEBUG_STACKOVERFLOW existed for x86_64 in 2.4, but seems to have gone AWOL in 2.6. I've pretty much just copied this over from the 2.4 code, with appropriate tweaks for the 2.6 kernel, plus a bugfix. I'd personally rather see it printed out the way other arches do it, i.e. bytes-remaining-until-overflow, rather than having to do the subtraction yourself. Also, only 128 bytes remaining seems awfully late to issue a warning. But I'll start here :) Signed-off-by: Eric Sandeen Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a4cffb6444c327677f901323ecf1a13d6bd2df3f tree aa3a2ca547dc6e232a3784cd65897b3bd77029da parent 0080e667550db5ae8c9318181500c413b99ff164 author Christian Kujau Mon, 26 Jun 2006 14:00:02 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:22 -0700 [PATCH] x86_64: msi_apic.c build fix CC drivers/pci/msi-apic.o In file included from include/asm/msi.h:11, from drivers/pci/msi.h:71, from drivers/pci/msi-apic.c:8: include/asm/smp.h:103: error: syntax error before '->' token akpm: nasty. It appears to be static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask) conflicting with include/asm-x86_64/mach_apic.h's #define cpu_mask_to_apicid (genapic->cpu_mask_to_apicid) And I don't know which patch in rc4-mm1 triggered this. Fixing this in the .c file seems wrong. Including asm/smp.h instead of linux/smp.h seems wrong too. Need that .config. Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0080e667550db5ae8c9318181500c413b99ff164 tree 3d6d162f0017aaa7c6049e785bbcdfc18dbc23ae parent e77deacb7b078156fcadf27b838a4ce1a65eda04 author Venkatesh Pallipadi Mon, 26 Jun 2006 13:59:59 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:22 -0700 [PATCH] x86_64: i386/x86-64 Add nmi watchdog support for new Intel CPUs Intel now has support for Architectural Performance Monitoring Counters ( Refer to IA-32 Intel Architecture Software Developer's Manual http://www.intel.com/design/pentium4/manuals/253669.htm ). This feature is present starting from Intel Core Duo and Intel Core Solo processors. What this means is, the performance monitoring counters and some performance monitoring events are now defined in an architectural way (using cpuid). And there will be no need to check for family/model etc for these architectural events. Below is the patch to use this performance counters in nmi watchdog driver. Patch handles both i386 and x86-64 kernels. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e77deacb7b078156fcadf27b838a4ce1a65eda04 tree e594ce9a9f65c45e19cfb3b8417c614dd2eb5386 parent 704fc59e1d056de80beaf30174bc8e0b1682efbb author Keith Owens Mon, 26 Jun 2006 13:59:56 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:22 -0700 [PATCH] x86_64: Avoid broadcasting NMI IPIs On some i386/x86_64 systems, sending an NMI IPI as a broadcast will reset the system. This seems to be a BIOS bug which affects machines where one or more cpus are not under OS control. It occurs on HT systems with a version of the OS that is not compiled without HT support. It also occurs when a system is booted with max_cpus=n where 2 <= n < cpus known to the BIOS. The fix is to always send NMI IPI as a mask instead of as a broadcast. Signed-off-by: Keith Owens Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 704fc59e1d056de80beaf30174bc8e0b1682efbb tree 0b6d3e62105d680b5c8deac2fa614de42293923a parent 03fdc2c277afdbd217eccd1ce0cfeff77ebd8b77 author Siddha, Suresh B Mon, 26 Jun 2006 13:59:53 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:22 -0700 [PATCH] x86_64: fix apic error on bootup Appended patch fixes the "APIC error on CPUX: 00(40)" observed during bootup. From SDM Vol-3A "Valid Interrupt Vectors" section: "When an illegal vector value (0-15) is written to an LVT entry and the delivery mode is Fixed, the APIC may signal an illegal vector error, with out regard to whether the mask bit is set or whether an interrupt is actually seen on input." Signed-off-by: Suresh Siddha Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 03fdc2c277afdbd217eccd1ce0cfeff77ebd8b77 tree e7264520754eed7b71296c839dff36d9270ee516 parent 6bfa9bb5195c68f75bd3937e4d77cb0bfe852d0d author Chuck Ebbert <76306.1226@compuserve.com> Mon, 26 Jun 2006 13:59:50 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:22 -0700 [PATCH] x86_64: enlarge window for stack growth Allow stack growth so the 'enter' instruction works. Also fixes problem in compat_sys_kexec_load() which could allocate more than 128 bytes using compat_alloc_user_space(). Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6bfa9bb5195c68f75bd3937e4d77cb0bfe852d0d tree cb6833ec8a32ac4b139be375b706b7110004a799 parent 2ee60e17896c65da1df5780d3196c050bccb7d10 author Andi Kleen Mon, 26 Jun 2006 13:59:47 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:22 -0700 [PATCH] x86_64: Minor string functions optimizations - Use tail call from clear_user to __clear_user to save some code size - Use standard memcpy for forward memmove Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2ee60e17896c65da1df5780d3196c050bccb7d10 tree 54b41b23c92a79e44c7f27c697c84c64052cb85d parent 45486f81c9aa07218b73a38cbcf62ffa66e99088 author Andi Kleen Mon, 26 Jun 2006 13:59:44 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:22 -0700 [PATCH] x86_64: Move export symbols to their C functions Only exports for assembler files are left in x8664_ksyms.c Originally inspired by a patch from Al Viro Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 45486f81c9aa07218b73a38cbcf62ffa66e99088 tree 8fc03b93b941c6ba3131bb016fe126f2f95e3c86 parent 9c63f8738734eb7e6d3f76ca03186f16ef88edf5 author Keith Owens Mon, 26 Jun 2006 13:59:41 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:22 -0700 [PATCH] x86_64: Standardize i386/x86_64 handling of NMI_VECTOR x86_64 and i386 behave inconsistently when sending an IPI on vector 2 (NMI_VECTOR). Make both behave the same, so IPI 2 is sent as NMI. The crash code was abusing send_IPI_allbutself() by passing a code instead of a vector, it only worked because crash knew about the internal code of send_IPI_allbutself(). Change crash to use NMI_VECTOR instead, and remove the comment about how crash was abusing the function. This patch is a pre-requisite for fixing the problem where sending an IPI as NMI would reboot some Dell Xeon systems. I cannot fix that problem while crash continus to abuse send_IPI_allbutself(). It also removes the inconsistency between i386 and x86_64 for NMI_VECTOR. That will simplify all the RAS code that needs to bring all the cpus to a clean stop, even when one or more cpus are spinning disabled. Signed-off-by: Keith Owens Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9c63f8738734eb7e6d3f76ca03186f16ef88edf5 tree cebc6fd2410b9db4cbb9984e68c1841761edeaa5 parent d39159c27fe1375bb7773d364213b1047265022c author Piotr Kaczuba Mon, 26 Jun 2006 13:59:38 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:21 -0700 [PATCH] x86_64: Fix modular pc speaker It turned out that the following change is needed when the speaker is compiled as a module. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d39159c27fe1375bb7773d364213b1047265022c tree df739b757e042cf781af34dfbfb5630b28107811 parent 409f89e0efcfea1a8b25f9c4a050c0cf1f1cb87c author Adrian Bunk Mon, 26 Jun 2006 13:59:35 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:21 -0700 [PATCH] x86_64: remove sys32_ni_syscall() This patch removes the no longer used sys32_ni_syscall() Signed-off-by: Adrian Bunk Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 409f89e0efcfea1a8b25f9c4a050c0cf1f1cb87c tree 21ce71ccd66e34c6a9be99da0703ba808b773eca parent 899ced0dd9457b9c349663ca4cb4ec09167728a6 author Sergey Vlasov Mon, 26 Jun 2006 13:59:32 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:21 -0700 [PATCH] x86_64: Do not use -ffunction-sections for modules Currently CONFIG_REORDER uses -ffunction-sections for all code; however, creating a separate section for each function is not useful for modules and just adds bloat. Moving this option from CFLAGS to CFLAGS_KERNEL shrinks module object files (e.g., the module tree for a kernel built with most drivers as modules shrinked from 54M to 46M), and decreases the number of sysfs files in /sys/module/*/sections/ directories. Signed-off-by: Sergey Vlasov Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 899ced0dd9457b9c349663ca4cb4ec09167728a6 tree 9b23a1d8fa804b28dba69df494bc8dc16d772738 parent cab093b9d4b40c71c6261a11ba8f1ca027e09008 author Andreas Mohr Mon, 26 Jun 2006 13:59:29 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:21 -0700 [PATCH] x86_64: Add cpu_relax to apic_wait_icr_idle This one is adding a cpu_relax() that already existed in the i386 version. Signed-off-by: Andreas Mohr Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit cab093b9d4b40c71c6261a11ba8f1ca027e09008 tree 0d29ab7454531d5fa7745760764df44c446c0c91 parent bdbdaa791fb5b97ba5b3124c7593ffe308e2afef author Jan Beulich Mon, 26 Jun 2006 13:59:26 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:21 -0700 [PATCH] x86_64: adjust kstack_depth_to_print default Defaulting to a value not evenly divisible by four makes little sense, as four values are displayed per line (and hence the rest of the line would otherwise be wasted). Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bdbdaa791fb5b97ba5b3124c7593ffe308e2afef tree afaee26e7e91112dbe76d2df8a8ae0d374df8fae parent da5311258d2afb96fc592c8b11e818facfa46dc3 author Jan Beulich Mon, 26 Jun 2006 13:59:23 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:21 -0700 [PATCH] i386/x86-64: adjust /proc/interrupts column headings With (significantly) more than 10 CPUs online, the column headings drifted off the positions of the column contents with growing CPU numbers. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit da5311258d2afb96fc592c8b11e818facfa46dc3 tree cdd51f187028cb2cd3da716cb7c1b3df88902ed6 parent 75bd665cc9f4d0f67164d9145e446ae554d4ed3f author Andi Kleen Mon, 26 Jun 2006 13:59:20 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:21 -0700 [PATCH] x86_64: Fix race in cpu_local_* on preemptible kernels When a process changes CPUs while doing the non atomic cpu_local_* operations it might operate on the local_t of a different CPUs. Fix that by disabling preemption. Pointed out by Christopher Lameter Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 75bd665cc9f4d0f67164d9145e446ae554d4ed3f tree ddfd134ef54138eea8e341039466c7e470203c71 parent e42f94373764d825e2c0464092738f66f5d3effb author Andi Kleen Mon, 26 Jun 2006 13:59:17 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:21 -0700 [PATCH] x86_64: Fix fast check in safe_smp_processor_id The APIC ID returned by hard_smp_processor_id can be beyond NR_CPUS and then overflow the x86_cpu_to_apic[] array. Add a check for overflow. If it happens then the slow loop below will catch. Bug pointed out by Doug Thompson Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e42f94373764d825e2c0464092738f66f5d3effb tree a8b6a567e0ab70135b9c053b158b3ca2f1e22c20 parent 495ab9c045e1b0e5c82951b762257fe1c9d81564 author Rohit Seth Mon, 26 Jun 2006 13:59:14 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:21 -0700 [PATCH] x86_64: x86_64 setup.c - printing cmp related boottime information Getting phys_proc_id and cpu_core_id information to be printed at boot time for AMD processors. Also matching the Node related boot time information that gets printed for Intel and AMD processors for NUMA configurations. Signed-off-by: Rohit Seth Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 495ab9c045e1b0e5c82951b762257fe1c9d81564 tree f95c376015d340794f64f36fd52f8fa80a1daab7 parent d9005b52de7bc9b20afa93e06d3e15843bafc12f author Andi Kleen Mon, 26 Jun 2006 13:59:11 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:21 -0700 [PATCH] i386/x86-64/ia64: Move polling flag into thread_info_status During some profiling I noticed that default_idle causes a lot of memory traffic. I think that is caused by the atomic operations to clear/set the polling flag in thread_info. There is actually no reason to make this atomic - only the idle thread does it to itself, other CPUs only read it. So I moved it into ti->status. Converted i386/x86-64/ia64 for now because that was the easiest way to fix ACPI which also manipulates these flags in its idle function. Cc: Nick Piggin Cc: Tony Luck Cc: Len Brown Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d9005b52de7bc9b20afa93e06d3e15843bafc12f tree 4a55cd045b40dba9736a8be6efc36e3fdc4a7537 parent 8fa3d6fc5e952300c26490167a93bf502de03a99 author Andi Kleen Mon, 26 Jun 2006 13:59:08 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:20 -0700 [PATCH] x86_64: Remove bogus RED-PEN comment in signal.c No red zone possible/needed on the alternative stack. It caused confusion. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8fa3d6fc5e952300c26490167a93bf502de03a99 tree def24d7abd54652784614d565a822d9145eefb33 parent 5f51e139d8b29116779044f26f84cceae34c31a4 author Andrew Morton Mon, 26 Jun 2006 13:59:05 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:20 -0700 [PATCH] x86_64: check_addr() cleanups - Use DMA_32BIT_MASK - Use %z for size_t - 80-cols Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5f51e139d8b29116779044f26f84cceae34c31a4 tree 23fd510f939878a3c833cf8b657d4f27ec30049d parent b633237e9c1b91b86c431c5d41266b47408b4642 author Jan Beulich Mon, 26 Jun 2006 13:59:02 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:20 -0700 [PATCH] x86_64: miscellaneous mm/init.c fixes - fix an off-by-one error in phys_pmd_init() - prevent phys_pmd_init() from removing mappings established earlier - fix the direct mapping early printk to in fact show the end of the range - remove an apparently orphan comment Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b633237e9c1b91b86c431c5d41266b47408b4642 tree 3be108c43b239736596e10b28609115a0a6b66ea parent 2903ee85ce462d66955b800a0c48e26e51de0aae author Andi Kleen Mon, 26 Jun 2006 13:58:59 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:20 -0700 [PATCH] x86_64: Mark mce_amd cpu notifier __cpuinit/__cpuinitdata Cc: Jacob Shin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2903ee85ce462d66955b800a0c48e26e51de0aae tree d7c452273667bb2145328aee7e90e68d8a8a516c parent 95268664390b19962ed41a3506c5bc8149db71e8 author Jacob Shin Mon, 26 Jun 2006 13:58:56 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:20 -0700 [PATCH] x86_64: mce_amd cleanup Clean up mce_amd.c for readability and remove code no longer needed. Signed-off-by: Jacob Shin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 95268664390b19962ed41a3506c5bc8149db71e8 tree 5085fd67ead36a1d278ebdad428d7c1c5dafcecc parent fff2e89f11dd9b9b45e9212bc543154ca3d028a1 author Jacob Shin Mon, 26 Jun 2006 13:58:53 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:20 -0700 [PATCH] x86_64: mce_amd support for family 0x10 processors Add support for mce threshold registers found in future AMD family 0x10 processors. Backwards compatible with family 0xF hardware. AK: fixed build on !SMP Signed-off-by: Jacob Shin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit fff2e89f11dd9b9b45e9212bc543154ca3d028a1 tree fa25f3e41cf642f23c187a2fb13c0595eba825bc parent 17fc14ff1bdbc393e1cf4f6fd1e1e53d72ab9fe5 author Jacob Shin Mon, 26 Jun 2006 13:58:50 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:20 -0700 [PATCH] x86_64: mce_amd relocate sysfs files Get rid of /sys/devices/system/threshold directory and move mce_amd thresholding files into the machine sysfs directory -- /sys/devices/system/machinecheck. AK: Fixed warning Signed-off-by: Jacob Shin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 17fc14ff1bdbc393e1cf4f6fd1e1e53d72ab9fe5 tree 9992a9079f4792f423f1e421d93814509b2c7d88 parent c38bfdc85aae0c6d1458269c0e063c2f4a116711 author Jacob Shin Mon, 26 Jun 2006 13:58:47 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:20 -0700 [PATCH] x86_64: apic support for extended apic interrupt Add support for extended APIC LVT found in future AMD processors. Signed-off-by: Jacob Shin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit c38bfdc85aae0c6d1458269c0e063c2f4a116711 tree 076cf7f521e7c7364a0e81b58b23062a607562e0 parent bf660254e0d430e5d991e432d5dad8d6714828f6 author Andi Kleen Mon, 26 Jun 2006 13:58:44 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:20 -0700 [PATCH] x86_64: Move VM86 config into arch/i386/Kconfig Architecture specific configs like this have no business at all in init/Kconfig. This prevents it from being set on x86-64 Pointed out by H.Peter Anvin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bf660254e0d430e5d991e432d5dad8d6714828f6 tree 42955c823512e3f0655128c297c7f1ccac78831a parent 2f82bde472184f989283c173c1eb95bab455a774 author Andi Kleen Mon, 26 Jun 2006 13:58:41 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:19 -0700 [PATCH] i386/x86-64: Fix isoimage when syslinux is in /usr/share It's like this on SUSE systems. Cc: hpa@zytor.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2f82bde472184f989283c173c1eb95bab455a774 tree 00cda3c70903f4c9257a26d2c5b70eadfe4c6c26 parent b2df3ddb68fc02e3bae78b7adaeca8561d02ea6d author Vojtech Pavlik Mon, 26 Jun 2006 13:58:38 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:19 -0700 [PATCH] x86_64: Update copyright in time.c Update my copyright dates in arch/x86-64/kernel/time.c Signed-off-by: Vojtech Pavlik Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b2df3ddb68fc02e3bae78b7adaeca8561d02ea6d tree 6787e6674fc52b1b31032cfa3edcf40034bf6bf0 parent 4221133845f81ab4428c79a89e37be2c87624c1a author Vojtech Pavlik Mon, 26 Jun 2006 13:58:35 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:19 -0700 [PATCH] x86_64: Explain why HPET T0_CMP register is written twice After writing the CFG register, the first value written to the T0_CMP register is the value at which next interrupt should be triggered, every value after that sets the period of the interrupt. For that reason, the code needs to write the value twice - to set both the phase and period. [AK: I had already figured it out by myself, but it's still useful to have a comment for this.] Signed-off-by: Vojtech Pavlik Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4221133845f81ab4428c79a89e37be2c87624c1a tree 884bfc1913bff964be43321cedb4653bfa976cf3 parent e30db3e69948dafb616d121e52c8d62d38dab68c author Vojtech Pavlik Mon, 26 Jun 2006 13:58:32 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:19 -0700 [PATCH] x86_64: Make use of the *PER* constants in time.c This patch makes use of the newly added conversion constants in time.h to x86-64 time.c. The code gets significantly easier to understand. Signed-off-by: Vojtech Pavlik Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e30db3e69948dafb616d121e52c8d62d38dab68c tree 14f03545e0796f7bbc5436f816ff044f76407bc0 parent 7b0e85012581a9a8b12a8191d365716bf3ca3d3c author Vojtech Pavlik Mon, 26 Jun 2006 13:58:29 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:19 -0700 [PATCH] x86_64: Remove hack to manually enable HPET on AMD8111 southbridges Remove #ifdefed code to manually enable HPET on AMD8111, where the BIOS doesn't have ACPI HPET tables and doesn't enable it for us. Signed-off-by: Vojtech Pavlik Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7b0e85012581a9a8b12a8191d365716bf3ca3d3c tree a8e8b5f20e910334d259f4ef8863b6a8273b3b6a parent f8bf3c65a962530821fa9a9b4bad43d8c7e13574 author Vojtech Pavlik Mon, 26 Jun 2006 13:58:26 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:19 -0700 [PATCH] x86_64: Add X86_FEATURE_RDTSCP, fix rdtscp in /proc/cpuinfo This patch adds the X86_FEATURE_RDTSCP #define, so that kernel code can check for the feature easily and also fixes the location of the "rdtscp" string in the cpuinfo tables. Signed-off-by: Vojtech Pavlik Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f8bf3c65a962530821fa9a9b4bad43d8c7e13574 tree b52d7fa60f52e877abced7470e705a6a544701b9 parent 05ebb76109f302b949e745724bbf0f0634dba43f author Vojtech Pavlik Mon, 26 Jun 2006 13:58:23 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:19 -0700 [PATCH] x86_64: Rename oem_force_hpet_timer to apic_is_clustered_box Rename oem_force_hpet_timer to apic_is_clustered_box, to give the function a better fitting name - it really isn't at all about HPET. Signed-off-by: Vojtech Pavlik Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 05ebb76109f302b949e745724bbf0f0634dba43f tree 350fa24df135197d53fef2e7d969b1bab7f97859 parent f3fa8ebc25129bb69929e20b0c84049c39029d8d author Vojtech Pavlik Mon, 26 Jun 2006 13:58:20 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:19 -0700 [PATCH] x86_64: Add useful constants to time.h In timekeeping code, one often does need to use conversion constants. Naming these leads to code that's easier to understand, showing the reader between which units the conversion is made. Signed-off-by: Vojtech Pavlik Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f3fa8ebc25129bb69929e20b0c84049c39029d8d tree 56b0df80a38128ca91a2e613d30c594e2e54f7c7 parent e465058d55a88feb4c7ecabe63eea7ea7147e206 author Rohit Seth Mon, 26 Jun 2006 13:58:17 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:19 -0700 [PATCH] x86_64: moving phys_proc_id and cpu_core_id to cpuinfo_x86 Most of the fields of cpuinfo are defined in cpuinfo_x86 structure. This patch moves the phys_proc_id and cpu_core_id for each processor to cpuinfo_x86 structure as well. Signed-off-by: Rohit Seth Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e465058d55a88feb4c7ecabe63eea7ea7147e206 tree d431ed689e072415915694eecdfbcb9304287f01 parent 0dc243ae10c8309c170a3af9f1adad1924a9f217 author Jon Mason Mon, 26 Jun 2006 13:58:14 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:19 -0700 [PATCH] x86_64: Calgary IOMMU - Calgary specific bits This patch hooks Calgary into the build, the x86-64 IOMMU initialization paths, and introduces the Calgary specific bits. The implementation draws inspiration from both PPC (which has support for the same chip but requires firmware support which we don't have on x86-64) and gart. Calgary is different from gart in that it support a translation table per PHB, as opposed to the single gart aperture. Changes from previous version: * Addition of boot-time disablement for bus-level translation/isolation (e.g, enable userspace DMA for things like X) * Usage of newer IOMMU abstraction functions Signed-off-by: Muli Ben-Yehuda Signed-off-by: Jon Mason Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0dc243ae10c8309c170a3af9f1adad1924a9f217 tree f550a8097913728ce96322d5f799329489db85a1 parent a3c042a0f022dade8e02bf6c9be5d2379d7e133c author Jon Mason Mon, 26 Jun 2006 13:58:11 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:18 -0700 [PATCH] x86_64: Calgary IOMMU - IOMMU abstractions This patch creates a new interface for IOMMUs by adding a centralized location for IOMMU allocation (for translation tables/apertures) and IOMMU initialization. In creating these, code was moved around for abstraction, uniformity, and consiceness. Take note of the move of the iommu_setup bootarg parsing code to __setup. This is enabled by moving back the location of the aperture allocation/detection to mem init (which while ugly, was already the location of the swiotlb_init). While a slight departure from the previous patch, I belive this provides the true intention of the previous versions of the patch which changed this code. It also makes the addition of the upcoming calgary code much cleaner than previous patches. [AK: Removed one broken change. iommu_setup still has to be called early] Signed-off-by: Muli Ben-Yehuda Signed-off-by: Jon Mason Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a3c042a0f022dade8e02bf6c9be5d2379d7e133c tree 0f690d13444c7c77c90da64ea9fb2373a21f7a4f parent 8d4f6b93a4aaa6b56b600cd1165c971f4395e4b3 author Jon Mason Mon, 26 Jun 2006 13:58:08 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:18 -0700 [PATCH] x86_64: Calgary IOMMU - move valid_dma_direction into the callers Based on Andi Kleen's comments on the original Calgary patch, move valid_dma_direction into the calling functions. Signed-off-by: Muli Ben-Yehuda Signed-off-by: Jon Mason Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8d4f6b93a4aaa6b56b600cd1165c971f4395e4b3 tree 23955634ded577e53c46390714a6f069b4587c86 parent 2bbc419f9d51b44f3fdeea12c5b786bdace82b8e author Jon Mason Mon, 26 Jun 2006 13:58:05 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:18 -0700 [PATCH] x86_64: Calgary IOMMU - introduce iommu_detected swiotlb relies on the gart specific iommu_aperture variable to know if we discovered a hardware IOMMU before swiotlb initialization. Introduce iommu_detected to do the same thing, but in a HW IOMMU neutral manner, in preparation for adding the Calgary HW IOMMU. Signed-Off-By: Muli Ben-Yehuda Signed-Off-By: Jon Mason Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2bbc419f9d51b44f3fdeea12c5b786bdace82b8e tree b7b3bbea8a92aaabd35571f1bdf7ca601626fe90 parent 46d13a384bc695ec61458e5dcbac1eee6d623a9b author Rohit Seth Mon, 26 Jun 2006 13:58:02 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:18 -0700 [PATCH] x86_64: Change assembly to use regular cpuid_count macro Minor cleanup patch: Replacing the asm statement with cpuid_count macro(which already provides the same functionality). Signed-off-by: Rohit Seth Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 46d13a384bc695ec61458e5dcbac1eee6d623a9b tree 35e5ed5eb3a2c989b63b3f9863b2e201d332e996 parent d2ae5b5f6afd3c4caaf82444102a4372135cb994 author Jan Beulich Mon, 26 Jun 2006 13:57:59 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:18 -0700 [PATCH] x86_64: use halt() instead of raw inline assembly Use abstractions whenever possible. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d2ae5b5f6afd3c4caaf82444102a4372135cb994 tree 4011a28241f4528f4d922cbe718797120b31036c parent b79c4df714ff190f7149d3d5a86278bdc25a90ec author Andi Kleen Mon, 26 Jun 2006 13:57:56 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:18 -0700 [PATCH] x86_64: Get rid of pud_offset_k / __pud_offset_k pud_offset_k() equivalent to pud_offset() now. Pointed out by Jan Beulich Similar for __pud_offset_ok, which needs a small change in the callers. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b79c4df714ff190f7149d3d5a86278bdc25a90ec tree e7fae9732a1d36a6e8399cdbe528e7fb1834f043 parent 83f4fcce7fdd213bd570b899862c3838871f8cf7 author Carl-Daniel Hailfinger Mon, 26 Jun 2006 13:57:53 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:18 -0700 [PATCH] i386/x86-64: Consolidate arch/{i386,x86_64}/boot/compressed/misc.c Clean up arch/{i386,x86_64}/boot/compressed/misc.c a bit to reduce their differences. Should have zero effect on code generation. Signed-off-by: Carl-Daniel Hailfinger Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 83f4fcce7fdd213bd570b899862c3838871f8cf7 tree ba66890ee98386e33b5d642af76291fabf8d0d29 parent c33bd9aac0597eeedaaa01ea5aafe456894b2f2b author Jan Beulich Mon, 26 Jun 2006 13:57:50 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:18 -0700 [PATCH] x86_64: allow unwinder to build without module support Add proper conditionals to be able to build with CONFIG_MODULES=n. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit c33bd9aac0597eeedaaa01ea5aafe456894b2f2b tree cdac9bb99eb3943feccc2a21d09a1524a8867cb0 parent fe7cacc1c25e286872b878c5d46880b620cd1e2d author Jan Beulich Mon, 26 Jun 2006 13:57:47 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:18 -0700 [PATCH] i386/x86-64: fall back to old-style call trace if no unwinding If no unwinding is possible at all for a certain exception instance, fall back to the old style call trace instead of not showing any trace at all. Also, allow setting the stack trace mode at the command line. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit fe7cacc1c25e286872b878c5d46880b620cd1e2d tree 36b0e47e15eb00c7ee4240cb28572952f4d39348 parent 176a2718f408ce92788b29127050b04dfd6e4f68 author Jan Beulich Mon, 26 Jun 2006 13:57:44 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:17 -0700 [PATCH] i386: reliable stack trace support i386 entry.S To increase the usefulness of reliable stack unwinding, this adds CFI unwind annotations to many low-level i386 routines. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 176a2718f408ce92788b29127050b04dfd6e4f68 tree bb637b13098f821551d07d3a13d140a908e7bc04 parent dffead4e421e289c8434351400d24fd35723e874 author Jan Beulich Mon, 26 Jun 2006 13:57:41 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:17 -0700 [PATCH] i386: reliable stack trace support (i386) These are the i386-specific pieces to enable reliable stack traces. This is going to be even more useful once CFI annotations get added to he assembly code, namely to entry.S. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit dffead4e421e289c8434351400d24fd35723e874 tree 8b95fac885640f1abfa4b67758b3fb6a521e061a parent 1de9c3f67ec6fddfb85325bab551f4094f55f410 author Jan Beulich Mon, 26 Jun 2006 13:57:38 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:17 -0700 [PATCH] x86_64: reliable stack trace support (x86-64 syscall Adjust the CFA offset for 64- and 32-bit syscall entries so that the five slots pre-subtracted from the stack pointer do not appear to reside outside of the current frame. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1de9c3f67ec6fddfb85325bab551f4094f55f410 tree c3d469e9ea995a12e4ae299b27c9e747d3eaa3ac parent b538ed278b80641ee6d7b75497d5e14de1bb1137 author Jan Beulich Mon, 26 Jun 2006 13:57:35 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:17 -0700 [PATCH] x86_64: reliable stack trace support (x86-64 IRQ stack Change the switching to/from the IRQ stack so that unwind annotations can be added for it without requiring CFA expressions. AK: I cleaned it up a bit, making it unconditional and removing the obsolete DEBUG_INFO full frame code. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b538ed278b80641ee6d7b75497d5e14de1bb1137 tree fe508a2f950ec08c832474a253f41b188ceece75 parent 4552d5dc08b79868829b4be8951b29b07284753f author Jan Beulich Mon, 26 Jun 2006 13:57:32 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:17 -0700 [PATCH] x86_64: reliable stack trace support (x86-64) These are the x86_64-specific pieces to enable reliable stack traces. The only restriction with this is that it currently cannot unwind across the interrupt->normal stack boundary, as that transition is lacking proper annotation. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4552d5dc08b79868829b4be8951b29b07284753f tree 7b25695b4c0e1917fc80e8dd4bc494de36320ccc parent 2b28592b07223d7fc0691ce3fe57d495dc9cbe3a author Jan Beulich Mon, 26 Jun 2006 13:57:28 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:17 -0700 [PATCH] x86_64: reliable stack trace support These are the generic bits needed to enable reliable stack traces based on Dwarf2-like (.eh_frame) unwind information. Subsequent patches will enable x86-64 and i386 to make use of this. Thanks to Andi Kleen and Ingo Molnar, who pointed out several possibilities for improvement. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2b28592b07223d7fc0691ce3fe57d495dc9cbe3a tree ca5c7939d8b23fb40714784fa4a5040ddcd8a7d1 parent a813ce432f27c4f5011c7b5ac9d2bbbfeb41d9a7 author bibo,mao Mon, 26 Jun 2006 13:57:25 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:17 -0700 [PATCH] x86_64: x86_86 msi miss one entry handler In x86_64 architecture, if device driver with msi function gets 0xee vector by assign_irq_vector() function, system will crash if this interrupt happens. It is because 0xee interrupt entry is empty. This patch modifies this. This patch is based on 2.6.17-rc6. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a813ce432f27c4f5011c7b5ac9d2bbbfeb41d9a7 tree 377a1aeb76547faf06ecd93b9da9b4c90817b2d4 parent 4d9bc79cd28b779610d9590b3a96a28a0f64a25a author Andi Kleen Mon, 26 Jun 2006 13:57:22 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:17 -0700 [PATCH] x86_64: Rename IOMMU option, fix help and mark option embedded. - Rename the GART_IOMMU option to IOMMU to make clear it's not just for AMD - Rewrite the help text to better emphatise this fact - Make it an embedded option because too many people get it wrong. To my astonishment I discovered the aacraid driver tests this symbol directly. This looks quite broken to me - it's an internal implementation detail of the PCI DMA API. Can the maintainer please clarify what this test was intended to do? Cc: linux-scsi@vger.kernel.org Cc: alan@redhat.com Cc: markh@osdl.org Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4d9bc79cd28b779610d9590b3a96a28a0f64a25a tree 83af4802b88318fe7951125bc663008a1adec62a parent 26a3c49cec96ffb9cfcc30dfa0cd05ccc25dcb3a author Andi Kleen Mon, 26 Jun 2006 13:57:19 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:17 -0700 [PATCH] x86_64: Make sure is_compat_task works early Previously it would only work in the first 32bit system call, not during early process setup. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 26a3c49cec96ffb9cfcc30dfa0cd05ccc25dcb3a tree 920ef76b04ee3bdea0fe8ead5c7b861ec4fb8b6f parent 357c2b9056df447390b7df3e49960a4c609a89a9 author Ingo Molnar Mon, 26 Jun 2006 13:57:16 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:17 -0700 [PATCH] x86_64: fix vector_lock deadlock in io_apic.c Fix a potential deadlock scenario introduced by io_apic.c's new vector_lock on i386 and x86_64. Found by the locking correctness validator. The patch was boot-tested on x86. For details of the deadlock scenario, see the validator output: ====================================================== [ BUG: hard-safe -> hard-unsafe lock order detected! ] ------------------------------------------------------ idle/1 [HC0[0]:SC0[0]:HE0:SE1] is trying to acquire: (msi_lock){....}, at: [] startup_msi_irq_wo_maskbit+0x10/0x35 and this task is already holding: (&irq_desc[i].lock){++..}, at: [] probe_irq_on+0x36/0x107 which would create a new lock dependency: (&irq_desc[i].lock){++..} -> (msi_lock){....} but this new dependency connects a hard-irq-safe lock: (&irq_desc[i].lock){++..} ... which became hard-irq-safe at: [] lockdep_acquire+0x68/0x84 [] _spin_lock+0x21/0x2f [] __do_IRQ+0x3d/0x113 [] do_IRQ+0x8c/0xad to a hard-irq-unsafe lock: (vector_lock){--..} ... which became hard-irq-unsafe at: ... [] lockdep_acquire+0x68/0x84 [] _spin_lock+0x21/0x2f [] assign_irq_vector+0x34/0xc8 [] setup_IO_APIC+0x45a/0xcff [] smp_prepare_cpus+0x5ea/0x8aa [] init+0x32/0x2cb [] kernel_thread_helper+0x5/0xb which could potentially lead to deadlocks! other info that might help us debug this: 3 locks held by idle/1: #0: (port_mutex){--..}, at: [] uart_add_one_port+0x61/0x289 #1: (&state->mutex){--..}, at: [] uart_add_one_port+0x73/0x289 #2: (&irq_desc[i].lock){++..}, at: [] probe_irq_on+0x36/0x107 the hard-irq-safe lock's dependencies: -> (&irq_desc[i].lock){++..} ops: 9861 { initial-use at: [] lockdep_acquire+0x68/0x84 [] _spin_lock_irqsave+0x2a/0x3a [] setup_irq+0x9b/0x14d [] time_init_hook+0xf/0x11 [] time_init+0x44/0x46 [] start_kernel+0x191/0x38f [] 0xc0100210 in-hardirq-W at: [] lockdep_acquire+0x68/0x84 [] _spin_lock+0x21/0x2f [] __do_IRQ+0x3d/0x113 [] do_IRQ+0x8c/0xad in-softirq-W at: [] lockdep_acquire+0x68/0x84 [] _spin_lock+0x21/0x2f [] __do_IRQ+0x3d/0x113 [] do_IRQ+0x8c/0xad } ... key at: [] irq_desc_lock_type+0x0/0x20 -> (i8259A_lock){++..} ops: 5149 { initial-use at: [] lockdep_acquire+0x68/0x84 [] _spin_lock_irqsave+0x2a/0x3a [] init_8259A+0x11/0x8f [] init_ISA_irqs+0x12/0x4d [] pre_intr_init_hook+0x8/0xa [] init_IRQ+0xe/0x65 [] start_kernel+0x178/0x38f [] 0xc0100210 in-hardirq-W at: [] lockdep_acquire+0x68/0x84 [] _spin_lock_irqsave+0x2a/0x3a [] mask_and_ack_8259A+0x1b/0xcc [] __do_IRQ+0x4f/0x113 [] do_IRQ+0x8c/0xad in-softirq-W at: [] lockdep_acquire+0x68/0x84 [] _spin_lock_irqsave+0x2a/0x3a [] mask_and_ack_8259A+0x1b/0xcc [] __do_IRQ+0x4f/0x113 [] do_IRQ+0x8c/0xad } ... key at: [] i8259A_lock+0x14/0x40 ... acquired at: [] lockdep_acquire+0x68/0x84 [] _spin_lock_irqsave+0x2a/0x3a [] enable_8259A_irq+0x10/0x47 [] startup_8259A_irq+0x8/0xc [] setup_irq+0xe4/0x14d [] time_init_hook+0xf/0x11 [] time_init+0x44/0x46 [] start_kernel+0x191/0x38f [] 0xc0100210 -> (ioapic_lock){+...} ops: 122 { initial-use at: [] lockdep_acquire+0x68/0x84 [] _spin_lock_irqsave+0x2a/0x3a [] io_apic_get_version+0x16/0x55 [] mp_register_ioapic+0xc6/0x127 [] acpi_parse_ioapic+0x2d/0x39 [] acpi_table_parse_madt_family+0xb4/0x100 [] acpi_table_parse_madt+0x16/0x18 [] acpi_boot_init+0x132/0x251 [] setup_arch+0xd36/0xe37 [] start_kernel+0x66/0x38f [] 0xc0100210 in-hardirq-W at: [] lockdep_acquire+0x68/0x84 [] _spin_lock_irqsave+0x2a/0x3a [] mask_IO_APIC_irq+0x11/0x31 [] ack_edge_ioapic_vector+0x31/0x41 [] __do_IRQ+0x4f/0x113 [] do_IRQ+0x8c/0xad } ... key at: [] ioapic_lock+0x14/0x3c -> (i8259A_lock){++..} ops: 5149 { initial-use at: [] lockdep_acquire+0x68/0x84 [] _spin_lock_irqsave+0x2a/0x3a [] init_8259A+0x11/0x8f [] init_ISA_irqs+0x12/0x4d [] pre_intr_init_hook+0x8/0xa [] init_IRQ+0xe/0x65 [] start_kernel+0x178/0x38f [] 0xc0100210 in-hardirq-W at: [] lockdep_acquire+0x68/0x84 [] _spin_lock_irqsave+0x2a/0x3a [] mask_and_ack_8259A+0x1b/0xcc [] __do_IRQ+0x4f/0x113 [] do_IRQ+0x8c/0xad in-softirq-W at: [] lockdep_acquire+0x68/0x84 [] _spin_lock_irqsave+0x2a/0x3a [] mask_and_ack_8259A+0x1b/0xcc [] __do_IRQ+0x4f/0x113 [] do_IRQ+0x8c/0xad } ... key at: [] i8259A_lock+0x14/0x40 ... acquired at: [] lockdep_acquire+0x68/0x84 [] _spin_lock_irqsave+0x2a/0x3a [] disable_8259A_irq+0x10/0x47 [] startup_edge_ioapic_vector+0x31/0x58 [] setup_irq+0xe4/0x14d [] request_irq+0xda/0xf9 [] rtc_init+0x6a/0x1a7 [] init+0x14a/0x2cb [] kernel_thread_helper+0x5/0xb ... acquired at: [] lockdep_acquire+0x68/0x84 [] _spin_lock_irqsave+0x2a/0x3a [] mask_IO_APIC_irq+0x11/0x31 [] ack_edge_ioapic_vector+0x31/0x41 [] __do_IRQ+0x4f/0x113 [] do_IRQ+0x8c/0xad the hard-irq-unsafe lock's dependencies: -> (vector_lock){--..} ops: 31 { initial-use at: [] lockdep_acquire+0x68/0x84 [] _spin_lock+0x21/0x2f [] assign_irq_vector+0x34/0xc8 [] setup_IO_APIC+0x45a/0xcff [] smp_prepare_cpus+0x5ea/0x8aa [] init+0x32/0x2cb [] kernel_thread_helper+0x5/0xb softirq-on-W at: [] lockdep_acquire+0x68/0x84 [] _spin_lock+0x21/0x2f [] assign_irq_vector+0x34/0xc8 [] setup_IO_APIC+0x45a/0xcff [] smp_prepare_cpus+0x5ea/0x8aa [] init+0x32/0x2cb [] kernel_thread_helper+0x5/0xb hardirq-on-W at: [] lockdep_acquire+0x68/0x84 [] _spin_lock+0x21/0x2f [] assign_irq_vector+0x34/0xc8 [] setup_IO_APIC+0x45a/0xcff [] smp_prepare_cpus+0x5ea/0x8aa [] init+0x32/0x2cb [] kernel_thread_helper+0x5/0xb } ... key at: [] vector_lock+0x14/0x3c stack backtrace: [] show_trace+0xd/0xf [] dump_stack+0x17/0x19 [] check_usage+0x1f6/0x203 [] __lockdep_acquire+0x8c2/0xaa5 [] lockdep_acquire+0x68/0x84 [] _spin_lock_irqsave+0x2a/0x3a [] startup_msi_irq_wo_maskbit+0x10/0x35 [] probe_irq_on+0x44/0x107 [] serial8250_config_port+0x84b/0x986 [] uart_add_one_port+0x105/0x289 [] serial8250_init+0xc3/0x10a [] init+0x14a/0x2cb [] kernel_thread_helper+0x5/0xb Signed-off-by: Ingo Molnar Cc: Jan Beulich Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 357c2b9056df447390b7df3e49960a4c609a89a9 tree b4eeb5ee6dd59a32482f4498c676bac280455cb3 parent 08cd36570e47176c7b6bd3e80125aa46c4638097 author Jon Mason Mon, 26 Jun 2006 13:57:13 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:16 -0700 [PATCH] x86_64: remove unused gart header file include/asm-x86_64/gart-mapping.h is only ever used in arch/x86_64/kernel/setup.c and none of its contents are referenced. Looks to be leftover cruft not removed in the dma_ops patch. Signed-off-by: Jon Mason Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 08cd36570e47176c7b6bd3e80125aa46c4638097 tree 02c9cb3be4a2b520772e9b66bb57901401dd2666 parent 5282aab87a8be3f5e6c36a4c2ee4b71852def1bb author Andi Kleen Mon, 26 Jun 2006 13:57:10 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:16 -0700 [PATCH] x86_64: Optimize bitmap_weight for small bitmaps Use inline code bitmaps <= BITS_PER_LONG in bitmap_weight. This gives _much_ better code. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5282aab87a8be3f5e6c36a4c2ee4b71852def1bb tree 319d96e66e3beca077206720ccff1b8347918a20 parent 5c0f80fab3724aa44b3352d88155fe0eaae0e54a author Andi Kleen Mon, 26 Jun 2006 13:57:07 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:16 -0700 [PATCH] x86_64: Remove ia32_sys_call_table export It was originally added for 2.4 oprofile, but 2.6 oprofile doesn't need that anymore. Shouldn't be any use in tree anymore and it doesn't make much sense to export the ia32 syscalls when the main syscalls are not exported. I think Adrian Bunk asked for removing it several times. Also included hunk from Adrian to remove the .globl ia32_sys_call_table Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5c0f80fab3724aa44b3352d88155fe0eaae0e54a tree da598a78562b711dadee8feaaeacee08a4a0134b parent 3e4ff115740c28dea463561aa1405a3c0de0d2d0 author Andi Kleen Mon, 26 Jun 2006 13:57:04 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:16 -0700 [PATCH] x86_64: Remove long obsolete CVS Early development of x86-64 Linux was in CVS, but that hasn't been the case for a long time now. Remove the obsolete $Id$s. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3e4ff115740c28dea463561aa1405a3c0de0d2d0 tree 517e293240ae7f2ccb6b4545a6d9a22660e46f02 parent 14118c3cdd46d72e503ee2f727b11d881f72f755 author Don Zickus Mon, 26 Jun 2006 13:57:01 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:16 -0700 [PATCH] x86_64: nmi watchdog header cleanup Misc header cleanup for nmi watchdog. Signed-off-by: Don Zickus Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 14118c3cdd46d72e503ee2f727b11d881f72f755 tree dd17cb39fddee25dc251df2734a8e174f45da4e6 parent 4b787e0b831c71c6b09902b66575dadb2260a7c8 author Ingo Molnar Mon, 26 Jun 2006 13:56:58 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:16 -0700 [PATCH] x86_64: fix unlikely profiling & vsyscalls on x86_64 fix unlikely profiling in vsyscalls ... Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4b787e0b831c71c6b09902b66575dadb2260a7c8 tree 73ad905b40a5a07c0ccce8d75544bd7f320dc7c0 parent bebfa1013eee1d91b3242e5801cc8fbdfaf148ec author Jan Beulich Mon, 26 Jun 2006 13:56:55 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:16 -0700 [PATCH] x86_64: add END()/ENDPROC() annotations to entry.S Since END()/ENDPROC() are now available, add respective annotations to x86_64's entry.S. This should help debugging activities. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bebfa1013eee1d91b3242e5801cc8fbdfaf148ec tree d1abf916c29bbb5c312717f57798987268aff9a9 parent f201611fcecdfa825471dc425ee007997228fae4 author Andi Kleen Mon, 26 Jun 2006 13:56:52 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:16 -0700 [PATCH] x86_64: Add compat_printk and sysctl to turn off compat layer warnings Sometimes e.g. with crashme the compat layer warnings can be noisy. Add a way to turn them off by gating all output through compat_printk that checks a global sysctl. The default is not changed. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f201611fcecdfa825471dc425ee007997228fae4 tree a44d043b26b0030bd5f192a0bd1f9861a36bcde2 parent 6ebcc00e95fa78218a048a88d8d5ee491aa7d6d0 author Andi Kleen Mon, 26 Jun 2006 13:56:49 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:15 -0700 [PATCH] x86_64: Use -ENODEV in IOMMU initialization Fix initcall at 0xffffffff806c5b89: pci_iommu_init+0x0/0x53c(): returned with error code -1 Return -ENODEV instead when the IOMMU is not used. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6ebcc00e95fa78218a048a88d8d5ee491aa7d6d0 tree 9c9302b86c8a0b15c69371973c77afbb58542a5c parent 0a1ad60d7a7eb433095bc1b2c8b475f3f278f61d author Jan Beulich Mon, 26 Jun 2006 13:56:46 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:15 -0700 [PATCH] i386/x86-64: simplify ioapic_register_intr() Simplify (remove duplication of) code in ioapic_register_intr(). Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0a1ad60d7a7eb433095bc1b2c8b475f3f278f61d tree b7f0efd5d2afb879b8ff9bfbc44c6ea94b3e7a89 parent a32073bffc656ca4bde6002b6cf7c1a8e0e22712 author Jan Beulich Mon, 26 Jun 2006 13:56:43 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:15 -0700 [PATCH] x86_64: serialize assign_irq_vector() use of static variables Since assign_irq_vector() can be called at runtime, its access of static variables should be protected by a lock. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a32073bffc656ca4bde6002b6cf7c1a8e0e22712 tree 5ddcd3107eca8807685a19490c2c849d728a51a6 parent 7c2d9cd218916276e52a5dae827b84a159fe5c96 author Andi Kleen Mon, 26 Jun 2006 13:56:40 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:15 -0700 [PATCH] x86_64: Clean and enhance up K8 northbridge access code - Factor out the duplicated access/cache code into a single file * Shared between i386/x86-64. - Share flush code between AGP and IOMMU * Fix a bug: AGP didn't wait for end of flush before - Drop 8 northbridges limit and allocate dynamically - Add lock to serialize AGP and IOMMU GART flushes - Add PCI ID for next AMD northbridge - Random related cleanups The old K8 NUMA discovery code is unchanged. New systems should all use SRAT for this. Cc: "Navin Boppuri" Cc: Dave Jones Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7c2d9cd218916276e52a5dae827b84a159fe5c96 tree 922891554c06e3a58d99efd9d21095a790d22adb parent f0f2d6536e3515b5b1b7ae97dc8f176860c8c2ce author Jon Mason Mon, 26 Jun 2006 13:56:37 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:15 -0700 [PATCH] x86_64: trivial gart clean-up A trivial change to have gart_unmap_sg call gart_unmap_single directly, instead of bouncing through the dma_unmap_single wrapper in dma-mapping.h. This change required moving the gart_unmap_single above gart_unmap_sg, and under gart_map_single (which seems a more logical place that its current location IMHO). Signed-off-by: Jon Mason Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f0f2d6536e3515b5b1b7ae97dc8f176860c8c2ce tree 6d26714a540c0b77e1573522b46c5b74989c4950 parent f5adc9c79d3a15478c0028139c54453ff3900488 author Andi Kleen Mon, 26 Jun 2006 13:56:34 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:15 -0700 [PATCH] x86_64: Implement compat functions for PTRACE_SETSIGINFO/GETSIGINFO Previously we would just silently provide 64 bit services for this to 32bit processes. I also added all the other cases explicitely to the ptrace compat wrapper to make sure this doesn't happen again. And removed one bogus check in the wrapper. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f5adc9c79d3a15478c0028139c54453ff3900488 tree f8829f7aa53781985e2bcb4a6c55a76a3ff21350 parent ed0a893fc8866baf116323acbcd883a3cc4a36a3 author Mike Waychison Mon, 26 Jun 2006 13:56:31 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:15 -0700 [PATCH] x86_64: iommu_gart_bitmap search to cross next_bit Allow search for a contiguous block of iommu space to cross the next_bit marker if we have already committed ourselves to flushing the gart. There shouldn't be any reason why we'd restrict the search. Signed-off-by: Mike Waychison Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ed0a893fc8866baf116323acbcd883a3cc4a36a3 tree 059173e7ad1050f618db5a0b4312fd22401983eb parent 3c5846470c30580bbcb4d5f2339f75a2c88cfe6e author Andi Kleen Mon, 26 Jun 2006 13:56:28 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:15 -0700 [PATCH] x86_64: Remove bogus comment in topology.h Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3c5846470c30580bbcb4d5f2339f75a2c88cfe6e tree 1aa3622ede1d72be42ab6707a79cf1ab033ffc87 parent 0c90bb87730613709e65c03c86d614e31a675d4f author Ingo Molnar Mon, 26 Jun 2006 13:56:25 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:15 -0700 [PATCH] x86_64: x86_64-enable-large-bzImage.patch enable large bzImages on x86_64. (fix is from x86's build.c) Using this patch i have successfully built and booted an allyesconfig 13MB+ bzImage on x86_64 too: $ size64 vmlinux text data bss dec hex filename 23444831 8202642 3439360 35086833 21761f1 vmlinux -rw-rw-r-- 1 mingo mingo 13121740 Apr 19 09:32 arch/x86_64/boot/bzImage Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0c90bb87730613709e65c03c86d614e31a675d4f tree eaa60cb20b39567dedb2552b5d48c1b12a72cefb parent 9f2036f3e280ef1df072c5b2ca115a0e766c1d10 author Andi Kleen Mon, 26 Jun 2006 13:56:22 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:15 -0700 [PATCH] x86_64: Remove most of ia32_unistd.h It's only needed for three system calls, no need to maintain a full list forever. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9f2036f3e280ef1df072c5b2ca115a0e766c1d10 tree aea40066112f6621fdbfec5d8fb5321e6f338fb4 parent d167a51877e94dda73dd656c51f363502309f713 author Jon Mason Mon, 26 Jun 2006 13:56:19 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:14 -0700 [PATCH] x86_64: pci-dma.c clean-up - trivial Replace hard coded DMA masks with #defines from include/linux/dma-mapping.h Signed-off-by: Jon Mason Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d167a51877e94dda73dd656c51f363502309f713 tree eb02c2974b61777f575dfdc07d4c2adf83bde434 parent 240cd6a80642da528bfa382ec2ae4e3cb8991ea7 author Gerd Hoffmann Mon, 26 Jun 2006 13:56:16 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:14 -0700 [PATCH] x86_64: x86_64 version of the smp alternative patch. Changes are largely identical to the i386 version: * alternative #define are moved to the new alternative.h file. * one new elf section with pointers to the lock prefixes which can be nop'ed out for non-smp. * two new elf sections simliar to the "classic" alternatives to replace SMP code with simpler UP code. * fixup headers to use alternative.h instead of defining their own LOCK / LOCK_PREFIX macros. The patch reuses the i386 version of the alternatives code to avoid code duplication. The code in alternatives.c was shuffled around a bit to reduce the number of #ifdefs needed. It also got some tweaks needed for x86_64 (vsyscall page handling) and new features (noreplacement option which was x86_64 only up to now). Debug printk's are changed from compile-time to runtime. Loosely based on a early version from Bastian Blank Signed-off-by: Gerd Hoffmann Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 240cd6a80642da528bfa382ec2ae4e3cb8991ea7 tree 6c24052ea167a2fd7e0be93c167e9e7da5bddd2b parent faee9a5dc9d8399cc3b1b8e18b6d7ff7b17f1af1 author Andi Kleen Mon, 26 Jun 2006 13:56:13 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:14 -0700 [PATCH] i386/x86-64: Emulate CPUID4 on AMD Intel systems report the cache level data from CPUID 4 in sysfs. Add a CPUID 4 emulation for AMD CPUs to report the same information for them. This allows programs to read this information in a uniform way. The AMD way to report this is less flexible so some assumptions are hardcoded (e.g. no L3) Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit faee9a5dc9d8399cc3b1b8e18b6d7ff7b17f1af1 tree e909f4ca48bd3d61b06e3b77f4c380301cd7b857 parent 79121ea9f098934850347eeed3857ffd836810c3 author Andi Kleen Mon, 26 Jun 2006 13:56:10 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:14 -0700 [PATCH] i386/x86-64: Use new official CPUID to get APICID/core split on AMD platforms Previously the apicid<->coreid split was computed based on the max number of cores. Now use a new CPUID AMD defined for that. On most systems right now it should be 0 and the old method will be used. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 79121ea9f098934850347eeed3857ffd836810c3 tree 282973882b7e138f002c9d9c273896c3e65321d7 parent 0f4fdb7fba0b3ec66df39d0e743e701404161fb8 author Andi Kleen Mon, 26 Jun 2006 13:56:07 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:14 -0700 [PATCH] x86_64: Use __always_inline for __inline_memcpy Inspired from i386 changes Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0f4fdb7fba0b3ec66df39d0e743e701404161fb8 tree c54005e24d649db5c5c0c01ff0a3e01e29dbefd1 parent 7c393e7b95bceafcefd5357afdda9f5047b6aa69 author ravikiran thirumalai Mon, 26 Jun 2006 13:56:04 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:14 -0700 [PATCH] x86_64: Use local APIC ID from local APIC instead of CPUID vSMPowered systems use apic_cluster too. Forcing apic_physflat works on these systems too, but only if we change phys_pkg_id to use hard_smp_prcoessor_id() instead of cpuid_ebx. I am guessing other multichassi cluster systems would need this too. Signed-off-by: ravikiran thirumalai Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7c393e7b95bceafcefd5357afdda9f5047b6aa69 tree 01ddc3806ff98baabed8b89142e2155cfcf26831 parent fcc18e83e1f6fd9fa6b333735bf0fcd530655511 author Andi Kleen Mon, 26 Jun 2006 13:56:01 +0200 committer Linus Torvalds Mon, 26 Jun 2006 10:48:14 -0700 [PATCH] x86_64: Update defconfig Enable some hwmon drivers as modules and tulip and stack unwinding Kernel image should be somewhat bigger now because of the unwind information being included, but you'll get exact backtraces for that. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8871e73fdbde07d0a41393f7ee30787b65387b36 tree c54027e3ceb18f00db886871494d5e7b56e74b45 parent 61a46dc9d1c10d07a2ed6b7d346b868803b52506 parent 749805dc10e955b0170573061f9522a6a21cbae0 author Linus Torvalds Mon, 26 Jun 2006 10:08:32 -0700 committer Linus Torvalds Mon, 26 Jun 2006 10:08:32 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Add iomap interfaces. [OPENPROM]: Rewrite driver to use in-kernel device tree. [OPENPROMFS]: Rewrite using in-kernel device tree and seq_file. [SPARC]: Add unique device_node IDs and a ".node" property. [SPARC]: Add of_set_property() interface. [SPARC64]: Export auxio_register to modules. [SPARC64]: Add missing interfaces to dma-mapping.h [SPARC64]: Export _PAGE_IE to modules. [SPARC64]: Allow floppy driver to build modular. [SPARC]: Export x_bus_type to modules. [RIOWATCHDOG]: Fix the build. [CPWATCHDOG]: Fix the build. [PARPORT] sunbpp: Fix typo. [MTD] sun_uflash: Port to new EBUS device layer. commit 61a46dc9d1c10d07a2ed6b7d346b868803b52506 tree ac81648c6aa7315f42d1d17455ddf7f09d14e6b6 parent b78709cfd4387c15a9894748bcada8a4ca75c561 parent 8070b2b1ecbeb5437c92c33b4dcea1d8d80399ee author Linus Torvalds Mon, 26 Jun 2006 10:08:13 -0700 committer Linus Torvalds Mon, 26 Jun 2006 10:08:13 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits) [IOAT]: Do not dereference THIS_MODULE directly to set unsafe. [NETROM]: Fix possible null pointer dereference. [NET] netpoll: break recursive loop in netpoll rx path [NET] netpoll: don't spin forever sending to stopped queues [IRDA]: add some IBM think pads [ATM]: atm/mpc.c warning fix [NET]: skb_find_text ignores to argument [NET]: make net/core/dev.c:netdev_nit static [NET]: Fix GSO problems in dev_hard_start_xmit() [NET]: Fix CHECKSUM_HW GSO problems. [TIPC]: Fix incorrect correction to discovery timer frequency computation. [TIPC]: Get rid of dynamically allocated arrays in broadcast code. [TIPC]: Fixed link switchover bugs [TIPC]: Enhanced & cleaned up system messages; fixed 2 obscure memory leaks. [TIPC]: First phase of assert() cleanup [TIPC]: Disallow config operations that aren't supported in certain modes. [TIPC]: Fixed memory leak in tipc_link_send() when destination is unreachable [TIPC]: Added missing warning for out-of-memory condition [TIPC]: Withdrawing all names from nameless port now returns success, not error [TIPC]: Optimized argument validation done by connect(). ... commit 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c tree 425d5bbf1a5fac50cfba1d974651c786af940376 parent f274afc9933e5fd5987a4a2a5f02687958f8ba65 author olecom@mail.ru Mon, 26 Jun 2006 19:05:40 +0200 committer Adrian Bunk Mon, 26 Jun 2006 19:05:40 +0200 typo fixes Signed-off-by: Adrian Bunk commit b78709cfd4387c15a9894748bcada8a4ca75c561 tree 999f5beae5983280fa1c3d98cefb47ee4a95d83b parent 2139a7fbf3effd8cad505871e3a3c308780ada32 author Peter Williams Mon, 26 Jun 2006 16:58:00 +1000 committer Linus Torvalds Mon, 26 Jun 2006 10:02:41 -0700 [PATCH] sched: fix SCHED_FIFO bug in sys_sched_rr_get_interval() The introduction of SCHED_BATCH scheduling class with a value of 3 means that the expression (p->policy & SCHED_FIFO) will return true if policy is SCHED_BATCH or SCHED_FIFO. Unfortunately, this expression is used in sys_sched_rr_get_interval() and in the absence of a comment to say that this is intentional I presume that it is unintentional and erroneous. The fix is to change the expression to (p->policy == SCHED_FIFO). Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit f274afc9933e5fd5987a4a2a5f02687958f8ba65 tree 90f24f45b66312da3d675e8a8321bd0f13877592 parent 2efe55a9cec8418f0e0cde3dc3787a42fddc4411 author Jesper Juhl Mon, 26 Jun 2006 19:01:01 +0200 committer Adrian Bunk Mon, 26 Jun 2006 19:01:01 +0200 Clean up 'inline is not at beginning' warnings for usb storage Usually we don't care much about 'gcc -W' warnings, but some of us do build kernels that way to look for problems, and then the fewer warnings we have to wade through the better. Especially when they are very easy and non-intrusive to clean up. Which is the case for the following warnings spewed by drivers/usb/storage/usb.h : drivers/usb/storage/usb.h:163: warning: `inline' is not at beginning of +declaration drivers/usb/storage/usb.h:166: warning: `inline' is not at beginning of +declaration There's also some precedence for cleaning up these warnings. I've had a few patches merged in the past that remove exactly this class of warnings. Signed-off-by: Jesper Juhl Signed-off-by: Adrian Bunk commit 2139a7fbf3effd8cad505871e3a3c308780ada32 tree 7697089be2d16bab7b59d9f261bad857649a0a10 parent 05381954243de2348def8e338ca23fb40a0a721d author H. Peter Anvin Mon, 26 Jun 2006 00:28:02 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:40 -0700 [PATCH] initramfs overwrite fix This patch ensures that initramfs overwrites work correctly, even when dealing with device nodes of different types. Furthermore, when replacing a file which already exists, we must make very certain that we truncate the existing file. Signed-off-by: H. Peter Anvin Cc: Michael Neuling Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05381954243de2348def8e338ca23fb40a0a721d tree de3341922d1329cde035e7cd111c0ec6e9289199 parent f655675b3fe09c4d0506d357527fe07544623009 author Adrian Bunk Mon, 26 Jun 2006 00:28:01 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:40 -0700 [PATCH] drivers/md/md.c: make code static Make needlessly global code static. Signed-off-by: Adrian Bunk Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f655675b3fe09c4d0506d357527fe07544623009 tree 969a798b6ba25b88f08b0f9cfe1aed323be81d3e parent a94213b1fa7b26dcc271bf4b4f9eebf1f1af33a2 author NeilBrown Mon, 26 Jun 2006 00:28:01 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:40 -0700 [PATCH] md: Allow the write_mostly flag to be set via sysfs It appears in /sys/mdX/md/dev-YYY/state and can be set or cleared by writing 'writemostly' or '-writemostly' respectively. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a94213b1fa7b26dcc271bf4b4f9eebf1f1af33a2 tree 4954e6e461e2edf25bb63e9b286bfaea7a07a84a parent d4dbd0250ea1d24bb3d2d13559432fa069d795e2 author NeilBrown Mon, 26 Jun 2006 00:28:00 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:40 -0700 [PATCH] md: Allow resync_start to be set and queried via sysfs Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4dbd0250ea1d24bb3d2d13559432fa069d795e2 tree 060ec90679ea9d7a535146a35b0e9a8c9d940252 parent 45dc2de1e53a29f898b81326b8a16e6192d52e4e author NeilBrown Mon, 26 Jun 2006 00:27:59 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:39 -0700 [PATCH] md: Allow raid 'layout' to be read and set via sysfs Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45dc2de1e53a29f898b81326b8a16e6192d52e4e tree a1076950eef59cbe525435522d83757390f23c42 parent 9e653b6342c94016f5cc9937061ef99e9c4b4045 author NeilBrown Mon, 26 Jun 2006 00:27:58 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:39 -0700 [PATCH] md: Allow rdev state to be set via sysfs The md/dev-XXX/state file can now be written: "faulty" simulates an error on the device "remove" removes the device from the array (if it is not busy) Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e653b6342c94016f5cc9937061ef99e9c4b4045 tree ec6d984d1c6142a59a70308af511c3244276a8e5 parent 42543769142d2375f2b5f8fc9cac999f84bd4c4c author NeilBrown Mon, 26 Jun 2006 00:27:58 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:39 -0700 [PATCH] md: Set/get state of array via sysfs This allows the state of an md/array to be directly controlled via sysfs and adds the ability to stop and array without tearing it down. Array states/settings: clear No devices, no size, no level Equivalent to STOP_ARRAY ioctl inactive May have some settings, but array is not active all IO results in error When written, doesn't tear down array, but just stops it suspended (not supported yet) All IO requests will block. The array can be reconfigured. Writing this, if accepted, will block until array is quiescent readonly no resync can happen. no superblocks get written. write requests fail read-auto like readonly, but behaves like 'clean' on a write request. clean - no pending writes, but otherwise active. When written to inactive array, starts without resync If a write request arrives then if metadata is known, mark 'dirty' and switch to 'active'. if not known, block and switch to write-pending If written to an active array that has pending writes, then fails. active fully active: IO and resync can be happening. When written to inactive array, starts with resync write-pending (not supported yet) clean, but writes are blocked waiting for 'active' to be written. active-idle like active, but no writes have been seen for a while (100msec). Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42543769142d2375f2b5f8fc9cac999f84bd4c4c tree 404606c37da872639111c5b641f07fff2ded1dff parent 07d84d109d8beedd68df9da2e4e9f25c8217e7fb author NeilBrown Mon, 26 Jun 2006 00:27:57 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:39 -0700 [PATCH] md: Don't write dirty/clean update to spares - leave them alone - record the 'event' count on each individual device (they might sometimes be slightly different now) - add a new value for 'sb_dirty': '3' means that the super block only needs to be updated to record a clean<->dirty transition. - Prefer odd event numbers for dirty states and even numbers for clean states - Using all the above, don't update the superblock on a spare device if the update is just doing a clean-dirty transition. To accomodate this, a transition from dirty back to clean might now decrement the events counter if nothing else has changed. The net effect of this is that spare drives will not see any IO requests during normal running of the array, so they can go to sleep if that is what they want to do. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07d84d109d8beedd68df9da2e4e9f25c8217e7fb tree 09b4749cb2ff1759c076c362891a28ceda2b8520 parent 3285edf152cefff482f95ceb90b1bd46ac169df1 author NeilBrown Mon, 26 Jun 2006 00:27:56 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:39 -0700 [PATCH] md: Allow re-add to work on array without bitmaps When an array has a bitmap, a device can be removed and re-added and only blocks changes since the removal (as recorded in the bitmap) will be resynced. It should be possible to do a similar thing to arrays without bitmaps. i.e. if a device is removed and re-added and *no* changes have been made in the interim, then the add should not require a resync. This patch allows that option. This means that when assembling an array one device at a time (e.g. during device discovery) the array can be enabled read-only as soon as enough devices are available, but extra devices can still be added without causing a resync. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3285edf152cefff482f95ceb90b1bd46ac169df1 tree 88dd6e57f6405d71c621f136d236e1dde599e5a7 parent b3cc9ec76ba44d010f4c820c4608b91aaf28a0b9 author NeilBrown Mon, 26 Jun 2006 00:27:55 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:39 -0700 [PATCH] md: Fix bug that stops raid5 resync from happening As data_disks is *less* than raid_disks, the current test here is obviously wrong. And as the difference is already available in conf->max_degraded, it makes much more sense to use that. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3cc9ec76ba44d010f4c820c4608b91aaf28a0b9 tree 69fc8168c27c616a1a9830c5b992a4221aad7afc parent 4d2554d045497d1be3204cf67385f966f01cc9bd author akpm@osdl.org Mon, 26 Jun 2006 00:27:54 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:39 -0700 [PATCH] md: Fix Kconfig error RAID5 recently changed to RAID456 Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d2554d045497d1be3204cf67385f966f01cc9bd tree 2dcef5c96d3435eb6d8671e3696d6fe71e19efef parent 8838832830d2c6c28ae2db93188ae90652eb7fc2 author Justin Piszcz Mon, 26 Jun 2006 00:27:50 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:39 -0700 [PATCH] md: md Kconfig speeling feex I was experimenting with Linux SW raid today and found a spelling error when reading the help menus... (and fly spell found more). Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8838832830d2c6c28ae2db93188ae90652eb7fc2 tree d17a7027161352ea1893236dc6ea5bd309f6ceb4 parent ce25c31bdd3b39266debd86a7732007e05983a67 author NeilBrown Mon, 26 Jun 2006 00:27:50 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:39 -0700 [PATCH] md: Calculate correct array size for raid10 in new offset mode The size calculation made assumtion which the new offset mode didn't follow. This gets the size right in all cases. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce25c31bdd3b39266debd86a7732007e05983a67 tree 1afafa2a68eb71b702db0a24aff2feb52b9f56c7 parent d785a06a0b9d0cd86b3cc1bf8e236e62af7b47ed author NeilBrown Mon, 26 Jun 2006 00:27:49 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:38 -0700 [PATCH] md: Change md/bitmap file handling to use bmap to file blocks-fix Fix problems with new bmap based access to bitmap files. 1/ When not using a file based bitmap, attach a NULL list of buffers to each page so the common free_buffer routine can cope. 2/ Use submit_bh to read as well as write, rather than vfs_read. This makes read and write more symetric. 3/ sync the file before reading, to ensure that the page cache has no dirty pages that might get written out later. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d785a06a0b9d0cd86b3cc1bf8e236e62af7b47ed tree 7a238aedb0facb5c207a0477296e78b9ef7d551b parent acc55e220166a5ad898e66ad6153fd62eaaac76d author NeilBrown Mon, 26 Jun 2006 00:27:48 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:38 -0700 [PATCH] md/bitmap: change md/bitmap file handling to use bmap to file blocks If md is asked to store a bitmap in a file, it tries to hold onto the page cache pages for that file, manipulate them directly, and call a cocktail of operations to write the file out. I don't believe this is a supportable approach. This patch changes the approach to use the same approach as swap files. i.e. bmap is used to enumerate all the block address of parts of the file and we write directly to those blocks of the device. swapfile only uses parts of the file that provide a full pages at contiguous addresses. We don't have that luxury so we have to cope with pages that are non-contiguous in storage. To handle this we attach buffers to each page, and store the addresses in those buffers. With this approach the pagecache may contain data which is inconsistent with what is on disk. To alleviate the problems this can cause, md invalidates the pagecache when releasing the file. If the file is to be examined while the array is active (a non-critical but occasionally useful function), O_DIRECT io must be used. And new version of mdadm will have support for this. This approach simplifies a lot of code: - we no longer need to keep a list of pages which we need to wait for, as the b_endio function can keep track of how many outstanding writes there are. This saves a mempool. - -EAGAIN returns from write_page are no longer possible (not sure if they ever were actually). Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit acc55e220166a5ad898e66ad6153fd62eaaac76d tree c342dcd3303f01d97c5fe7718af9daf22ec086d2 parent 0cdd02cabd86b5d547f882005e23a93929f0ace9 author NeilBrown Mon, 26 Jun 2006 00:27:47 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:38 -0700 [PATCH] md/bitmap: tidy up i_writecount handling in md/bitmap md/bitmap modifies i_writecount of a bitmap file to make sure that no-one else writes to it. The reverting of the change is sometimes done twice, and there is one error path where it is omitted. This patch tidies that up. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0cdd02cabd86b5d547f882005e23a93929f0ace9 tree f6b54f8c58d96ca239d8a0923025eef69fdd91ff parent a647e4bc5ce697e25ff50d2e22de68a581b1ed38 author NeilBrown Mon, 26 Jun 2006 00:27:47 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:38 -0700 [PATCH] md/bitmap: remove dead code from md/bitmap bitmap_active is never called, and the BITMAP_ACTIVE flag is never users or tested, so discard them both. Also remove some out-of-date 'todo' comments. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a647e4bc5ce697e25ff50d2e22de68a581b1ed38 tree 465559f3786e7b5b10bf1ff58a63e198c95c8879 parent e16b68b6e456a61b895a198baf5aa473cf2a32bf author NeilBrown Mon, 26 Jun 2006 00:27:46 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:38 -0700 [PATCH] md/bitmap: remove unnecessary page reference manipulations from md/bitmap code md/bitmap gets a collection of pages representing the bitmap when it initialises the bitmap, and puts all the references when discarding the bitmap. It also occasionally takes extra references without any good reason, and sometimes drops them ... though it doesn't always drop them, which can result in a memory leak. This patch removes the unnecessary 'get_page' calls, and the corresponding 'put_page' calls. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e16b68b6e456a61b895a198baf5aa473cf2a32bf tree 0d592ee3c7245f4958dcd337cc506e650cefac2c parent ec7a3197f4777eff5039251d0e08a031b3372d6c author NeilBrown Mon, 26 Jun 2006 00:27:45 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:38 -0700 [PATCH] md/bitmap: use set_bit etc for bitmap page attributes In particular, this means that we use 4 bits per page instead of a whole unsigned long. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec7a3197f4777eff5039251d0e08a031b3372d6c tree 5ccb31fbc03f8e7247f856613b5078300fee3bbf parent 0b79ccf0cdd9f59e5f99017e1a5d23da336544b2 author NeilBrown Mon, 26 Jun 2006 00:27:45 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:38 -0700 [PATCH] md/bitmap: cleaner separation of page attribute handlers in md/bitmap md/bitmap has some attributes per-page. Handling of these attributes in largely abstracted in set_page_attr and clear_page_attr. However get_page_attr exposes the format used to store them. So prior to changing that format, introduce test_page_attr instead of get_page_attr, and make appropriate usage changes. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b79ccf0cdd9f59e5f99017e1a5d23da336544b2 tree 8688d9810fcba1e24abce726eaf35ff32f6b58d9 parent d7375ab324971e7acbea9f02a0269ae7348f4147 author NeilBrown Mon, 26 Jun 2006 00:27:44 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:38 -0700 [PATCH] md/bitmap: remove bitmap writeback daemon md/bitmap currently has a separate thread to wait for writes to the bitmap file to complete (as we cannot get a callback on that action). However this isn't needed as bitmap_unplug is called from process context and waits for the writeback thread to do it's work. The same result can be achieved by doing the waiting directly in bitmap_unplug. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7375ab324971e7acbea9f02a0269ae7348f4147 tree 0a2e2f17a6ed37be1870b2bcc2b02cd6cf7e8cf2 parent 52c03291a832d86c093996d0491a326de4a6b79b author NeilBrown Mon, 26 Jun 2006 00:27:43 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:38 -0700 [PATCH] md/bitmap: fix online removal of file-backed bitmaps When "mdadm --grow /dev/mdX --bitmap=none" is used to remove a filebacked bitmap, the bitmap was disconnected from the array, but the file wasn't closed (until the array was stopped). The file also wasn't closed if adding the bitmap file failed. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52c03291a832d86c093996d0491a326de4a6b79b tree c1ec4c49e9265911cd3be0b9145491431291bce9 parent 5e56341d029f0c2cf31e78dc01d4c861ba4d6a5e author NeilBrown Mon, 26 Jun 2006 00:27:43 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:37 -0700 [PATCH] md: split reshape portion of raid5 sync_request into a separate function ... as raid5 sync_request is WAY too big. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e56341d029f0c2cf31e78dc01d4c861ba4d6a5e tree e77087a31d3d1b86c563fb4461f07ee642de280b parent c93983bf517c100a31e40ef087e19bd3d7aa2d28 author Adrian Bunk Mon, 26 Jun 2006 00:27:42 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:37 -0700 [PATCH] md: make md_print_devices() static This patch makes the needlessly global md_print_devices() static. Signed-off-by: Adrian Bunk Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c93983bf517c100a31e40ef087e19bd3d7aa2d28 tree 9361c68d5f00ccd34cbc0a3bc7bc2389ce7f4c3a parent 7c7546ccf6463edbeee8d9aac6de7be1cd80d08a author NeilBrown Mon, 26 Jun 2006 00:27:41 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:37 -0700 [PATCH] md: support stripe/offset mode in raid10 The "industry standard" DDF format allows for a stripe/offset layout where data is duplicated on different stripes. e.g. A B C D D A B C E F G H H E F G (columns are drives, rows are stripes, LETTERS are chunks of data). This is similar to raid10's 'far' mode, but not quite the same. So enhance 'far' mode with a 'far/offset' option which follows the layout of DDFs stripe/offset. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c7546ccf6463edbeee8d9aac6de7be1cd80d08a tree 56c1f734db9f8a66a7c8c5ef11fb35e07dbb2f91 parent 5fd6c1dce06ec24ef3de20fe0c7ecf2ba9fe5ef9 author NeilBrown Mon, 26 Jun 2006 00:27:41 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:37 -0700 [PATCH] md: allow a linear array to have drives added while active Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fd6c1dce06ec24ef3de20fe0c7ecf2ba9fe5ef9 tree bd7cc8c22615e8622d3d63b7fc68dcc3ac1964de parent a8a55c387da28d67d98f56e4f5021462cb61f7a6 author NeilBrown Mon, 26 Jun 2006 00:27:40 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:37 -0700 [PATCH] md: allow checkpoint of recovery with version-1 superblock For a while we have had checkpointing of resync. The version-1 superblock allows recovery to be checkpointed as well, and this patch implements that. Due to early carelessness we need to add a feature flag to signal that the recovery_offset field is in use, otherwise older kernels would assume that a partially recovered array is in fact fully recovered. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8a55c387da28d67d98f56e4f5021462cb61f7a6 tree b45bc26d02ed060a6d902beedd236f5ee436b041 parent 16a53ecc35f2a80dc285be2e769768847d89ca37 author NeilBrown Mon, 26 Jun 2006 00:27:39 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:37 -0700 [PATCH] md: remove nuisance message at shutdown At shutdown, we switch all arrays to read-only, which creates a message for every instantiated array, even those which aren't actually active. So remove the message for non-active arrays. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 16a53ecc35f2a80dc285be2e769768847d89ca37 tree 19d005f19af68e9b98efaf16885bb60498f540c1 parent 16f17b39f385212b73278a76d482cdcaaebe6c02 author NeilBrown Mon, 26 Jun 2006 00:27:38 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:37 -0700 [PATCH] md: merge raid5 and raid6 code There is a lot of commonality between raid5.c and raid6main.c. This patches merges both into one module called raid456. This saves a lot of code, and paves the way for online raid5->raid6 migrations. There is still duplication, e.g. between handle_stripe5 and handle_stripe6. This will probably be cleaned up later. Cc: "H. Peter Anvin" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 16f17b39f385212b73278a76d482cdcaaebe6c02 tree b7b79b380257e7438516a8b38cd9fbd33284f64f parent 9443a1d1f72c688646278c06d0a9a3c79e895325 author NeilBrown Mon, 26 Jun 2006 00:27:37 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:37 -0700 [PATCH] md: increase the delay before marking metadata clean, and make it configurable When a md array has been idle (no writes) for 20msecs it is marked as 'clean'. This delay turns out to be too short for some real workloads. So increase it to 200msec (the time to update the metadata should be a tiny fraction of that) and make it sysfs-configurable. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9443a1d1f72c688646278c06d0a9a3c79e895325 tree f4c536bb90c04bd71502921e85496a51bb033248 parent 8932c2e0dcae52e73430878fd8a7a7800176eada author NeilBrown Mon, 26 Jun 2006 00:27:37 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:36 -0700 [PATCH] md: remove useless ioctl warning This warning was slightly useful back in 2.2 days, but is more an annoyance now. It makes it awkward to add new ioctls (that we we are likely to do that in the current climate, but it is possible). Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8932c2e0dcae52e73430878fd8a7a7800176eada tree 3b734ccaa0fb210f1fd76ff9bb6fb9700d1c4095 parent c70810b327a247d12805554d0aa4605e257effb8 author NeilBrown Mon, 26 Jun 2006 00:27:36 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:36 -0700 [PATCH] md: remove arbitrary limit on chunk size The largest chunk size the code can support without substantial surgery is 2^30 bytes, so make that the limit instead of an arbitrary 4Meg. Some day, the 'chunksize' should change to a sector-shift instead of a byte-count. Then no limit would be needed. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c70810b327a247d12805554d0aa4605e257effb8 tree dc642c342a1ca994ce1017f8aa410f5b32fe2351 parent 72d9486169a2a8353e022813185ba2f32d7dde69 author NeilBrown Mon, 26 Jun 2006 00:27:35 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:36 -0700 [PATCH] md: reformat code in raid1_end_write_request to avoid goto A recent change made this goto unnecessary, so reformat the code to make it clearer what is happening. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72d9486169a2a8353e022813185ba2f32d7dde69 tree 2fe6c382feb3f21d829abf543c54be486007557c parent 5c6bd75d06db512515a3781aa97e42df2faf0815 author Alasdair G Kergon Mon, 26 Jun 2006 00:27:35 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:36 -0700 [PATCH] dm: improve error message consistency Tidy device-mapper error messages to include context information automatically. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c6bd75d06db512515a3781aa97e42df2faf0815 tree 43d68c6d3174e1ae8a778acd834665c122f8b2a4 parent c2ade42dd35466d90aa6fc7cc717f396e165492f author Alasdair G Kergon Mon, 26 Jun 2006 00:27:34 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:36 -0700 [PATCH] dm: prevent removal if open If you misuse the device-mapper interface (or there's a bug in your userspace tools) it's possible to end up with 'unlinked' mapped devices that cannot be removed until you reboot (along with uninterruptible processes). This patch prevents you from removing a device that is still open. It introduces dm_lock_for_deletion() which is called when a device is about to be removed to ensure that nothing has it open and nothing further can open it. It uses a private open_count for this which also lets us remove one of the problematic bdget_disk() calls elsewhere. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c2ade42dd35466d90aa6fc7cc717f396e165492f tree 245baeabfea43a3b2654adb962e776a877da0059 parent 17b2f66f2a39a4e4d1ed456f35ee3bb598e41d35 author David Teigland Mon, 26 Jun 2006 00:27:33 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:36 -0700 [PATCH] dm: create error table Add a library function dm_create_error_table() to create a table that rejects any I/O sent to a device with EIO. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17b2f66f2a39a4e4d1ed456f35ee3bb598e41d35 tree 64801e095918f685fa83bface7f8289e33bb9bcd parent 2b06cfff12f0f87c4bc4d4c4dd76997e72c360ba author Alasdair G Kergon Mon, 26 Jun 2006 00:27:33 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:36 -0700 [PATCH] dm: add exports Move definitions of core device-mapper functions for manipulating mapped devices and their tables to advertising their availability for use elsewhere in the kernel. Protect the contents of device-mapper.h with ifdef __KERNEL__. And throw in a few formatting clean-ups and extra comments. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b06cfff12f0f87c4bc4d4c4dd76997e72c360ba tree 68e9085593ef64b78a60daec94898e620bf716c3 parent 814d68629b40e863997fa0eea459be4cc99a06cc author Alasdair G Kergon Mon, 26 Jun 2006 00:27:32 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:36 -0700 [PATCH] dm: consolidate creation functions Merge dm_create() and dm_create_with_minor() by introducing the special value DM_ANY_MINOR to request the allocation of the next available minor number. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 814d68629b40e863997fa0eea459be4cc99a06cc tree 85dddcb7d8c1885a2af45aa4be36b0b78a4c7ddd parent ce503f59ae899c3e75a8a1cf46f2d44c0c5b5c7c author David Teigland Mon, 26 Jun 2006 00:27:31 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:36 -0700 [PATCH] dm table split_args: handle no input Return sense if dm_split_args is called with a NULL input parameter. Signed-off-by: David Teigland Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce503f59ae899c3e75a8a1cf46f2d44c0c5b5c7c tree 7bec805d077c3a7f47f7a1965a1a8020082c5544 parent 8a835f11bce68ed990533e49b5dedb00bee46d71 author Jonathan Brassow Mon, 26 Jun 2006 00:27:30 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:35 -0700 [PATCH] dm kcopyd: error accumulation fix kcopyd should accumulate errors - otherwise I/O failures may be ignored unintentionally. And invert 'success' (used in a future patch), using a more intuitive !(read_err || write_err). Signed-off-by: Jonathan Brassow Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a835f11bce68ed990533e49b5dedb00bee46d71 tree 8311b7c5b722fdf1a2b1c7267098ca0c05bd9a54 parent 29121bd0b00ebb9524971a583fea4a2f7afe8041 author Alasdair G Kergon Mon, 26 Jun 2006 00:27:30 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:35 -0700 [PATCH] dm mirror log: sync_count fix When a mirror is reduced in size, clear the part of the bitmap that is no longer used. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29121bd0b00ebb9524971a583fea4a2f7afe8041 tree 499be8e6dea167fd9a17ccce11467d6bdd1c40dc parent b7cca195c4cc051210f3e60a859b779ca833a2e4 author Alasdair G Kergon Mon, 26 Jun 2006 00:27:29 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:35 -0700 [PATCH] dm mirror log: bitset_size fix Fix the 'sizeof' in the region log bitmap size calculation: it's uint32_t, not unsigned long - this breaks on some archs. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7cca195c4cc051210f3e60a859b779ca833a2e4 tree f9d7f2cc386c90214eaec2617715365708118bdc parent 702ca6f0be9ef95087ee2c9f31e6517492554483 author Alasdair G Kergon Mon, 26 Jun 2006 00:27:29 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:35 -0700 [PATCH] dm mirror log: refactor context Refactor the code that creates the core and disk log contexts to avoid the repeated allocation of clean_bits introduced by the last patch. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 702ca6f0be9ef95087ee2c9f31e6517492554483 tree e59b9a1e71e68a9f0230d12a10931b60da1ac9c4 parent 143535396c7ebd9395a931a000b3963f457712b8 author Kevin Corry Mon, 26 Jun 2006 00:27:28 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:35 -0700 [PATCH] dm mirror log: sector size fix On-disk logs for dm-mirror devices are currently hard-coded to use 512 byte hard-sector-sizes. This patch fixes dm-log so it will work with devices with non-512-byte hard-sector-sizes. To maintain full compatibility, instead of moving the clean-bits bitset to a bitset, and enlarges the disk-header buffer to encompass both the header and the bitset. The I/O routines for the bitset are removed, and the I/O routines for the disk-header now also read/write the bitset. Signed-off-by: Kevin Corry Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 143535396c7ebd9395a931a000b3963f457712b8 tree 725203a6ed6be6c795fa0f0441aa1b91f5ea8721 parent e4c8b3ba34cc1aeab451c7a5cc843c5fd62cbe3d author Milan Broz Mon, 26 Jun 2006 00:27:27 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:35 -0700 [PATCH] dm table: get_target: fix last index The table is indexed from 0, so an index equal to t->num_targets should be rejected. (There is no code in the current tree that would exercise this bug.) Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4c8b3ba34cc1aeab451c7a5cc843c5fd62cbe3d tree 2b211393b1ffacd05a7fbae994012b7000e2c233 parent f0b04115368ff383654a3bd26baf8f4be5e81132 author Neil Brown Mon, 26 Jun 2006 00:27:26 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:35 -0700 [PATCH] dm: mirror sector offset fix The device-mapper core does not perform any remapping of bios before passing them to the targets. If a particular mapping begins part-way into a device, targets obtain the sector relative to the start of the mapping by subtracting ti->begin. The dm-raid1 target didn't do this everywhere: this patch fixes it, taking care to subtract ti->begin exactly once for each bio. [akpm: too late for 2.6.17 - suitable for 2.6.17.x after it has settled] Signed-off-by: Neil Brown Signed-off-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0b04115368ff383654a3bd26baf8f4be5e81132 tree 13429da63d6da393c30554d1483c3dac50e266bb parent 10da4f795f965f22039aa2930b6f80964aad3ee5 author Jeff Mahoney Mon, 26 Jun 2006 00:27:25 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:35 -0700 [PATCH] dm: fix block device initialisation In alloc_dev(), we register the device with the block layer and then continue to initialize the device. But register_disk() makes the device available to be opened before we have completed initialising it. This patch moves the final bits of the initialization above the disk registration. [akpm: too late for 2.6.17 - suitable for 2.6.17.x after it has settled] Signed-off-by: Jeff Mahoney Signed-off-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10da4f795f965f22039aa2930b6f80964aad3ee5 tree 6f4bfd27cdcdad15b53df997476fae539383bf4a parent 7ec75f254742766eb729f1d1024a5b4e6692fc5f author Jeff Mahoney Mon, 26 Jun 2006 00:27:25 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:35 -0700 [PATCH] dm: add module ref counting The reference counting on dm-mod is zero if no mapped devices are open. This is incorrect, and can lead to an oops if the module is unloaded while mapped devices exist. This patch claims a reference to the module whenever a device is created, and drops it again when the device is freed. Devices must be removed before dm-mod is unloaded. [akpm: too late for 2.6.17 - suitable for 2.6.17.x after it has settled] Signed-off-by: Jeff Mahoney Signed-off-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ec75f254742766eb729f1d1024a5b4e6692fc5f tree 67cf98f49397c4f7a71e12afc82c04c7dedbe17f parent fba9f90e568e17c326257ee293207b75880b39d6 author Jeff Mahoney Mon, 26 Jun 2006 00:27:24 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:35 -0700 [PATCH] dm: fix mapped device ref counting To avoid races, _minor_lock must be held while changing mapped device reference counts. There are a few paths where a mapped_device pointer is returned before a reference is taken. This patch fixes them. [akpm: too late for 2.6.17 - suitable for 2.6.17.x after it has settled] Signed-off-by: Jeff Mahoney Signed-off-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fba9f90e568e17c326257ee293207b75880b39d6 tree 6dc982f7c7923105adf8fb55f1ca0925be3ecdab parent f32c10b09940cffc3620ce111315ec44343fd3ca author Jeff Mahoney Mon, 26 Jun 2006 00:27:23 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:34 -0700 [PATCH] dm: add DMF_FREEING There is a chicken and egg problem between the block layer and dm in which the gendisk associated with a mapping keeps a reference-less pointer to the mapped_device. This patch uses a new flag DMF_FREEING to indicate when the mapped_device is no longer valid. This is checked to prevent any attempt to open the device from succeeding while the device is being destroyed. [akpm: too late for 2.6.17 - suitable for 2.6.17.x after it has settled] Signed-off-by: Jeff Mahoney Signed-off-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f32c10b09940cffc3620ce111315ec44343fd3ca tree e5f1ee2febebd9c3b2426973a054ae16b5a80640 parent 62f75c2f3244553b1290447abd1f1e6b1144d3e9 author Jeff Mahoney Mon, 26 Jun 2006 00:27:22 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:34 -0700 [PATCH] dm: change minor_lock to spinlock While removing a device, another another thread might attempt to resurrect it. This patch replaces the _minor_lock mutex with a spinlock and uses atomic_dec_and_lock() to serialize reference counting in dm_put(). [akpm: too late for 2.6.17 - suitable for 2.6.17.x after it has settled] Signed-off-by: Jeff Mahoney Signed-off-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62f75c2f3244553b1290447abd1f1e6b1144d3e9 tree 14bfc0757b6662e37f8544dd52a7c304230f8695 parent ba61fdd17d73ddb5c892a9f12383c6c560a20d56 author Jeff Mahoney Mon, 26 Jun 2006 00:27:21 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:34 -0700 [PATCH] dm: move idr_pre_get idr_pre_get() can sleep while allocating memory. The next patch will change _minor_lock into a spinlock, so this patch moves idr_pre_get() outside the lock in preparation. [akpm: too late for 2.6.17 - suitable for 2.6.17.x after it has settled] Signed-off-by: Jeff Mahoney Signed-off-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba61fdd17d73ddb5c892a9f12383c6c560a20d56 tree 7623bd742e2c142a8c5a1d8e5b940095b8673f3f parent 5806f07cd2c32920d5105e0f9ff3117338f34eec author Jeff Mahoney Mon, 26 Jun 2006 00:27:21 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:34 -0700 [PATCH] dm: fix idr minor allocation One part of the system can attempt to use a mapped device before another has finished initialising it or while it is being freed. This patch introduces a place holder value, MINOR_ALLOCED, to mark the minor as allocated but in a state where it can't be used, such as mid-allocation or mid-free. At the end of the initialization, it replaces the place holder with the pointer to the mapped_device, making it available to the rest of the dm subsystem. [akpm: too late for 2.6.17 - suitable for 2.6.17.x after it has settled] Signed-off-by: Jeff Mahoney Signed-off-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5806f07cd2c32920d5105e0f9ff3117338f34eec tree 65242ea629a19308656a3090fee6b513dfa0f723 parent c51c2752491e5e771de6c8861a85ba46752d7888 author Jeff Mahoney Mon, 26 Jun 2006 00:27:19 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:34 -0700 [PATCH] lib: add idr_replace This patch adds idr_replace() to replace an existing pointer in a single operation. Device-mapper will use this to update the pointer it stored against a given id. Signed-off-by: Jeff Mahoney Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c51c2752491e5e771de6c8861a85ba46752d7888 tree 9371dab2a38e1a17bf91d9bc143b47b1c58c5fb7 parent b877a96409a3a99f2ce27b3c6473c9b28298ac7c author Alasdair G Kergon Mon, 26 Jun 2006 00:27:18 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:34 -0700 [PATCH] dm snapshot: unify chunk_size Persistent snapshots currently store a private copy of the chunk size. Userspace also supplies the chunk size when loading a snapshot. Ensure consistency by only storing the chunk_size in one place instead of two. Currently the two sizes will differ if the chunk size supplied by userspace does not match the chunk size an existing snapshot actually uses. Amongst other problems, this causes an incorrect 'percentage full' to be reported. The patch ensures consistency by only storing the chunk_size in one place, removing it from struct pstore. Some initialisation is delayed until the correct chunk_size is known. If read_header() discovers that the wrong chunk size was supplied, the 'area' buffer (which the header already got read into) is reinitialised to the correct size. [akpm: too late for 2.6.17 - suitable for 2.6.17.x after it has settled] Signed-off-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b877a96409a3a99f2ce27b3c6473c9b28298ac7c tree 4bd3772e0dfd8613e19606bcf5a5771822f3bac6 parent 2aea875da2b7e403b13dd05a9dc80665f39d85e4 author Antonino A. Daplas Mon, 26 Jun 2006 00:27:17 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:34 -0700 [PATCH] VT binding: Make sticon support binding Do not mark sticon_startup() as __init Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2aea875da2b7e403b13dd05a9dc80665f39d85e4 tree b6010aa75bf21454fe1c12c3d3e494c9ce47300c parent e86bb8acc0fdca82d22d12d46ef5482ecc408b26 author Antonino A. Daplas Mon, 26 Jun 2006 00:27:16 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:34 -0700 [PATCH] VT binding: Make promcon support binding Do not mark promcon_startup() and promcon_init_unimap() as __init Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e86bb8acc0fdca82d22d12d46ef5482ecc408b26 tree e9cfb71e6199377fd8c23f16908e6adbc3f6d48d parent ac08dae816d3ea5160bb3e8420e87c03bf42224b author Antonino A. Daplas Mon, 26 Jun 2006 00:27:15 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:34 -0700 [PATCH] VT binding: Make newport_con support binding - move register ioremap from newport_startup() to newport_console_init() - fonts are freed multiple times, do it only once Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac08dae816d3ea5160bb3e8420e87c03bf42224b tree fe8e702f3518e55ad9fb07916a6c0c7425c02378 parent 6690075d0b97837aca533b92715e6357ad6de279 author Antonino A. Daplas Mon, 26 Jun 2006 00:27:15 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:33 -0700 [PATCH] VT binding: Make mdacon support binding Do not mark mdacon_startup __init. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6690075d0b97837aca533b92715e6357ad6de279 tree abd914a173dfc68569fedda51d3b494200b3cbc1 parent 5bd42536b395944a1134baa3624b2e0cff6ac7bf author Antonino A. Daplas Mon, 26 Jun 2006 00:27:14 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:33 -0700 [PATCH] VT binding: Update documentation Update Documentation/fb/fbcon.txt and Documentatin/console/console.txt to reflect the following changes: 1. sysfs attributes are relocated to /sys/class/vtconsole 2. feature is selectable in Kconfig 3. add sample scripts to fbcon.txt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5bd42536b395944a1134baa3624b2e0cff6ac7bf tree 13f8a511d15b14c107b352cda5c8306aad8d50a0 parent 13ae66458971b4967350765a8bfaf2a636442e5f author Antonino A. Daplas Mon, 26 Jun 2006 00:27:13 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:33 -0700 [PATCH] VT binding: Do not create a device file for class device 'fbcon' The class device "fbcon" does not need to be a device file. Do not create one by passing a major and minor number of zero to class_device_create()/destroy(). Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13ae66458971b4967350765a8bfaf2a636442e5f tree 37940517f06cbb500c77770da71986c5cced6772 parent 6db4063c5b72b46e9793b0f141a7a3984ac6facf author Antonino A. Daplas Mon, 26 Jun 2006 00:27:12 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:33 -0700 [PATCH] VT binding: Make VT binding a Kconfig option To enable this feature, CONFIG_VT_HW_CONSOLE_BINDING must be set to 'y'. This feature will default to 'n' to minimize users accidentally corrupting their virtual terminals. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6db4063c5b72b46e9793b0f141a7a3984ac6facf tree 47e4295617e6c47aae2a1344923dcce6fd81166a parent 79062a0d396272f5b103d5223f3c96c58fd27451 author Antonino A. Daplas Mon, 26 Jun 2006 00:27:12 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:33 -0700 [PATCH] VT binding: Add sysfs control to the VT layer Add sysfs control to the VT layer. A new sysfs class, 'vtconsole', and class devices 'vtcon[n]' are added. Each class device file has the following attributes: /sys/class/vtconsole/vtcon[n]/name - read-only attribute showing the name of the current backend /sys/class/vtconsole/vtcon[n]/bind - read/write attribute where: 0 - backend is unbound/unbind backend from the VT layer 1 - backend is bound/bind backend to the VT layer In addition, if any of the consoles are in KD_GRAPHICS mode, binding and unbinding will not succeed. KD_GRAPHICS mode usually indicates that the underlying console hardware is used for other purposes other than displaying text (ie X). This feature should prevent binding/unbinding from interfering with a graphics application using the VT. [akpm@osdl.org: warning fixes] Signed-off-by: Antonino Daplas Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79062a0d396272f5b103d5223f3c96c58fd27451 tree 34cfb4e76422bfc3c3c089b4fdf6d3d502a32489 parent 418d1ce61839251004fee6525f58a4581a75239e author Antonino A. Daplas Mon, 26 Jun 2006 00:27:11 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:33 -0700 [PATCH] VT binding: Add new doc file describing the feature This newly added file will: - Describe the characteristics of 2 general types of console drivers - How to use the sysfs to unbind and bind console drivers - Uses for this feature Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 418d1ce61839251004fee6525f58a4581a75239e tree 53193cc45088997a7a233b2d6e9648ee59e1b3be parent e614b18dcedb247ce6f848e623cdf2336df2b476 author Antonino A. Daplas Mon, 26 Jun 2006 00:27:10 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:33 -0700 [PATCH] VT binding: fbcon: Update documentation Update Documentation/fb/fbcon.txt to reflect the following changes: 1. Simple illustration of the binding of the console down to individual framebuffer drivers 2. Usage of userspace tools to help with recovery of text console 3. How to use the attributes in /sys/class/tty/console to unload fbcon and the framebuffer drivers Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e614b18dcedb247ce6f848e623cdf2336df2b476 tree a867f1fa177eb2ed6c577e45d297374744adca3b parent 3e795de7631b2366d7301182c8d91f6d2911467b author Antonino A. Daplas Mon, 26 Jun 2006 00:27:09 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:33 -0700 [PATCH] VT binding: Update fbcon to support binding The control for binding/unbinding is moved from fbcon to the console layer. Thus the fbcon sysfs attributes, attach and detach, are also gone. 1. Add a notifier event that tells fbcon if a framebuffer driver has been unregistered. If no registered driver remains, fbcon will unregister itself from the console layer. 2. Replaced calls to give_up_console() with unregister_con_driver(). 3. Still use take_over_console() instead of register_con_driver() to maintain compatibility 4. Respect the parameter first_fb_vc and last_fb_vc instead of using 0 and MAX_NR_CONSOLES - 1. These parameters are settable by the user. 5. When fbcon is completely unbound from the console layer, fbcon will also release (iow, decrement module reference counts to zero) all fbdev drivers. In other words, a bind or unbind request from the console layer will propagate down to the framebuffer drivers. 6. If fbcon is not bound to the console, it will ignore all notifier events (except driver registration and unregistration) and all sysfs requests. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e795de7631b2366d7301182c8d91f6d2911467b tree e119d2eec9825ad86c2b07e43d2bb06e7d558858 parent a4a73e1f0283850edc143d28502c1c517c6ab49c author Antonino A. Daplas Mon, 26 Jun 2006 00:27:08 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:33 -0700 [PATCH] VT binding: Add binding/unbinding support for the VT console The framebuffer console is now able to dynamically bind and unbind from the VT console layer. Due to the way the VT console layer works, the drivers themselves decide when to bind or unbind. However, it was decided that binding must be controlled, not by the drivers themselves, but by the VT console layer. With this, dynamic binding is possible for all VT console drivers, not just fbcon. Thus, the VT console layer will impose the following to all VT console drivers: - all registered VT console drivers will be entered in a private list - drivers can register themselves to the VT console layer, but they cannot decide when to bind or unbind. (Exception: To maintain backwards compatibility, take_over_console() will automatically bind the driver after registration.) - drivers can remove themselves from the list by unregistering from the VT console layer. A prerequisite for unregistration is that the driver must not be bound. The following functions are new in the vt.c: register_con_driver() - public function, this function adds the VT console driver to an internal list maintained by the VT console bind_con_driver() - private function, it binds the driver to the console take_over_console() is changed to call register_con_driver() followed by a bind_con_driver(). This is the only time drivers can decide when to bind to the VT layer. This is to maintain backwards compatibility. unbind_con_driver() - private function, it unbinds the driver from its console. The vacated consoles will be taken over by the default boot console driver. unregister_con_driver() - public function, removes the driver from the internal list maintained by the VT console. It will only succeed if the driver is currently unbound. con_is_bound() checks if the driver is currently bound or not give_up_console() is just a wrapper to unregister_con_driver(). There are also 3 additional functions meant to be called only by the tty layer for sysfs control: vt_bind() - calls bind_con_driver() vt_unbind() - calls unbind_con_driver() vt_show_drivers() - shows the list of registered drivers Most VT console drivers will continue to work as is, but might have problems when unbinding or binding which should be fixable with minimal changes. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4a73e1f0283850edc143d28502c1c517c6ab49c tree c3e767bf8a3a19d0823d770357c472f70dde324a parent 5428b04405af1bb441aa8aabd314e48b870bc58e author Antonino A. Daplas Mon, 26 Jun 2006 00:27:07 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:33 -0700 [PATCH] Detaching fbcon: update documentation Update Documentation/fb/fbcon.txt on the following: 1. sysfs attributes are now located in class/graphics/fbcon 2. instructions on how to attach, detach and/or unload fbcon Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5428b04405af1bb441aa8aabd314e48b870bc58e tree f5f94e7ddc3df72e9c323fdab82b0805cf32abe6 parent e55186fe5fad31962d0ea5ef267bf0c23d98abd4 author Antonino A. Daplas Mon, 26 Jun 2006 00:27:06 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:32 -0700 [PATCH] Detaching fbcon: add capability to attach/detach fbcon Add the ability to detach and attach the framebuffer console to and from the vt layer. This is done by echo'ing any value to sysfs attributes located in class/graphics/fbcon. The two attributes are: attach - bind fbcon to the vt layer detach - unbind fbcon from the vt layer Once fbcon is detached from the vt layer, fbcon can be unloaded if compiled as a module. This feature is quite useful for developers who work on the framebuffer or console subsystem. This is also useful for users who want to go to text mode or graphics mode without having to reboot. Directly unloading the fbcon module is not possible because the vt layer increments the module reference count for all bound consoles. Detaching fbcon decrements the module reference count to zero so unloading becomes possible. Detaching fbcon may interfere with X and/or DRM. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e55186fe5fad31962d0ea5ef267bf0c23d98abd4 tree cd9dc9399fbf82dc7b329980c291a17b5b5697bf parent 9a17917671d407d37bf23a527aa55acca3cb4735 author Antonino A. Daplas Mon, 26 Jun 2006 00:27:05 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:32 -0700 [PATCH] Detaching fbcon: clean up exit code To detach fbcon, it must also clean up all resources it allocated. This was never done before because fbcon cannot be unloaded. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a17917671d407d37bf23a527aa55acca3cb4735 tree 1e78f6f82d913ee58c174776529589afe1d3b2a9 parent a06630f3e7fb29f2524e1d7b009eb8b5a278ba23 author Antonino A. Daplas Mon, 26 Jun 2006 00:27:05 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:32 -0700 [PATCH] Detaching fbcon: sdd sysfs class device entry for fbcon In order for this feature to work, an interface will be needed. The most appropriate is sysfs. However, the framebuffer console has no sysfs entry yet. This will create a sysfs class device entry for fbcon under /sys/class/graphics. Add a class_device entry 'fbcon' under class 'graphics'. Console-specific attributes which where previously under class/graphics/fb[x] are moved to class/graphics/fbcon. These attributes, 'con_rotate' and 'con_rotate_all', are also renamed to 'rotate' and 'rotate_all' respectively. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a06630f3e7fb29f2524e1d7b009eb8b5a278ba23 tree da80382cdbdda004fff12484281a3ddbad0069b3 parent 1c8ce271fe707d26b7bca4e490067fe65694b363 author Antonino A. Daplas Mon, 26 Jun 2006 00:27:04 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:32 -0700 [PATCH] Detaching fbcon: remove calls to pci_disable_device() Detaching fbcon allows individual drivers to be unloaded. However several drivers call pci_disable_device() upon exit. This function will disable the BAR's which will kill VGA text mode and/or affect X/DRM. To prevent this, remove calls to pci_disable_device() from several drivers. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c8ce271fe707d26b7bca4e490067fe65694b363 tree 42fc5fa81161065874b9aa751773d15465a8de9b parent 50ec42edd9784fad6a37b05be03064ea24098db6 author Antonino A. Daplas Mon, 26 Jun 2006 00:27:03 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:32 -0700 [PATCH] Detaching fbcon: fix give_up_console() To allow for detaching fbcon, it must be able to give up the console. However, the function give_up_console() is plain broken. It just sets the entries in the console driver map to NULL, it leaves the vt layer without a console driver, and does not decrement the module reference count. Calling give_up_console() is guaranteed to hang the machine.. To fix this problem, ensure that the virtual consoles are not left dangling without a driver. All systems have a default boot driver (either vgacon or dummycon) which is never unloaded. For those vt's that lost their driver, the default boot driver is reassigned back to them. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50ec42edd9784fad6a37b05be03064ea24098db6 tree d4f145507e36bf52a5f26a8aad10af46392f36fc parent 9dac73a4ec2c0a791bbfc6630dc4629ce11e68b9 author Antonino A. Daplas Mon, 26 Jun 2006 00:27:02 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:32 -0700 [PATCH] Detaching fbcon: fix vgacon to allow retaking of the console One of the limitations of the framebuffer console system is its inablity to unload or detach itself from the console layer. And once it loads, it also locks in framebuffer drivers preventing their unload. Although the con2fbmap utility does provide a means to unload individual drivers, it requires that at least one framebuffer driver is loaded for use by fbcon. With this change, it is possible to detach fbcon from the console layer. If it is detached, it will reattach the boot console driver (which is permanently loaded) back to the console layer so the system can continue to work. As a consequence, fbcon will also decrement its reference count of individual framebuffer drivers, allowing all of these drivers to be unloaded even if fbcon is still loaded. Unless you use drivers that restores the display to text mode (rivafb and i810fb, for example), detaching fbcon does require assistance from userspace tools (ie, vbetools) for text mode to be restored completely. Without the help of these tools, fbcon will leave the VGA console corrupted. The methods that can be used will be described in Documentation/fb/fbcon.txt. Because the vt layer also increments the module reference count for each console driver, fbcon cannot be directly unloaded. It must be detached first prior to unload. Similarly, fbcon can be reattached to the console layer without having to reload the module. A nice feature if fbcon is compiled statically. Attaching and detaching fbcon is done via sysfs attributes. A class device entry for fbcon is created in /sys/class/graphics. The two attributes that controls this feature are detach and attach. Two other attributes that are piggybacked under /sys/class/graphics/fb[n] that are fbcon-specific, 'con_rotate' and 'con_rotate_all' are moved to fbcon. They are renamed as 'rotate' and 'rotate_all' respectively. Overall, this feature is a great help for developers working in the framebuffer or console layer. There is not need to continually reboot the kernel for every small change. It is also useful for regular users who wants to choose between a graphical console or a text console without having to reboot. Example usage for x86: /* start in text mode */ modprobe xxxfb modprobe fbcon /* graphical mode with fbcon using xxxfb */ echo 1 > /sys/class/graphics/fbcon/detach /* back to text mode, will produce corrupt display unless vbetool is used */ rmmod xxxfb modprobe yyyfb /* back to graphical mode with fbcon using yyyfb */ Before trying out this feature, please read Documentation/fb/fbcon.txt. This patch: In order for fbcon to detach itself from the console layer, vgacon, which is a boot console driver, must be fixed so it can retake the console multiple times, not just during init. The following needs to be done: - remove __init from the vgacon_startup, this is called again by take_over_console(). - vc->rows and vc->cols are set manually by vgacon during init. After init, vc_resize() can be used - make sure the scrollback_buffer is not reallocated Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9dac73a4ec2c0a791bbfc6630dc4629ce11e68b9 tree c09c03d8d02f351d49fc1f60cd3bb74e13acd735 parent 90b4f9aca4d124d114e02bbb3d1d4f3d1d47138f author Daniel R Thompson Mon, 26 Jun 2006 00:27:00 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:32 -0700 [PATCH] fbdev: tag by scantype in sysfs Modify the sysfs description of a video mode such that modes are tagged with their scan type, (p)rogessive, (i)nterlaced, (d)ouble scan. For example, U:1920x1080i-50. This is useful to disambiguate some of the 'consumer' video timings found in CEA-861 (especially those for EDTV). Signed-off-by: Daniel R Thompson Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90b4f9aca4d124d114e02bbb3d1d4f3d1d47138f tree e367b2fd3ad08b706bd7825c6251a95284f3bb76 parent 1a8c9795290361cef232fd54f425a57d143108a8 author Edgar Hucek Mon, 26 Jun 2006 00:26:59 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:32 -0700 [PATCH] imacfb: Add Intel-based Macintosh Framebuffer Support This patch adds a new framebuffer driver for the Intel Based macs. This framebuffer is needed when booting from EFI to get something out the box. [akpm: note: doesn't support modular building] [akpm@osdl.org: cleanups] Signed-off-by: Edgar Hucek Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a8c9795290361cef232fd54f425a57d143108a8 tree 1b7cfc5ca7b0ee80083320d5a06b33118c4fd34b parent 9b27915b6aa33b5fbc17beb8c7d5d0b662419018 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:58 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:31 -0700 [PATCH] atyfb: Fix section warnings Fix the following warning: WARNING: drivers/video/aty/atyfb.o - Section mismatch: reference to .init.text:aty_init_cursor from .text between 'aty_init' (at offset 0x241d) and 'atyfb_blank' Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b27915b6aa33b5fbc17beb8c7d5d0b662419018 tree 3eaca9bf89747566d6e22f0493950950aaaa6d9d parent f837e6f73fe3f04594dad9829df6c7baa5b64a85 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:57 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:31 -0700 [PATCH] macmodes: Fix section warning Fix the following warning: WARNING: drivers/video/macmodes.o - Section mismatch: reference to .init.text:mac_find_mode from __ksymtab after '__ksymtab_mac_find_mode' (at offset 0x10) Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f837e6f73fe3f04594dad9829df6c7baa5b64a85 tree ef08bf98f116c50189a5659137e7f6b6b1795b60 parent 4efefd1d8ea4eaf71bacc4f71fa017c202fa67ec author Antonino A. Daplas Mon, 26 Jun 2006 00:26:56 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:31 -0700 [PATCH] fbdev: Fix logo rotation if width != height Logo drawing crashes or produces a corrupt display if the logo width and height are not equal. The dimensions are transposed prior to the actual rotation and the width is used instead of the height in the actual rotation code. These produce a corrupt image. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4efefd1d8ea4eaf71bacc4f71fa017c202fa67ec tree a4dfb7b415cc9591f3450ee2220b520af9517c38 parent dc1c43e972c95b82416cc87258dbc037d6de5923 author Christian Trefzer Mon, 26 Jun 2006 00:26:55 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:31 -0700 [PATCH] neofb: fix unblank logic interfering with lid toggled backlight This is a fix for the most annoying problem that remained with neofb: After "setterm -powersave powerdown" the console blanker will disable the backlight after the given timeout expires. If this happens after the lid has been shut, we read "LCD off" from the register and store that in the driver. Once the lid is opened, the backlight turns on, but any key press that would awaken the blanked console will switch the backlight off again. The workaround so far was to use the "display config toggle" Fn key combo - once if no external display is attached, otherwise as often as required to restore the desired display setup. The following patch fixes the issue at least for the LCD-only case, with no external monitor attached. Other display setup permutations are pending further testing, but so far I can guarantee at least no negative change in behaviour, if any at all. Signed-off-by: Christian Trefzer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc1c43e972c95b82416cc87258dbc037d6de5923 tree 5b6d2de49c877dfc408cbe81b5b93d6883538be0 parent f77f50ca1a236ae213d1b9cef4ac042090c98ae6 author Arnaldo Carvalho de Melo Mon, 26 Jun 2006 00:26:51 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:31 -0700 [PATCH] skeletonfb: remove duplicate module init, exit, license lines Signed-off-by: Arnaldo Carvalho de Melo Acked-by: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f77f50ca1a236ae213d1b9cef4ac042090c98ae6 tree 25ab1fe586378c43b3a8d3e42a13f2cfeeb2c3e7 parent 137a8899b1dba82b54463811844995a33b21ca39 author Rodolfo Giometti Mon, 26 Jun 2006 00:26:49 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:31 -0700 [PATCH] au1100fb: add power management support Add power management support [akpm@osdl.org: cleanup] Signed-off-by: Rodolfo Giometti Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 137a8899b1dba82b54463811844995a33b21ca39 tree 4437b760766db42f7f9cc622be54c26c12bdb488 parent 6931a764e1cff26c59be23fbde94cd51fe96bf42 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:49 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:31 -0700 [PATCH] backlight: Fix Kconfig dependency CONFIG_FB = m and CONFIG_{BACKLIGHT:LCD}_CLASS_DEVICE = y is possible resulting in link errors. Fix by making backlight and lcd class also depend on FB Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6931a764e1cff26c59be23fbde94cd51fe96bf42 tree 2a2b66ca3cd1d73a022ee43665d514d8c3a2957f parent c72755b3bdcf551dcfb1d061c8f09fc243e28f49 author Arnaud Patard Mon, 26 Jun 2006 00:26:45 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:31 -0700 [PATCH] s3c2410fb: Fix resume regs.lcdcon1 was not updated on suspend. The result was a garbaged display on resume. This bug was first noticed by Christer Weinigel. This patch is a modified version of the one he sent to me. Signed-off-by: Arnaud Patard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c72755b3bdcf551dcfb1d061c8f09fc243e28f49 tree 05418c8c33a024c0a1b1aef14247316a66dbedce parent 17cc6281c12b26425209c58e3d8825a9568db3cc author Adrian Bunk Mon, 26 Jun 2006 00:26:45 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:31 -0700 [PATCH] fbdev: Remove unused exports This patch removes the following unused EXPORT_SYMBOL's: - fbcvt.c: fb_find_mode_cvt - fbmem.c: fb_con_duit - fbmem.c: fb_new_modelist - macmodes.c: mac_var_to_vmode - modedb.c: fb_delete_videomode - modedb.c: fb_destroy_modelist Signed-off-by: Adrian Bunk Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17cc6281c12b26425209c58e3d8825a9568db3cc tree ad5d9b0dc35765e7d2ae8c7d53784531ba1e690f parent 8126a044f9e686f4ecf95e32fd89ad1dd48b4183 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:44 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:31 -0700 [PATCH] fbdev: Coverity Bug 90 It's a false positive, but let's suppress it anyway. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8126a044f9e686f4ecf95e32fd89ad1dd48b4183 tree 0f80ff412b46d7d2b6a57224fd457a588ded80ca parent 0fa67f84f445e8c567f8a189f2262dd9f8334bc1 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:43 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:30 -0700 [PATCH] fbdev: Coverity Bug 85 It's a false positive, but let's suppress it anyway. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fa67f84f445e8c567f8a189f2262dd9f8334bc1 tree 6e71418fc5b3e4e578e1a79f211f784f3cb28ab3 parent 4ee1acce49d616e0e3fbff76fa1dea0c7350535d author Antonino A. Daplas Mon, 26 Jun 2006 00:26:43 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:30 -0700 [PATCH] atyfb: Fix dead code Coverity Bug 68: Fix dead code Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ee1acce49d616e0e3fbff76fa1dea0c7350535d tree 55e4f15b64263681205e2eabf9749be761dd2362 parent 6dbde380ca525bbfedd65e11402f345e1d64cba9 author David Hollister Mon, 26 Jun 2006 00:26:41 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:30 -0700 [PATCH] vt: Delay the update of the visible console Delay the update of the visible framebuffer console until all other consoles have been initialized in order to avoid losing information. This only seems to be a problem with modules, not with built-in drivers. Signed-off-by: David Hollister Signed-off-by: Jordan Crouse Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6dbde380ca525bbfedd65e11402f345e1d64cba9 tree 4782592646559a4bef308ec1d055bb9a09bd72cf parent 313ca22f0bfab792adeb447146d9cb86536c64d3 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:41 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:30 -0700 [PATCH] vesafb: Prefer VGA registers over PMI - As per VESA specs, use the VGA registers to set the palette if the mode is VGA compatible. Otherwise, use the protected mode interface. - Make pmi_setpal default to 1 Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 313ca22f0bfab792adeb447146d9cb86536c64d3 tree 2a8855eec50beef14a6a4e4ea122cae3e16c9c4f parent f71689e4139a91c98cc476240aca40bd091d4538 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:40 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:30 -0700 [PATCH] vesafb: Fix return code of vesafb_setcolreg If the hardware palette cannot be accessed, make vesafb_setcolreg return a nonzero value. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f71689e4139a91c98cc476240aca40bd091d4538 tree e591d425a0bd55907dcdb8560a7bdfc3fdf3b3bb parent fe610671d7a88e363e8cebcb7e2f32078b0151ce author Dennis Munsie Mon, 26 Jun 2006 00:26:39 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:30 -0700 [PATCH] fbdev: Add 1366x768 (WXGA) mode to mode database Adds 1366x768 @ 60Hz to drivers/video/modedb.c. Signed-off-by: Dennis Munsie Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe610671d7a88e363e8cebcb7e2f32078b0151ce tree bc32cb0616a2a0a2e940e69dc5f0b230bb422e9f parent ba70710e59c701734aad524bc441b3400700e94b author Antonino A. Daplas Mon, 26 Jun 2006 00:26:38 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:30 -0700 [PATCH] nvidiafb: Add support for Geforce 6100 and related chipsets Add support for Geforce 6100 and related chipsets (PCI device id 0x024x) Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba70710e59c701734aad524bc441b3400700e94b tree b48dc0a2295ac3a1c76d60418c1ca0ddb02d99cc parent 026fbe16c29848648599df9967b98250a6b86916 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:37 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:30 -0700 [PATCH] fbdev: Firmware EDID fixes - make firmware edid independent from framebuffer (No need to choose framebuffer just to disable this option - enable this option in X86_64 - check if VBE/DDC function is implemented before calling actual function Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 026fbe16c29848648599df9967b98250a6b86916 tree 1810960b5b8130265c3509c957b1b0216b0103bd parent 0c683dbfc017e52e632853b33981be1a49276ba6 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:36 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:30 -0700 [PATCH] savagefb: Whitespace cleanup Whitespace cleanup Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c683dbfc017e52e632853b33981be1a49276ba6 tree feb766bb827598e2fc5cf0635a1e58308945431a parent ae6d3218760f3cc28192de1f7ff594be744495b4 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:36 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:29 -0700 [PATCH] fbdev: Static pseudocolor with depth less than 4 does exist A static pseudocolor visual with depth less than 4 does exist, so let's not accidentally upscale the depth with this configuration Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae6d3218760f3cc28192de1f7ff594be744495b4 tree ed96718a292d07d2b77457604c950e9c4af777c2 parent 20cecf6a6ade62e3a721eb31540f22126df7462b author Antonino A. Daplas Mon, 26 Jun 2006 00:26:35 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:29 -0700 [PATCH] vga16fb: Update platform code Update platform code to dynamically allocate the platform device Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20cecf6a6ade62e3a721eb31540f22126df7462b tree 064382401cbee14ca35b48ebdf34047fab7f2824 parent 103edf024b98ff6a1feef9c43886f39b00c5753d author Antonino A. Daplas Mon, 26 Jun 2006 00:26:34 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:29 -0700 [PATCH] vfb: Update platform code Update platform code to dynamically allocate the platform device Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 103edf024b98ff6a1feef9c43886f39b00c5753d tree 14abaa9b44a47fd013c10f067d20dd165c0198ca parent 673681c1b575a73159606ae3c4498de851596489 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:33 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:29 -0700 [PATCH] vesafb: Update platform code Update platform code to dynamically allocate the platform device Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 673681c1b575a73159606ae3c4498de851596489 tree f590155c9c903ba653c4a59f8f04acb57cd6c6e8 parent 7914cb27eebed4868bac01a28f550ea966fb422e author Antonino A. Daplas Mon, 26 Jun 2006 00:26:33 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:29 -0700 [PATCH] epson1355fb: Update platform code Update platform code to dynamically allocate the platform device Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7914cb27eebed4868bac01a28f550ea966fb422e tree cca294725394514793c553219e8c2faf7d23a3e3 parent 58221097a8d8aa2151a70cbf749977998bb3d815 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:32 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:29 -0700 [PATCH] atyfb: Set correct acceleration flags Set the appropriate acceleration flags so fbcon can choose the optimal scrolling mode. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58221097a8d8aa2151a70cbf749977998bb3d815 tree 46ae4968747d2edf596c440719f8b05ec67be3d4 parent 72c24cc51aef31219f2e258b4dcb68e09399e040 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:31 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:29 -0700 [PATCH] atyfb: Remove unneeded calls to wait_for_idle The drawing functions of atyfb is unecessary syncing the GPU which is affecting performance. Remove the calls, any direct access by fbcon to the framebuffer will always be preceeded by a call to atyfb_sync(). Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72c24cc51aef31219f2e258b4dcb68e09399e040 tree 22744106aeeef6f10abf45b34e2a5c3e5da8cb09 parent 8eec4981080dc9dcf8fd5931a947c6f066ee0be6 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:31 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:29 -0700 [PATCH] atyfb: Fix hardware cursor handling Fix image and color handling in atyfb_cursor() - In the 2-bit scheme of the cursor image, just set the first bit to be always zero (turn off transparency and/or XOR), and just do the masking manually - The cursor color is converted into 32-bit RGBA8888 using struct fb_cmap. Each component in the cmap is u16 in size, so mask the upper 8 bits. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8eec4981080dc9dcf8fd5931a947c6f066ee0be6 tree df0822ee01841ee32f0c3adf7c226eaed0dd8224 parent 3007683144b2d53008363f5a7b36a78c53710db4 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:30 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:29 -0700 [PATCH] nvidiafb: Revise pci_device_id table nVidia is churning out chipsets like there's no tomorrow. And even though the pci_device_id table now has numerous entries, it is still not guaranteed that all supported devices are included or will be included. Fortunately, nvidiafb has chipset detection logic built in. So, change the contents of the pci_device_id table so it will capture all nVidia devices of the display class. Unsupported chipsets will then be filtered out by nvidiafb's detection logic. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3007683144b2d53008363f5a7b36a78c53710db4 tree dc738feee436ec164fb841f82d015f33e9d36e83 parent 22f4a00fd5207a107fb81984f7b4cc09e5047b45 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:29 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:29 -0700 [PATCH] fbdev: More accurate sync range extrapolation The EDID block should specify the display's operating limits (vertical and horizontal sync ranges, and maximum dot clock). If not given by the EDID block, the ranges are extrapolated from the modelist. However, the computation used is only a rough approximation, and the resulting values may not reflect the actual capability of the display. This problem is frequently encountered when the EDID block has a single entry, the single mode entry will fail validation. To prevent this, calculate the values based on the same method used in fb_validate_mode(). Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22f4a00fd5207a107fb81984f7b4cc09e5047b45 tree d051e758c7a2e509605ee0d699b973f3067ed031 parent 31c5cdba69c3c6e9bb1aaf15870f5c23402267e0 author Adrian Bunk Mon, 26 Jun 2006 00:26:28 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:28 -0700 [PATCH] fbdev: Remove duplicate #include's Remove unneeded duplicate #include's of the same header file. In the case of fbmon.c linux/pci.h is now #include'd unconditional, but this should be safe. Signed-off-by: Adrian Bunk Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31c5cdba69c3c6e9bb1aaf15870f5c23402267e0 tree 091fe4832efd7d284fb4f4130097faa65a167d2c parent e4423781850025726b6c4e24ba3d93c7ff9cd826 author Adrian Bunk Mon, 26 Jun 2006 00:26:28 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:28 -0700 [PATCH] fbdev: cleanup the CONFIG_VIDEO_SELECT mess We had three (sic) VIDEO_SELECT options: - two in drivers/video/Kconfig - one in drivers/video/console/Kconfig This patch removes the two options in drivers/video/Kconfig and also removes the unneeded usage in drivers/video/sis/sis_main.c . Signed-off-by: Adrian Bunk Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4423781850025726b6c4e24ba3d93c7ff9cd826 tree a154cdf7a39e0554177cd096758f28efcc24c1e1 parent f8020dc560fde089becc05de1d0ada1f7f46dc51 author Richard Purdie Mon, 26 Jun 2006 00:26:27 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:28 -0700 [PATCH] backlight: LOCOMO Backlight Driver updates Add backlight intensity control to the LOCOMO lcd/backlight driver using the backlight class and add basic power management support. This is a reimplementation and improvement of patches by John Lenz and Pavel Machek Signed-off-by: Richard Purdie Signed-off-by: Antonino Daplas Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8020dc560fde089becc05de1d0ada1f7f46dc51 tree 20e0c20df709072838a554215fc608c3b3543244 parent 2356614b08bf8769790c4f1f55c83d95f802bc51 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:24 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:28 -0700 [PATCH] savagefb: Add state save and_restore hooks Reported by: Rich (Bugzilla Bug 6417) "if savage driver is used in x.org together with savagefb, it results in seriously garbled and distorted screen - coupled with severe slowdowns." This bug is the result of Xorg unable to handle savagefb altering the hardware which results in X failing to start properly and/or failed console switching. Add savagefb_state_save and savagefb_state_restore. These hooks will only save and restore the extended VGA registers. Standard VGA registers will be left alone. This is enough to make savagefb play nicely with the latest Xorg savage driver, and perhaps with savage DRI. (Transient screen artifacts may appear before X loads and during console switches). (Unfortunately, blanking the screen also leaves Xorg in a blanked state, so I have to unblank the screen before Xorg loads. So I doubt if the transient screen artifacts will be completely invisible but hopefully it will only be for a shorter duration (not much).) [akpm@osdl.org: cleanups] Signed-off-by: Antonino Daplas Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2356614b08bf8769790c4f1f55c83d95f802bc51 tree b91aaa653189fabe3cb09fc9ed015fa384b22b01 parent 1ba70a019599b4fa3e091c6dbc4a04e2c607eea3 author Antonino A. Daplas Mon, 26 Jun 2006 00:26:23 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:28 -0700 [PATCH] savagefb: Allocate space for current and saved register states Allocate space for 2 register states: 'current' for the current state of the hardware, and 'saved', to be used for restoring the hardware to a sane state. This is in preparation for the addition of state save and restore hooks to make savagefb work together with the latest Xorg savage driver. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ba70a019599b4fa3e091c6dbc4a04e2c607eea3 tree a4ceed29e47bef02c46de92b529940dd845a07d0 parent fb4ece268bfebaa9f8084b3aa854b56867935724 author Tobias Oed Mon, 26 Jun 2006 00:26:19 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:28 -0700 [PATCH] Remove code that has long been commented out from pdc20265_old Signed-off-by: Tobias Oed Acked-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Sergei Shtylyov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb4ece268bfebaa9f8084b3aa854b56867935724 tree f7f92fa7999995fc0fe00a3cb31370f7bf0c5b4f parent 3d1c1cc962cebaae6a70fd89a0adb29ad10a2a12 author Tobias Oed Mon, 26 Jun 2006 00:26:18 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:28 -0700 [PATCH] pdc202xx_old depends on CONFIG_BLK_DEV_IDEDMA The driver pdc202xx_old requires CONFIG_BLK_DEV_IDEDMA, so it's always defined Signed-off-by: Tobias Oed Acked-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Sergei Shtylyov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d1c1cc962cebaae6a70fd89a0adb29ad10a2a12 tree aff0c6a073d42abe8ff80f1aed98c9b01c0eced7 parent 8b6ebe016bf68fc9b3f3f2ce79c1918b0808481c author Ingo Molnar Mon, 26 Jun 2006 00:26:17 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:28 -0700 [PATCH] fix IDE deadlock in error reporting code Michal Piotrowski reported the following validator assert: hdd: set_drive_speed_status: status=0x51 { DriveReady SeekComplete Error } hdd: set_drive_speed_status: error=0xb4 { AbortedCommand LastFailedSense=0x0b } ============================ [ BUG: illegal lock usage! ] ---------------------------- illegal {in-hardirq-W} -> {hardirq-on-W} usage. hdparm/1821 [HC0[0]:SC0[0]:HE1:SE1] takes: (ide_lock){++..}, at: [] ide_dump_opcode+0x13/0x9b [...] stack backtrace: [] show_trace+0x1b/0x20 [] dump_stack+0x1f/0x24 [] print_usage_bug+0x1a5/0x1b1 [] mark_lock+0x2ca/0x4f7 [] __lockdep_acquire+0x47e/0xaa4 [] lockdep_acquire+0x67/0x7f [] _spin_lock+0x24/0x32 [] ide_dump_opcode+0x13/0x9b [] ide_dump_status+0x4a6/0x4cc [] ide_config_drive_speed+0x32a/0x33a [] piix_tune_chipset+0x2ed/0x2f8 [] piix_config_drive_xfer_rate+0x61/0xb5 [] set_using_dma+0x2f/0x60 [] ide_write_setting+0x4a/0xc3 [] generic_ide_ioctl+0x8a/0x47f [] idecd_ioctl+0xfd/0x133 [ide_cd] [] blkdev_driver_ioctl+0x4b/0x5f [] blkdev_ioctl+0x770/0x7bd [] block_ioctl+0x1f/0x21 [] do_ioctl+0x27/0x6e [] vfs_ioctl+0x26a/0x280 [] sys_ioctl+0x4d/0x7e [] sysenter_past_esp+0x63/0xa1 in ide_dump_opcode() takes the ide_lock in an irq-unsafe manner, i.e. this function expects to be called with irqs disabled. But ide_dump_ata[pi]_status() doesnt do that - it enables interrupts specifically. That is a no-no - what guarantees that another IDE port couldnt generate an IDE interrupt while we are dumping this error? The fix is to turn the irq-enabling in these functions into irq-disabling. Signed-off-by: Ingo Molnar Cc: Michal Piotrowski Cc: Alan Cox Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b6ebe016bf68fc9b3f3f2ce79c1918b0808481c tree 695ae9c7a2e0053adb410b7e2e9b0797068fbf55 parent 17c1033d331a430ce631805e15215e63b4cce764 author Sergei Shtylyov Mon, 26 Jun 2006 00:26:16 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:28 -0700 [PATCH] ide: pdc202xx_old: remove the obsolete busproc Remove the busproc from pdc202xx_old.c because: - it handles the obsolete HDIO_TRISTATE_HWIF ioctl instead of the modern HDIO_SET_BUSSTATE, so treats its argument wrong; - I don't think that tristating both channels is good idea (probably can't be done otherwise since there seems to be only single bit controlling this). Signed-off-by: Sergei Shtylyov Cc: Bartlomiej Zolnierkiewicz Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17c1033d331a430ce631805e15215e63b4cce764 tree 3ec734f17ecc4a77116388947e8ee96426ee2d01 parent 178184b60979992508130741f16499c360bc9c9a author Sergei Shtylyov Mon, 26 Jun 2006 00:26:15 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:27 -0700 [PATCH] ide: actually honor drive's minimum PIO/DMA cycle times The function ide_timing_compute() fails to *actually* take drive's specified minimum PIO/DMA cycle times into account -- when doing this, it calls ide_timing_merge() on the 'struct ide_timing' argument which contains garbage at the moment, and then ultimately destroys the read cycle time by quantizing the ide_timing[] entry, instead of copying from that entry to the argument structure, and only then doing a merge/quantize. Cc: Bartlomiej Zolnierkiewicz Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 178184b60979992508130741f16499c360bc9c9a tree 32a565f7e25e720e24f1c81fb2ae94644687b732 parent 4fb0f76d8cf4f7a3ffc36dd5e1bc8ca977b68824 author Al Boldi Mon, 26 Jun 2006 00:26:13 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:27 -0700 [PATCH] ide-io: increase timeout value to allow for slave wakeup During an STR resume cycle, the ide master disk times-out when there is also a slave present (especially CD). Increasing the timeout in ide-io from 10,000 to 100,000 fixes this problem. Acked-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4fb0f76d8cf4f7a3ffc36dd5e1bc8ca977b68824 tree 6ba26f667cdddae3aea67253ae6c2fce0c1dffc8 parent b5cdccf841d7d29fb96e03de5a64ed395e0fde61 author Alan Cox Mon, 26 Jun 2006 00:26:12 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:27 -0700 [PATCH] Fix IDE locking error This bit us a few kernels ago, and for some reason never made it's way upstream. https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=144743 Kernel panic - not syncing: drivers/ide/pci/piix.c:231: spin_lock(drivers/ide/ide.c:c03cef28) already locked by driver/ide/ide-iops.c/1153. Signed-off-by: Dave Jones Cc: Bartlomiej Zolnierkiewicz Cc: Dave Jones Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5cdccf841d7d29fb96e03de5a64ed395e0fde61 tree e5a86f6d820659168a85ddd37e170c146609aa10 parent cf2dfbfbf4c5cb489ea12defd85a484307b955b8 author Tobias Oed Mon, 26 Jun 2006 00:26:11 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:27 -0700 [PATCH] ide: pdc202xx_old.c: remove unneeded tuneproc() call Remove a call to hwif->tuneproc() on the error path of config_chipset_for_dma(), as its single caller (pdc202xx_config_drive_xfer_rate()) will do the call in that case. Signed-off-by: Tobias Oed Cc: Bartlomiej Zolnierkiewicz Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf2dfbfbf4c5cb489ea12defd85a484307b955b8 tree c6aa61378a738694390c2728957ed72608b4a183 parent 5debfa6da5b06954bc79fe8deed0d1062c58dcec author Oleg Nesterov Mon, 26 Jun 2006 00:26:10 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:27 -0700 [PATCH] coredump: copy_process: don't check SIGNAL_GROUP_EXIT After the previous patch SIGNAL_GROUP_EXIT implies a pending SIGKILL, we can remove this check from copy_process() because we already checked !signal_pending(). Signed-off-by: Oleg Nesterov Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5debfa6da5b06954bc79fe8deed0d1062c58dcec tree 30cb592c5020cccd203f4ab466dea9eee3f626d5 parent dcf560c59330945a231d5e52f95dfedde4e32c9d author Oleg Nesterov Mon, 26 Jun 2006 00:26:09 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:27 -0700 [PATCH] coredump: shutdown current process first This patch optimizes zap_threads() for the case when there are no ->mm users except the current's thread group. In that case we can avoid 'for_each_process()' loop. It also adds a useful invariant: SIGNAL_GROUP_EXIT (if checked under ->siglock) always implies that all threads (except may be current) have pending SIGKILL. Signed-off-by: Oleg Nesterov Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcf560c59330945a231d5e52f95dfedde4e32c9d tree 069e34265ee3e6b3adbde1a75ed7a588eef23ef7 parent 7b1c6154fa8bb937e0b1b4f2adbb315d70270f10 author Oleg Nesterov Mon, 26 Jun 2006 00:26:08 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:27 -0700 [PATCH] coredump: some code relocations This is a preparation for the next patch. No functional changes. Basically, this patch moves '->flags & SIGNAL_GROUP_EXIT' check into zap_threads(), and 'complete(vfork_done)' into coredump_wait outside of ->mmap_sem protected area. Signed-off-by: Oleg Nesterov Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b1c6154fa8bb937e0b1b4f2adbb315d70270f10 tree 1d58e5e7da61330639ebe62671fb666596d1b00a parent d5f70c00ad24cd1158d3678b44ff969b4c971d49 author Oleg Nesterov Mon, 26 Jun 2006 00:26:08 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:27 -0700 [PATCH] coredump: don't take tasklist_lock This patch removes tasklist_lock from zap_threads(). This is safe wrt: do_exit: The caller holds mm->mmap_sem. This means that task which shares the same ->mm can't pass exit_mm(), so it can't be unhashed from init_task.tasks or ->thread_group lists. fork: None of sub-threads can fork after zap_process(leader). All processes which were created before this point should be visible to zap_threads() because copy_process() adds the new process to the tail of init_task.tasks list, and ->siglock lock/unlock provides a memory barrier. de_thread: It does list_replace_rcu(&leader->tasks, ¤t->tasks). So zap_threads() will see either old or new leader, it does not matter. However, it can change p->sighand, so we should use lock_task_sighand() in zap_process(). Signed-off-by: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d5f70c00ad24cd1158d3678b44ff969b4c971d49 tree b4b71a71b413250fb24cb2d83cbbfd7507da9efc parent 281de339ceb822ca6c04d4373ecb9a45c1890ce4 author Oleg Nesterov Mon, 26 Jun 2006 00:26:07 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:27 -0700 [PATCH] coredump: kill ptrace related stuff With this patch zap_process() sets SIGNAL_GROUP_EXIT while sending SIGKILL to the thread group. This means that a TASK_TRACED task 1. Will be awakened by signal_wake_up(1) 2. Can't sleep again via ptrace_notify() 3. Can't go to do_signal_stop() after return from ptrace_stop() in get_signal_to_deliver() So we can remove all ptrace related stuff from coredump path. Signed-off-by: Oleg Nesterov Cc: "Eric W. Biederman" Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 281de339ceb822ca6c04d4373ecb9a45c1890ce4 tree 8791013a7d92078a9c00a1a67c80c9b0760a9954 parent aceecc041217b35df753d1ed6e25bd17c0c558d8 author Oleg Nesterov Mon, 26 Jun 2006 00:26:06 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:27 -0700 [PATCH] coredump: speedup SIGKILL sending With this patch a thread group is killed atomically under ->siglock. This is faster because we can use sigaddset() instead of force_sig_info() and this is used in further patches. Signed-off-by: Oleg Nesterov Cc: "Eric W. Biederman" Acked-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aceecc041217b35df753d1ed6e25bd17c0c558d8 tree d78a9961bd8daecc31fc4720868b6f2a9a93aa94 parent 2ceb8693ef63ae3d154ce1a05d275f2bb20a5e4c author Oleg Nesterov Mon, 26 Jun 2006 00:26:05 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:26 -0700 [PATCH] coredump: optimize ->mm users traversal zap_threads() iterates over all threads to find those ones which share current->mm. All threads in the thread group share the same ->mm, so we can skip entire thread group if it has another ->mm. This patch shifts the killing of thread group into the newly added zap_process() function. This looks as unnecessary complication, but it is used in further patches. Signed-off-by: Oleg Nesterov Cc: "Eric W. Biederman" Acked-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ceb8693ef63ae3d154ce1a05d275f2bb20a5e4c tree 6e61f8c5513cb905d6326417b0e95f27d3623735 parent 42c3e03ef6b298813557cdb997bd6db619cd65a2 author Oleg Nesterov Mon, 26 Jun 2006 00:26:04 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:26 -0700 [PATCH] de_thread: fix lockless do_each_thread We should keep the value of old_leader->tasks.next in de_thread, otherwise we can't do for_each_process/do_each_thread without tasklist_lock held. Signed-off-by: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42c3e03ef6b298813557cdb997bd6db619cd65a2 tree c2fba776ccf7015d45651ff7d2aee89f06da6f42 parent c1df7fb88a011b39ea722ac00975c5b8a803261b author Eric Paris Mon, 26 Jun 2006 00:26:03 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:26 -0700 [PATCH] SELinux: Add sockcreate node to procattr API Below is a patch to add a new /proc/self/attr/sockcreate A process may write a context into this interface and all subsequent sockets created will be labeled with that context. This is the same idea as the fscreate interface where a process can specify the label of a file about to be created. At this time one envisioned user of this will be xinetd. It will be able to better label sockets for the actual services. At this time all sockets take the label of the creating process, so all xinitd sockets would just be labeled the same. I tested this by creating a tcp sender and listener. The sender was able to write to this new proc file and then create sockets with the specified label. I am able to be sure the new label was used since the avc denial messages kicked out by the kernel included both the new security permission setsockcreate and all the socket denials were for the new label, not the label of the running process. Signed-off-by: Eric Paris Signed-off-by: James Morris Cc: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1df7fb88a011b39ea722ac00975c5b8a803261b tree d3cbbe5bde859897993ceb8969a080ae71166a67 parent a872ff0cb2218dc9688b990c5ccda064dc40946b author Oleg Nesterov Mon, 26 Jun 2006 00:26:02 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:26 -0700 [PATCH] cleanup next_tid() Try to make next_tid() a bit more readable and deletes unnecessary "pid_alive(pos)" check. Signed-off-by: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a872ff0cb2218dc9688b990c5ccda064dc40946b tree ff94ae63e668f0229fc7aeed220def7e9708db3a parent cc288738c9ae3c64d3c50b86604044d1f6d22941 author Oleg Nesterov Mon, 26 Jun 2006 00:26:01 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:26 -0700 [PATCH] simplify/fix first_tid() first_tid: /* If nr exceeds the number of threads there is nothing todo */ if (nr) { if (nr >= get_nr_threads(leader)) goto done; } This is not reliable: sub-threads can exit after this check, so the 'for' loop below can overlap and proc_task_readdir() can return an already filldir'ed dirents. for (; pos && pid_alive(pos); pos = next_thread(pos)) { if (--nr > 0) continue; Off-by-one error, will return 'leader' when nr == 1. This patch tries to fix these problems and simplify the code. Signed-off-by: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc288738c9ae3c64d3c50b86604044d1f6d22941 tree 87058616bfa84572647fbe574fe733e81c1d17b6 parent df26c40e567356caeefe2861311e19c54444d917 author Eric W. Biederman Mon, 26 Jun 2006 00:26:01 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:26 -0700 [PATCH] proc: Remove tasklist_lock from proc_task_readdir. This is just like my previous removal of tasklist_lock from first_tgid, and next_tgid. It simply had to wait until it was rcu safe to walk the thread list. This should be the last instance of the tasklist_lock in proc. So user processes should not be able to influence the tasklist lock hold times. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df26c40e567356caeefe2861311e19c54444d917 tree 415527677e85e8b612b916f6fda1645a6207d8e2 parent 778c1144771f0064b6f51bee865cceb0d996f2f9 author Eric W. Biederman Mon, 26 Jun 2006 00:25:59 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:26 -0700 [PATCH] proc: Cleanup proc_fd_access_allowed In process of getting proc_fd_access_allowed to work it has developed a few warts. In particular the special case that always allows introspection and the special case to allow inspection of kernel threads. The special case for introspection is needed for /proc/self/mem. The special case for kernel threads really should be overridable by security modules. So consolidate these checks into ptrace.c:may_attach(). The check to always allow introspection is trivial. The check to allow access to kernel threads, and zombies is a little trickier. mem_read and mem_write already verify an mm exists so it isn't needed twice. proc_fd_access_allowed only doesn't want a check to verify task->mm exits, s it prevents all access to kernel threads. So just move the task->mm check into ptrace_attach where it is needed for practical reasons. I did a quick audit and none of the security modules in the kernel seem to care if they are passed a task without an mm into security_ptrace. So the above move should be safe and it allows security modules to come up with more restrictive policy. Signed-off-by: Eric W. Biederman Cc: Stephen Smalley Cc: Chris Wright Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 778c1144771f0064b6f51bee865cceb0d996f2f9 tree 1204e6d84cc5e7e75374544102839e85cfb9eba0 parent 5b0c1dd38b66e2dd0cf655aa845e341b50b93ddd author Eric W. Biederman Mon, 26 Jun 2006 00:25:58 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:26 -0700 [PATCH] proc: Use sane permission checks on the /proc//fd/ symlinks Since 2.2 we have been doing a chroot check to see if it is appropriate to return a read or follow one of these magic symlinks. The chroot check was asking a question about the visibility of files to the calling process and it was actually checking the destination process, and not the files themselves. That test was clearly bogus. In my first pass through I simply fixed the test to check the visibility of the files themselves. That naive approach to fixing the permissions was too strict and resulted in cases where a task could not even see all of it's file descriptors. What has disturbed me about relaxing this check is that file descriptors are per-process private things, and they are occasionaly used a user space capability tokens. Looking a little farther into the symlink path on /proc I did find userid checks and a check for capability (CAP_DAC_OVERRIDE) so there were permissions checking this. But I was still concerned about privacy. Besides /proc there is only one other way to find out this kind of information, and that is ptrace. ptrace has been around for a long time and it has a well established security model. So after thinking about it I finally realized that the permission checks that make sense are the permission checks applied to ptrace_attach. The checks are simple per process, and won't cause nasty surprises for people coming from less capable unices. Unfortunately there is one case that the current ptrace_attach test does not cover: Zombies and kernel threads. Single stepping those kinds of processes is impossible. Being able to see which file descriptors are open on these tasks is important to lsof, fuser and friends. So for these special processes I made the rule you can't find out unless you have CAP_SYS_PTRACE. These proc permission checks should now conform to the principle of least surprise. As well as using much less code to implement :) Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b0c1dd38b66e2dd0cf655aa845e341b50b93ddd tree e8d3341591958d9c3e11400a2f16287a6dd00c46 parent 13b41b09491e5d75e8027dca1ee78f5e073bc4c0 author Eric W. Biederman Mon, 26 Jun 2006 00:25:57 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:26 -0700 [PATCH] proc: optimize proc_check_dentry_visible The code doesn't need to sleep to when making this check so I can just do the comparison and not worry about the reference counts. TODO: While looking at this I realized that my original cleanup did not push the permission check far enough down into the stack. The call of proc_check_dentry_visible needs to move out of the generic proc readlink/follow link code and into the individual get_link instances. Otherwise the shared resources checks are not quite correct (shared files_struct does not require a shared fs_struct), and there are races with unshare. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13b41b09491e5d75e8027dca1ee78f5e073bc4c0 tree 3f08183a4f59075fc3015165183b8ef17cb562a6 parent 99f895518368252ba862cc15ce4eb98ebbe1bec6 author Eric W. Biederman Mon, 26 Jun 2006 00:25:56 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:26 -0700 [PATCH] proc: Use struct pid not struct task_ref Incrementally update my proc-dont-lock-task_structs-indefinitely patches so that they work with struct pid instead of struct task_ref. Mostly this is a straight 1-1 substitution. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99f895518368252ba862cc15ce4eb98ebbe1bec6 tree a9dcc01963221d1fd6a7e357b95d361ebfe91c6d parent 8578cea7509cbdec25b31d08b48a92fcc3b1a9e3 author Eric W. Biederman Mon, 26 Jun 2006 00:25:55 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:25 -0700 [PATCH] proc: don't lock task_structs indefinitely Every inode in /proc holds a reference to a struct task_struct. If a directory or file is opened and remains open after the the task exits this pinning continues. With 8K stacks on a 32bit machine the amount pinned per file descriptor is about 10K. Normally I would figure a reasonable per user process limit is about 100 processes. With 80 processes, with a 1000 file descriptors each I can trigger the 00M killer on a 32bit kernel, because I have pinned about 800MB of useless data. This patch replaces the struct task_struct pointer with a pointer to a struct task_ref which has a struct task_struct pointer. The so the pinning of dead tasks does not happen. The code now has to contend with the fact that the task may now exit at any time. Which is a little but not muh more complicated. With this change it takes about 1000 processes each opening up 1000 file descriptors before I can trigger the OOM killer. Much better. [mlp@google.com: task_mmu small fixes] Signed-off-by: Eric W. Biederman Cc: Trond Myklebust Cc: Paul Jackson Cc: Oleg Nesterov Cc: Albert Cahalan Signed-off-by: Prasanna Meda Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8578cea7509cbdec25b31d08b48a92fcc3b1a9e3 tree 8de6c9bcd4108c3311fab9e66c3be5132e6f854d parent 9cc8cbc7f8b7bc3db48bf6d59a731af728e786ce author Eric W. Biederman Mon, 26 Jun 2006 00:25:54 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:25 -0700 [PATCH] proc: make PROC_NUMBUF the buffer size for holding integers as strings Currently in /proc at several different places we define buffers to hold a process id, or a file descriptor . In most of them we use either a hard coded number or a different define. Modify them all to use PROC_NUMBUF, so the code has a chance of being maintained. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9cc8cbc7f8b7bc3db48bf6d59a731af728e786ce tree fb94d7ee120c14d7a1b56005e8cd67bcba4083e6 parent de7587343bfebc186995ad294e3de0da382eb9bc author Eric W. Biederman Mon, 26 Jun 2006 00:25:52 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:25 -0700 [PATCH] simply fix first_tgid Like the bug Oleg spotted in first_tid there was also a small off by one error in first_tgid, when a seek was done on the /proc directory. This fixes that and changes the code structure to make it a little more obvious what is going on. Signed-off-by: Eric W. Biederman Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de7587343bfebc186995ad294e3de0da382eb9bc tree db5d696d19c8255bd58929516be79409743c6081 parent 454cc105ef690f2a0ba7c6b194d55666b4e918ce author Eric W. Biederman Mon, 26 Jun 2006 00:25:51 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:25 -0700 [PATCH] proc: Remove tasklist_lock from proc_pid_lookup() and proc_task_lookup() Since we no longer need the tasklist_lock for get_task_struct the lookup methods no longer need the tasklist_lock. This just depends on my previous patch that makes get_task_struct() rcu safe. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 454cc105ef690f2a0ba7c6b194d55666b4e918ce tree b3e4fef90f42ddd16afc324fcff6371e44f63255 parent 0bc58a910220be3446eedc8e77fd45c0a16d8f25 author Eric W. Biederman Mon, 26 Jun 2006 00:25:51 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:25 -0700 [PATCH] proc: Remove tasklist_lock from proc_pid_readdir We don't need the tasklist_lock to safely iterate through processes anymore. This depends on my previous to task patches that make get_task_struct rcu safe, and that make next_task() rcu safe. I haven't gotten first_tid/next_tid yet only because next_thread is missing an rcu_dereference. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0bc58a910220be3446eedc8e77fd45c0a16d8f25 tree 70ffacd6e2e22471034b053e441f305a9507a052 parent cd6a3ce9ec040c0b56ea92a81ff710417798c559 author Eric W. Biederman Mon, 26 Jun 2006 00:25:50 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:25 -0700 [PATCH] proc: refactor reading directories of tasks There are a couple of problems this patch addresses. - /proc//task currently does not work correctly if you stop reading in the middle of a directory. - /proc/ currently requires a full pass through the task list with the tasklist lock held, to determine there are no more processes to read. - The hand rolled integer to string conversion does not properly running out of buffer space. - We seem to be batching reading of pids from the tasklist without reason, and complicating the logic of the code. This patch addresses that by changing how tasks are processed. A first_ function is built that handles restarts, and a next_ function is built that just advances to the next task. first_ when it detects a restart usually uses find_task_by_pid. If that doesn't work because there has been a seek on the directory, or we have already given a complete directory listing, it first checks the number tasks of that type, and only if we are under that count does it walk through all of the tasks to find the one we are interested in. The code that fills in the directory is simpler because there is only a single for loop. The hand rolled integer to string conversion is replaced by snprintf which should handle the the out of buffer case correctly. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd6a3ce9ec040c0b56ea92a81ff710417798c559 tree 350c0b4bb63a971c9409be8459a45b690ef4ac67 parent 48e6484d49020dba3578ad117b461e8a391e8f0f author Eric W. Biederman Mon, 26 Jun 2006 00:25:49 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:25 -0700 [PATCH] proc: Close the race of a process dying durning lookup proc_lookup and task exiting are not synchronized, although some of the previous code may have suggested that. Every time before we reuse a dentry namei.c calls d_op->derevalidate which prevents us from reusing a stale dcache entry. Unfortunately it does not prevent us from returning a stale dcache entry. This race has been explicitly plugged in proc_pid_lookup but there is nothing to confine it to just that proc lookup function. So to prevent the race I call revalidate explictily in all of the proc lookup functions after I call d_add, and report an error if the revalidate does not succeed. Years ago Al Viro did something similar but those changes got lost in the churn. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48e6484d49020dba3578ad117b461e8a391e8f0f tree 7824ca84bfe71c3fe2c09a1fedc31106fec4f500 parent 662795deb854b31501e0ffb42b7f0cce802c134a author Eric W. Biederman Mon, 26 Jun 2006 00:25:48 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:24 -0700 [PATCH] proc: Rewrite the proc dentry flush on exit optimization To keep the dcache from filling up with dead /proc entries we flush them on process exit. However over the years that code has gotten hairy with a dentry_pointer and a lock in task_struct and misdocumented as a correctness feature. I have rewritten this code to look and see if we have a corresponding entry in the dcache and if so flush it on process exit. This removes the extra fields in the task_struct and allows me to trivially handle the case of a /proc//task/ entry as well as the current /proc/ entries. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 662795deb854b31501e0ffb42b7f0cce802c134a tree d4849ad5ca7383ca9d0c9b6d46db83097d5dba85 parent 6e66b52bf587f0dd9a8e0a581b9570e5c1969e33 author Eric W. Biederman Mon, 26 Jun 2006 00:25:48 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:24 -0700 [PATCH] proc: Move proc_maps_operations into task_mmu.c All of the functions for proc_maps_operations are already defined in task_mmu.c so move the operations structure to keep the functionality together. Since task_nommu.c implements a dummy version of /proc//maps give it a simplified version of proc_maps_operations that it can modify to best suit its needs. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e66b52bf587f0dd9a8e0a581b9570e5c1969e33 tree 18b630e89490f7e01ee45f07a427fded50a1c6cf parent 0f2fe20f55c85f26efaf14feeb69c7c2eb3f7a75 author Eric W. Biederman Mon, 26 Jun 2006 00:25:47 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:24 -0700 [PATCH] proc: Fix the link count for /proc//task Use getattr to get an accurate link count when needed. This is cheaper and more accurate than trying to derive it by walking the thread list of a process. Especially as it happens when needed stat instead of at readdir time. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f2fe20f55c85f26efaf14feeb69c7c2eb3f7a75 tree 93649d0579bed2ed43e69f03c06b325bdb0c312e parent 22c2c5d75e6ad4b9ac41269476b32ba8c9fe263f author Eric W. Biederman Mon, 26 Jun 2006 00:25:46 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:24 -0700 [PATCH] proc: Properly filter out files that are not visible to a process Long ago and far away in 2.2 we started checking to ensure the files we displayed in /proc were visible to the current process. It was an unsophisticated time and no one was worried about functions full of FIXMES in a stable kernel. As time passed the function became sacred and was enshrined in the shrine of how things have always been. The fixes came in but only to keep the function working no one really remembering or documenting why we did things that way. The intent and the functionality make a lot of sense. Don't let /proc be an access point for files a process can see no other way. The implementation however is completely wrong. We are currently checking the root directories of the two processes, we are not checking the actual file descriptors themselves. We are strangely checking with a permission method instead of just when we use the data. This patch fixes the logic to actually check the file descriptors and make a note that implementing a permission method for this part of /proc almost certainly indicates a bug in the reasoning. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22c2c5d75e6ad4b9ac41269476b32ba8c9fe263f tree 568754afe4d00da3ecaee4a960021e596d0e4beb parent 68602066c3327fa340899609d715781eda423751 author Eric W. Biederman Mon, 26 Jun 2006 00:25:45 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:24 -0700 [PATCH] proc: Kill proc_mem_inode_operations The inode operations only exist to support the proc_permission function. Currently mem_read and mem_write have all the same permission checks as ptrace. The fs check makes no sense in this context, and we can trivially get around it by calling ptrace. So simply the code by killing the strange weird case. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68602066c3327fa340899609d715781eda423751 tree fdd1db5b08755bf2c353364b56a778f62e5009f4 parent aed7a6c476d90660ac5af860158407ae9fe61c68 author Eric W. Biederman Mon, 26 Jun 2006 00:25:45 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:24 -0700 [PATCH] proc: Remove bogus proc_task_permission First we can access every /proc//task/ directory as /proc/ so proc_task_permission is not usefully limiting visibility. Second having related filesystems information should have nothing to do with process visibility. kill does not implement any checks like that. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aed7a6c476d90660ac5af860158407ae9fe61c68 tree b8b92412f457598a2348de0eb304b9b4ec204157 parent 87bfbf679ffb1e95dd9ada694f66aafc4bfa5959 author Eric W. Biederman Mon, 26 Jun 2006 00:25:44 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:24 -0700 [PATCH] proc: Replace proc_inode.type with proc_inode.fd The sole renaming use of proc_inode.type is to discover the file descriptor number, so just store the file descriptor number and don't wory about processing this field. This removes any /proc limits on the maximum number of file descriptors, and clears the path to make the hard coded /proc inode numbers go away. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87bfbf679ffb1e95dd9ada694f66aafc4bfa5959 tree f4f549435f64bd1c42594dcb4d27d9de92e379f6 parent 167965495153ba9829d0a34b6800dbf5d94de8c8 author Eric W. Biederman Mon, 26 Jun 2006 00:25:43 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:23 -0700 [PATCH] proc: Simplify the ownership rules for /proc Currently in /proc if the task is dumpable all of files are owned by the tasks effective users. Otherwise the files are owned by root. Unless it is the /proc// or /proc//task/ directory in that case we always make the directory owned by the effective user. However the special case for directories is pointless except as a way to read the effective user, because the permissions on both of those directories are world readable, and executable. /proc//status provides a much better way to read a processes effecitve userid, so it is silly to try to provide that on the directory. So this patch simplifies the code by removing a pointless special case and gets us one step closer to being able to remove the hard coded /proc inode numbers. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 167965495153ba9829d0a34b6800dbf5d94de8c8 tree ee923581fc2fb1a9bcae7920a8a362fed7b55705 parent ff9724a3f7a69f7b443c05981f84e28017c2fc5a author Eric W. Biederman Mon, 26 Jun 2006 00:25:42 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:23 -0700 [PATCH] proc: Remove unnecessary and misleading assignments from proc_pid_make_inode The removed fields are already set by proc_alloc_inode. Initializing them in proc_alloc_inode implies they need it for proper cleanup. At least ei->pde was not set on all paths making it look like proc_alloc_inode was buggy. So just remove the redundant assignments. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff9724a3f7a69f7b443c05981f84e28017c2fc5a tree 2c3fae763eb68d18645b4820e2189dc5d0ceabf5 parent 5634708b5fce807bdf2091cfafc2fb24d791f0c8 author Eric W. Biederman Mon, 26 Jun 2006 00:25:42 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:23 -0700 [PATCH] proc: Remove useless BKL in proc_pid_readlink We already call everything except do_proc_readlink outside of the BKL in proc_pid_followlink, and there appears to be nothing in do_proc_readlink that needs any special protection. So remove this leftover from one of the BKL cleanup efforts. Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5634708b5fce807bdf2091cfafc2fb24d791f0c8 tree dc383be7cd284c9364d90147bdea981b3d9cb5d4 parent f05e15b59467d97c30fbffed80db9e00b73d640b author Eric W. Biederman Mon, 26 Jun 2006 00:25:40 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:23 -0700 [PATCH] proc: Fix the .. inode number on /proc//fd Signed-off-by: Eric W. Biederman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f05e15b59467d97c30fbffed80db9e00b73d640b tree 90bc3b3a0854e0b063d438c8b151f0085d287ba0 parent 5024ad4af69b3570e18d312786dc46318a1bad1a author Herbert Xu Mon, 26 Jun 2006 00:25:39 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:23 -0700 [PATCH] nfsd kconfig: select things at the closest tristate instead of bool I noticed recently that my CONFIG_CRYPTO_MD5 turned into a y again instead of m. It turns out that CONFIG_NFSD_V4 is selecting it to be y even though I've chosen to compile nfsd as a module. In general when we have a bool sitting under a tristate it is better to select things you need from the tristate rather than the bool since that allows the things you select to be modules. The following patch does it for nfsd. Signed-off-by: Herbert Xu Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5024ad4af69b3570e18d312786dc46318a1bad1a tree fb92af314e6408ae0a2981e1fb15b11577f68cbe parent 698e3ed9d4f47286134f66ea333b6679b29e59e4 author Hansjoerg Lipp Mon, 26 Jun 2006 00:25:35 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:23 -0700 [PATCH] i4l: Gigaset drivers: add IOCTLs to compat_ioctl.h Add the IOCTLs of the Gigaset drivers to compat_ioctl.h in order to make them available for 32 bit programs on 64 bit platforms. Please merge. Signed-off-by: Hansjoerg Lipp Acked-by: Tilman Schmidt Cc: Karsten Keil Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 698e3ed9d4f47286134f66ea333b6679b29e59e4 tree 07d9fd5666d7bff48ba4520abbb2bc78b7160558 parent 06163f86349f0b39948a86d21b2db0d53e47fd8c author Tilman Schmidt Mon, 26 Jun 2006 00:25:34 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:23 -0700 [PATCH] isdn4linux: Gigaset driver cleanup The following patch to the common part of the Siemens Gigaset driver prevents it from trying to send the +++ break sequence if the device has been disconnected, and removes a couple of assignments which didn't have any effect. Signed-off-by: Tilman Schmidt Acked-by: Hansjoerg Lipp Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06163f86349f0b39948a86d21b2db0d53e47fd8c tree 09849d7123bed68086e6d576c8518b85f83869b4 parent 9f13fae2479ed2e2801d538d6a22309123c704f6 author Tilman Schmidt Mon, 26 Jun 2006 00:25:33 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:23 -0700 [PATCH] isdn4linux: Gigaset base driver: improve error recovery The following patch to the Siemens Gigaset base driver adds graceful recovery for some frequently encountered error conditions, by retrying failed control requests (eg. stalled control pipe), and by closing and reopening the AT command channel when it appears to be stuck. Signed-off-by: Tilman Schmidt Acked-by: Hansjoerg Lipp Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f13fae2479ed2e2801d538d6a22309123c704f6 tree a6c048a1d9cac33793f704ada758c9e20caed5cf parent 6aa65472d18703064898eefb5eb58f7ecd0d8912 author Eric Sesterhenn Mon, 26 Jun 2006 00:25:32 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:23 -0700 [PATCH] Fix typo in drivers/isdn/hisax/q931.c This fixes coverity bug #517. Since IESIZE is greater than IESIZE_NI1 we might run past the end of ielist_ni1. This fixes it by using the proper IESIZE_NI1 define. Signed-off-by: Eric Sesterhenn Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6aa65472d18703064898eefb5eb58f7ecd0d8912 tree d7085a9599febe317937dab77abddf857910f55b parent e6f47f978bcd5413fff610613b18e9e0eab9bc1b author Michael Buesch Mon, 26 Jun 2006 00:25:30 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:22 -0700 [PATCH] CAPI crash / race condition I am getting more or less reproducible crashes from the CAPI subsystem using the fcdsl driver: Unable to handle kernel NULL pointer dereference at virtual address 00000010 printing eip: c39bbca4 *pde = 00000000 Oops: 0000 [#1] Modules linked in: netconsole capi capifs 3c59x mii fcdsl kernelcapi uhci_hcd usbcore ide_cd cdrom CPU: 0 EIP: 0060:[] Tainted: P VLI EFLAGS: 00010202 (2.6.16.11 #3) EIP is at handle_minor_send+0x17a/0x241 [capi] eax: c24abbc0 ebx: c0b4c980 ecx: 00000010 edx: 00000010 esi: c1679140 edi: c2783016 ebp: 0000c28d esp: c0327e24 ds: 007b es: 007b ss: 0068 Process swapper (pid: 0, threadinfo=c0326000 task=c02e1300) Stack: <0>000005b4 c1679180 00000000 c28d0000 c1ce04e0 c2f69654 c221604e c1679140 c39bc19a 00000038 c20c0400 c075c560 c1f2f800 00000000 c01dc9b5 c1e96a40 c075c560 c2ed64c0 c1e96a40 c01dcd3b c2fb94e8 c075c560 c0327f00 c1e96a40 Call Trace: [] capinc_tty_write+0xda/0xf3 [capi] [] ppp_sync_push+0x52/0xfe [] ppp_sync_send+0x1f5/0x204 [] ppp_push+0x3e/0x9c [] ppp_xmit_process+0x422/0x4cc [] ppp_start_xmit+0x1c1/0x1f6 [] qdisc_restart+0xa7/0x135 [] dev_queue_xmit+0xba/0x19e [] ip_output+0x1eb/0x236 [] ip_forward+0x1c1/0x21a [] ip_rcv+0x38e/0x3ea [] netif_receive_skb+0x166/0x195 [] process_backlog+0x6d/0xd2 [] net_rx_action+0x6a/0xff [] __do_softirq+0x35/0x7d [] do_softirq+0x22/0x26 [] do_IRQ+0x1e/0x25 [] common_interrupt+0x1a/0x20 [] default_idle+0x2b/0x53 [] cpu_idle+0x39/0x4e [] start_kernel+0x20b/0x20d Code: c0 e8 b3 b6 77 fc 85 c0 75 10 68 d8 c8 9b c3 e8 82 3d 75 fc 8b 43 60 5a eb 50 8d 56 50 c7 00 00 00 00 00 66 89 68 04 eb 02 89 ca <8b> 0a 85 c9 75 f8 89 02 89 da ff 46 54 8b 46 10 e8 30 79 fd ff <0>Kernel panic - not syncing: Fatal exception in interrupt That oops took me to the "ackqueue" implementation in capi.c. The crash occured in capincci_add_ack() (auto-inlined by the compiler). I read the code a bit and finally decided to replace the custom linked list implementation (struct capiminor->ackqueue) by a struct list_head. That did not solve the crash, but produced the following interresting oops: Unable to handle kernel paging request at virtual address 00200200 printing eip: c39bb1f5 *pde = 00000000 Oops: 0002 [#1] Modules linked in: netconsole capi capifs 3c59x mii fcdsl kernelcapi uhci_hcd usbcore ide_cd cdrom CPU: 0 EIP: 0060:[] Tainted: P VLI EFLAGS: 00010246 (2.6.16.11 #3) EIP is at capiminor_del_ack+0x18/0x49 [capi] eax: 00200200 ebx: c18d41a0 ecx: c1385620 edx: 00100100 esi: 0000d147 edi: 00001103 ebp: 0000d147 esp: c1093f3c ds: 007b es: 007b ss: 0068 Process events/0 (pid: 3, threadinfo=c1092000 task=c1089030) Stack: <0>c2a17580 c18d41a0 c39bbd16 00000038 c18d41e0 00000000 d147c640 c29e0b68 c29e0b90 00000212 c29e0b68 c39932b2 c29e0bb0 c10736a0 c0119ef0 c399326c c10736a8 c10736a0 c10736b0 c0119f93 c011a06e 00000001 00000000 00000000 Call Trace: [] handle_minor_send+0x1af/0x241 [capi] [] recv_handler+0x46/0x5f [kernelcapi] [] run_workqueue+0x5e/0x8d [] recv_handler+0x0/0x5f [kernelcapi] [] worker_thread+0x0/0x10b [] worker_thread+0xdb/0x10b [] default_wake_function+0x0/0xc [] kthread+0x90/0xbc [] kthread+0x0/0xbc [] kernel_thread_helper+0x5/0xb Code: 7e 02 89 ee 89 f0 5a f7 d0 c1 f8 1f 5b 21 f0 5e 5f 5d c3 56 53 8b 48 50 89 d6 89 c3 8b 11 eb 2f 66 39 71 08 75 25 8b 41 04 8b 11 <89> 10 89 42 04 c7 01 00 01 10 00 89 c8 c7 41 04 00 02 20 00 e8 The interresting part of it is the "virtual address 00200200", which is LIST_POISON2. I thought about some race condition, but as this is an UP system, it leads to questions on how it can happen. If we look at EFLAGS: 00010202, we see that interrupts are enabled at the time of the crash (eflags & 0x200). Finally, I don't understand all the capi code, but I think that handle_minor_send() is racing somehow against capi_recv_message(), which call both capiminor_del_ack(). So if an IRQ occurs in the middle of capiminor_del_ack() and another instance of it is invoked, it leads to linked list corruption. I came up with the following patch. With this, I could not reproduce the crash anymore. Clearly, this is not the correct fix for the issue. As this seems to be some locking issue, there might be more locking issues in that code. For example, doesn't the whole struct capiminor have to be locked somehow? Cc: Carsten Paeth Cc: Kai Germaschewski Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6f47f978bcd5413fff610613b18e9e0eab9bc1b tree bf9e698cb76a0e958a8c9157fba74fb6d8255298 parent 3d5631e0631a11633c649bc995a6537ec21b67b4 author Anil S Keshavamurthy Mon, 26 Jun 2006 00:25:29 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:22 -0700 [PATCH] Notify page fault call chain With this patch Kprobes now registers for page fault notifications only when their is an active probe registered. Once all the active probes are unregistered their is no need to be notified of page faults and kprobes unregisters itself from the page fault notifications. Hence we will have ZERO side effects when no probes are active. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d5631e0631a11633c649bc995a6537ec21b67b4 tree 84924f8c647c2d67b9a1113408efd24e48dabf66 parent d98f8f05188b45168db43df8ddc9feeb0b1cd512 author Anil S Keshavamurthy Mon, 26 Jun 2006 00:25:28 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:22 -0700 [PATCH] Kprobes registers for notify page fault Kprobes now registers for page fault notifications. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d98f8f05188b45168db43df8ddc9feeb0b1cd512 tree 505edc88aa4e8ec3593d7a218c470e7cb9640fb7 parent 4f9e87c0454059e80f3811f95ad9f40ed28c69a2 author Anil S Keshavamurthy Mon, 26 Jun 2006 00:25:27 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:22 -0700 [PATCH] Notify page fault call chain for sparc64 Overloading of page fault notification with the notify_die() has performance issues(since the only interested components for page fault is kprobes and/or kdb) and hence this patch introduces the new notifier call chain exclusively for page fault notifications their by avoiding notifying unnecessary components in the do_page_fault() code path. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f9e87c0454059e80f3811f95ad9f40ed28c69a2 tree cc8290b8fc757b34e01a4e9c25bbe00496400084 parent ae9a5b85655d7133ab8e7c99b742ef20c8dbb7d2 author Anil S Keshavamurthy Mon, 26 Jun 2006 00:25:27 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:22 -0700 [PATCH] Notify page fault call chain for powerpc Overloading of page fault notification with the notify_die() has performance issues(since the only interested components for page fault is kprobes and/or kdb) and hence this patch introduces the new notifier call chain exclusively for page fault notifications their by avoiding notifying unnecessary components in the do_page_fault() code path. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae9a5b85655d7133ab8e7c99b742ef20c8dbb7d2 tree 011bf055ef888a4cfb949fec467bd6385a090d12 parent b71b5b652852db1b499d22aaabed8f5043acafad author Anil S Keshavamurthy Mon, 26 Jun 2006 00:25:26 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:22 -0700 [PATCH] Notify page fault call chain for ia64 Overloading of page fault notification with the notify_die() has performance issues(since the only interested components for page fault is kprobes and/or kdb) and hence this patch introduces the new notifier call chain exclusively for page fault notifications their by avoiding notifying unnecessary components in the do_page_fault() code path. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b71b5b652852db1b499d22aaabed8f5043acafad tree 82f5e0c8090515fc8886f26540a3b00ae603ae77 parent 1bd858a507937cef6e8ca5efc6820a5744e73683 author Anil S Keshavamurthy Mon, 26 Jun 2006 00:25:25 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:22 -0700 [PATCH] Notify page fault call chain for i386 Overloading of page fault notification with the notify_die() has performance issues(since the only interested components for page fault is kprobes and/or kdb) and hence this patch introduces the new notifier call chain exclusively for page fault notifications their by avoiding notifying unnecessary components in the do_page_fault() code path. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1bd858a507937cef6e8ca5efc6820a5744e73683 tree 2c935864cb3375c16aa7a2fd84d797aca78afd14 parent 36721656776f177280ccb50477a02e86e6444292 author Anil S Keshavamurthy Mon, 26 Jun 2006 00:25:25 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:22 -0700 [PATCH] Notify page fault call chain for x86_64 Currently in the do_page_fault() code path, we call notify_die(DIE_PAGE_FAULT, ...) to notify the page fault. Since notify_die() is highly overloaded, this page fault notification is currently being sent to all the components registered with register_die_notification() which uses the same die_chain to loop for all the registered components which is unnecessary. In order to optimize the do_page_fault() code path, this critical page fault notification is now moved to different call chain and the test results showed great improvements. And the kprobes which is interested in this notifications, now registers onto this new call chain only when it need to, i.e Kprobes now registers for page fault notification only when their are an active probes and unregisters from this page fault notification when no probes are active. I have incorporated all the feedback given by Ananth and Keith and everyone, and thanks for all the review feedback. This patch: Overloading of page fault notification with the notify_die() has performance issues(since the only interested components for page fault is kprobes and/or kdb) and hence this patch introduces the new notifier call chain exclusively for page fault notifications their by avoiding notifying unnecessary components in the do_page_fault() code path. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36721656776f177280ccb50477a02e86e6444292 tree 20cb06eb08e98636e97703d6e0df77790ede23cf parent 585deacaca3e7bfc63580623f0344d1fa9c47f11 author mao, bibo Mon, 26 Jun 2006 00:25:22 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:22 -0700 [PATCH] Kprobe: multi kprobe posthandler for booster If there are multi kprobes on the same probepoint, there will be one extra aggr_kprobe on the head of kprobe list. The aggr_kprobe has aggr_post_handler/aggr_break_handler whether the other kprobe post_hander/break_handler is NULL or not. This patch modifies this, only when there is one or more kprobe in the list whose post_handler is not NULL, post_handler of aggr_kprobe will be set as aggr_post_handler. [soshima@redhat.com: !CONFIG_PREEMPT fix] Signed-off-by: bibo, mao Cc: Masami Hiramatsu Cc: Ananth N Mavinakayanahalli Cc: "Keshavamurthy, Anil S" Cc: Prasanna S Panchamukhi Cc: Jim Keniston Cc: Yumiko Sugita Cc: Hideo Aoki Signed-off-by: Satoshi Oshima Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 585deacaca3e7bfc63580623f0344d1fa9c47f11 tree f0006846255aa002c74e97a2c32be6063f8de990 parent 6ae7440e6b7a46f4c119c60580aa9384c1b463f7 author Masami Hiramatsu Mon, 26 Jun 2006 00:25:19 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:22 -0700 [PATCH] kprobe: boost 2byte-opcodes on i386 Previous kprobe-booster patch has not handled any 2byte opcodes and prefixes. I checked whole IA32 opcode map and classified it. This patch enables kprobe to boost those 2byte opcodes and prefixes. Signed-off-by: Masami Hiramatsu Cc: Ananth N Mavinakayanahalli Cc: "Keshavamurthy, Anil S" Cc: Prasanna S Panchamukhi Cc: Jim Keniston Cc: Yumiko Sugita Cc: Satoshi Oshima Cc: Hideo Aoki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ae7440e6b7a46f4c119c60580aa9384c1b463f7 tree d288e15b56c8eebf02b25ea92e3678d9f2c0fee4 parent 19923c190e0932bf0ac1e1d06a48f5c3678dd0de author Jim Cromie Mon, 26 Jun 2006 00:25:19 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:21 -0700 [PATCH] GTOD: add scx200 HRT clocksource Add a GTOD clocksource driver based on the Geode SCx200's Hi-Res Timer. Signed-off-by: Jim Cromie Cc: Roman Zippel Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19923c190e0932bf0ac1e1d06a48f5c3678dd0de tree 2a32f5f16b3bbebd74c0f4910493c7f28a70fd84 parent 6415ce9a922a1446e7ee0ac9b016082232ebe373 author Roman Zippel Mon, 26 Jun 2006 00:25:18 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:21 -0700 [PATCH] fix and optimize clock source update This fixes the clock source updates in update_wall_time() to correctly track the time coming in via current_tick_length(). Optimize the fast paths to be as short as possible to keep the overhead low. Signed-off-by: Roman Zippel Acked-by: John Stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6415ce9a922a1446e7ee0ac9b016082232ebe373 tree 6f90fe4360ce23d54d23277b588730ccb5ba1d84 parent 7f9f303aa33c7acc7b4aa9ebea25cbd990bc707b author john stultz Mon, 26 Jun 2006 00:25:16 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:21 -0700 [PATCH] time: fix time going backward w/ clock=pit Here is the PIT fix against the TOD patches that Tim pointed out. Many thanks to Tim for hunting this down. Cc: Tim Mann Signed-off-by: John Stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f9f303aa33c7acc7b4aa9ebea25cbd990bc707b tree b5916e6b018356afdb5c8687e554a049532633bd parent 7d622d4794490cef933c20e4a6279e43e03fafad author Jim Cromie Mon, 26 Jun 2006 00:25:15 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:21 -0700 [PATCH] generic-time: add macro to simplify/hide mask constants Add a CLOCKSOURCE_MASK macro to simplify initializing the mask for a struct clocksource, and use it to replace literal mask constants in the various clocksource drivers. Signed-off-by: Jim Cromie Acked-by: John Stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d622d4794490cef933c20e4a6279e43e03fafad tree 1c13c63335aa021533997b1f88c412170fba193f parent a275254975a29c51929ee175b92ac471ac2a0043 author Andreas Mohr Mon, 26 Jun 2006 00:25:14 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:21 -0700 [PATCH] make pmtmr_ioport __read_mostly - written on init only, accessed for every timer read --> __read_mostly - fix broken sentence Signed-off-by: Andreas Mohr Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a275254975a29c51929ee175b92ac471ac2a0043 tree 42ec41bf74c0c601f05ed12ff674539f4bf6f505 parent 5d0cf410e94b1f1ff852c3f210d22cc6c5a27ffa author john stultz Mon, 26 Jun 2006 00:25:14 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:21 -0700 [PATCH] time: rename clocksource functions As suggested by Roman Zippel, change clocksource functions to use clocksource_xyz rather then xyz_clocksource to avoid polluting the namespace. Signed-off-by: John Stultz Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d0cf410e94b1f1ff852c3f210d22cc6c5a27ffa tree a30cd6d201295945f401fd1f2731493f68db9ee9 parent 61743fe445213b87fb55a389c8d073785323ca3e author john stultz Mon, 26 Jun 2006 00:25:12 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:21 -0700 [PATCH] Time: i386 Clocksource Drivers Implement the time sources for i386 (acpi_pm, cyclone, hpet, pit, and tsc). With this patch, the conversion of the i386 arch to the generic timekeeping code should be complete. The patch should be fairly straight forward, only adding the new clocksources. [hirofumi@mail.parknet.co.jp: acpi_pm cleanup] Signed-off-by: John Stultz Signed-off-by: Adrian Bunk Signed-off-by: Paul Mundt Signed-off-by: John Stultz Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61743fe445213b87fb55a389c8d073785323ca3e tree 41a737a9ef3cd564323a48db670332f46113a85d parent 6f84fa2f3edc8902cfed02cd510c7c58334bb9bd author john stultz Mon, 26 Jun 2006 00:25:12 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:21 -0700 [PATCH] Time: i386 Conversion - part 4: Remove Old timer_opts Code Remove the old timers/timer_opts infrastructure which has been disabled. It is a fairly straightforward set of deletions Note that this does not provide any i386 clocksources, so you will only have the jiffies clocksource. To get full replacements for the code being removed here, the timeofday-clocks-i386 patch will be needed. Signed-off-by: John Stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f84fa2f3edc8902cfed02cd510c7c58334bb9bd tree afc4229a3ff0aa7e9956759334b7ad1f1b4827d9 parent 539eb11e6e904f2cd4f62908cc5e44d724879721 author john stultz Mon, 26 Jun 2006 00:25:11 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:21 -0700 [PATCH] Time: i386 Conversion - part 3: Enable Generic Timekeeping This converts the i386 arch to use the generic timeofday subsystem. It enabled the GENERIC_TIME option, disables the timer_opts code and other arch specific timekeeping code and reworks the delay code. While this patch enables the generic timekeeping, please note that this patch does not provide any i386 clocksource. Thus only the jiffies clocksource will be available. To get full replacements for the code being disabled here, the timeofday-clocks-i386 patch will needed. Signed-off-by: John Stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 539eb11e6e904f2cd4f62908cc5e44d724879721 tree df18c747c5226b138862fb19fad5b1527055b9c9 parent 8d016ef1380a2a9a5ca5742ede04334199868f82 author john stultz Mon, 26 Jun 2006 00:25:10 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:21 -0700 [PATCH] Time: i386 Conversion - part 2: Rework TSC Support As part of the i386 conversion to the generic timekeeping infrastructure, this introduces a new tsc.c file. The code in this file replaces the TSC initialization, management and access code currently in timer_tsc.c (which will be removed) that we want to preserve. The code also introduces the following functionality: o tsc_khz: like cpu_khz but stores the TSC frequency on systems that do not change TSC frequency w/ CPU frequency o check/mark_tsc_unstable: accessor/modifier flag for TSC timekeeping usability o minor cleanups to calibration math. This patch also includes a one line __cpuinitdata fix from Zwane Mwaikambo. Signed-off-by: John Stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d016ef1380a2a9a5ca5742ede04334199868f82 tree 77eb8ad4e4c990f942e4aa4315a3d569585d61e3 parent ede65f3926a284f07765b94d6d9fd10d63791174 author john stultz Mon, 26 Jun 2006 00:25:09 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:20 -0700 [PATCH] Time: i386 Conversion - part 1: Move timer_pit.c to i8253.c A simple cleanup for the i386 arch in preparation of moving to the generic timeofday infrastructure. It simply moves the PIT initialization code, locks, and other code we want to keep from some code from timer_pit.c (which will be removed) to i8253.c. Signed-off-by: John Stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ede65f3926a284f07765b94d6d9fd10d63791174 tree c608aca4389cd178d83ce7c0f80a498134e57150 parent cf3c769b4b0dd1146da84d5cf045dcfe53bd0f13 author Andrew Morton Mon, 26 Jun 2006 00:25:09 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:20 -0700 [PATCH] hangcheck: remove monotomic_clock on x86 John's about to nuke x86's monotonic clock without grepping for it first. The patch lamely borrows the ppc64 code for x86. hangcheck-timer shouldn't be doing it this way a) HAVE_MONOTONIC should be CONFIG_MONOTONIC_CLOCK and it should be defined in arch/xxx/Kconfig. b) That ifdef tangle shouldn't be in hangcheck-timer.c. It should be using arch-provided helper functions, which CONFIG_MONOTONIC_CLOCK-enabling architectures implement in arch/something.c Cc: john stultz Acked-by: Joel Becker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf3c769b4b0dd1146da84d5cf045dcfe53bd0f13 tree caeb91eff6538ed5910e673a40a9f2bd9a022afa parent 5eb6d20533d14a432df714520939a6181e28f099 author john stultz Mon, 26 Jun 2006 00:25:08 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:20 -0700 [PATCH] Time: Introduce arch generic time accessors Introduces clocksource switching code and the arch generic time accessor functions that use the clocksource infrastructure. Signed-off-by: John Stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5eb6d20533d14a432df714520939a6181e28f099 tree b032147620a8e213356658783f8037d2f5623b57 parent 260a42309b31cbc54eb4b6b85649e412bcad053f author john stultz Mon, 26 Jun 2006 00:25:07 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:20 -0700 [PATCH] Time: Use clocksource abstraction for NTP adjustments Instead of incrementing xtime by tick_nsec + ntp adjustments, use the clocksource abstraction to increment and scale time. Using the clocksource abstraction allows other clocksources to be used consistently in the face of late or lost ticks, while preserving the existing behavior via the jiffies clocksource. This removes the need to keep time_phase adjustments as we just use the current_tick_length() function as the NTP interface and accumulate time using shifted nanoseconds. The basics of this design was by Roman Zippel, however it is my own interpretation and implementation, so the credit should go to him and the blame to me. Signed-off-by: John Stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 260a42309b31cbc54eb4b6b85649e412bcad053f tree 51efc7bb51075b0d25d0e8465d3c056e6a57fe16 parent ad596171ed635c51a9eef829187af100cbf8dcf7 author john stultz Mon, 26 Jun 2006 00:25:07 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:20 -0700 [PATCH] Time: Let user request precision from current_tick_length() Change the current_tick_length() function so it takes an argument which specifies how much precision to return in shifted nanoseconds. This provides a simple way to convert between NTPs internal nanoseconds shifted by (SHIFT_SCALE - 10) to other shifted nanosecond units that are used by the clocksource abstraction. Signed-off-by: John Stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad596171ed635c51a9eef829187af100cbf8dcf7 tree 24b19bec1b1abd8bd110064226569aa42dde0b3b parent 734efb467b31e56c2f9430590a9aa867ecf3eea1 author john stultz Mon, 26 Jun 2006 00:25:06 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:20 -0700 [PATCH] Time: Use clocksource infrastructure for update_wall_time Modify the update_wall_time function so it increments time using the clocksource abstraction instead of jiffies. Since the only clocksource driver currently provided is the jiffies clocksource, this should result in no functional change. Additionally, a timekeeping_init and timekeeping_resume function has been added to initialize and maintain some of the new timekeping state. [hirofumi@mail.parknet.co.jp: fixlet] Signed-off-by: John Stultz Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 734efb467b31e56c2f9430590a9aa867ecf3eea1 tree 30bf6b52d1e67128e656fb9a01cd7e6e13b7755e parent ade1a29e168ba08b699a418ff5e762315fa33f70 author john stultz Mon, 26 Jun 2006 00:25:05 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:20 -0700 [PATCH] Time: Clocksource Infrastructure This introduces the clocksource management infrastructure. A clocksource is a driver-like architecture generic abstraction of a free-running counter. This code defines the clocksource structure, and provides management code for registering, selecting, accessing and scaling clocksources. Additionally, this includes the trivial jiffies clocksource, a lowest common denominator clocksource, provided mainly for use as an example. [hirofumi@mail.parknet.co.jp: Don't enable IRQ too early] Signed-off-by: John Stultz Signed-off-by: Ingo Molnar Signed-off-by: Paul Mundt Signed-off-by: John Stultz Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ade1a29e168ba08b699a418ff5e762315fa33f70 tree d01dbf3a9da6f76d21e2c0b17f481709b17c8839 parent 71c0cd7042672fce2463d82183d20bfb574f4cb5 author Badari Pulavarty Mon, 26 Jun 2006 00:25:04 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:20 -0700 [PATCH] ext3: Add "-o bh" option This patch adds "-o bh" option to force use of buffer_heads. This option is needed when we make "nobh" as default - and if we run into problems. Signed-off-by: Badari Pulavarty Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71c0cd7042672fce2463d82183d20bfb574f4cb5 tree ff2396202becd0d57872301e2291c189cae3977a parent ebc915ad26d881ddcafbe4e0975203d23289f36f author Michael Buesch Mon, 26 Jun 2006 00:25:04 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:19 -0700 [PATCH] Add bcm43xx HW RNG support Signed-off-by: Michael Buesch Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ebc915ad26d881ddcafbe4e0975203d23289f36f tree fc094ef896f3770293252010e5f4bdebe8e848bd parent d7174bcb919c15b295271e37c3f65c716710715c author Michael Buesch Mon, 26 Jun 2006 00:25:03 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:19 -0700 [PATCH] Add TI OMAP CPU family HW RNG driver Signed-off-by: Michael Buesch Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7174bcb919c15b295271e37c3f65c716710715c tree 0384d489f7cbd519bd50d9c270d1be65aa237aa0 parent 13523363577d49b9af3cad06fcb757126bedc61b author Michael Buesch Mon, 26 Jun 2006 00:25:02 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:19 -0700 [PATCH] Add ixp4xx HW RNG driver Signed-off-by: Michael Buesch Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13523363577d49b9af3cad06fcb757126bedc61b tree c553841a21aee8c375a261a6f30680b552b7c034 parent ef5d862734b84239e0140319a95fb0bbff5ef394 author Michael Buesch Mon, 26 Jun 2006 00:25:02 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:19 -0700 [PATCH] Add VIA HW RNG driver Signed-off-by: Michael Buesch Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef5d862734b84239e0140319a95fb0bbff5ef394 tree 29b39c830c9e55f3d78abfd9e7f57ef01052a1bc parent 96d63c0297ccfd6d9059c614b3f5555d9441a2b3 author Michael Buesch Mon, 26 Jun 2006 00:25:01 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:19 -0700 [PATCH] Add Geode HW RNG driver Signed-off-by: Michael Buesch Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96d63c0297ccfd6d9059c614b3f5555d9441a2b3 tree c4d3abbb9b03456b8c258d75e2c3b260d8f9ccf5 parent ca644bd5039566725b7c71a559e65ea91b7abfb5 author Michael Buesch Mon, 26 Jun 2006 00:25:00 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:19 -0700 [PATCH] Add AMD HW RNG driver Signed-off-by: Michael Buesch Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca644bd5039566725b7c71a559e65ea91b7abfb5 tree bb742631c38a676267750d194ed6053489acfd88 parent 844dd05fec172d98b0dacecd9b9e9f6595204c13 author Michael Buesch Mon, 26 Jun 2006 00:24:59 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:19 -0700 [PATCH] Add Intel HW RNG driver Signed-off-by: Michael Buesch Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 844dd05fec172d98b0dacecd9b9e9f6595204c13 tree a62ebcbd314ed4be35c233eb6a5eba414493a50f parent 59f5d35f83738bf07e66f8cdcff32a433df804a3 author Michael Buesch Mon, 26 Jun 2006 00:24:59 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:19 -0700 [PATCH] Add new generic HW RNG core Signed-off-by: Michael Buesch Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59f5d35f83738bf07e66f8cdcff32a433df804a3 tree 886c17315aaeb887d764bca659eda1a514392b9e parent 9637f28f8b9facff53b00bea6b5d27c9b150b422 author Michael Buesch Mon, 26 Jun 2006 00:24:58 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:19 -0700 [PATCH] Remove old HW RNG support This patch series replaces the old non-generic Hardware Random Number Generator support by a fully generic RNG API. This makes it possible to register additional RNGs from modules. With this patch series applied, Laptops with a bcm43xx chip (PowerBook) have a HW RNG available now. Additionally two new RNG drivers are added for the "ixp4xx" and "omap" devices. (Written by Deepak Saxena). This patch series includes the old patches by Deepak Saxena. The old x86-rng driver has beed split. The userspace RNG daemon can later be updated to select the RNG through /sys/class/misc/hw_random/ for convenience. For now it is sufficient to use cat and echo -n on the sysfs attributes. Signed-off-by: Michael Buesch Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9637f28f8b9facff53b00bea6b5d27c9b150b422 tree 64c3f3600f423229dd81bfaaa536cf0666486d5d parent 4eb582cf1fbd7b9e5f466e3718a59c957e75254e author Alexey Dobriyan Mon, 26 Jun 2006 00:24:57 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:19 -0700 [PATCH] reiserfs: remove reiserfs_aio_write() Signed-off-by: Alexey Dobriyan Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4eb582cf1fbd7b9e5f466e3718a59c957e75254e tree 4387e460a50efa8d46a54526d0cf0959c0e3b428 parent 06ec7be557a1259611d6093a00463c42650dc71a author Michael LeMay Mon, 26 Jun 2006 00:24:57 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:18 -0700 [PATCH] keys: add a way to store the appropriate context for newly-created keys Add a /proc//attr/keycreate entry that stores the appropriate context for newly-created keys. Modify the selinux_key_alloc hook to make use of the new entry. Update the flask headers to include a new "setkeycreate" permission for processes. Update the flask headers to include a new "create" permission for keys. Use the create permission to restrict which SIDs each task can assign to newly-created keys. Add a new parameter to the security hook "security_key_alloc" to indicate whether it is being invoked by the kernel, or from userspace. If it is being invoked by the kernel, the security hook should never fail. Update the documentation to reflect these changes. Signed-off-by: Michael LeMay Signed-off-by: James Morris Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06ec7be557a1259611d6093a00463c42650dc71a tree b83cdbc8405e0a174939d36e4fe40fb8adb51071 parent e51f6d343789a4f0a2a7587ad7ec7746969d5c1c author Michael LeMay Mon, 26 Jun 2006 00:24:56 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:18 -0700 [PATCH] keys: restrict contents of /proc/keys to Viewable keys Restrict /proc/keys such that only those keys to which the current task is granted View permission are presented. The documentation is also updated to reflect these changes. Signed-off-by: Michael LeMay Signed-off-by: James Morris Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e51f6d343789a4f0a2a7587ad7ec7746969d5c1c tree 39ca4e05c0dda995f3eaaea1aaa2c8689003f1d0 parent 5801649d8b83e7cb9b15839761bdee594653c294 author Michael LeMay Mon, 26 Jun 2006 00:24:54 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:18 -0700 [PATCH] keys: allocate key serial numbers randomly Cause key_alloc_serial() to generate key serial numbers randomly rather than in linear sequence. Using an linear sequence permits a covert communication channel to be established, in which one process can communicate with another by creating or not creating new keys within a certain timeframe. The second process can probe for the expected next key serial number and judge its existence by the error returned. This is a problem as the serial number namespace is globally shared between all tasks, regardless of their context. For more information on this topic, this old TCSEC guide is recommended: http://www.radium.ncsc.mil/tpep/library/rainbow/NCSC-TG-030.html Signed-off-by: Michael LeMay Signed-off-by: James Morris Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5801649d8b83e7cb9b15839761bdee594653c294 tree 4534b606908596651a533b2f51418444b5a1e705 parent 31204ed925b067d2bb65adb89501656f8274a32a author Fredrik Tolf Mon, 26 Jun 2006 00:24:51 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:18 -0700 [PATCH] keys: let keyctl_chown() change a key's owner Let keyctl_chown() change a key's owner, including attempting to transfer the quota burden to the new user. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31204ed925b067d2bb65adb89501656f8274a32a tree a5c3e5101e9f79bf39672f02c0eea573e7a47cb8 parent 7e047ef5fe2d52e83020e856b1bf2556a6a2ce98 author David Howells Mon, 26 Jun 2006 00:24:51 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:18 -0700 [PATCH] keys: discard the contents of a key on revocation Cause the keys linked to a keyring to be unlinked from it when revoked and it causes the data attached to a user-defined key to be discarded when revoked. This frees up most of the quota a key occupied at that point, rather than waiting for the key to actually be destroyed. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e047ef5fe2d52e83020e856b1bf2556a6a2ce98 tree 97656e2c56a27be9d1da451dde627b693b8643f2 parent f116629d03655adaf7832b93b03c99391d09d4a7 author David Howells Mon, 26 Jun 2006 00:24:50 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:18 -0700 [PATCH] keys: sort out key quota system Add the ability for key creation to overrun the user's quota in some circumstances - notably when a session keyring is created and assigned to a process that didn't previously have one. This means it's still possible to log in, should PAM require the creation of a new session keyring, and fix an overburdened key quota. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f116629d03655adaf7832b93b03c99391d09d4a7 tree 526f689619817df3c23ab00e3228b4776bde2190 parent 179e09172ab663b8587ecc46bb18a56a770304a9 author Akinobu Mita Mon, 26 Jun 2006 00:24:46 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:18 -0700 [PATCH] fs: use list_move() This patch converts the combination of list_del(A) and list_add(A, B) to list_move(A, B) under fs/. Cc: Ian Kent Acked-by: Joel Becker Cc: Neil Brown Cc: Hans Reiser Cc: Urban Widmark Acked-by: David Howells Acked-by: Mark Fasheh Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 179e09172ab663b8587ecc46bb18a56a770304a9 tree 4d57324584c43f81ac2a6d258bb46e75fb6b4327 parent a842ef297fd91b1b93f2aa5898d2efd19e95f6a5 author Akinobu Mita Mon, 26 Jun 2006 00:24:41 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:18 -0700 [PATCH] drivers: use list_move() This patch converts the combination of list_del(A) and list_add(A, B) to list_move(A, B) under drivers/. Acked-by: Corey Minyard Cc: Ben Collins Acked-by: Roland Dreier Cc: Alasdair Kergon Cc: Gerd Knorr Cc: Paul Mackerras Cc: Frank Pavlic Acked-by: Matthew Wilcox Cc: Andrew Vasquez Cc: Mikael Starvik Cc: Greg Kroah-Hartman Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a842ef297fd91b1b93f2aa5898d2efd19e95f6a5 tree ee5c41d7588798a4970c308ad8a7b5d49f6b9c14 parent 1bfba4e8ea0e555e3a0296051517d96253660ccc author Akinobu Mita Mon, 26 Jun 2006 00:24:40 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:17 -0700 [PATCH] net/rxrpc: use list_move() This patch converts the combination of list_del(A) and list_add(A, B) to list_move(A, B) under net/rxrpc. Acked-by: David Howells Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1bfba4e8ea0e555e3a0296051517d96253660ccc tree 48ced9016b5c08f1be217677c25e6879c07b5278 parent a7addcea6ac7c0e9733a48cda06ca0880f116a48 author Akinobu Mita Mon, 26 Jun 2006 00:24:40 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:17 -0700 [PATCH] core: use list_move() This patch converts the combination of list_del(A) and list_add(A, B) to list_move(A, B). Cc: Greg Kroah-Hartman Cc: Ram Pai Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7addcea6ac7c0e9733a48cda06ca0880f116a48 tree 5d18b98798c98dd2c044f4a9ed9c7b372c599a9c parent 8e13059a37252c45ab7173a0e4bac05e4a444ab6 author Akinobu Mita Mon, 26 Jun 2006 00:24:39 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:17 -0700 [PATCH] arch: use list_move() This patch converts the combination of list_del(A) and list_add(A, B) to list_move(A, B) under arch/. Cc: Geert Uytterhoeven Cc: "David S. Miller" Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e13059a37252c45ab7173a0e4bac05e4a444ab6 tree 5a1e2d011e9b2690b9463a738a4d906ce3e8362c parent 38e13929c391e6964b00840b765ed601a3377d33 author Akinobu Mita Mon, 26 Jun 2006 00:24:37 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:17 -0700 [PATCH] use list_add_tail() instead of list_add() This patch converts list_add(A, B.prev) to list_add_tail(A, &B) for readability. Acked-by: Karsten Keil Cc: Jan Harkes Acked-by: Jan Kara AOLed-by: David Woodhouse Cc: Sridhar Samudrala Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 38e13929c391e6964b00840b765ed601a3377d33 tree c68392946b53efdb004c18429e6b149766c4997c parent d2be8ee53856c3c510d4d38f534979747db65d96 author Alan Cox Mon, 26 Jun 2006 00:24:36 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:17 -0700 [PATCH] Correct tty doc This method died some time ago, so kill the doc for it. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2be8ee53856c3c510d4d38f534979747db65d96 tree 41ee3ded18d9b9f24a287c865e4ff66966dce907 parent 0c6856f702732d3cfc33eb59303e998ad6961de8 author Fredrik Roubert Mon, 26 Jun 2006 00:24:35 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:17 -0700 [PATCH] fix magic sysrq on strange keyboards Magic sysrq fails to work on many keyboards, particulary most of notebook keyboards. This patch fixes it. The idea is quite simple: Discard the SysRq break code if Alt is still being held down. This way the broken keyboard can send the break code (or the user with a normal keyboard can release the SysRq key) and the kernel waits until the next key is pressed or the Alt key is released. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c6856f702732d3cfc33eb59303e998ad6961de8 tree 98d3c76586f6e63b4dc43a0f763e9b6a7cc4a984 parent 57136ca6d57359c7f21a9bbb4a5a0a61eeb53f2b author Markus Armbruster Mon, 26 Jun 2006 00:24:34 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:17 -0700 [PATCH] oprofile: Fix unnecessary cleverness nmi_create_files() in arch/i386/oprofile/nmi_int.c depends on model->num_counters (number of performance counters) being less than 10. While this is currently the case, it's too clever by half. Other archs aren't quite as clever: they assume 100. I suggest to normalize them all to 1000. Cc: Philippe Elie Cc: John Levon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57136ca6d57359c7f21a9bbb4a5a0a61eeb53f2b tree 79c31abe40196cc1c350734a15d146d43fa3692c parent 81615b624a45621b758380ec45d750483eae281d author Jesper Juhl Mon, 26 Jun 2006 00:24:33 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:16 -0700 [PATCH] Bluetooth: fix potential NULL ptr deref in dtl1_cs.c::dtl1_hci_send_frame() There's a problem in drivers/bluetooth/dtl1_cs.c::dtl1_hci_send_frame() If bt_skb_alloc() returns NULL, then skb_reserve(s, NSHL); will cause a NULL pointer deref - ouch. If we can't allocate the resources we require we need to tell the caller by returning -ENOMEM. Found by the coverity checker as bug #409 Signed-off-by: Jesper Juhl Acked-by: Marcel Holtmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 81615b624a45621b758380ec45d750483eae281d tree 9373ca3e4a484fe4fdac48ae6e6d204c7e560121 parent 1fb00c6cbd8356f43b46322742f3c01c2a1f02da author Ingo Molnar Mon, 26 Jun 2006 00:24:32 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:16 -0700 [PATCH] Convert kernel/cpu.c to mutexes Convert kernel/cpu.c from semaphore to mutex. I've reviewed all lock_cpu_hotplug() critical sections, and they all seem to fit mutex semantics. Signed-off-by: Ingo Molnar Cc: Rusty Russell Cc: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1fb00c6cbd8356f43b46322742f3c01c2a1f02da tree d337fb8dca27a719221d9012292e72c55e7267d1 parent 20c5426f8155a89b6df06325f9b278f5052b8c7e author Ingo Molnar Mon, 26 Jun 2006 00:24:31 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:16 -0700 [PATCH] work around ppc64 bootup bug by making mutex-debugging save/restore irqs It seems ppc64 wants to lock mutexes in early bootup code, with interrupts disabled, and they expect interrupts to stay disabled, else they crash. Work around this bug by making mutex debugging variants save/restore irq flags. Signed-off-by: Ingo Molnar Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20c5426f8155a89b6df06325f9b278f5052b8c7e tree 3a4cf6617d9164820bae28aad799c27b2488fe16 parent fcc18e83e1f6fd9fa6b333735bf0fcd530655511 author Andrew Morton Mon, 26 Jun 2006 00:24:30 -0700 committer Linus Torvalds Mon, 26 Jun 2006 09:58:16 -0700 [PATCH] fix "USB: move to " Update this driver for recent header file movement. Cc: David Brownell Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2efe55a9cec8418f0e0cde3dc3787a42fddc4411 tree 5550d6ee925ced2f2b168569fea7fb3e87ea51f0 parent 48a1204c462985378e02b4c5129901f3dbc93f80 author Tobias Klauser Mon, 26 Jun 2006 18:57:34 +0200 committer Adrian Bunk Mon, 26 Jun 2006 18:57:34 +0200 Storage class should be first Storage class should be before const Signed-off-by: Tobias Klauser Signed-off-by: Adrian Bunk commit b184a4c9a4e542890265b4cdd3ff7908f4adc9c4 tree 7fe80637976e6033230e007fce63ed3dcb54be08 parent cfc736564fd01ee008d746913b1bbb90e3eb1f99 author Lennert Buytenhek Mon, 26 Jun 2006 17:48:29 +0100 committer Russell King Mon, 26 Jun 2006 17:48:29 +0100 [ARM] 3654/1: add ajeco 1arm sbc support Patch from Lennert Buytenhek This patch adds support for the Ajeco 1ARM Single Board Computer, a VME form factor SBC based on the Atmel AT91 SoC, with 64M RAM, seven serial ports, three ethernet ports, IDE, CF, USB host and device, and S-Video/VGA out.-- Signed-off-by: Lennert Buytenhek Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 48a1204c462985378e02b4c5129901f3dbc93f80 tree 6a786025abe0f1100302e6f18bee16e0a0f9c75e parent bc940c40c6473cb40178458e2c74aea6b45aac03 author Egry Gabor Mon, 26 Jun 2006 18:47:15 +0200 committer Adrian Bunk Mon, 26 Jun 2006 18:47:15 +0200 i386: Trivial typo fixes Trivial typo fixes in Kconfig files (i386). Signed-off-by: Egry Gabor Signed-off-by: Adrian Bunk commit bc940c40c6473cb40178458e2c74aea6b45aac03 tree 5e9b3e4db760d973e83039cf3f606324f65fa17a parent d6e05edc59ecd79e8badf440c0d295a979bdfa3e author Matthew Martin Mon, 26 Jun 2006 18:43:54 +0200 committer Adrian Bunk Mon, 26 Jun 2006 18:43:54 +0200 ixj: make ixj_set_tone_off() static Signed-off-by: Matthew Martin Signed-off-by: Alexey Dobriyan Signed-off-by: Adrian Bunk commit d6e05edc59ecd79e8badf440c0d295a979bdfa3e tree 50362161f69317242ab603c51a18a818a4c93285 parent f18190bd3407554ba6df30a1927e07e6cba93e56 author Andreas Mohr Mon, 26 Jun 2006 18:35:02 +0200 committer Adrian Bunk Mon, 26 Jun 2006 18:35:02 +0200 spelling fixes acquired (aquired) contiguous (contigious) successful (succesful, succesfull) surprise (suprise) whether (weather) some other misspellings Signed-off-by: Andreas Mohr Signed-off-by: Adrian Bunk commit f18190bd3407554ba6df30a1927e07e6cba93e56 tree 0df4f4f575242923d670ef77b4978d22a4a98bf4 parent a0ebb3ffd6c195011f7e4abdfc40f98342d36ce2 author Lee Revell Mon, 26 Jun 2006 18:30:00 +0200 committer Adrian Bunk Mon, 26 Jun 2006 18:30:00 +0200 fix paniced->panicked typos In a testament to the utter simplicity and logic of the English language ;-), I found a single correct use - in kernel/panic.c - and 10-15 incorrect ones. Signed-Off-By: Lee Revell Signed-off-by: Adrian Bunk commit a0ebb3ffd6c195011f7e4abdfc40f98342d36ce2 tree 11eaf602c240efd7e157fa517a96d09ccca8f453 parent 0ecbf4b5fc38479ba29149455d56c11a23b131c0 author Michael Hayes Mon, 26 Jun 2006 18:27:35 +0200 committer Adrian Bunk Mon, 26 Jun 2006 18:27:35 +0200 Spelling fixes for Documentation/atomic_ops.txt Spelling and typo fixes for Documentation/atomic_ops.txt Signed-off-by: Adrian Bunk commit 0ecbf4b5fc38479ba29149455d56c11a23b131c0 tree d3431b2704d33f0bf7130e934c0f07c8bc794b47 parent bdca3f202dbeaca2fcc4fb47219476286c999b0d author Adrian Bunk Mon, 26 Jun 2006 18:21:37 +0200 committer Adrian Bunk Mon, 26 Jun 2006 18:21:37 +0200 move acknowledgment for Mark Adler to CREDITS The place in the documentation of the Linux kernel to acknowledge contributions is the CREDITS file. Give Mark Adler an entry there instead of including a string in the kernel image. Signed-off-by: Adrian Bunk commit bdca3f202dbeaca2fcc4fb47219476286c999b0d tree aab6876fecfd248c2990b9621b6817fb5c4f8a89 parent fcc18e83e1f6fd9fa6b333735bf0fcd530655511 author Adrian Bunk Mon, 26 Jun 2006 18:19:23 +0200 committer Adrian Bunk Mon, 26 Jun 2006 18:19:23 +0200 remove the bouncing email address of David Campbell This patch removes a bouncing email address from the kernel sources. Signed-off-by: Adrian Bunk commit 62ed948cb1405fe95d61d8c6445c102e0c9da0a6 tree f139adcc861a05e7cc09cdb387a271a652fc2d07 parent 17ffc7ba6d7ea68b8d5f55a5ca1b87163e69720d parent fcc18e83e1f6fd9fa6b333735bf0fcd530655511 author David Woodhouse Mon, 26 Jun 2006 16:35:44 +0100 committer David Woodhouse Mon, 26 Jun 2006 16:35:44 +0100 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit 9ea7290902abcf22f796e9aeae4dc2e71d3f7e67 tree 911f84457212f09c160f3e8d9f404c1b6bd60c4e parent 03aba2f79594ca94d159c8bab454de9bcc385b76 author Alan Stern Fri, 23 Jun 2006 14:25:34 -0400 committer James Bottomley Mon, 26 Jun 2006 10:00:52 -0500 [SCSI] SCSI core: Allow QUIESCE -> CANCEL sdev transition We have to be able to remove SCSI devices even when they are suspended, so QUIESCE -> CANCEL must be a legal state transition. This patch (as727) adds the transition to the state machine. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit 03aba2f79594ca94d159c8bab454de9bcc385b76 tree 5fcd23bfd01c80d356e7cab2f20854513db6b0f7 parent f89d0a4e1d01168f20f9e8273de7dfc094b2a430 author Luben Tuikov Fri, 23 Jun 2006 09:39:09 -0700 committer James Bottomley Mon, 26 Jun 2006 10:00:20 -0500 [SCSI] sd/scsi_lib simplify sd_rw_intr and scsi_io_completion This patch simplifies "good_bytes" computation in sd_rw_intr(). sd: "good_bytes" computation is always done in terms of the resolution of the device's medium, since after that it is the number of good bytes we pass around and other layers/contexts (as opposed ot sd) can translate that to their own resolution (block layer:512). It also makes scsi_io_completion() processing more straightforward, eliminating the 3rd argument to the function. It also fixes a couple of bugs like not checking return value, using "break" instead of "return;", etc. I've been running with this patch for some time now on a test (do-it-all) system. Signed-off-by: Luben Tuikov Signed-off-by: James Bottomley commit f89d0a4e1d01168f20f9e8273de7dfc094b2a430 tree 192535b673233f57fa7617b99ce593892957cb2f parent 9ba0883cfc5ab69820c05f1bf2b7711bb0a0103c author Hannes Reinecke Thu, 22 Jun 2006 11:45:00 +0200 committer James Bottomley Mon, 26 Jun 2006 09:59:18 -0500 [SCSI] aic79xx: remove slave_destroy Even with the latest fixes aic79xx still occasionally triggers the BUG_ON in slave_destroy. Rather than trying to figure out the various levels of interaction here I've decided to remove the callback altogether. The primary reason for the slave_alloc / slave_destroy is to keep an index of pointers to the sdevs associated with a given target. However, by changing the arguments to the affected functions slightly it's possible to avoid the use of that index entirely. The only performance penalty we'll incur is in writing the information for /proc/scsi/XXX, as we'll have to recurse over all available sdevs to find the correct ones. But I doubt that reading from /proc is in any way time-critical. Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley commit 9ba0883cfc5ab69820c05f1bf2b7711bb0a0103c tree 96cf8399e3f7374e5a6b181fcb629d00342d68d8 parent 0e98936c924e2329f876b0b7791b45249c2e2129 author Hannes Reinecke Thu, 22 Jun 2006 09:19:51 +0200 committer James Bottomley Mon, 26 Jun 2006 09:30:00 -0500 [SCSI] HP XP devinfo update According to Anthony Cheung all HP XP arrays with "OPEN-" types support REPORT_LUN. So there is no reason why we shouldn't use it. Signed-off-by: Anthony Cheung Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley commit 0e98936c924e2329f876b0b7791b45249c2e2129 tree 83893e205f60aa728dc9d912981a92c856e50133 parent cefbda2d6cd9bf78a93768130729a6d142588d67 author Sumant Patro Tue, 20 Jun 2006 15:32:37 -0700 committer James Bottomley Mon, 26 Jun 2006 09:29:07 -0500 [SCSI] megaraid_sas: zcr with fix The patch adds support for a ZCR controller (Device ID : 0x413). It also has a critical bug fix : Disable controller interrupt before firing INIT cmd to FW. Interrupt is enabled after required initialization is over. This is done to ensure that driver is ready to handle interrupts when it is generated by the controller. Signed-off-by: Sumant Patro Signed-off-by: James Bottomley commit cfc736564fd01ee008d746913b1bbb90e3eb1f99 tree 6192a27c1ace4bf76795dadadbe1eb63cbe47429 parent cd701aa27e4cfab5c99c7da13d404b1f3a0aecfb author Ingo Molnar Mon, 26 Jun 2006 15:26:13 +0100 committer Russell King Mon, 26 Jun 2006 15:26:13 +0100 [ARM] fix drivers/mfd/ucb1x00-core.c IRQ probing bug While reviewing the IRQ autoprobing code i found the attached buglet. probe_irq_on()/off() calls must always be in pairs, because the generic IRQ code uses a global semaphore to serialize all autoprobing activites. (which does make sense) The ARM code's probe_irq_*() implementation does not do this, but if this driver is ever used on another platform, this bug might bite. (It probably does not trigger in practice, because a zero probing mask returned should be rare - but still.) Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Russell King commit b07076e6173a2593e369c3375f07c1cd7d78c36f tree f7d0219596b3a751a2e3950904c141179bf6c916 parent fcc18e83e1f6fd9fa6b333735bf0fcd530655511 author Ben Collins Mon, 26 Jun 2006 15:24:36 +0100 committer Russell King Mon, 26 Jun 2006 15:24:36 +0100 [SERIAL] 8250_pnp: add support for other Wacom tablets http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=6a242b6c279af7805a6cca8f39dbc5bfe1f78cd1 Signed-off-by: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Russell King commit cefbda2d6cd9bf78a93768130729a6d142588d67 tree 73c2b6e956d4959c292e550ae230534a2214d23c parent c65b1445d153a66ca91b00c1f10187e495c17918 author Dave C Boutcher Mon, 12 Jun 2006 21:22:51 -0500 committer James Bottomley Mon, 26 Jun 2006 09:15:41 -0500 [SCSI] ibmvscsi: treat busy and error conditions separately This patch fixes a condition where ibmvscsi treats a transport error as a "busy" condition, so no errors were returned to the scsi mid-layer. In a RAID environment this means that I/O hung rather than failing over. Signed-off-by: James Bottomley commit cd701aa27e4cfab5c99c7da13d404b1f3a0aecfb tree 66419b7bf0e05751458d4b66ce4821379bf9f3e4 parent 28c68e3450a19930d12e1798950d62e09f447ae1 author Ben Dooks Mon, 26 Jun 2006 15:12:58 +0100 committer Russell King Mon, 26 Jun 2006 15:12:58 +0100 [ARM] 3651/1: S3C24XX: Make arch list more detailed Patch from Ben Dooks Add the rest of the supported S3C24XX family to the configuration selection for ARCH_S3C2410. This should try and make it clearer for people trying to find the S3C2440 or freinds where they can be found.-- Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 28c68e3450a19930d12e1798950d62e09f447ae1 tree 5b0181b367678e5fb7361d2c8aa3560eb3ac8c58 parent 52c5ceceb145fad10b9996ce414dadcb6b02d959 author Ben Dooks Mon, 26 Jun 2006 15:12:57 +0100 committer Russell King Mon, 26 Jun 2006 15:12:57 +0100 [ARM] 3650/1: S3C2412: Update s3c2410_defconfig Patch from Ben Dooks Add SMDK2413 to the list of the machines being built for ARCH_S3C2410, thus ensursing our all machines build has an representitive of the S3C2412/S3C2413 CPU series-- Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 52c5ceceb145fad10b9996ce414dadcb6b02d959 tree c5a690fbe00650290f9980cb3a373ef8f7e6fd60 parent 689391210a4a8a1bf35119f87c51b3e01ef549e6 author Ben Dooks Mon, 26 Jun 2006 15:12:56 +0100 committer Russell King Mon, 26 Jun 2006 15:12:56 +0100 [ARM] 3649/1: S3C24XX: Fix capitalisation of CPU on SMDK2440 Patch from Ben Dooks Make CPU uppercase on the SMDK2440 KConfig entries-- Signed-off-by: Ben Dooks Signed-off-by: Russell King commit c65b1445d153a66ca91b00c1f10187e495c17918 tree 33957363da428cd53c4fc372c0f8253d7a5927f1 parent 4311fa60b0d1cb5a2f62f646978294bca7b46cbb author Douglas Gilbert Tue, 06 Jun 2006 00:11:24 -0400 committer James Bottomley Mon, 26 Jun 2006 09:12:42 -0500 [SCSI] scsi_debug version 1.79 - add 'virtual_gb' parameter to simulate large storage (by wrapping in dev_size_mb megabytes of actual ram) - add 'no_lun_0' parameter to skip lun 0 on each target (but still respond as required to INQUIRY + REPORT LUNS) - add well know lu support - add MODE SELECT commands support [pages: 0xa and 0x1c] - add LOG SENSE command support [pages: 0xd and 0x2f] - add READ CAPACITY (16) support - increase number of mode pages supported (to read), mainly transport specific (SAS) mode (sub)pages - add more VPD pages and extend others, including ATA information VPD page - START STOP UNIT now maintains a state machine - READ (16) and WRITE (16) cope with lbas larger than 32 bits (needed for the 'virtual_gb' parameter) - allow single command transfers up to 32 MB - more precise error (sense data) messages Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit 4311fa60b0d1cb5a2f62f646978294bca7b46cbb tree 978aaa728b02c1d7fccd6b4a73e2f7c4fdead5db parent fcc18e83e1f6fd9fa6b333735bf0fcd530655511 author Dave Jones Thu, 22 Jun 2006 15:46:15 -0400 committer James Bottomley Mon, 26 Jun 2006 09:10:17 -0500 [SCSI] kmalloc argument switcheroo in recent 53c700 change. On Wed, Jun 21, 2006 at 07:00:34PM +0000, Linux Kernel wrote: > commit 67d59dfdeb21df2c16dcd478b66177e91178ecd0 > tree ae85703651d81740f4a6cd398f9dd4d6aabe6a2f > parent 6db874fbdbedba5e15e76cc03b42f52ea70338c0 > author James Bottomley Wed, 14 Jun 2006 07:31:19 -0500 > committer James Bottomley Tue, 20 Jun 2006 05:34:01 -0500 > > [SCSI] 53c700: remove reliance on deprecated cmnd fields > ... > > + SDp->hostdata = kmalloc(GFP_KERNEL, sizeof(struct NCR_700_sense)); > + > + if (!SDp->hostdata) > + return -ENOMEM; "I'll take reversed arguments for $100 please Alex". Signed-off-by: Dave Jones Signed-off-by: James Bottomley commit 124a27fe32398a69d16bae374aeb17ad67a0ebbf tree 8912beacdcbb75912222321285c338943316d56e parent cd49b492fe3fef0b6348f18001f0d73f2577eb01 author Ingo Molnar Mon, 26 Jun 2006 13:47:59 +0000 committer Steve French Mon, 26 Jun 2006 13:47:59 +0000 [CIFS] Remove calls to to take f_owner.lock CIFS takes/releases f_owner.lock - why? It does not change anything in the fowner state. Remove this locking. Signed-off-by: Ingo Molnar Signed-off-by: Steve French commit 33f40b3b023b9f00b40ecfb3a39286de13516b33 tree d17cd688f6d193b9c27aba29470038c770c76c79 parent 8cbde94be34f95c01515ba19ce32bcd51ab3949e author Andrew Morton Sun, 25 Jun 2006 17:48:22 -0300 committer Mauro Carvalho Chehab Mon, 26 Jun 2006 09:21:57 -0300 V4L/DVB (4227): Update this driver for recent header file movement. Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 8cbde94be34f95c01515ba19ce32bcd51ab3949e tree f01514f3cf11dcada4d9e9e68708c0292ebb7fcf parent 4f725cb3fa46fabe7fd7c7175fa77e12616bfdb8 author Hans Verkuil Sat, 24 Jun 2006 14:36:02 -0300 committer Mauro Carvalho Chehab Mon, 26 Jun 2006 09:21:45 -0300 V4L/DVB (4223): Add V4L2_CID_MPEG_STREAM_VBI_FMT control V4L2_CID_MPEG_STREAM_VBI_FMT controls if and how VBI data is embedded in an MPEG stream. Currently only one format is supported: the format designed for the ivtv driver. This should be extended with new standard formats (such as defined for DVB) in the future. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4f725cb3fa46fabe7fd7c7175fa77e12616bfdb8 tree c525f45faa57f52670e4dd348deb5f7acb8a7dc9 parent 91a972910df042a0a308b2ffd3aa6fd42b0242e3 author Hans Verkuil Sat, 24 Jun 2006 09:47:56 -0300 committer Mauro Carvalho Chehab Mon, 26 Jun 2006 09:21:35 -0300 V4L/DVB (4222): Always switch tuner mode when calling VIDIOC_S_FREQUENCY. Fixes the weird and incorrect condition in VIDIOC_S_FREQUENCY. The tuner should always be switched to the mode specified in the v4l2_frequency struct. Much simpler and also corresponding to the v4l2 specification. The old condition made it impossible to switch from radio to analog tv mode using VIDIOC_S_FREQUENCY. Instead the (tv) frequency would be given to the radio tuner. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 91a972910df042a0a308b2ffd3aa6fd42b0242e3 tree 4c54d9f3db737ca4513907ec81cd3d8246783b3d parent 61391e0446e97bea44d93bd1624e5b32d3cc8474 author Hans Verkuil Sat, 24 Jun 2006 09:26:43 -0300 committer Mauro Carvalho Chehab Mon, 26 Jun 2006 09:21:32 -0300 V4L/DVB (4221): Add HM12 YUV format define. HM12 is a YUV 4:1:1 format used by the cx2341x MPEG encoder/decoder for the raw YUV input/output. The Y and UV planes are broken up in 16x16 macroblocks and each macroblock is transmitted in turn (row by row). Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 61391e0446e97bea44d93bd1624e5b32d3cc8474 tree c1a1579505a07a1c58c3c7f58ed8ba775acd02c0 parent 4a4edcca22bf46622f34db74a876a7eb91d95865 author Tim Kaiser Sun, 25 Jun 2006 09:14:07 -0300 committer Mauro Carvalho Chehab Mon, 26 Jun 2006 09:21:26 -0300 V4L/DVB (4219): Av7110: analog sound output of DVB-C rev 2.3 Added support for the msp34x5 audio dac. Analog sound output of Technotrend DVB-C 2300 (aka Hauppauge Nexus-CA) works now. Signed-off-by: Tim Kaiser Signed-off-by: Marco Schluessler Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 4a4edcca22bf46622f34db74a876a7eb91d95865 tree f4a3232bd137dd7be00cde65e643c271503f16c5 parent 7670d73266d37d18ded5b328db2804c9a7ab7921 author Manu Abraham Sun, 25 Jun 2006 05:46:26 -0300 committer Mauro Carvalho Chehab Mon, 26 Jun 2006 09:21:20 -0300 V4L/DVB (4217): Fix a misplaced closing bracket/else, which caused swzigzag not to be called Thanks to Oliver Endriss for spotting this. Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 7670d73266d37d18ded5b328db2804c9a7ab7921 tree 18bc715d01210de48ae1d2789812df0ca01a37a9 parent 3446807d6e9ccf4b21476b0b143d35fcc964be4b author Michael Krufky Sat, 24 Jun 2006 21:05:12 -0300 committer Mauro Carvalho Chehab Mon, 26 Jun 2006 09:21:09 -0300 V4L/DVB (4215): Make VIDEO_CX88_BLACKBIRD a separate build option This patch creates a new Kconfig menu option, entitled, "Blackbird MPEG encoder support (cx2388x + cx23416)" so that the cx88-blackbird mpeg encoder module can be chosen separately. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 3446807d6e9ccf4b21476b0b143d35fcc964be4b tree 6c506631ebc234f62c615d6b56f77aabd53318b7 parent dff47bf21be002b3f0a6562d368474c41971b448 author Michael Krufky Sat, 24 Jun 2006 20:47:21 -0300 committer Mauro Carvalho Chehab Mon, 26 Jun 2006 09:20:56 -0300 V4L/DVB (4214): Make VIDEO_CX2341X a selectable build option The cx2341x mpeg encoder module is used by cx88-blackbird, pvrusb2 and the external ivtv driver. This patch allows for cx2341x to be selected without having to also select cx88-blackbird. This will be needed to build the external ivtv driver or the standalone pvrusb2 driver against kernel 2.6.18 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit dff47bf21be002b3f0a6562d368474c41971b448 tree 2031e4dc6f5ddcb67e92d5aff8107f78425f02a2 parent d772bd03bc38794c84811be9d2537c225e08c9b8 author Adrian Bunk Sat, 24 Jun 2006 19:25:43 -0300 committer Mauro Carvalho Chehab Mon, 26 Jun 2006 09:20:51 -0300 V4L/DVB (4213): Cx88: cleanups remove the following unused hooks: - cx88-blackbird.c: cx88_ioctl_hook() - cx88-blackbird.c: cx88_ioctl_translator() make the following needlessly global functions static: - cx88-tvaudio.c: cx88_detect_nicam() remove the following unused EXPORT_SYMBOL's: - cx88-cards.c: cx88_bcount - cx88-cards.c: cx88_subids - cx88-cards.c: cx88_idcount - cx88-cards.c: cx88_card_list - cx88-cards.c: cx88_card_setup - cx88-core.c: cx88_start_audio_dma - cx88-core.c: cx88_stop_audio_dma - cx88-i2c.c: cx88_i2c_init Signed-off-by: Adrian Bunk Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit d772bd03bc38794c84811be9d2537c225e08c9b8 tree b1f763fbc8937bc980edf8cdae278133c14fe364 parent fcc18e83e1f6fd9fa6b333735bf0fcd530655511 author Manu Abraham Sat, 24 Jun 2006 11:18:58 -0300 committer Mauro Carvalho Chehab Mon, 26 Jun 2006 09:20:49 -0300 V4L/DVB (4211): Fix an Oops for all fe that have get_frontend_algo == NULL Thanks to Johannes Stezenbach for pointing it out Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit b9d0a25a484a90c1d60b974d115eff2fe580ce16 tree b76924924662ab1867b53001ea4a0db4a87b57ce parent e90b1a2be6010acf01673b0625cfbf18240f7744 author Herbert Xu Sat, 10 Jun 2006 18:06:34 +1000 committer Herbert Xu Mon, 26 Jun 2006 17:34:42 +1000 [CRYPTO] tcrypt: Forbid tcrypt from being built-in It makes no sense to build tcrypt into the kernel. In fact, now that the driver init function's return status is being checked, it is in fact harmful to do so. Signed-off-by: Herbert Xu commit e90b1a2be6010acf01673b0625cfbf18240f7744 tree 7b99c136335b94bde40a6a260a6d823c83433024 parent e805792851bcb0bb42f0c8a352be64564c13e374 author Herbert Xu Fri, 02 Jun 2006 08:42:25 +1000 committer Herbert Xu Mon, 26 Jun 2006 17:34:42 +1000 [CRYPTO] aes: Add wrappers for assembly routines The wrapper routines are required when asmlinkage differs from the usual calling convention. So we need to have them. However, by rearranging the parameters, they will get optimised away to a single jump for most people. Signed-off-by: Herbert Xu commit e805792851bcb0bb42f0c8a352be64564c13e374 tree b0668a398fd8398601cd43219a9fb04b31b9dc86 parent 14fdf477a7e3ff54f8e67fe506dd2677a36c56e4 author Michal Ludvig Tue, 30 May 2006 22:04:19 +1000 committer Herbert Xu Mon, 26 Jun 2006 17:34:41 +1000 [CRYPTO] tcrypt: Speed benchmark support for digest algorithms This patch adds speed tests (benchmarks) for digest algorithms. Tests are run with different buffer sizes (16 bytes, ... 8 kBytes) and with each buffer multiple tests are run with different update() sizes (e.g. hash 64 bytes buffer in four 16 byte updates). There is no correctness checking of the result and all tests and algorithms use the same input buffer. Signed-off-by: Michal Ludvig Signed-off-by: Herbert Xu commit 14fdf477a7e3ff54f8e67fe506dd2677a36c56e4 tree c21533b46aa27463a7de7b7219b9af219d75c5b7 parent 996e2523cc347cc98237d2da3454aedc779fdcba author Michal Ludvig Tue, 30 May 2006 14:49:38 +1000 committer Herbert Xu Mon, 26 Jun 2006 17:34:41 +1000 [CRYPTO] tcrypt: Return -EAGAIN from module_init() Intentionaly return -EAGAIN from module_init() to ensure it doesn't stay loaded in the kernel. The module does all its work from init() and doesn't offer any runtime functionality => we don't need it in the memory, do we? Signed-off-by: Michal Ludvig Signed-off-by: Herbert Xu commit 996e2523cc347cc98237d2da3454aedc779fdcba tree 8f58774666bfe6c166fc051bede26d779b827e4f parent d913ea0d6b6a48dd6eed8fc5e299b8b10e049186 author Herbert Xu Sun, 21 May 2006 11:57:20 +1000 committer Herbert Xu Mon, 26 Jun 2006 17:34:41 +1000 [CRYPTO] api: Allow replacement when registering new algorithms We already allow asynchronous removal of existing algorithm modules. By allowing the replacement of existing algorithms, we can replace algorithms without having to wait for for all existing users to complete. Signed-off-by: Herbert Xu commit d913ea0d6b6a48dd6eed8fc5e299b8b10e049186 tree baa603652c2428baa923dd5eef5773489c624ecf parent c7fc05992afcf1d63d6d5fb6142c8d39094dbca9 author Herbert Xu Sun, 21 May 2006 08:45:26 +1000 committer Herbert Xu Mon, 26 Jun 2006 17:34:40 +1000 [CRYPTO] api: Removed const from cra_name/cra_driver_name We do need to change these names now and even more so in future with instantiated algorithms. So let's stop lying to the compiler and get rid of the const modifiers. Signed-off-by: Herbert Xu commit c7fc05992afcf1d63d6d5fb6142c8d39094dbca9 tree 201d72844c0b27269e34bf3172d579b9e556e10c parent 110bf1c0e932615cbe43a8af8a07bc3750ae4295 author Herbert Xu Wed, 24 May 2006 13:02:26 +1000 committer Herbert Xu Mon, 26 Jun 2006 17:34:40 +1000 [CRYPTO] api: Added cra_init/cra_exit This patch adds the hooks cra_init/cra_exit which are called during a tfm's construction and destruction respectively. This will be used by the instances to allocate child tfm's. For now this lets us get rid of the coa_init/coa_exit functions which are used for exactly that purpose (unlike the dia_init function which is called for each transaction). In fact the coa_exit path is currently buggy as it may get called twice when an error is encountered during initialisation. Signed-off-by: Herbert Xu commit 110bf1c0e932615cbe43a8af8a07bc3750ae4295 tree 9bf86514298535a6a8615f6136306b6859853e21 parent 82062c72cd643c99a9e1c231270acbab986fd23f author Michal Ludvig Mon, 22 May 2006 08:28:06 +1000 committer Herbert Xu Mon, 26 Jun 2006 17:34:40 +1000 [CRYPTO] api: Fixed incorrect passing of context instead of tfm Fix a few omissions in passing TFM instead of CTX to algorithms. Signed-off-by: Michal Ludvig Signed-off-by: Herbert Xu commit 82062c72cd643c99a9e1c231270acbab986fd23f tree 42c1900095bfa27c2f2b5af7566adc9caf7402bf parent 6c2bb98bc33ae33c7a33a133a4cd5a06395fece5 author Herbert Xu Tue, 16 May 2006 22:20:34 +1000 committer Herbert Xu Mon, 26 Jun 2006 17:34:39 +1000 [CRYPTO] padlock: Rearrange context structure to reduce code size i386 assembly has more compact instructions for accessing 7-bit offsets. So by moving the large members to the end of the structure we can save quite a bit of code size. This patch shaves about 10% or 300 bytes off the padlock-aes file. Signed-off-by: Herbert Xu commit 6c2bb98bc33ae33c7a33a133a4cd5a06395fece5 tree 96684cd2c473cd05d651ce1fa3dd72b1b4b19b09 parent 43600106e32809a4dead79fec67a63e9860e3d5d author Herbert Xu Tue, 16 May 2006 22:09:29 +1000 committer Herbert Xu Mon, 26 Jun 2006 17:34:39 +1000 [CRYPTO] all: Pass tfm instead of ctx to algorithms Up until now algorithms have been happy to get a context pointer since they know everything that's in the tfm already (e.g., alignment, block size). However, once we have parameterised algorithms, such information will be specific to each tfm. So the algorithm API needs to be changed to pass the tfm structure instead of the context pointer. This patch is basically a text substitution. The only tricky bit is the assembly routines that need to get the context pointer offset through asm-offsets.h. Signed-off-by: Herbert Xu commit 43600106e32809a4dead79fec67a63e9860e3d5d tree 20590746b98c41d6cc8b590b01cecddf9a185270 parent 8b55ba0303bb59c34fab8e015634018780491614 author Herbert Xu Tue, 16 May 2006 22:06:54 +1000 committer Herbert Xu Mon, 26 Jun 2006 17:34:38 +1000 [CRYPTO] digest: Remove unnecessary zeroing during init Various digest algorithms operate one block at a time and therefore keep a temporary buffer of partial blocks. This buffer does not need to be initialised since there is a counter which indicates what is and isn't valid in it. Signed-off-by: Herbert Xu commit 8b55ba0303bb59c34fab8e015634018780491614 tree f0b3cc55bf76febe7706dae0ee23be8bbf6ffd81 parent e1147d8f47eb8fef93f98a30858192145137d2b2 author Herbert Xu Sun, 14 May 2006 11:00:39 +1000 committer Herbert Xu Mon, 26 Jun 2006 17:34:38 +1000 [CRYPTO] aes-i586: Get rid of useless function wrappers The wrappers aes_encrypt/aes_decrypt simply reverse the order of the function arguments. It's just as easy to get the actual assembly code to read them in the opposite order. Signed-off-by: Herbert Xu commit e1147d8f47eb8fef93f98a30858192145137d2b2 tree 7e1bc0ab3d263e5bd801900195ab310625d9ab59 parent d00e708cef16442cabaf23f653baf924f5d66e83 author Atsushi Nemoto Mon, 10 Apr 2006 08:42:35 +1000 committer Herbert Xu Mon, 26 Jun 2006 17:34:38 +1000 [CRYPTO] digest: Add alignment handling Some hash modules load/store data words directly. The digest layer should pass properly aligned buffer to update()/final() method. This patch also add cra_alignmask to some hash modules. Signed-off-by: Atsushi Nemoto Signed-off-by: Herbert Xu commit d00e708cef16442cabaf23f653baf924f5d66e83 tree 29529332b4d96826711184893d5754e84d7dddcc parent fcc18e83e1f6fd9fa6b333735bf0fcd530655511 author Atsushi Nemoto Thu, 06 Apr 2006 03:26:01 +1000 committer Herbert Xu Mon, 26 Jun 2006 17:34:37 +1000 [CRYPTO] khazad: Use 32-bit reads on key On 64-bit platform, reading 64-bit keys (which is supposed to be 32-bit aligned) at a time will result in unaligned access. Signed-off-by: Atsushi Nemoto Signed-off-by: Herbert Xu commit 8070b2b1ecbeb5437c92c33b4dcea1d8d80399ee tree 03e4cc4b1ed8c9905ed8742ea1f88c38b9638cfa parent 52383678a8ac80e6679f94f60c897f9292e0e8b9 author David S. Miller Mon, 26 Jun 2006 00:10:46 -0700 committer David S. Miller Mon, 26 Jun 2006 00:10:46 -0700 [IOAT]: Do not dereference THIS_MODULE directly to set unsafe. Use the __unsafe() macro instead. Noticed by Miles Lane. Signed-off-by: David S. Miller commit 52383678a8ac80e6679f94f60c897f9292e0e8b9 tree 071aa3fe0dd9124a645ef4c9cc7b769a5b034d91 parent 068c6e98bc7ec4419299b38cd40be26ebf4bdeda author Ralf Baechle Mon, 26 Jun 2006 00:05:23 -0700 committer David S. Miller Mon, 26 Jun 2006 00:05:23 -0700 [NETROM]: Fix possible null pointer dereference. If in nr_link_failed the neighbour list is non-empty but the node list is empty we'll end dereferencing a in a NULL pointer. This fixes coverity 362. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 068c6e98bc7ec4419299b38cd40be26ebf4bdeda tree 4312d3449036c35d5fc8fd4f60f447200928e817 parent 8834807b43200b1658b49d3b779e74a4f77e4ffb author Neil Horman Mon, 26 Jun 2006 00:04:27 -0700 committer David S. Miller Mon, 26 Jun 2006 00:04:27 -0700 [NET] netpoll: break recursive loop in netpoll rx path The netpoll system currently has a rx to tx path via: netpoll_rx __netpoll_rx arp_reply netpoll_send_skb dev->hard_start_tx This rx->tx loop places network drivers at risk of inadvertently causing a deadlock or BUG halt by recursively trying to acquire a spinlock that is used in both their rx and tx paths (this problem was origionally reported to me in the 3c59x driver, which shares a spinlock between the boomerang_interrupt and boomerang_start_xmit routines). This patch breaks this loop, by queueing arp frames, so that they can be responded to after all receive operations have been completed. Tested by myself and the reported with successful results. Specifically it was tested with netdump. Heres the BZ with details: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=194055 Signed-off-by: Neil Horman Acked-by: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 8834807b43200b1658b49d3b779e74a4f77e4ffb tree e9f8f2312b9ee3d4f6ea388f3b33c65e1495868c parent d83561a4d67863b4aa297e8f598823dd4dfe855e author Jeremy Fitzhardinge Mon, 26 Jun 2006 00:03:40 -0700 committer David S. Miller Mon, 26 Jun 2006 00:03:40 -0700 [NET] netpoll: don't spin forever sending to stopped queues When transmitting a skb in netpoll_send_skb(), only retry a limited number of times if the device queue is stopped. Signed-off-by: Jeremy Fitzhardinge Acked-by: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit d83561a4d67863b4aa297e8f598823dd4dfe855e tree d5c71904c838339ce0a36b408af6f1c51f58c5d8 parent 1e4fd51e2c830f2a10c9b143986757d8ea35b0fc author Ben Collins Mon, 26 Jun 2006 00:02:47 -0700 committer David S. Miller Mon, 26 Jun 2006 00:02:47 -0700 [IRDA]: add some IBM think pads [UBUNTU:nsc-ircc] Add some IBM think pads Add Thinkpad T60/X60/Z60/T43/R52 Infrared driver support. http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=7b8d2713435a9fb69719a282ba75e117f3f76a5b Signed-off-by: Ben Collins Signed-off-by: Andrew Morton commit 1e4fd51e2c830f2a10c9b143986757d8ea35b0fc tree a6b0756bcda7cb0d0168d77fc954696a60849beb parent f72b948dcbb8558d639214536c2ace1b0760f41d author Andrew Morton Mon, 26 Jun 2006 00:01:58 -0700 committer David S. Miller Mon, 26 Jun 2006 00:01:58 -0700 [ATM]: atm/mpc.c warning fix net/atm/mpc.c: In function 'MPOA_res_reply_rcvd': net/atm/mpc.c:1116: warning: unused variable 'ip' Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit f72b948dcbb8558d639214536c2ace1b0760f41d tree 5ff1c481585ed41fefc9f9b5a0a40991dc6ea30b parent 6048126440dcb3ba01316f961465c0ff5a255dd1 author Phil Oester Mon, 26 Jun 2006 00:00:57 -0700 committer David S. Miller Mon, 26 Jun 2006 00:00:57 -0700 [NET]: skb_find_text ignores to argument skb_find_text takes a "to" argument which is supposed to limit how far into the skb it will search for the given text. At present, it seems to ignore that argument on the first skb, and instead return a match even if the text occurs beyond the limit. Patch below fixes this, after adjusting for the "from" starting point. This consequently fixes the netfilter string match's "--to" handling, which currently is broken. Signed-off-by: Phil Oester Signed-off-by: David S. Miller commit 6048126440dcb3ba01316f961465c0ff5a255dd1 tree b8a58f213f510d47ca6b2e122e026a7b4339793e parent f54d9e8d7f7dd60f26157c12acda3fc94fcd9ab7 author Adrian Bunk Sun, 25 Jun 2006 23:58:10 -0700 committer David S. Miller Sun, 25 Jun 2006 23:58:10 -0700 [NET]: make net/core/dev.c:netdev_nit static netdev_nit can now become static. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit f54d9e8d7f7dd60f26157c12acda3fc94fcd9ab7 tree 4cd16db2905ccca54a2e79cc68669b62c024b433 parent 0718bcc09b3597c51e87f265c72135a4928d3c0b author Michael Chan Sun, 25 Jun 2006 23:57:04 -0700 committer David S. Miller Sun, 25 Jun 2006 23:57:04 -0700 [NET]: Fix GSO problems in dev_hard_start_xmit() Fix 2 problems in dev_hard_start_xmit(): 1. nskb->next needs to link back to skb->next if hard_start_xmit() returns non-zero. 2. Since the total number of GSO fragments may exceed MAX_SKB_FRAGS + 1, it needs to stop transmitting if the netif_queue is stopped. Signed-off-by: Michael Chan Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 0718bcc09b3597c51e87f265c72135a4928d3c0b tree fd4a686629488bad28f3c780e6b2b52803698877 parent 3ba07e65b288f00cc4d2420f1da46309b1cb5a0c author Herbert Xu Sun, 25 Jun 2006 23:55:46 -0700 committer David S. Miller Sun, 25 Jun 2006 23:55:46 -0700 [NET]: Fix CHECKSUM_HW GSO problems. Fix checksum problems in the GSO code path for CHECKSUM_HW packets. The ipv4 TCP pseudo header checksum has to be adjusted for GSO segmented packets. The adjustment is needed because the length field in the pseudo-header changes. However, because we have the inequality oldlen > newlen, we know that delta = (u16)~oldlen + newlen is still a 16-bit quantity. This also means that htonl(delta) + th->check still fits in 32 bits. Therefore we don't have to use csum_add on this operations. This is based on a patch by Michael Chan . Signed-off-by: Herbert Xu Acked-by: Michael Chan Signed-off-by: David S. Miller commit 3ba07e65b288f00cc4d2420f1da46309b1cb5a0c tree 204ae8a1c4be5fcb88d1d2740a0288a3b7b43b4f parent 65f51ef0971f01d64027cb3bca2c5827fb5b19cb author Allan Stephens Sun, 25 Jun 2006 23:53:47 -0700 committer David S. Miller Sun, 25 Jun 2006 23:53:47 -0700 [TIPC]: Fix incorrect correction to discovery timer frequency computation. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 65f51ef0971f01d64027cb3bca2c5827fb5b19cb tree 8080e86d8bfe4398b3c1478580bfbfeb5bd6c866 parent 5392d646886d8f1ae01be69c10600b8df5284c41 author Allan Stephens Sun, 25 Jun 2006 23:53:20 -0700 committer David S. Miller Sun, 25 Jun 2006 23:53:20 -0700 [TIPC]: Get rid of dynamically allocated arrays in broadcast code. This change improves an earlier change which replaced the large local variable arrays used during broadcasting with dynamically allocated arrays. The temporary arrays are now incoprorated into the multicast link data structure. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 5392d646886d8f1ae01be69c10600b8df5284c41 tree 38f6c38498dc7f1632cc04a50098b82037307e44 parent a10bd924a421e0e5d5bb9640735b9317b8e473b5 author Allan Stephens Sun, 25 Jun 2006 23:52:50 -0700 committer David S. Miller Sun, 25 Jun 2006 23:52:50 -0700 [TIPC]: Fixed link switchover bugs Incorporates several related fixes: - switchover now occurs when switching from an active link to a standby link - failure of a standby link no longer initiates switchover - links now display correct # of received packtes following reactivation Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit a10bd924a421e0e5d5bb9640735b9317b8e473b5 tree d86ac98e60292c3197a8f6ef9af86549dd051102 parent f131072c3da84e70a0f65d71b3a3f6611c6a22bc author Allan Stephens Sun, 25 Jun 2006 23:52:17 -0700 committer David S. Miller Sun, 25 Jun 2006 23:52:17 -0700 [TIPC]: Enhanced & cleaned up system messages; fixed 2 obscure memory leaks. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit f131072c3da84e70a0f65d71b3a3f6611c6a22bc tree 6b00e151ee25a9d20fc56c4aa5f947561a65047d parent e100ae92a68c55e7ba287866c20fe1b0ad4fcdee author Allan Stephens Sun, 25 Jun 2006 23:51:37 -0700 committer David S. Miller Sun, 25 Jun 2006 23:51:37 -0700 [TIPC]: First phase of assert() cleanup This also contains enhancements to simplify comparisons in name table publication removal algorithm and to simplify name table sanity checking when shutting down TIPC. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit e100ae92a68c55e7ba287866c20fe1b0ad4fcdee tree 733d0cbd80793d00aa53f2fbe09c85e8529fc901 parent c33d53b23589d9133af85effefbaa619853eb7f0 author Allan Stephens Sun, 25 Jun 2006 23:51:08 -0700 committer David S. Miller Sun, 25 Jun 2006 23:51:08 -0700 [TIPC]: Disallow config operations that aren't supported in certain modes. This change provides user-friendly feedback when TIPC is unable to perform certain configuration operations that don't work properly in certain modes. (In particular, any reconfiguration request that would temporarily take TIPC from network mode to standalone mode, or from standalone mode to not running mode, is disallowed.) Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit c33d53b23589d9133af85effefbaa619853eb7f0 tree 8680ad82411d2dac96374e9133ce4c266a5322ae parent a75bf874278d8318ffe11043f3acb9b281fa911a author Allan Stephens Sun, 25 Jun 2006 23:50:30 -0700 committer David S. Miller Sun, 25 Jun 2006 23:50:30 -0700 [TIPC]: Fixed memory leak in tipc_link_send() when destination is unreachable Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit a75bf874278d8318ffe11043f3acb9b281fa911a tree b3ba22c9d4d3a3f8d2744e8b57a4833d33572f5d parent a7513528cd0deeb62624c229c21054472ec976e6 author Allan Stephens Sun, 25 Jun 2006 23:50:01 -0700 committer David S. Miller Sun, 25 Jun 2006 23:50:01 -0700 [TIPC]: Added missing warning for out-of-memory condition Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit a7513528cd0deeb62624c229c21054472ec976e6 tree 2e1f0ff78db589e53f260b7b3845e27e62b29ac8 parent 51f9cc1ff8aa0866ff8fb3c06be4c64b5edbb2e8 author Allan Stephens Sun, 25 Jun 2006 23:49:33 -0700 committer David S. Miller Sun, 25 Jun 2006 23:49:33 -0700 [TIPC]: Withdrawing all names from nameless port now returns success, not error Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 51f9cc1ff8aa0866ff8fb3c06be4c64b5edbb2e8 tree ba3bfa86415fb9afa88e764672beb6fb9014b231 parent a3b0a5a9d004002a9cf9cf7a9d10cf1447a73d2b author Allan Stephens Sun, 25 Jun 2006 23:49:06 -0700 committer David S. Miller Sun, 25 Jun 2006 23:49:06 -0700 [TIPC]: Optimized argument validation done by connect(). Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit a3b0a5a9d004002a9cf9cf7a9d10cf1447a73d2b tree dab990b30b9c5d677c9c3408c2f8e73a5e50db72 parent 4b087b28a629cc9388e42fdccdcd929deaa7ac81 author Allan Stephens Sun, 25 Jun 2006 23:48:22 -0700 committer David S. Miller Sun, 25 Jun 2006 23:48:22 -0700 [TIPC]: Simplify code for returning partial success of stream send request. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 4b087b28a629cc9388e42fdccdcd929deaa7ac81 tree c0cfa32be5bd91352986b8bd8cb1625c01547a34 parent 499786516fc12791223f075d682a45ea1129eb04 author Allan Stephens Sun, 25 Jun 2006 23:47:44 -0700 committer David S. Miller Sun, 25 Jun 2006 23:47:44 -0700 [TIPC]: recvmsg() now returns TIPC ancillary data using correct level (SOL_TIPC) Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 499786516fc12791223f075d682a45ea1129eb04 tree 7c1e2b25687eae5c41d8a24b34e6bb4190d969e8 parent 1303e8f173a8a5000ee6e2fba876fec9474ed1f6 author Allan Stephens Sun, 25 Jun 2006 23:47:18 -0700 committer David S. Miller Sun, 25 Jun 2006 23:47:18 -0700 [TIPC]: Improved performance of error checking during socket creation. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 1303e8f173a8a5000ee6e2fba876fec9474ed1f6 tree 1a4e21bce31d879f550d81fd88e5358ae2438248 parent bdd94789d2348e20d13c1d5e477c8cf830dd204b author Allan Stephens Sun, 25 Jun 2006 23:46:50 -0700 committer David S. Miller Sun, 25 Jun 2006 23:46:50 -0700 [TIPC]: Stream socket send indicates partial success if data partially sent. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit bdd94789d2348e20d13c1d5e477c8cf830dd204b tree 14726d6f25d20e7e84f26e4c834e3187e017deaa parent 3546c7508d7e97fd855f8ac37afdd09622fa5ce1 author Allan Stephens Sun, 25 Jun 2006 23:45:53 -0700 committer David S. Miller Sun, 25 Jun 2006 23:45:53 -0700 [TIPC]: Connected send now checks socket state when retrying congested send. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 3546c7508d7e97fd855f8ac37afdd09622fa5ce1 tree bd7dcdbbb83244a4e06c06449d3fdbc965e1d118 parent 3388007bc4d662e50c2c01a7fb1fa2c31cea98ad author Allan Stephens Sun, 25 Jun 2006 23:45:24 -0700 committer David S. Miller Sun, 25 Jun 2006 23:45:24 -0700 [TIPC]: Can now return destination name of form {0,x,y} via ancillary data. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 3388007bc4d662e50c2c01a7fb1fa2c31cea98ad tree 9971f7cb08c6d20485db861a36604bdafe1019e2 parent 6b384de853c9f05e5e6da6c95edb475b96dd2cc1 author Allan Stephens Sun, 25 Jun 2006 23:44:57 -0700 committer David S. Miller Sun, 25 Jun 2006 23:44:57 -0700 [TIPC]: Implied connect now saves dest name for retrieval as ancillary data. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 6b384de853c9f05e5e6da6c95edb475b96dd2cc1 tree b9b26a5c1c41153eb2557480910339576583ffa6 parent e9024f0f79c3f847a793d6a16bf4fefc6d7a4649 author Allan Stephens Sun, 25 Jun 2006 23:44:27 -0700 committer David S. Miller Sun, 25 Jun 2006 23:44:27 -0700 [TIPC]: Fixed connect() to detect a dest address that is missing or too short. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit e9024f0f79c3f847a793d6a16bf4fefc6d7a4649 tree 5c93a0fb02ddadebe2d0f52c1d026657c4155434 parent 687a25f1cdfc6ee1f2f60f299dbd294908eb0d59 author Allan Stephens Sun, 25 Jun 2006 23:43:57 -0700 committer David S. Miller Sun, 25 Jun 2006 23:43:57 -0700 [TIPC]: Non-operation-affecting corrections to comments & function definitions. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 687a25f1cdfc6ee1f2f60f299dbd294908eb0d59 tree ca7953096dcc44c8250fc18d0a6eb0e28d97d33f parent a592ea6362a967a49eb4b5d1cd36b78d8f180622 author Allan Stephens Sun, 25 Jun 2006 23:43:21 -0700 committer David S. Miller Sun, 25 Jun 2006 23:43:21 -0700 [TIPC]: Validate entire interface name when locating bearer to enable. This fix prevents a bearer from being enabled using the wrong interface. For example, specifying "eth:eth14" might enable "eth:eth1" by mistake. Signed-off-by: Allan Stephens Signed-off-by: Per Liden commit a592ea6362a967a49eb4b5d1cd36b78d8f180622 tree 9ed43405555fdbd12909b3b80a3b86b15926df44 parent 8b1f0a92e98a67e1e69aa37d538f8956d1640cba author Allan Stephens Sun, 25 Jun 2006 23:42:47 -0700 committer David S. Miller Sun, 25 Jun 2006 23:42:47 -0700 [TIPC]: Added support for MODULE_VERSION capability. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 8b1f0a92e98a67e1e69aa37d538f8956d1640cba tree 32d8bab469ca97549cad25a46f2136280ffcaa47 parent 70cb23477019b8739d23ead223539c7e6dfc509c author Allan Stephens Sun, 25 Jun 2006 23:42:19 -0700 committer David S. Miller Sun, 25 Jun 2006 23:42:19 -0700 [TIPC]: Fix misleading comment in buf_discard() routine. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 70cb23477019b8739d23ead223539c7e6dfc509c tree 8bcdd7772db92688b5ef30c22515ae58e44361a0 parent 3ac90216abc7d39e694533aec2805efeb06bf8ac author Allan Stephens Sun, 25 Jun 2006 23:41:47 -0700 committer David S. Miller Sun, 25 Jun 2006 23:41:47 -0700 [TIPC]: Fixed privilege checking typo in dest_name_check(). This patch originated by Stephane Ouellette . Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 3ac90216abc7d39e694533aec2805efeb06bf8ac tree c3374590eb318578896b41ca5af9d098275fc36f parent a4e0927902508a5f7f04be56d3c3e1b174481705 author Eric Sesterhenn Sun, 25 Jun 2006 23:41:15 -0700 committer David S. Miller Sun, 25 Jun 2006 23:41:15 -0700 [TIPC] Fix for NULL pointer dereference This fixes a bug spotted by the coverity checker, bug id #366. If (mod(seqno - prev) != 1) we set buf to NULL, dereference it in the for case, and set it to whatever value happes to be at adress 0+next, if it happens to be non-zero, we even stay in the loop. It seems that the author intended to break there. Signed-off-by: Eric Sesterhenn Signed-off-by: Per Liden Signed-off-by: David S. Miller commit a4e0927902508a5f7f04be56d3c3e1b174481705 tree 5ee3be5ca4697b03d6acfe6233b5d2464311066d parent d356eeba8e34786621d85468e5176052813a3059 author Allan Stephens Sun, 25 Jun 2006 23:40:35 -0700 committer David S. Miller Sun, 25 Jun 2006 23:40:35 -0700 [TIPC]: Allow compilation when CONFIG_TIPC_DEBUG is not set. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit d356eeba8e34786621d85468e5176052813a3059 tree 0f802091559dfafdc62fa6c3059fcebff60b2bc7 parent 260082471ed3f6d751e9767e5a278d4e495d83f7 author Allan Stephens Sun, 25 Jun 2006 23:40:01 -0700 committer David S. Miller Sun, 25 Jun 2006 23:40:01 -0700 [TIPC]: Multicast link failure now resets all links to "nacking" node. This fix prevents node from crashing. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 260082471ed3f6d751e9767e5a278d4e495d83f7 tree 5bf904b9cdc16ae877f562e5d4909827c00d9fd5 parent 9688243b635ecede23fe4492ba23f36439398095 author Allan Stephens Sun, 25 Jun 2006 23:39:31 -0700 committer David S. Miller Sun, 25 Jun 2006 23:39:31 -0700 [TIPC]: Links now validate destination node specified by incoming messages. This fix prevents link flopping and name table inconsistency problems arising when a node is assigned a different value than it used previously. (Changing the value causes other nodes to have two link endpoints sending to the same MAC address using two different destination values, requiring the receiving node to filter out the unwanted messages.) Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 9688243b635ecede23fe4492ba23f36439398095 tree 5e32d909a89a1e4efe53fd8f1cf9eaa14cfddad5 parent 49384507896ee26e67266cebef6b6a9f2e31081c author Allan Stephens Sun, 25 Jun 2006 23:38:58 -0700 committer David S. Miller Sun, 25 Jun 2006 23:38:58 -0700 [TIPC]: Allow ports to receive multicast messages through native API. This fix prevents a kernel panic if an application mistakenly sends a multicast message to TIPC's topology service or configuration service. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 49384507896ee26e67266cebef6b6a9f2e31081c tree 0a1dd7ef172455c7a433755277c331e3690c10bf parent 2535ec50b7a51833ff65dc97ca85e1155d4090f8 author Allan Stephens Sun, 25 Jun 2006 23:38:29 -0700 committer David S. Miller Sun, 25 Jun 2006 23:38:29 -0700 [TIPC]: Corrected potential misuse of tipc_media_addr structure. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 2535ec50b7a51833ff65dc97ca85e1155d4090f8 tree 9eb6d0389d304b7a8f2afbcf3c9a18f0c9eba5ab parent 9ab230f82f404e534387dda6067072291441a34d author Allan Stephens Sun, 25 Jun 2006 23:38:00 -0700 committer David S. Miller Sun, 25 Jun 2006 23:38:00 -0700 [TIPC]: Use correct upper bound when validating network zone number. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 9ab230f82f404e534387dda6067072291441a34d tree c0f6b2a17d640bea336795988f109e53120c0711 parent 5e3c8854c1898828ffb0141d4ac4e6190aa9eb4e author Allan Stephens Sun, 25 Jun 2006 23:37:24 -0700 committer David S. Miller Sun, 25 Jun 2006 23:37:24 -0700 [TIPC]: Prevent name table corruption if no room for new publication Now exits cleanly if attempt to allocate larger array of subsequences fails, without losing track of pointer to existing array. Signed-off-by: Allan Stephens Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 5e3c8854c1898828ffb0141d4ac4e6190aa9eb4e tree 37d58dc51a1d3f7bc7f2fef26397563bb38bfaa9 parent fcc18e83e1f6fd9fa6b333735bf0fcd530655511 author Jon Maloy Sun, 25 Jun 2006 23:36:43 -0700 committer David S. Miller Sun, 25 Jun 2006 23:36:43 -0700 [TIPC] Improved tolerance to promiscuous mode interface Signed-off-by: Jon Maloy Signed-off-by: Per Liden Signed-off-by: David S. Miller commit 749805dc10e955b0170573061f9522a6a21cbae0 tree 610f0a5f10564e4627349d4518f99e98ddf39467 parent 8e48aec714f1faf581949f23ae0e3d6e2317433b author David S. Miller Sun, 25 Jun 2006 23:24:24 -0700 committer David S. Miller Sun, 25 Jun 2006 23:24:24 -0700 [SPARC]: Add iomap interfaces. Signed-off-by: David S. Miller commit 8e48aec714f1faf581949f23ae0e3d6e2317433b tree 0b0c34ba577d64f54c2a29c5f748f93f2b1bf0d1 parent 3d824a46b7210ea3b0a13ab0d0fbd7f6e2e91ddf author David S. Miller Sun, 25 Jun 2006 23:19:30 -0700 committer David S. Miller Sun, 25 Jun 2006 23:19:30 -0700 [OPENPROM]: Rewrite driver to use in-kernel device tree. Signed-off-by: David S. Miller commit 3d824a46b7210ea3b0a13ab0d0fbd7f6e2e91ddf tree 012bb6f2ed43b8e67be5988d8682c5a253141a30 parent 87b385da1f5a5f4a12a28e00fe597bcde8d6fea3 author David S. Miller Sun, 25 Jun 2006 23:19:14 -0700 committer David S. Miller Sun, 25 Jun 2006 23:19:14 -0700 [OPENPROMFS]: Rewrite using in-kernel device tree and seq_file. We lose property writing functionality for the time being, but that will be easy to add back. The code and framework is so much simpler now. Signed-off-by: David S. Miller commit 87b385da1f5a5f4a12a28e00fe597bcde8d6fea3 tree 6090a5fa706d81ed1a12f6769cc0d8371ea16044 parent fb7cd9d9acfb52dc1b9fbd5079445e4732667bbc author David S. Miller Sun, 25 Jun 2006 23:18:57 -0700 committer David S. Miller Sun, 25 Jun 2006 23:18:57 -0700 [SPARC]: Add unique device_node IDs and a ".node" property. Signed-off-by: David S. Miller commit fb7cd9d9acfb52dc1b9fbd5079445e4732667bbc tree a4f554595e2cebcca8b594cfe20b9a79ac6e535f parent dda9beb41414035de230e78cb53416f3e551295a author David S. Miller Sun, 25 Jun 2006 23:18:36 -0700 committer David S. Miller Sun, 25 Jun 2006 23:18:36 -0700 [SPARC]: Add of_set_property() interface. Signed-off-by: David S. Miller commit dda9beb41414035de230e78cb53416f3e551295a tree c55314996a3384dcd17a9f9ff61fcffc0356a52a parent 36321426e320c2c6bc2f8a1587d6f4d695fca84c author David S. Miller Sun, 25 Jun 2006 02:08:47 -0700 committer David S. Miller Sun, 25 Jun 2006 23:15:08 -0700 [SPARC64]: Export auxio_register to modules. Signed-off-by: David S. Miller commit 36321426e320c2c6bc2f8a1587d6f4d695fca84c tree bf37ac9d3452d158929af4db0d3b6ab3d5a95b9b parent 987c74fcb7a4479a04c44745098089785c16f5fe author David S. Miller Sun, 25 Jun 2006 02:07:52 -0700 committer David S. Miller Sun, 25 Jun 2006 23:15:05 -0700 [SPARC64]: Add missing interfaces to dma-mapping.h Signed-off-by: David S. Miller commit 987c74fcb7a4479a04c44745098089785c16f5fe tree 74ad5643a457284e27c6740892e3fc4b13a9a4a0 parent 350559961593a9680244b22b32733a49e21f25d6 author David S. Miller Sun, 25 Jun 2006 01:34:43 -0700 committer David S. Miller Sun, 25 Jun 2006 23:15:03 -0700 [SPARC64]: Export _PAGE_IE to modules. Signed-off-by: David S. Miller commit 350559961593a9680244b22b32733a49e21f25d6 tree 587baa8873bfede50fb9d7fdf06176001f2f947f parent 698539187aee83ea6843e29875dde70b473f8bc1 author David S. Miller Sun, 25 Jun 2006 01:32:25 -0700 committer David S. Miller Sun, 25 Jun 2006 23:15:01 -0700 [SPARC64]: Allow floppy driver to build modular. Signed-off-by: David S. Miller commit 698539187aee83ea6843e29875dde70b473f8bc1 tree bcbe9b95c210d389e505203ab0834a0c919ce1da parent 95b0ce9d6d95819e65a7456261a0a5573b65ef1c author David S. Miller Sun, 25 Jun 2006 01:21:38 -0700 committer David S. Miller Sun, 25 Jun 2006 23:14:59 -0700 [SPARC]: Export x_bus_type to modules. Signed-off-by: David S. Miller commit 95b0ce9d6d95819e65a7456261a0a5573b65ef1c tree 0ae3828ad55453b9292483017ab0b2b2ae880afa parent 1715f5ef0db94d12d9131d5afa9134e26f77529f author David S. Miller Sun, 25 Jun 2006 00:17:11 -0700 committer David S. Miller Sun, 25 Jun 2006 23:14:57 -0700 [RIOWATCHDOG]: Fix the build. Signed-off-by: David S. Miller commit 1715f5ef0db94d12d9131d5afa9134e26f77529f tree 6e0ed0893ae92eeedfc51aae495096bb6957c1a2 parent 09ec431476aa6efca436faf1e1aaadb4fa283972 author David S. Miller Sun, 25 Jun 2006 00:11:21 -0700 committer David S. Miller Sun, 25 Jun 2006 23:14:55 -0700 [CPWATCHDOG]: Fix the build. Signed-off-by: David S. Miller commit 09ec431476aa6efca436faf1e1aaadb4fa283972 tree 2688e6751b99d7a29667469671cd7aab17c092ea parent 29f7ac7ecc853037cd7273f1fa35b1d996f8234a author David S. Miller Sun, 25 Jun 2006 00:04:43 -0700 committer David S. Miller Sun, 25 Jun 2006 23:14:53 -0700 [PARPORT] sunbpp: Fix typo. Signed-off-by: David S. Miller commit 29f7ac7ecc853037cd7273f1fa35b1d996f8234a tree bc4fe3260845ae6e675ab8cff62b725d8b64a49c parent fcc18e83e1f6fd9fa6b333735bf0fcd530655511 author David S. Miller Sat, 24 Jun 2006 23:27:00 -0700 committer David S. Miller Sun, 25 Jun 2006 23:14:51 -0700 [MTD] sun_uflash: Port to new EBUS device layer. Signed-off-by: David S. Miller commit e2e8115b54aa6f159ac3dfec8d3d23b0af5fbfa0 tree 7dda356ab9030836dfdf0f14f315ab52bacf223b parent b0c9ad8e0ff154f8c4730b8c4383f49b846c97c4 author Jesper Juhl Mon, 26 Jun 2006 01:59:52 -0400 committer Dmitry Torokhov Mon, 26 Jun 2006 01:59:52 -0400 Input: iforce - remove some pointless casts The 'private' member of struct input_dev is a void*, so no need to cast it when assigning it to a struct iforce* variable. Signed-off-by: Jesper Juhl Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit b0c9ad8e0ff154f8c4730b8c4383f49b846c97c4 tree beb295f07520d8df7b100504e2f49effc0b78c26 parent 0ae051a19092d36112b5ba60ff8b5df7a5d5d23b author Pozsar Balazs Mon, 26 Jun 2006 01:56:08 -0400 committer Dmitry Torokhov Mon, 26 Jun 2006 01:56:08 -0400 Input: psmouse - add support for Intellimouse 4.0 Add support for the H-Wheel present on Microsoft Intellimouse 4.0 (AKA "tilt mouse") Signed-off-by: Pozsar Balazs Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 0ae051a19092d36112b5ba60ff8b5df7a5d5d23b tree 26c56905ff7f26995e8ba1085f60c9c33e8a8483 parent b9ab58dd8e771d30df110c56e785db1ae5e073df author Dmitry Torokhov Mon, 26 Jun 2006 01:52:34 -0400 committer Dmitry Torokhov Mon, 26 Jun 2006 01:52:34 -0400 Input: atkbd - fix HANGEUL/HANJA keys Make atkbd report HANGEUL/HANJA keys by default and use correct scan codes for these keys (they were swapped). Also make sure their scancodes reported as EV_MSC/MSC_SCAN events. Signed-off-by: Dmitry Torokhov commit b9ab58dd8e771d30df110c56e785db1ae5e073df tree 7c69f92d23c46f9b1990d57ffa49690bd5806c78 parent 9e8e30a0cc0ccb43773d14d8b8b84bcc585e9cc1 author Jerome Pinot Mon, 26 Jun 2006 01:51:23 -0400 committer Dmitry Torokhov Mon, 26 Jun 2006 01:51:23 -0400 Input: fix misspelling of Hangeul key Fix a mispelling of the korean alphabet name in the input subsystem. See http://en.wikipedia.org/wiki/Hangeul#Names for more details. KEY_HANGUEL left to not break people Signed-off-by: Jerome Pinot Signed-off-by: Dmitry Torokhov commit 9e8e30a0cc0ccb43773d14d8b8b84bcc585e9cc1 tree 0e5c5a6b28953b934d4533d330f51af740c0399e parent ca56fe07f46e1c174b544e714be183f1476fecea author Johannes Berg Mon, 26 Jun 2006 01:49:55 -0400 committer Dmitry Torokhov Mon, 26 Jun 2006 01:49:55 -0400 Input: via-pmu - add input device support Add an input device for the button and lid switch so that userspace gets notified about the user pressing them via the standard input layer. Signed-off-by: Johannes Berg Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit ca56fe07f46e1c174b544e714be183f1476fecea tree 98542f30bfac7802c3014439208f246807651d9c parent 1e0afb288e56d469ca1c583342bb9782d49333c6 author Dmitry Torokhov Mon, 26 Jun 2006 01:49:21 -0400 committer Dmitry Torokhov Mon, 26 Jun 2006 01:49:21 -0400 Input: rearrange exports New style is to mark symbol as exported right after its definition. Signed-off-by: Dmitry Torokhov commit 1e0afb288e56d469ca1c583342bb9782d49333c6 tree 5d2f5d4ebc029a5361d66acebec3a8023ea05ad4 parent f60d2b111cd55c335c2b70e50d66a612d2b10856 author Dmitry Torokhov Mon, 26 Jun 2006 01:48:47 -0400 committer Dmitry Torokhov Mon, 26 Jun 2006 01:48:47 -0400 Input: fix formatting to better follow CodingStyle Signed-off-by: Dmitry Torokhov commit f60d2b111cd55c335c2b70e50d66a612d2b10856 tree 95ec2063e270ad8f87ab07d507d4c20affacb2a5 parent 8a3cf456adbde8317a15fc038cfe82c630512f2e author Dmitry Torokhov Mon, 26 Jun 2006 01:48:36 -0400 committer Dmitry Torokhov Mon, 26 Jun 2006 01:48:36 -0400 Input: reset name, phys and uniq when unregistering Name, phys and uniq are quite often constant strings in moules implementing particular input device. If a module unregisters input device and then gets unloaded, the device could still be present in memory (pinned via sysfs), but aforementioned members would point to some random memory. Set them all to NULL when unregistering so sysfs handlers won't try dereferencing them. Signed-off-by: Dmitry Torokhov commit 8a3cf456adbde8317a15fc038cfe82c630512f2e tree 376ba671845f8c12c646b9b25979a792916f3f4e parent 62f7caf9273e3596aab1ec399b5c1e02cfb390da author Richard Purdie Mon, 26 Jun 2006 01:48:21 -0400 committer Dmitry Torokhov Mon, 26 Jun 2006 01:48:21 -0400 Input: return correct size when reading modalias attribute Signed-off-by: Richard Purdie Signed-off-by: Dmitry Torokhov commit 62f7caf9273e3596aab1ec399b5c1e02cfb390da tree 7cbedf2e320767aa9b1126fe1f3af10d035c1e24 parent ea08c6faa0a8dc93b016663de55e49822ed0b33f author Dmitry Torokhov Mon, 26 Jun 2006 01:47:56 -0400 committer Dmitry Torokhov Mon, 26 Jun 2006 01:47:56 -0400 Input: change my e-mail address in MAINTAINERS file Signed-off-by: Dmitry Torokhov commit ea08c6faa0a8dc93b016663de55e49822ed0b33f tree a1cc8a448e87457c8f8ed45d5f9f430369eb4062 parent a21466cc77b25dc2afd1292c79c7fc8fd454a1a7 author Dmitry Torokhov Mon, 26 Jun 2006 01:46:17 -0400 committer Dmitry Torokhov Mon, 26 Jun 2006 01:46:17 -0400 Input: fix potential overflows in driver/input/keyboard Change all sprintfs into snprintfs to make sure we won't stomp on data adjacent to our buffers. Signed-off-by: Dmitry Torokhov commit a21466cc77b25dc2afd1292c79c7fc8fd454a1a7 tree 0b081efdfde7962acfca18d8f17170ae7cbf35d9 parent 10ca4c0a622a942e55dc8a6d57ebd441089c9e38 author Dmitry Torokhov Mon, 26 Jun 2006 01:46:04 -0400 committer Dmitry Torokhov Mon, 26 Jun 2006 01:46:04 -0400 Input: fix potential overflows in driver/input/touchscreen Change all sprintfs into snprintfs to make sure we won't stomp on data adjacent to our buffers. Signed-off-by: Dmitry Torokhov commit 10ca4c0a622a942e55dc8a6d57ebd441089c9e38 tree dcdb84833a46e80ff95fb73b0d1f83b737f3d2b9 parent 08ffce4560e0133e10634b0dd85eecee11257a1c author Dmitry Torokhov Mon, 26 Jun 2006 01:45:48 -0400 committer Dmitry Torokhov Mon, 26 Jun 2006 01:45:48 -0400 Input: fix potential overflows in driver/input/joystick Change all sprintfs into snprintfs to make sure we won't stomp on data adjacent to our buffers. Signed-off-by: Dmitry Torokhov commit 08ffce4560e0133e10634b0dd85eecee11257a1c tree eff2a0266e0897e72e48db949fb28f367812222e parent 4854c7b27f0975a2b629f35ea3996d2968eb7c4f author Dmitry Torokhov Mon, 26 Jun 2006 01:45:10 -0400 committer Dmitry Torokhov Mon, 26 Jun 2006 01:45:10 -0400 Input: fix potential overflows in driver/input/mouse Change all sprintfs into snprintfs to make sure we won't stomp on data adjacent to our buffers. Noticed by Wouter Paesen Signed-off-by: Dmitry Torokhov commit 4854c7b27f0975a2b629f35ea3996d2968eb7c4f tree 4102bdb70289764a2058aff0f907b13d7cf0e0d1 parent 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce parent fcc18e83e1f6fd9fa6b333735bf0fcd530655511 author Dmitry Torokhov Mon, 26 Jun 2006 01:31:38 -0400 committer Dmitry Torokhov Mon, 26 Jun 2006 01:31:38 -0400 Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit 46f18e3a28295a9e11a6ffa4478241c19bc93735 tree f563b12a18cadd6583925ce1dbc3bc79538ac866 parent 3448097fccdce4ea8f0fcad4f37f502a8cd72e68 author Venkatesh Pallipadi Mon, 26 Jun 2006 00:34:43 -0400 committer Len Brown Mon, 26 Jun 2006 00:34:43 -0400 ACPI: HW P-state coordination support Treat HW coordination as independent CPUs. This enables per-cpu monintoring of P-states http://bugzilla.kernel.org/show_bug.cgi?id=5737 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit cd49b492fe3fef0b6348f18001f0d73f2577eb01 tree 09102af7aee4eb73a233354b3555ae0876370609 parent f90f00a358fe887fe5c3454897521064bdace7cc author Steve French Mon, 26 Jun 2006 04:22:36 +0000 committer Steve French Mon, 26 Jun 2006 04:22:36 +0000 [CIFS] remove some redundant null pointer checks some of them pointed out by Dave Jones Signed-off-by: Steve French commit fcc18e83e1f6fd9fa6b333735bf0fcd530655511 tree 44cfe84786b80dcbc76a1c0a073137db27dd3f68 parent 091487772c3312f3de599d99ca1d73395b54ed61 author Malcolm Parsons Mon, 26 Jun 2006 11:49:41 +1000 committer Linus Torvalds Sun, 25 Jun 2006 21:04:24 -0700 [PATCH] uclinux: use PER_LINUX_32BIT in binfmt_flat binfmt_flat.c calls set_personality with PER_LINUX as the personality. On the arm architecture this results in the program running in 26bit usermode. PER_LINUX_32BIT should be used instead. This doesn't affect other architectures that use binfmt_flat. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 091487772c3312f3de599d99ca1d73395b54ed61 tree c08db236f1e93db46592c9188c4e79ad1057be3f parent afd1b836a0dfadeba43ec2167646ac7d428fb800 author Greg Ungerer Mon, 26 Jun 2006 11:47:35 +1000 committer Linus Torvalds Sun, 25 Jun 2006 21:04:24 -0700 [PATCH] m68knommu: make enable_irq() macro statement Change enable_irq() macro to be a statement, not expression. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit afd1b836a0dfadeba43ec2167646ac7d428fb800 tree d1e1d1cfa6fba3450e4525c4a9ee387f91525355 parent 1b1a9bd2777878c5ff0091e8742364c78341be71 author Greg Ungerer Mon, 26 Jun 2006 11:43:35 +1000 committer Linus Torvalds Sun, 25 Jun 2006 21:04:24 -0700 [PATCH] m68knommu: fix ColdFire 5249 PLL set Fix PLL setting for the Coldfire 5249 CPU. This brings it into line with the new style frequency configuration of m68knommu parts. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 1b1a9bd2777878c5ff0091e8742364c78341be71 tree 85bb1e633f251d787b6f30f158895ac31eea81e3 parent 623f523cc05c35a385c04fde2114925f5954192b author Greg Ungerer Mon, 26 Jun 2006 11:40:44 +1000 committer Linus Torvalds Sun, 25 Jun 2006 21:04:24 -0700 [PATCH] m68knommu: ColdFire cache flush fixups Fix flush code for the ColdFire 5206/5206e/5272 cases. Add support for the new ColdFire 532x CPU family Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 623f523cc05c35a385c04fde2114925f5954192b tree 5bd31c92272974c50650dd276bef3d0719303197 parent 7bf9a37d8df1e7db82784117d28bb98da5f53f2f author Philippe De Muyter Mon, 26 Jun 2006 11:37:57 +1000 committer Linus Torvalds Sun, 25 Jun 2006 21:04:24 -0700 [PATCH] m68knommu: improve syscall entry and fix strace Here is a patch to the system call handling for 5307/5272/etc to: - fix the strace support (one tested the wrong bit) - make all system calls a little bit faster by inlining set_esp0 and supporting ENOSYS out of the critical path. - remove extraneous spaces Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 7bf9a37d8df1e7db82784117d28bb98da5f53f2f tree 605552c82a6e6f50459af7c487cdddc984001693 parent 31f4fde38c5027ca05941db4a05c163d6314278e author Greg Ungerer Mon, 26 Jun 2006 11:01:32 +1000 committer Linus Torvalds Sun, 25 Jun 2006 21:04:24 -0700 [PATCH] m68knommu: force stack alignment on ColdFire This patch solve a bug triggered by execvp (this function use calloc to store the argument list and gcc 3.4.x align the stack to word, not to dword). This situation aren't related to signal handling and all 2.6.x have the bug. On ColdFire targets we must force the stack to be aligned. Original patch from Andrea Tarani , Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 31f4fde38c5027ca05941db4a05c163d6314278e tree cebb2e24cd98ec55109c4c0b9119199db89c60a9 parent e648cd2688547516f86709b1d00ad4f8b618d635 author Greg Ungerer Mon, 26 Jun 2006 10:58:09 +1000 committer Linus Torvalds Sun, 25 Jun 2006 21:04:24 -0700 [PATCH] m68knommu: configurable frequency selection header Remove list of fixed clock frequency options used for configuring master clock, and make field an int. Much more flexible this way, no need to add more options for every new used freqency. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit e648cd2688547516f86709b1d00ad4f8b618d635 tree fc9ebbd9cf01ea80f5d2300d6671dafda85d3e03 parent 04860bd22f2892cb01b1d3232c656fa1e843090e author Greg Ungerer Mon, 26 Jun 2006 10:55:36 +1000 committer Linus Torvalds Sun, 25 Jun 2006 21:03:14 -0700 [PATCH] m68knommu: configurable frequency selection Remove list of fixed clock frequency options used for configuring master clock, and make field an int. Much more flexible this way, no need to add more options for every new used freqency. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 04860bd22f2892cb01b1d3232c656fa1e843090e tree c15fc8666cdad9bb06ae5f934cbc5b7dbe2e58b8 parent 5d36f8eb387eb38cd8224de721f6edb8697450af author Greg Ungerer Mon, 26 Jun 2006 10:47:13 +1000 committer Linus Torvalds Sun, 25 Jun 2006 21:01:07 -0700 [PATCH] m68knommu: configure support for Avnet5282 board Add support for the AVNET 5282 board. Patch submitted by Daniel Alomar . Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 5d36f8eb387eb38cd8224de721f6edb8697450af tree f4bc7a26db9e3f2553d557d139e88dccaa165f3d parent 3448097fccdce4ea8f0fcad4f37f502a8cd72e68 author Greg Ungerer Mon, 26 Jun 2006 10:45:45 +1000 committer Linus Torvalds Sun, 25 Jun 2006 21:01:07 -0700 [PATCH] m68knommu: ColdFire 532x CPU configure support Add configure support for the new Freescale 532x family of CPUs. Patch submitted by Matt Waddel . Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 3448097fccdce4ea8f0fcad4f37f502a8cd72e68 tree 583ee97128a9e2657d5bf73def841c460371804a parent 5503967307f3fa443f5770a4df5ea4fbe9fb3917 author Linus Torvalds Sun, 25 Jun 2006 18:41:00 -0700 committer Linus Torvalds Sun, 25 Jun 2006 18:41:00 -0700 Revert "swsusp special saveable pages support" commits This reverts commits 3e3318dee0878d42ed62a19c292a2ac284135db3 [PATCH] swsusp: x86_64 mark special saveable/unsaveable pages b6370d96e09944c6e3ae8d5743ca8a8ab1f79f6c [PATCH] swsusp: i386 mark special saveable/unsaveable pages ce4ab0012b32c1a4a1d6e934aeb73bf3151c48d9 [PATCH] swsusp: add architecture special saveable pages support because not only do they apparently cause page faults on x86, the infrastructure doesn't compile on powerpc. Signed-off-by: Linus Torvalds commit 5503967307f3fa443f5770a4df5ea4fbe9fb3917 tree b31f89429dfdccfc1f4aecf3c46a84c6927bafd1 parent f3dd71209472b93340c1a940cc832c2712307b3e author Greg Ungerer Mon, 26 Jun 2006 10:33:10 +1000 committer Linus Torvalds Sun, 25 Jun 2006 17:51:39 -0700 [PATCH] m68knommu: ColdFire 532x CPU platform build support Add build support for the new Freescale 532x CPU platforms. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit f3dd71209472b93340c1a940cc832c2712307b3e tree c3f5ffd002af0990dc7749373f07f7affcc23d02 parent f7399c3d96d852ae2105f51de766a50b9b021b18 author Greg Ungerer Mon, 26 Jun 2006 10:33:10 +1000 committer Linus Torvalds Sun, 25 Jun 2006 17:43:34 -0700 [PATCH] m68knommu: add ColdFire 532x UART address support Add support for the UART addressing on the new Freescale M532x CPU family. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit f7399c3d96d852ae2105f51de766a50b9b021b18 tree a079e663c77a10833b770d1957b306cb37e8c901 parent 7877d01e8ea205e047fa308e20e5e05c58952b1a author Greg Ungerer Mon, 26 Jun 2006 10:33:10 +1000 committer Linus Torvalds Sun, 25 Jun 2006 17:43:34 -0700 [PATCH] m68knommu: add ColdFire 532x timer build support Add build support for new Freescale M532x CPU family timer. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 7877d01e8ea205e047fa308e20e5e05c58952b1a tree 3a282993e3f97a832cccab7b9d61c59ad3d72634 parent bb28632c0d651f26dddf99afb7d7703e8e0ce293 author Greg Ungerer Mon, 26 Jun 2006 10:33:10 +1000 committer Linus Torvalds Sun, 25 Jun 2006 17:43:34 -0700 [PATCH] m68knommu: cleanup setup.c A cleanup of m68knommu/kernel/setup.c : - No need to initialize global pointers to NULL, they will have that value automatically, and they eat up space in my data segment image in FLASH. - Remove get_cpuinfo. It has been replaced by show_cpuinfo. Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit bb28632c0d651f26dddf99afb7d7703e8e0ce293 tree 8278adb86195db0bb1615c349ae84566692f6122 parent 6f57622a32e6bdc0a585c8be6f25bb8e75a3ff9e author Greg Ungerer Mon, 26 Jun 2006 10:33:10 +1000 committer Linus Torvalds Sun, 25 Jun 2006 17:43:34 -0700 [PATCH] m68knommu: check DEBUG defined arch code Don't rely on DEBUG having a value, check for it being defined. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 6f57622a32e6bdc0a585c8be6f25bb8e75a3ff9e tree def6b3dd915d60684aa90917671eb2090a94ebbe parent df8fbe1e7f250b157c5815a005a9650548315d1f author Greg Ungerer Mon, 26 Jun 2006 10:33:10 +1000 committer Linus Torvalds Sun, 25 Jun 2006 17:43:33 -0700 [PATCH] m68knommu: include ColdFire 532x register definitions Include the ColdFire 532x support when including ColdFire peripharp support definitions. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit df8fbe1e7f250b157c5815a005a9650548315d1f tree d6c10c9fd138c6583fb5688ecbad79d4751f0a57 parent 76aa698f331475147825ae135eae98bfd457825b author Greg Ungerer Mon, 26 Jun 2006 10:33:10 +1000 committer Linus Torvalds Sun, 25 Jun 2006 17:43:33 -0700 [PATCH] m68knommu: add ColdFire 532x cache init Add cache init support for the new ColdFire 532x CPU family. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 76aa698f331475147825ae135eae98bfd457825b tree 3c4c8a4faae8122fe6a66ddf2bcd1e704569444b parent 7c99df64f0be6763bf5079560ccd96911c231b7b author Greg Ungerer Mon, 26 Jun 2006 10:33:10 +1000 committer Linus Torvalds Sun, 25 Jun 2006 17:43:33 -0700 [PATCH] m68knommu: 532x UART support ColdFire serial driver support for the new 532x CPU family UARTs. Patch submitted by Matt Waddel . Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 7c99df64f0be6763bf5079560ccd96911c231b7b tree 3a91c8ee22b16b94a7a38594eac654adc8614bde parent 3196cf83ad410d9549e78f69aa45db75540334b7 author Greg Ungerer Mon, 26 Jun 2006 10:33:10 +1000 committer Linus Torvalds Sun, 25 Jun 2006 17:43:33 -0700 [PATCH] m68knommu: ColdFire 532x register definitions Register definitions for the new Freescale 532x Coldfire CPU family. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 3196cf83ad410d9549e78f69aa45db75540334b7 tree 55851337a1205e01fba6d36bb544cdd910d282ed parent b671b653da35cd38897c7b19e9baed64e7a9e1a1 author Greg Ungerer Mon, 26 Jun 2006 10:33:10 +1000 committer Linus Torvalds Sun, 25 Jun 2006 17:43:33 -0700 [PATCH] m68knommu: ColdFire 532x CPU startup code Add kernel startup code for the new Freescale 532x CPU family. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit b671b653da35cd38897c7b19e9baed64e7a9e1a1 tree 1be02e974a212499302d02514af5e82ea122377d parent 2082b477dc7e9d5b3f773a36aae2dbc55b4263c2 author Greg Ungerer Mon, 26 Jun 2006 10:33:10 +1000 committer Linus Torvalds Sun, 25 Jun 2006 17:43:33 -0700 [PATCH] m68knommu: read/write register access for PIT timer Modify the m68knommu/ColdFire PIT timer code to use register offsets with raw_read/raw_write access, instead of a mapped struct. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 2082b477dc7e9d5b3f773a36aae2dbc55b4263c2 tree 5c86a1d6ddc1c55cb2cd4dd84ee5b789f6e79c73 parent 36a248fadf96cd78c6b344442046db5b85cf9a70 author Greg Ungerer Mon, 26 Jun 2006 10:33:10 +1000 committer Linus Torvalds Sun, 25 Jun 2006 17:43:33 -0700 [PATCH] m68knommu: remove use of rom_length Remove use of rom_length. It serves not real purpose, and when we move to new stye RAM configuration it will not be needed. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 36a248fadf96cd78c6b344442046db5b85cf9a70 tree 248bd3e5d12e486f6d619ce02cd75b136abfefba parent 0b7ac8e479f311f8ef15fbea3f849dded9f3ccd9 author Greg Ungerer Mon, 26 Jun 2006 10:33:10 +1000 committer Linus Torvalds Sun, 25 Jun 2006 17:43:33 -0700 [PATCH] m68knommu: switch arch config name to CONFIG_M68K Switch to naming the architecture config options for the m68knommu branch as "M68K", dropping "M68KNOMMU". The CONFIG_MMU separates the 2 now, and the m68knommu branch is still strictly speaking an M68K (including the ColdFire parts). Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 0b7ac8e479f311f8ef15fbea3f849dded9f3ccd9 tree d84b81667b7db390d704137b40903e5079f05e53 parent c88b36e2c828c78c51e90002351f9d9068b75dec author Greg Ungerer Mon, 26 Jun 2006 10:33:10 +1000 committer Linus Torvalds Sun, 25 Jun 2006 17:43:33 -0700 [PATCH] m68knommu: read/write register access for ColdFire core timer Modify the m68knommu/ColdFire core timer code to use register offsets with raw_read/raw_write access, instead of a mapped struct. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit c88b36e2c828c78c51e90002351f9d9068b75dec tree ff0603f741369f8bbcab1db2ecfe5476ca3db96a parent 73b6af8a21184f2178a7219eb4d64ea5a71aedf9 author Greg Ungerer Mon, 26 Jun 2006 10:33:10 +1000 committer Linus Torvalds Sun, 25 Jun 2006 17:43:33 -0700 [PATCH] m68knommu: 532x FEC eth struct map Specify the struct mapping used on the new Freescale 532x CPU family's FEC ethernet core. Patch submitted by Matt Waddel . Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 73b6af8a21184f2178a7219eb4d64ea5a71aedf9 tree 475c26f4e0d87b0007375e81feae72c62fdca380 parent 1e788f8d1ad71fea99a763114eae73c3ad55bc30 author Al Viro Sun, 25 Jun 2006 16:42:33 -0700 committer Linus Torvalds Sun, 25 Jun 2006 17:43:32 -0700 [PATCH] spufs: update ->flush method proto Signed-off-by: Al Viro Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e788f8d1ad71fea99a763114eae73c3ad55bc30 tree 0176099ba19df6c495081a30220bda691bda8f90 parent 61b9175808670d9abf52156803ae0ed1e3706ac4 author Alexey Dobriyan Sun, 25 Jun 2006 16:42:33 -0700 committer Linus Torvalds Sun, 25 Jun 2006 17:43:32 -0700 [PATCH] xfs: update ->flush method proto Signed-off-by: Alexey Dobriyan Cc: Nathan Scott Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61b9175808670d9abf52156803ae0ed1e3706ac4 tree feeaf7190aff1daa6ae365fd7c1107ea2d60fb9f parent f36f44de721db44b4c2944133c3c5c2e06f633f0 parent 3f1244a2f8d3892f991b662cea49b2a0b4e0c115 author Linus Torvalds Sun, 25 Jun 2006 16:07:58 -0700 committer Linus Torvalds Sun, 25 Jun 2006 16:07:58 -0700 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IB/iser: iSER Kconfig and Makefile IB/iser: iSER handling of memory for RDMA IB/iser: iSER RDMA CM (CMA) and IB verbs interaction IB/iser: iSER initiator iSCSI PDU and TX/RX IB/iser: iSCSI iSER transport provider high level code IB/iser: iSCSI iSER transport provider header file IB/uverbs: Remove unnecessary list_del()s IB/uverbs: Don't free wr list when it's known to be empty commit 689391210a4a8a1bf35119f87c51b3e01ef549e6 tree b53e15b38b89412f3722df766d32dd94f991e9eb parent 801194e3bcf7cde163b23c6279c559e69cb4ca57 author Milan Svoboda Sun, 25 Jun 2006 22:12:12 +0100 committer Russell King Sun, 25 Jun 2006 22:12:12 +0100 [ARM] 3612/1: make pci bus optional for ixp4xx platform Patch from Milan Svoboda IXP4XX platform can happily live without pci bus. This patch modifies Kconfig to support this option and modifies Makefile so pci only files are compiled only when pci is really selected. Patch is tested and ixdp465 runs fine with or without the pci bus.-- Signed-off-by: Milan Svoboda Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit f36f44de721db44b4c2944133c3c5c2e06f633f0 tree 47549ea4017b29532b633df4765da5b7c9feda6f parent a5d157e0675ac11188a8d429a062b1938bb2d353 author Linus Torvalds Sun, 25 Jun 2006 12:30:33 -0700 committer Linus Torvalds Sun, 25 Jun 2006 12:30:33 -0700 Fix NFS2 compile error Trond had apparently merged the same patch twice, causing a duplicate include of the "internal.h" file, with resulting obvious confusion. Tssk. I'm the only one allowed to send out trees that don't even compile! Who does this Trond guy think he is? Signed-off-by: Linus Torvalds commit a5d157e0675ac11188a8d429a062b1938bb2d353 tree 152d75b3ecda85427a92808ec363bc4d1c9bd243 parent 1d77062b1402aef5b26e1d3776991126e8026bde author Björn Steinbrink Sun, 25 Jun 2006 16:24:40 +0200 committer Linus Torvalds Sun, 25 Jun 2006 11:32:44 -0700 [PATCH] i386: Fix softirq accounting with 4K stacks Copy the softirq bits in preempt_count from the current context into the hardirq context when using 4K stacks to make the softirq_count macro work correctly and thereby fix softirq cpu time accounting. Signed-off-by: Björn Steinbrink Acked-by: Arjan van de Ven Signed-off-by: Linus Torvalds commit 1d77062b1402aef5b26e1d3776991126e8026bde tree 96e4da18878f5fb2ae50b260e194b78803d4c7a9 parent 25581ad107be24b89d805da51a03d616f8f3d1be parent 76a9f26c9e40e9c0ed5dc8f0cedd74e733f0088d author Linus Torvalds Sun, 25 Jun 2006 10:54:14 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:54:14 -0700 Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 * git://git.linux-nfs.org/pub/linux/nfs-2.6: (51 commits) nfs: remove nfs_put_link() nfs-build-fix-99 git-nfs-build-fixes Merge branch 'odirect' NFS: alloc nfs_read/write_data as direct I/O is scheduled NFS: Eliminate nfs_get_user_pages() NFS: refactor nfs_direct_free_user_pages NFS: remove user_addr, user_count, and pos from nfs_direct_req NFS: "open code" the NFS direct write rescheduler NFS: Separate functions for counting outstanding NFS direct I/Os NLM: Fix reclaim races NLM: sem to mutex conversion locks.c: add the fl_owner to nlm_compare_locks NFS: Display the chosen RPCSEC_GSS security flavour in /proc/mounts NFS: Split fs/nfs/inode.c NFS: Fix typo in nfs_do_clone_mount() NFS: Fix compile errors introduced by referrals patches NFSv4: Ensure that referral mounts bind to a reserved port NFSv4: A root pathname is sent as a zero component4 NFSv4: Follow a referral ... commit 25581ad107be24b89d805da51a03d616f8f3d1be tree 36e2bd32667b5dd5a39e1939c1c5162f18967715 parent 72cf2709bf8e0410800f118c4298bfbf8715b303 parent 7477ddaa4d2d69bbcd49e12990af158dbb03f2f2 author Linus Torvalds Sun, 25 Jun 2006 10:09:31 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:09:31 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (244 commits) V4L/DVB (4210b): git-dvb: tea575x-tuner build fix V4L/DVB (4210a): git-dvb versus matroxfb V4L/DVB (4209): Added some BTTV PCI IDs for newer boards Fixes some sync issues between V4L/DVB development and GIT V4L/DVB (4206): Cx88-blackbird: always set encoder height based on tvnorm->id V4L/DVB (4205): Merge tda9887 module into tuner. V4L/DVB (4203): Explicitly set the enum values. V4L/DVB (4202): allow selecting CX2341x port mode V4L/DVB (4200): Disable bitrate_mode when encoding mpeg-1. V4L/DVB (4199): Add cx2341x-specific control array to cx2341x.c V4L/DVB (4198): Avoid newer usages of obsoleted experimental MPEGCOMP API V4L/DVB (4197): Port new MPEG API to saa7134-empress with saa6752hs V4L/DVB (4196): Port cx88-blackbird to the new MPEG API. V4L/DVB (4193): Update cx2341x fw encoding API doc. V4L/DVB (4192): Use control helpers for saa7115, cx25840, msp3400. V4L/DVB (4191): Add CX2341X MPEG encoder module. V4L/DVB (4190): Add helper functions for control processing to v4l2-common. V4L/DVB (4189): Add videodev support for VIDIOC_S/G/TRY_EXT_CTRLS. V4L/DVB (4188): Add new MPEG control/ioctl definitions to videodev2.h V4L/DVB (4186): Add support for the DNTV Live! mini DVB-T card. ... commit 72cf2709bf8e0410800f118c4298bfbf8715b303 tree ef6cb4d1cffc56583ebc3233cf836ae4cb67c8e9 parent 1eec00565d849ceda67f425e089c3233e3ef2ca2 author Linus Torvalds Sun, 25 Jun 2006 10:04:15 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:04:15 -0700 Fix PM_TRACE dependency: works only on 32-bit x86 for now Not that x86-64 and other architecture support should be difficult to add (trivial fixups to the data format and add the proper linker script entry). Signed-off-by: Linus Torvalds commit 1eec00565d849ceda67f425e089c3233e3ef2ca2 tree 83f5bb133755ddde28772e64b99ff0cfd701f0d7 parent a45219483e2894af3c07f959cbd4edb4575b4f8c author Sonny Rao Sun, 25 Jun 2006 05:49:34 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:26 -0700 [PATCH] fix race in idr code I ran into a bug where the kernel died in the idr code: cpu 0x1d: Vector: 300 (Data Access) at [c000000b7096f710] pc: c0000000001f8984: .idr_get_new_above_int+0x140/0x330 lr: c0000000001f89b4: .idr_get_new_above_int+0x170/0x330 sp: c000000b7096f990 msr: 800000000000b032 dar: 0 dsisr: 40010000 current = 0xc000000b70d43830 paca = 0xc000000000556900 pid = 2022, comm = hwup 1d:mon> t [c000000b7096f990] c0000000000d2ad8 .expand_files+0x2e8/0x364 (unreliable) [c000000b7096faa0] c0000000001f8bf8 .idr_get_new_above+0x18/0x68 [c000000b7096fb20] c00000000002a054 .init_new_context+0x5c/0xf0 [c000000b7096fbc0] c000000000049dc8 .copy_process+0x91c/0x1404 [c000000b7096fcd0] c00000000004a988 .do_fork+0xd8/0x224 [c000000b7096fdc0] c00000000000ebdc .sys_clone+0x5c/0x74 [c000000b7096fe30] c000000000008950 .ppc_clone+0x8/0xc commit a45219483e2894af3c07f959cbd4edb4575b4f8c tree c3b5f0a9657906d408daf0b39e7f82c410bae1c3 parent f58a1ebb22f128fccfeafb2b18557c87741cd627 author Jan Engelhardt Sun, 25 Jun 2006 05:49:33 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:26 -0700 [PATCH] update-devices.txt Update Documentation/devices.txt with a new version from the LANANA site http://www.lanana.org/docs/device-list/devices-2.6+.txt Signed-off-by: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f58a1ebb22f128fccfeafb2b18557c87741cd627 tree 02fc9331087b97f69f50ab3bc78ae1e9910aa6ec parent d84a84775bba661d5a3fd06757bbb419381937f3 author Hua Zhong Sun, 25 Jun 2006 05:49:32 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:26 -0700 [PATCH] remove unlikely(sb) in prune_dcache likely profiling shows that the following is a miss. After boot: [+- ] Type | # True | # False | Function:Filename@Line +unlikely | 1074| 0 prune_dcache()@:fs/dcache.c@409 After a bonnie++ run: +unlikely | 66716| 19584 prune_dcache()@:fs/dcache.c@409 So remove it. Signed-off-by: Hua Zhong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d84a84775bba661d5a3fd06757bbb419381937f3 tree e3aa2122029d11686bf0abc1de9936fb467f1636 parent 00212fef814612245ed0261cbac8426d0c9a31a5 author Alexey Dobriyan Sun, 25 Jun 2006 05:49:32 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:26 -0700 [PATCH] Fix "biovec-(256)" in /proc/slabinfo Stringify does what it was told to do. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00212fef814612245ed0261cbac8426d0c9a31a5 tree a9316376451808f6a3bc8158abcc8906ce6d406f parent cc13ad6217018833e590a0e2ef5937aa16162d34 author Amul Shah Sun, 25 Jun 2006 05:49:31 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:26 -0700 [PATCH] Fix kdump Crash Kernel boot memory reservation for NUMA machines This patch will fix a boot memory reservation bug that trashes memory on the ES7000 when loading the kdump crash kernel. The code in arch/x86_64/kernel/setup.c to reserve boot memory for the crash kernel uses the non-numa aware "reserve_bootmem" function instead of the NUMA aware "reserve_bootmem_generic". I checked to make sure that no other function was using "reserve_bootmem" and found none, except the ones that had NUMA ifdef'ed out. I have tested this patch only on an ES7000 with NUMA on and off (numa=off) in a single (non-NUMA) and multi-cell (NUMA) configurations. Signed-off-by: Amul Shah Looks-good-to: Vivek Goyal Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc13ad6217018833e590a0e2ef5937aa16162d34 tree 9281d0c5a259d4545572d4250cea9bbbe55791fe parent bb12b76e2d795431fa9fd306eb274c69e5054dc7 author Heiko Carstens Sun, 25 Jun 2006 05:49:30 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:25 -0700 [PATCH] s390: setup.c cleanup + build fix Cleanup & fix 31 bit compilation: CC arch/s390/kernel/setup.o arch/s390/kernel/setup.c:83: error: initializer element is not computable at load time arch/s390/kernel/setup.c:83: error: (near initialization for 'code_resource.start') Not sure which patch in the -mm tree breaks this, but since this can be considered a cleanup it can be merged anyway. Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb12b76e2d795431fa9fd306eb274c69e5054dc7 tree 8c10f43c9c0126e6551ccb1cba8f3900f9eb0686 parent 7d469722779c9fe0b415163e8fe837440f9c70dc author Domen Puncer Sun, 25 Jun 2006 05:49:29 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:25 -0700 [PATCH] au1xxx: oss sound support for au1200 au1550 ac97 driver works fine on au1200 too. Comments at the top of file state this code is GPL, so lets mark it as GPL too. Signed-off-by: Domen Puncer Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d469722779c9fe0b415163e8fe837440f9c70dc tree e129864b897bced5ff55111856ae006749c6e15f parent 5e37ed37b1a70a65185736fbec543ca4ad64a673 author Randy Dunlap Sun, 25 Jun 2006 05:49:29 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:25 -0700 [PATCH] parport: add to kernel-doc Add parport interfaces to kernel-doc template. Small doc. cleanups in 2 parport source files. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e37ed37b1a70a65185736fbec543ca4ad64a673 tree dc78a3dcd683303464af6355e0147714525dc955 parent 7d93a1a53a72aa704a8fef6e0fb4f6c6cd6aa07a author Domen Puncer Sun, 25 Jun 2006 05:49:27 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:25 -0700 [PATCH] au1550_ac97: spin_unlock in error path Error paths didn't spin_unlock. Signed-off-by: Domen Puncer Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d93a1a53a72aa704a8fef6e0fb4f6c6cd6aa07a tree 75367213c35e8d4e1bd0bbccce22f39ae37da9d4 parent 77787bfb44da6e6166af088226707aeccee27968 author Evgeniy Dushistov Sun, 25 Jun 2006 05:49:27 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:25 -0700 [PATCH] ext2: cleanup: put_page and comment fix Things which force me think a little: why so? Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77787bfb44da6e6166af088226707aeccee27968 tree ada770c2f4f2d913c8f96f2eec3125d4cfb22011 parent f6ec29a42d7ac3b309a9cef179b686d23986ab98 author KaiGai Kohei Sun, 25 Jun 2006 05:49:26 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:25 -0700 [PATCH] pacct: none-delayed process accounting accumulation In current 2.6.17 implementation, signal_struct refered from task_struct is used for per-process data structure. The pacct facility also uses it as a per-process data structure to store stime, utime, minflt, majflt. But those members are saved in __exit_signal(). It's too late. For example, if some threads exits at same time, pacct facility has a possibility to drop accountings for a part of those threads. (see, the following 'The results of original 2.6.17 kernel') I think accounting information should be completely collected into the per-process data structure before writing out an accounting record. This patch fixes this matter. Accumulation of stime, utime, minflt and majflt are done before generating accounting record. [mingo@elte.hu: fix acct_collect() siglock bug found by lockdep] Signed-off-by: KaiGai Kohei Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6ec29a42d7ac3b309a9cef179b686d23986ab98 tree 5150d4f403833ac18b468bd0e0e0a9a7cdd9f4be parent 0e4648141af02331f21aabcd34940c70f09a2d04 author KaiGai Kohei Sun, 25 Jun 2006 05:49:25 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:25 -0700 [PATCH] pacct: avoidance to refer the last thread as a representation of the process When pacct facility generate an 'ac_flag' field in accounting record, it refers a task_struct of the thread which died last in the process. But any other task_structs are ignored. Therefore, pacct facility drops ASU flag even if root-privilege operations are used by any other threads except the last one. In addition, AFORK flag is always set when the thread of group-leader didn't die last, although this process has called execve() after fork(). We have a same matter in ac_exitcode. The recorded ac_exitcode is an exit code of the last thread in the process. There is a possibility this exitcode is not the group leader's one. commit 0e4648141af02331f21aabcd34940c70f09a2d04 tree 3e4dea992a8e3f3194be04a0fd3e14c24a313ee7 parent 6bc392741d661eb84be503d1fdf14b6746615e4c author KaiGai Kohei Sun, 25 Jun 2006 05:49:24 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:25 -0700 [PATCH] pacct: add pacct_struct to fix some pacct bugs. The pacct facility need an i/o operation when an accounting record is generated. There is a possibility to wake OOM killer up. If OOM killer is activated, it kills some processes to make them release process memory regions. But acct_process() is called in the killed processes context before calling exit_mm(), so those processes cannot release own memory. In the results, any processes stop in this point and it finally cause a system stall. commit 6bc392741d661eb84be503d1fdf14b6746615e4c tree a4b5b833f4425880eb6122f51186c5161018b93c parent 6f84be84b4cde72fa2a2f0d10ac284a31e923200 author David Howells Sun, 25 Jun 2006 05:49:22 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:24 -0700 [PATCH] Corrections to memory barrier doc Apply some small corrections to the memory barrier document, as contributed by: Christoph Lameter Kirill Smelkov Randy Dunlap Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f84be84b4cde72fa2a2f0d10ac284a31e923200 tree b5ad8cd7a2e1a609e58469f023834c0a244bed72 parent 294dad05311416718c2a172738e1ca4071449877 author Paul Fulghum Sun, 25 Jun 2006 05:49:22 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:24 -0700 [PATCH] synclink_gt: add GT2 adapter support Add support for SyncLink GT2 adapter to driver. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 294dad05311416718c2a172738e1ca4071449877 tree bfcccfb6e3cdc0b83005e6bb9c20447b56220248 parent 04b374d0f5a97761b91a0c3ff6d10f80abd206b0 author Paul Fulghum Sun, 25 Jun 2006 05:49:21 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:24 -0700 [PATCH] fix synclink_gt diagnostics error reporting Fix diagnostics error reporting that was being overwritten by incorrect use of return codes from individual diagnostic functions. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04b374d0f5a97761b91a0c3ff6d10f80abd206b0 tree 29fe696a534c6df75a149251031ba0be4f159083 parent 643f3319b9132c768081ce94f938a29139a16de9 author Paul Fulghum Sun, 25 Jun 2006 05:49:21 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:24 -0700 [PATCH] add synclink_gt crc return feature Add ability to return HDLC CRC to user application. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 643f3319b9132c768081ce94f938a29139a16de9 tree 741484abe1b7ae934555772276db391d4eff017c parent ed6a209024c23dbb39bfaa7361eb0b9c3fcc2b93 author Paul Fulghum Sun, 25 Jun 2006 05:49:20 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:24 -0700 [PATCH] add synclink_gt custom hdlc idle Add custom HDLC idle pattern feature. It allows the user to specify an arbitrary 8 or 16 bit repeating pattern on the transmit data pin between HDLC frames. In most cases the idle pattern is continuous ones or flags as supported by off the shelf synchronous controllers and defined in the ISO3309 standard. Some applications (radio/satellite modems, connections to legacy military hardware) require non-standard patterns. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed6a209024c23dbb39bfaa7361eb0b9c3fcc2b93 tree a60f8ec403024654016729e1043f46e80945e0fd parent 9e37bd301ee130598fa1406c1281caa159473bf8 author Andrew Morton Sun, 25 Jun 2006 05:49:19 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:24 -0700 [PATCH] irda-usb printk fix drivers/net/irda/irda-usb.c: In function 'stir421x_patch_device': drivers/net/irda/irda-usb.c:1108: warning: format '%u' expects type 'unsigned int', but argument 4 has type 'size_t' Cc: Greg KH Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e37bd301ee130598fa1406c1281caa159473bf8 tree c52de7a4eea72353e95c26266ad692a0cc0a8546 parent b0ef371e3f9fa3b2571058be366a6780827ec0bf author Randy Dunlap Sun, 25 Jun 2006 05:49:19 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:24 -0700 [PATCH] kthread: move kernel-doc and put it into DocBook Move kthread API kernel-doc from kthread.h to kthread.c & fix it. Add kthread API to kernel-api DocBook. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0ef371e3f9fa3b2571058be366a6780827ec0bf tree fbb46d62e8267b364ab420228b764220b709524f parent e905914f96e11862b130dd229f73045dad9a34e8 author Randy Dunlap Sun, 25 Jun 2006 05:49:18 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:24 -0700 [PATCH] DMI: cleanup kernel-doc, add to DocBook Add DMI interface functions to a new Firmware Interfaces chapter in the kernel-api DocBook. Clean up kernel-doc in drivers/firmware/dmi_scan.c. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e905914f96e11862b130dd229f73045dad9a34e8 tree 0e7cff381970e2439de521c3d42ded8c49f69354 parent f796937a062c7aeb44cd0e75e1586c8543634a7d author Jeremy Fitzhardinge Sun, 25 Jun 2006 05:49:17 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:23 -0700 [PATCH] Implement kasprintf Implement kasprintf, a kernel version of asprintf. This allocates the memory required for the formatted string, including the trailing '\0'. Returns NULL on allocation failure. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f796937a062c7aeb44cd0e75e1586c8543634a7d tree c3cfcbb27e291621e31cff71288f3e82d8b149a8 parent 891c668b90ded38cec36f0852c4983573597170d author Jeremy Fitzhardinge Sun, 25 Jun 2006 05:49:17 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:23 -0700 [PATCH] Fix bounds check in vsnprintf, to allow for a 0 size and NULL buffer This change allows callers to use a 0-byte buffer and a NULL buffer pointer with vsnprintf, so it can be used to determine how large the resulting formatted string will be. Previously the code effectively treated a size of 0 as a size of 4G (on 32-bit systems), with other checks preventing it from actually trying to emit the string - but the terminal \0 would still be written, which would crash if the buffer is NULL. This change changes the boundary check so that 'end' points to the putative location of the terminal '\0', which is only written if size > 0. vsnprintf still allows the buffer size to be set very large, to allow unbounded buffer sizes (to implement sprintf, etc). [akpm@osdl.org: fix long-vs-longlong confusion] Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 891c668b90ded38cec36f0852c4983573597170d tree 50bd91c6a8afab05cf974d5abe100b69b2bb3fd4 parent fa9799e33d362aeca4555cd6318735bab1c04d16 author Atsushi Nemoto Sun, 25 Jun 2006 05:49:15 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:23 -0700 [PATCH] LED: add LED heartbeat trigger Add an LED trigger acts like a heart beat. This can be used as a replacement of CONFIG_HEARTBEAT code exists in some arch's timer code. Signed-off-by: Atsushi Nemoto Acked-by: Richard Purdie Cc: "Nish Aravamudan" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa9799e33d362aeca4555cd6318735bab1c04d16 tree 3fbef83fe505f34950f4b30fb4158e2e599ce92f parent 9dc65576d67dc45e529062e41ca34066e02f03e5 author Randy Dunlap Sun, 25 Jun 2006 05:49:15 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:23 -0700 [PATCH] ktime/hrtimer: fix kernel-doc comments Fix kernel-doc formatting in ktime.h and hrtimer.[ch] files. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9dc65576d67dc45e529062e41ca34066e02f03e5 tree 37c75b56d792683703658bd7f87dac1b110aef59 parent c51d3dac321df417d59a47574caa7ab61b30d447 author Randy Dunlap Sun, 25 Jun 2006 05:49:14 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:23 -0700 [PATCH] reed-solomon: fix kernel-doc comments Fix kernel-doc formatting in Reed-Solomon code. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c51d3dac321df417d59a47574caa7ab61b30d447 tree 2e4e44a4fc348a0610ddc627702c1ffb82123def parent ecfb251a95dfca6ca0dba63414e9c91fcbb92335 author Randy Dunlap Sun, 25 Jun 2006 05:49:14 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:23 -0700 [PATCH] kernel-doc: use Members for struct fields consistently kernel-doc struct fields should be consistently called "Members", not "Arguments", so switch man-mode output to use "Members" like all of the other formats do. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ecfb251a95dfca6ca0dba63414e9c91fcbb92335 tree c965b6d557faf873d5df0eacb79597aab6d4858d parent cc44a817f65f9b4651643d334f6351b6d1f5e6c2 author Randy Dunlap Sun, 25 Jun 2006 05:49:13 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:23 -0700 [PATCH] kernel-doc: don't use XML escapes in text or man output mode For kernel-doc output modes of text and man, do not use XML escapes for less-than, greater-than, and ampersand characters. I.e., leave the text and man output clean and readable. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc44a817f65f9b4651643d334f6351b6d1f5e6c2 tree 818ea9a738b72cfd11f97637312e743aa344e195 parent 45c9b11a1d07770cabb48cb0f7960a77650ffc64 author Paul Fulghum Sun, 25 Jun 2006 05:49:12 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:22 -0700 [PATCH] fix memory leak in rocketport rp_do_receive Fix memory leak caused by incorrect use of tty buffer facility. tty buffers are allocated but never processed by call to tty_flip_buffer_push so they accumulate on the full buffer list. Current code uses the buffers as a temporary storage for data before passing it directly to the line discipline. Signed-off-by: Paul Fulghum Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45c9b11a1d07770cabb48cb0f7960a77650ffc64 tree f1928b66fa23a5350cc15b0c448e9acefff66758 parent 584e1236bbcdfec3f64c751908b8b4fe868c2d20 author Ulrich Drepper Sun, 25 Jun 2006 05:49:11 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:22 -0700 [PATCH] Implement AT_SYMLINK_FOLLOW flag for linkat When the linkat() syscall was added the flag parameter was added in the last minute but it wasn't used so far. The following patch should change that. My tests show that this is all that's needed. If OLDNAME is a symlink setting the flag causes linkat to follow the symlink and create a hardlink with the target. This is actually the behavior POSIX demands for link() as well but Linux wisely does not do this. With this flag (which will most likely be in the next POSIX revision) the programmer can choose the behavior, defaulting to the safe variant. As a side effect it is now possible to implement a POSIX-compliant link(2) function for those who are interested. touch file ln -s file symlink linkat(fd, "symlink", fd, "newlink", 0) -> newlink is hardlink of symlink linkat(fd, "symlink", fd, "newlink", AT_SYMLINK_FOLLOW) -> newlink is hardlink of file The value of AT_SYMLINK_FOLLOW is determined by the definition we already use in glibc. Signed-off-by: Ulrich Drepper Acked-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 584e1236bbcdfec3f64c751908b8b4fe868c2d20 tree ab55e9e001e0f43615a31d472423429047e7c554 parent fc75cdfa5b43ac4d3232b490800cd35063adafd3 author Yoichi Yuasa Sun, 25 Jun 2006 05:49:11 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:22 -0700 [PATCH] add "select GPIO_VR41XX" for TANBAC_TB0229 TANBAC_TB0229 requires GPIO_VR41XX. This patch adds "select GPIO_VR41XX" for TANBAC_TB0229. Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc75cdfa5b43ac4d3232b490800cd35063adafd3 tree 0529ffd9633667457d5340a09b3cb352d09436d2 parent 04a3446c90137a473837288b04b517b19dc67a0d author Heiko Carstens Sun, 25 Jun 2006 05:49:10 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:22 -0700 [PATCH] cpu hotplug: fix CPU_UP_CANCEL handling If a cpu hotplug callback fails on CPU_UP_PREPARE, all callbacks will be called with CPU_UP_CANCELED. A few of these callbacks assume that on CPU_UP_PREPARE a pointer to task has been stored in a percpu array. This assumption is not true if CPU_UP_PREPARE fails and the following calls to kthread_bind() in CPU_UP_CANCELED will cause an addressing exception because of passing a NULL pointer. Signed-off-by: Heiko Carstens Cc: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04a3446c90137a473837288b04b517b19dc67a0d tree 874f1681da03441b021f81446e72ace451b0cb09 parent 8bdd1d1250d55afe403ac4affa6ccc5f9e60468f author Frode Isaksen Sun, 25 Jun 2006 05:49:09 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:22 -0700 [PATCH] fs: sys_poll with timeout -1 bug fix If you do a poll() call with timeout -1, the wait will be a big number (depending on HZ) instead of infinite wait, since -1 is passed to the msecs_to_jiffies function. Signed-off-by: Frode Isaksen Acked-by: Nishanth Aravamudan Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bdd1d1250d55afe403ac4affa6ccc5f9e60468f tree b7ffa764ccaa88e07753f9a75d837ea47ea9ea01 parent 2b943cf09d75c0dfbfd22548988df48f6c24c727 author Serge E. Hallyn Sun, 25 Jun 2006 05:49:08 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:22 -0700 [PATCH] kthread: convert stop_machine into a kthread - Update stop_machine.c to spawn stop_machine as kthreads rather than the deprecated kernel_threads. - Update stop_machine to use the more efficient kthread_bind() before running task in place of set_cpus_allowed() after. [akpm@osdl.org: remove now-wrong set_cpus_allowed()] Signed-off-by: Serge E. Hallyn Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b943cf09d75c0dfbfd22548988df48f6c24c727 tree 094e247b677c8b285570063ebf4c352a9875bddf parent f82ccdb992d694f46b28f0478f62468260f45607 author Al Viro Sun, 25 Jun 2006 05:49:08 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:22 -0700 [PATCH] fix %s in affs_fill_super() %s is only valid if array is known to contain NUL or precision is given and does not exceed the size of array. Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f82ccdb992d694f46b28f0478f62468260f45607 tree e8eec63d6f35462f813e2d38bc95b7163150186b parent 7c8328355609be6d229e1a5e016a0115e9328b83 author Bjorn Helgaas Sun, 25 Jun 2006 05:49:07 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:22 -0700 [PATCH] CCISS: tidy up product table indentation Make each one fit on a line so it's easier to read. I re-ordered COMPAQ_CISSC/0x4091, which was out of order. I double-checked these, but it would be good if you'd also check them to make sure I didn't miss any. Signed-off-by: Bjorn Helgaas Cc: Jeff Garzik Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c8328355609be6d229e1a5e016a0115e9328b83 tree 9180f623a5380c22e90235a24bfa7a3af522dc76 parent e2019b58fac87b93c04d9efc08324a28fd23d601 author Bjorn Helgaas Sun, 25 Jun 2006 05:49:06 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:21 -0700 [PATCH] CCISS: run through Lindent cciss is full of inconsistent style ("for (" vs. "for(", lines that end with whitespace, lines beginning with a mix of spaces & tabs, etc). This patch changes only whitespace. Signed-off-by: Bjorn Helgaas Acked-by: Jeff Garzik Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2019b58fac87b93c04d9efc08324a28fd23d601 tree 8618e5f4e1fba059fd274de67d2480a53656396c parent d14c4ab58c77c9a03b716c28f230ef944b08dc34 author Bjorn Helgaas Sun, 25 Jun 2006 05:49:05 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:21 -0700 [PATCH] CCISS: remove parens around return values Typical Linux style is "return -EINVAL", not "return(-EINVAL)". Signed-off-by: Bjorn Helgaas Acked-by: Jeff Garzik Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d14c4ab58c77c9a03b716c28f230ef944b08dc34 tree 541506dc11d6c49c25d3fa4629038f6f0c9a9fac parent 5e8621e8bdc2460da516d5f1a5c71d3467ded5d2 author Bjorn Helgaas Sun, 25 Jun 2006 05:49:04 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:21 -0700 [PATCH] CCISS: fix a few spelling errors Fix a few spelling errors. Signed-off-by: Bjorn Helgaas Acked-by: Jeff Garzik Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e8621e8bdc2460da516d5f1a5c71d3467ded5d2 tree 90557f32a4df3364cb6ff189f8e75c7d4338fc47 parent 40aabb5815723551e7c92dd08ed3ea82ec000ccd author Bjorn Helgaas Sun, 25 Jun 2006 05:49:03 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:21 -0700 [PATCH] CCISS: use ARRAY_SIZE without intermediates It's easier to verify loop bounds if the array name is mentioned the for() statement that steps through the array. Signed-off-by: Bjorn Helgaas Acked-by: Jeff Garzik Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40aabb5815723551e7c92dd08ed3ea82ec000ccd tree 7328b19bd64fd761ef6467d37016e558318b8fed parent 4e570309e80f7c7a532fe0074e74df26ff8ef5d2 author Bjorn Helgaas Sun, 25 Jun 2006 05:49:03 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:21 -0700 [PATCH] CCISS: announce cciss%d devices with PCI address/IRQ/DAC info We already print "cciss: using DAC cycles" or similar for every adapter found: why not just identify the device we're talking about and include other useful information? Jeff Garzik : Although this patch is correct, I would consider using dev_printk() rather than referencing pci_name() in printk() arguments. Signed-off-by: Bjorn Helgaas Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e570309e80f7c7a532fe0074e74df26ff8ef5d2 tree 82e8e7e21b537605acd48375113188434c1c2b58 parent c33ac89bc7d697e23ce09ddae73e0ece5f65ad48 author Bjorn Helgaas Sun, 25 Jun 2006 05:49:02 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:21 -0700 [PATCH] CCISS: request all PCI resources We should call pci_request_regions() to claim all resources the device decodes. Previously, we claimed only the I/O port range. Signed-off-by: Bjorn Helgaas Acked-by: Jeff Garzik Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c33ac89bc7d697e23ce09ddae73e0ece5f65ad48 tree 4584fa3aa65ee46d3eb48f7b6b81e4af2d165d0e parent e7b69055820a221d7da29092fd553fd7cd6a97d1 author Bjorn Helgaas Sun, 25 Jun 2006 05:49:01 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:21 -0700 [PATCH] CCISS: disable device when returning failure If something fails after we call pci_enable_device(), we should call pci_disable_device() before returning the failure. Signed-off-by: Bjorn Helgaas Acked-by: Jeff Garzik Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7b69055820a221d7da29092fd553fd7cd6a97d1 tree f80c1cbd5ada2179fc7ddc97c4d8696551ae96a3 parent fa366ad5d7fe05abaae44a1cd216348669e42ef8 author Rob Landley Sun, 25 Jun 2006 05:49:00 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:21 -0700 [PATCH] Initramfs docs update New section on creating an external initramfs image using cpio (with script), a warning about bad advice in the cpio man page, a bit of debugging advice (hello world and rdinit=/bin/sh), and a few minor tweaks to other parts of it. Signed-off-by: Rob Landley Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa366ad5d7fe05abaae44a1cd216348669e42ef8 tree 5c4bf3a48dca37d139b8ec16b6d3b71ee6a76abe parent c7b2eff059fcc2d1b7085ee3d84b79fd657a537b author Serge E. Hallyn Sun, 25 Jun 2006 05:49:00 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:21 -0700 [PATCH] kthread: convert smbiod Update smbiod to use kthread instead of deprecated kernel_thread. [akpm@osdl.org: cleanup] Signed-off-by: Serge E. Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7b2eff059fcc2d1b7085ee3d84b79fd657a537b tree 72d357c3975f27b5c8e5cfd77464e7823a9d6b1d parent 2f72100c01dd31d769097c58874e8ab1e70b2518 author Serge E. Hallyn Sun, 25 Jun 2006 05:48:59 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:20 -0700 [PATCH] kthread: update loop.c to use kthread Update loop.c to use a kthread instead of a deprecated kernel_thread for loop devices. [akpm@osdl.org: don't change the thread's name] Signed-off-by: Serge E. Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f72100c01dd31d769097c58874e8ab1e70b2518 tree e8f654f519f56ac37de88533e3d93a3e80cb6454 parent 28e83baac20e3fe624af89a55eb06c2a7cab6828 author Randy Dunlap Sun, 25 Jun 2006 05:48:59 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:20 -0700 [PATCH] kernel-doc for lib/crc*.c Make kernel-doc corrections & additions to lib/crc*.c. Add crc functions to kernel-api.tmpl in DocBook. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 28e83baac20e3fe624af89a55eb06c2a7cab6828 tree dc9855f9c7f4f775ff081853409909967deaf3d0 parent 6e1907ffdc694023712b5e6516933a29e1be954f author Randy Dunlap Sun, 25 Jun 2006 05:48:58 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:20 -0700 [PATCH] kernel-doc for lib/cmdline.c Add a new chapter for kernel-lib functions to kernel-api.tmpl. Add lib/cmdline.c to the new kernel-lib chapter. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e1907ffdc694023712b5e6516933a29e1be954f tree 87edb0233deca3b805d5154877964a09ca450db2 parent 099a71d99578a53bdf5f383c55e4095f1c59410c author Randy Dunlap Sun, 25 Jun 2006 05:48:57 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:20 -0700 [PATCH] kernel-doc for lib/bitmap.c Make corrections/fixes to kernel-doc in lib/bitmap.c and include it in DocBook template. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 099a71d99578a53bdf5f383c55e4095f1c59410c tree e43761b2e62c5ce2591113f65596389074c92105 parent 18cddac3d17781d9cbc109522d70ab021c846e2b author Eric Sesterhenn Sun, 25 Jun 2006 05:48:57 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:20 -0700 [PATCH] Remove needless checks in fs/9p/vfs_inode.c coverity found two needless checks in vfs_inode.c (cid #1165 and #1164) In both cases inode is always NULL when we goto error; either because it is still initialized to NULL or is set to NULL explicitly. This patch simply removes these checks to save some code. Signed-off-by: Eric Sesterhenn Acked-by: Eric Van Hensbergen Cc: Ron Minnich Cc: Latchesar Ionkov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18cddac3d17781d9cbc109522d70ab021c846e2b tree 32ef92afc51e17d67d124bb4b2372d3aebad20b2 parent 850622dfaf3d62907c96707773e0f8e84b3c0c06 author Randy Dunlap Sun, 25 Jun 2006 05:48:56 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:20 -0700 [PATCH] ide-floppy: fix debug-only syntax error Fix debug-only printk syntax error. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 850622dfaf3d62907c96707773e0f8e84b3c0c06 tree 905e002ee082453ab8da9f4a8fe805d69f59bc45 parent 9c8ef5614da22666e339b125263d315cfaa89109 author Randy Dunlap Sun, 25 Jun 2006 05:48:55 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:20 -0700 [PATCH] kernel-doc: warn on malformed function docs. When the verbose (-v) option is used with scripts/kernel-doc, this option reports when the kernel-doc format is malformed and apparently contains function description lines before function parameters. In these cases, the kernel-doc script will print something like: Warning(filemap.c:335): contents before sections I have fixed the problems in mm/filemap.c and added lots of kernel-doc to that file (posted to the linux-mm mailing list Mon. 2006-June-12). The real goal (as requested by Andrew Morton) is to allow the short function description to be more than one line long. This patch is both a kernel-doc checker and a tool en route to that goal. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c8ef5614da22666e339b125263d315cfaa89109 tree 860044f1b2c0c6189143b1c9daf263bd8ff5e5e0 parent a4d27e75ffb7b8ecb7eed0c7db0df975525f3fd7 author Miklos Szeredi Sun, 25 Jun 2006 05:48:55 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:20 -0700 [PATCH] fuse: scramble lock owner ID VFS uses current->files pointer as lock owner ID, and it wouldn't be prudent to expose this value to userspace. So scramble it with XTEA using a per connection random key, known only to the kernel. Only one direction needs to be implemented, since the ID is never sent in the reverse direction. The XTEA algorithm is implemented inline since it's simple enough to do so, and this adds less complexity than if the crypto API were used. Thanks to Jesper Juhl for the idea. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4d27e75ffb7b8ecb7eed0c7db0df975525f3fd7 tree 2353706a33196438547ed4651afd9f2d81dd96e8 parent f9a2842e5612b93fa20a624a8baa6c2a7ecea504 author Miklos Szeredi Sun, 25 Jun 2006 05:48:54 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:19 -0700 [PATCH] fuse: add request interruption Add synchronous request interruption. This is needed for file locking operations which have to be interruptible. However filesystem may implement interruptibility of other operations (e.g. like NFS 'intr' mount option). Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9a2842e5612b93fa20a624a8baa6c2a7ecea504 tree cc6865cc0a60a35b2f1740662313d288d9a20353 parent 33649c91a3df57c1090a657637d44b896de367e7 author Miklos Szeredi Sun, 25 Jun 2006 05:48:53 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:19 -0700 [PATCH] fuse: rename the interrupted flag Rename the 'interrupted' flag to 'aborted', since it indicates exactly that, and next patch will introduce an 'interrupted' flag for a Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33649c91a3df57c1090a657637d44b896de367e7 tree 1ee4871a65f2b37a931c796463eb39737a32cbaa parent 7142125937e1482ad3ae4366594c6586153dfc86 author Miklos Szeredi Sun, 25 Jun 2006 05:48:52 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:19 -0700 [PATCH] fuse: ensure FLUSH reaches userspace All POSIX locks owned by the current task are removed on close(). If the FLUSH request resulting initiated by close() fails to reach userspace, there might be locks remaining, which cannot be removed. The only reason it could fail, is if allocating the request fails. In this case use the request reserved for RELEASE, or if that is currently used by another FLUSH, wait for it to become available. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7142125937e1482ad3ae4366594c6586153dfc86 tree 8d85908a36485df0c80de2032e7fcfa493621fe4 parent bafa96541b250a7051e3fbc5de6e8369daf8ffec author Miklos Szeredi Sun, 25 Jun 2006 05:48:52 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:19 -0700 [PATCH] fuse: add POSIX file locking support This patch adds POSIX file locking support to the fuse interface. This implementation doesn't keep any locking state in kernel. Unlocking on close() is handled by the FLUSH message, which now contains the lock owner id. Mandatory locking is not supported. The filesystem may enfoce mandatory locking in userspace if needed. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bafa96541b250a7051e3fbc5de6e8369daf8ffec tree 9b758c424fcda2d263c71f25358bb65a0abc15d4 parent 51eb01e73599efb88c6c20b1c226d20309a75450 author Miklos Szeredi Sun, 25 Jun 2006 05:48:51 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:19 -0700 [PATCH] fuse: add control filesystem Add a control filesystem to fuse, replacing the attributes currently exported through sysfs. An empty directory '/sys/fs/fuse/connections' is still created in sysfs, and mounting the control filesystem here provides backward compatibility. Advantages of the control filesystem over the previous solution: - allows the object directory and the attributes to be owned by the filesystem owner, hence letting unpriviled users abort the filesystem connection - does not suffer from module unload race [akpm@osdl.org: fix this fs for recent dhowells depredations] [akpm@osdl.org: fix 64-bit printk warnings] Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51eb01e73599efb88c6c20b1c226d20309a75450 tree c37e7a61ce7c049a4615dfb2ee994866d3c85bd6 parent 3e8c54fad89144b8d63cc41619f363df1ec7cc42 author Miklos Szeredi Sun, 25 Jun 2006 05:48:50 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:19 -0700 [PATCH] fuse: no backgrounding on interrupt Don't put requests into the background when a fatal interrupt occurs while the request is in userspace. This removes a major wart from the implementation. Backgrounding of requests was introduced to allow breaking of deadlocks. However now the same can be achieved by aborting the filesystem through the 'abort' sysfs attribute. This is a change in the interface, but should not cause problems, since these kinds of deadlocks never happen during normal operation. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e8c54fad89144b8d63cc41619f363df1ec7cc42 tree f4a6f24792358ca7eb3703487eee7db7a122e6f0 parent 2b94895b9281976cf2a0f2f89bf41ee219742235 author Jan Engelhardt Sun, 25 Jun 2006 05:48:49 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:19 -0700 [PATCH] fuse: use MISC_MAJOR The following patches add POSIX file locking to the fuse interface. Additional changes ralated to this are: - asynchronous interrupt of requests by SIGKILL no longer supported - separate control filesystem, instead of using sysfs objects - add support for synchronously interrupting requests Details are documented in Documentation/filesystems/fuse.txt throughout the patches. This patch: Have fuse.h use MISC_MAJOR rather than a hardcoded '10'. Signed-off-by: Jan Engelhardt Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b94895b9281976cf2a0f2f89bf41ee219742235 tree bf42dba4bfb46c708d5fbb77ce7010f0058c3389 parent 326f28e9ec4b2619c2fd410593fc95fcb0ba6b41 author David Howells Sun, 25 Jun 2006 05:48:49 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:19 -0700 [PATCH] Another couple of alterations to the memory barrier doc Make another couple of alterations to the memory barrier document following suggestions by Alan Stern and in co-operation with Paul McKenney: (*) Rework the point of introduction of memory barriers and the description of what they are to reiterate why they're needed. (*) Modify a statement about the use of data dependency barriers to note that other barriers can be used instead (as they imply DD-barriers). Signed-off-by: David Howells Acked-By: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 326f28e9ec4b2619c2fd410593fc95fcb0ba6b41 tree 2a11507d8ab266b1f0eac6d3b3f37e9d18ddec5d parent fa791f5bdfa026a9abe1b48934943fd39f1e300b author Eric Sesterhenn Sun, 25 Jun 2006 05:48:48 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:19 -0700 [PATCH] More !tty cleanups in drivers/char Another bunch of checks in the char drivers .put_char() and .write() routines, where tty can never be NULL. This patch removes these checks to save some code. Coverity choked at those with the following bug ids: isicom.c 767, 766 specialix.c 773, 774 synclink_cs.c 779, 781 synclink_gt.c 784, 785 synclinkmp.c 784, 785 Signed-off-by: Eric Sesterhenn Cc: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa791f5bdfa026a9abe1b48934943fd39f1e300b tree b44374b03db6ca2b82f9d8c90e859079b7237307 parent f9022f66336b8ad680884d4810f1c421fff899e3 author Niels Kristian Bech Jensen Sun, 25 Jun 2006 05:48:47 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:18 -0700 [PATCH] Update contact information in CREDITS Update my contact information in CREDITS. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9022f66336b8ad680884d4810f1c421fff899e3 tree 7b2607f0d726c3e14976564fde0f6a570f150625 parent a2f20c7c274b6241767330c902b3111b9326d901 author Ian Kent Sun, 25 Jun 2006 05:48:47 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:18 -0700 [PATCH] autofs4: need to invalidate children on tree mount expire I've found a case where invalid dentrys in a mount tree, waiting to be cleaned up by d_invalidate, prevent the expected expire. In this case dentrys created during a lookup for which a mount fails or has no entry in the mount map contribute to the d_count of the parent dentry. These dentrys may not be invalidated prior to comparing the interanl usage count of valid autofs dentrys against the dentry d_count which makes a mount tree appear busy so it doesn't expire. Signed-off-by: Ian Kent Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2f20c7c274b6241767330c902b3111b9326d901 tree bf41f3312bad291c2b9cb061edc980eebfa61f8e parent 969dd061d81d9e2bc7f954859452ac81cc639711 author Eric Sesterhenn Sun, 25 Jun 2006 05:48:46 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:17 -0700 [PATCH] Clean up char/esp.c coverity choked at another two !tty checks, in places where tty can never be NULL. Since it removes some code we should remove these checks. (Coverity ids #763,#762) Signed-off-by Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 969dd061d81d9e2bc7f954859452ac81cc639711 tree fa6a75db7d19d56de9720716dfc7f688061b3e5e parent 2aa92581fb13e04e1440e5041b412cc06c782e0e author Eric Sesterhenn Sun, 25 Jun 2006 05:48:45 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:17 -0700 [PATCH] Cyclades Cleanup coverity choked at two !tty checks, in places where tty can never be NULL. Since it removes some code we should remove these checks. (Coverity ids #763,#762) [akpm@osdl.org: even cleaner!] Signed-off-by: Eric Sesterhenn Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2aa92581fb13e04e1440e5041b412cc06c782e0e tree a39761477a300c8abcb69102f75511374df3b881 parent 165d6c78ee24127dde5c750b2af0a239f9c11d1a author Anton Blanchard Sun, 25 Jun 2006 05:48:44 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:17 -0700 [PATCH] Link error when futexes are disabled on 64bit architectures If futexes are disabled we fail to link on ppc64. Signed-off-by: Anton Blanchard Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 165d6c78ee24127dde5c750b2af0a239f9c11d1a tree a9329b5b24893588114441f43d576dfa310e5f43 parent 76d42bd96984832c4ea8bc8cbd74e496ac31409e author Paul E. McKenney Sun, 25 Jun 2006 05:48:44 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:17 -0700 [PATCH] RCU documentation: self-limiting updates and call_rcu() An update to the RCU documentation calling out the self-limiting-update-rate advantages of synchronize_rcu(), and describing how to use call_rcu() in a way that results in self-limiting updates. Self-limiting updates are important to avoiding RCU-induced OOM in face of denial-of-service attacks. Signed-off-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76d42bd96984832c4ea8bc8cbd74e496ac31409e tree 138fb5c39d671166485cf2e16e450332daeb7081 parent 78dbe706e22f54bce61571ad837238382e1ba5f9 author Wu Fengguang Sun, 25 Jun 2006 05:48:43 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:17 -0700 [PATCH] readahead: backoff on I/O error Backoff readahead size exponentially on I/O error. Michael Tokarev described the problem as: [QUOTE] Suppose there's a CD-rom with a scratch/etc, one sector is unreadable. In order to "fix" it, one have to read it and write to another CD-rom, or something.. or just ignore the error (if it's just a skip in a video stream). Let's assume the unreadable block is number U. But current behavior is just insane. An application requests block number N, which is before U. Kernel tries to read-ahead blocks N..U. Cdrom drive tries to read it, re-read it.. for some time. Finally, when all the N..U-1 blocks are read, kernel returns block number N (as requested) to an application, successefully. Now an app requests block number N+1, and kernel tries to read blocks N+1..U+1. Retrying again as in previous step. And so on, up to when an app requests block number U-1. And when, finally, it requests block U, it receives read error. So, kernel currentry tries to re-read the same failing block as many times as the current readahead value (256 (times?) by default). This whole process already killed my cdrom drive (I posted about it to LKML several months ago) - literally, the drive has fried, and does not work anymore. Ofcourse that problem was a bug in firmware (or whatever) of the drive *too*, but.. main problem with that is current readahead logic as described above. [/QUOTE] Which was confirmed by Jens Axboe : [QUOTE] For ide-cd, it tends do only end the first part of the request on a medium error. So you may see a lot of repeats :/ [/QUOTE] With this patch, retries are expected to be reduced from, say, 256, to 5. [akpm@osdl.org: cleanups] Signed-off-by: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78dbe706e22f54bce61571ad837238382e1ba5f9 tree 4da3f15df037bc9ff7b11c42c17b9bf523a1a930 parent c836043e708d50bb301479d0db8e0dc77d4f52ca author David Woodhouse Sun, 25 Jun 2006 05:48:41 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:17 -0700 [PATCH] R3964: fix GFP_KERNEL allocations in timer function In the error case, add_msg() gets called from timer functions, so should be using GFP_ATOMIC instead of GFP_KERNEL. Ref: http://bugzilla.kernel.org/show_bug.cgi?id=6659. Thanks to Christian Werner for reporting, and for the initial fix. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c836043e708d50bb301479d0db8e0dc77d4f52ca tree ca19a611afb7ae60cf3b5f203457898a0827058c parent 673e321cf9a12ecc2d6ce683fa9105f3443c1cbd author Randy Dunlap Sun, 25 Jun 2006 05:48:40 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:16 -0700 [PATCH] advansys section fixes Priority: not critical. Mark 3 functions __init. Saves a little memory. This makes these functions' calls to AdvWaitEEPCmd() (which is __init) be clean (i.e., eliminates text -> init -> text call chain). Fix multiple section mismatch warnings: WARNING: drivers/scsi/advansys.o - Section mismatch: reference to .init.text: from .text between 'AdvSet3550EEPConfig' (at offset 0x7a22) and 'AdvSet38C0800EEPConfig' WARNING: drivers/scsi/advansys.o - Section mismatch: reference to .init.text: from .text between 'AdvSet3550EEPConfig' (at offset 0x7a4e) and 'AdvSet38C0800EEPConfig' WARNING: drivers/scsi/advansys.o - Section mismatch: reference to .init.text: from .text between 'AdvSet3550EEPConfig' (at offset 0x7a79) and 'AdvSet38C0800EEPConfig' WARNING: drivers/scsi/advansys.o - Section mismatch: reference to .init.text: from .text between 'AdvSet3550EEPConfig' (at offset 0x7aa2) and 'AdvSet38C0800EEPConfig' WARNING: drivers/scsi/advansys.o - Section mismatch: reference to .init.text: from .text between 'AdvSet3550EEPConfig' (at offset 0x7abb) and 'AdvSet38C0800EEPConfig' WARNING: drivers/scsi/advansys.o - Section mismatch: reference to .init.text: from .text between 'AdvSet38C0800EEPConfig' (at offset 0x7ae0) and 'AdvSet38C1600EEPConfig' WARNING: drivers/scsi/advansys.o - Section mismatch: reference to .init.text: from .text between 'AdvSet38C0800EEPConfig' (at offset 0x7b0c) and 'AdvSet38C1600EEPConfig' WARNING: drivers/scsi/advansys.o - Section mismatch: reference to .init.text: from .text between 'AdvSet38C0800EEPConfig' (at offset 0x7b37) and 'AdvSet38C1600EEPConfig' WARNING: drivers/scsi/advansys.o - Section mismatch: reference to .init.text: from .text between 'AdvSet38C0800EEPConfig' (at offset 0x7b60) and 'AdvSet38C1600EEPConfig' WARNING: drivers/scsi/advansys.o - Section mismatch: reference to .init.text: from .text between 'AdvSet38C0800EEPConfig' (at offset 0x7b79) and 'AdvSet38C1600EEPConfig' WARNING: drivers/scsi/advansys.o - Section mismatch: reference to .init.text: from .text between 'AdvSet38C1600EEPConfig' (at offset 0x7b9e) and 'AdvExeScsiQueue' WARNING: drivers/scsi/advansys.o - Section mismatch: reference to .init.text: from .text between 'AdvSet38C1600EEPConfig' (at offset 0x7bca) and 'AdvExeScsiQueue' WARNING: drivers/scsi/advansys.o - Section mismatch: reference to .init.text: from .text between 'AdvSet38C1600EEPConfig' (at offset 0x7bf5) and 'AdvExeScsiQueue' WARNING: drivers/scsi/advansys.o - Section mismatch: reference to .init.text: from .text between 'AdvSet38C1600EEPConfig' (at offset 0x7c1e) and 'AdvExeScsiQueue' WARNING: drivers/scsi/advansys.o - Section mismatch: reference to .init.text: from .text between 'AdvSet38C1600EEPConfig' (at offset 0x7c37) and 'AdvExeScsiQueue' Signed-off-by: Randy Dunlap Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 673e321cf9a12ecc2d6ce683fa9105f3443c1cbd tree b1f95fceabe94ddb710f00fb34bfaa2ee1c9baf5 parent cad2af5eb7470f9a0b85498f5ffac894e3cdcd27 author Randy Dunlap Sun, 25 Jun 2006 05:48:39 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:16 -0700 [PATCH] char/ip2: more section fixes (replacement) Priority: tossup. In theory some of these (previously) __init functions could be called after init, but that problem has not been observed AFAIK. There were 2 cases of cleanup_module() (module_exit) calling __init functions (clear_requested_irq() & have_requested_irq()). These are more serious, but still not observed AFAIK. Fix sections mismatch: WARNING: drivers/char/ip2/ip2main.o - Section mismatch: reference to .init.text: from .text between 'cleanup_module' (at offset 0x228b) and 'ip2_loadmain' WARNING: drivers/char/ip2/ip2main.o - Section mismatch: reference to .init.text: from .text between 'cleanup_module' (at offset 0x22ae) and 'ip2_loadmain' WARNING: drivers/char/ip2/ip2main.o - Section mismatch: reference to .init.text: from .text between 'ip2_loadmain' (at offset 0x2501) and 'set_irq' WARNING: drivers/char/ip2/ip2main.o - Section mismatch: reference to .init.text: from .text between 'ip2_loadmain' (at offset 0x25de) and 'set_irq' WARNING: drivers/char/ip2/ip2main.o - Section mismatch: reference to .init.text: from .text between 'ip2_loadmain' (at offset 0x2698) and 'set_irq' WARNING: drivers/char/ip2/ip2main.o - Section mismatch: reference to .init.text: from .text between 'ip2_loadmain' (at offset 0x2922) and 'set_irq' WARNING: drivers/char/ip2/ip2main.o - Section mismatch: reference to .init.text: from .text between 'ip2_loadmain' (at offset 0x299e) and 'set_irq' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cad2af5eb7470f9a0b85498f5ffac894e3cdcd27 tree 7a713090a1d573d2151a6095d9e00b71d6112cb0 parent 474ab45a1f7de888df63da86b46785fe19d7fbe7 author Randy Dunlap Sun, 25 Jun 2006 05:48:38 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:16 -0700 [PATCH] cdrom/mcdx: section fixes Priority: not critical. Make __mcdx_init() __init and static. Saves a little memory. Fix section mismatch warning and make the function static while there: WARNING: drivers/cdrom/mcdx.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x8be) and 'mcdx_transfer' Signed-off-by: Randy Dunlap Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 474ab45a1f7de888df63da86b46785fe19d7fbe7 tree 6d3d0d400745abd70c57d88e0af488981550cbe7 parent 96ebb92840b6bbb2e2fd8ad6b2b55d9cd76a06a0 author Randy Dunlap Sun, 25 Jun 2006 05:48:38 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:15 -0700 [PATCH] trident fb section fixes Priority: not critical. Change 3 functions from __init to __devinit. Could be an init/probe problem in theory, but not observed, so not high priority IMO. Fix section mismatch warnings: WARNING: drivers/video/tridentfb.o - Section mismatch: reference to .init.text: from .text between 'trident_pci_probe' (at offset 0x1aad) and 'trident_pci_remove' WARNING: drivers/video/tridentfb.o - Section mismatch: reference to .init.text: from .text between 'trident_pci_probe' (at offset 0x1b22) and 'trident_pci_remove' WARNING: drivers/video/tridentfb.o - Section mismatch: reference to .init.text: from .text between 'trident_pci_probe' (at offset 0x1b31) and 'trident_pci_remove' Signed-off-by: Randy Dunlap Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96ebb92840b6bbb2e2fd8ad6b2b55d9cd76a06a0 tree 339c1138f18d4f701f33644ee26990300078b933 parent 6e656be899993f450a765056cdc8d87e58906508 author Randy Dunlap Sun, 25 Jun 2006 05:48:37 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:15 -0700 [PATCH] wan/sdla section fixes netdev->set_config can be called at any time, so these references to __initdata would be a real problem. However, problem has not been observed AFAIK. Fix section mismatch warnings: WARNING: drivers/net/wan/sdla.o - Section mismatch: reference to .init.data: from .text between 'sdla_set_config' (at offset 0x1b8e) and 'sdla_stats' WARNING: drivers/net/wan/sdla.o - Section mismatch: reference to .init.data: from .text between 'sdla_set_config' (at offset 0x1e76) and 'sdla_stats' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e656be899993f450a765056cdc8d87e58906508 tree 708037245036b7b3cef3d87299435ea461bed9c4 parent 838cd153a5250a79a302f6c5d68a4794b70c4ccb author Peter Staubach Sun, 25 Jun 2006 05:48:36 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:15 -0700 [PATCH] ftruncate does not always update m/ctime In the course of trying to track down a bug where a file mtime was not being updated correctly, it was discovered that the m/ctime updates were not quite being handled correctly for ftruncate() calls. Quoth SUSv3: open(2): If O_TRUNC is set and the file did previously exist, upon successful completion, open() shall mark for update the st_ctime and st_mtime fields of the file. truncate(2): Upon successful completion, if the file size is changed, this function shall mark for update the st_ctime and st_mtime fields of the file, and the S_ISUID and S_ISGID bits of the file mode may be cleared. ftruncate(2): Upon successful completion, if fildes refers to a regular file, the ftruncate() function shall mark for update the st_ctime and st_mtime fields of the file and the S_ISUID and S_ISGID bits of the file mode may be cleared. If the ftruncate() function is unsuccessful, the file is unaffected. The open(O_TRUNC) and truncate cases were being handled correctly, but the ftruncate case was being handled like the truncate case. The semantics of truncate and ftruncate don't quite match, so ftruncate needs to be handled slightly differently. The attached patch addresses this issue for ftruncate(2). My thanx to Stephen Tweedie and Trond Myklebust for their help in understanding the situation and semantics. Signed-off-by: Peter Staubach Cc: "Stephen C. Tweedie" Cc: Trond Myklebust Cc: Al Viro Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 838cd153a5250a79a302f6c5d68a4794b70c4ccb tree 9122d37d7521c9345779aa84e2ca8d754d997475 parent 92eeccd8badbfebe12383b6e5326b27dc707601d author akpm@osdl.org Sun, 25 Jun 2006 05:48:35 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:15 -0700 [PATCH] N32 sigset and __COMPAT_ENDIAN_SWAP__ I'm testing glibc on MIPS64, little-endian, N32, O32 and N64 multilibs. Among the NPTL test failures seen are some arising from sigsuspend problems for N32: it blocks the wrong signals, so SIGCANCEL (SIGRTMIN) is blocked despite glibc's carefully excluding it from sets of signals to block. Specifically, testing suggests it blocks signal N^32 instead of signal N, so (in the example tested) blocking SIGUSR1 (17) blocks signal 49 instead. glibc's sigset_t uses an array of unsigned long, as does the kernel. In both cases, signal N+1 is represented as (1UL << (N % (8 * sizeof (unsigned long)))) in word number (N / (8 * sizeof (unsigned long))). Thus the N32 glibc uses an array of 32-bit words and the N64 kernel uses an array of 64-bit words. For little-endian, the layout is the same, with signals 1-32 in the first 4 bytes, signals 33-64 in the second, etc.; for big-endian, userspace has that layout while in the kernel each 8 bytes have the two halves swapped from the userspace layout. The N32 sigsuspend syscall uses sigset_from_compat to convert the userspace sigset to kernel format. If __COMPAT_ENDIAN_SWAP__ is *not* set, this uses logic of the form set->sig[0] = compat->sig[0] | (((long)compat->sig[1]) << 32 ) to convert the userspace sigset to a kernel one. This looks correct to me for both big and little endian, given that in userspace compat->sig[1] will represent signals 33-64, and so will the high 32 bits of set->sig[0] in the kernel. If however __COMPAT_ENDIAN_SWAP__ *is* set, as it is for __MIPSEL__, it uses set->sig[0] = compat->sig[1] | (((long)compat->sig[0]) << 32 ); which seems incorrect for both big and little endian, and would explain the observed symptoms. This code is the only use of __COMPAT_ENDIAN_SWAP__, so if incorrect then that macro serves no purpose, in which case something like the following patch would seem appropriate to remove it. Signed-off-by: Joseph Myers Signed-off-by: Ralf Baechle Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92eeccd8badbfebe12383b6e5326b27dc707601d tree b3d96a855685ec96f4fa0ee4419b0f6efdb977ae parent 0710d36a0fd5db3176369397f0fc49db32a63507 author Johann Lombardi Sun, 25 Jun 2006 05:48:33 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:15 -0700 [PATCH] ext3: cleanup dead code in ext3_add_entry() The variables nlen and rlen are defined/initialized but not used in ext3_add_entry(). Signed-off-by: Johann Lombardi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0710d36a0fd5db3176369397f0fc49db32a63507 tree f1d0de2afccdd6c7f967fc12c752f5323e4e3a8f parent eab03ac7bd3e0da99eb9dc068772a85a5e3f3577 author Florin Malita Sun, 25 Jun 2006 05:48:31 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:15 -0700 [PATCH] 9pfs: missing result check in v9fs_vfs_readlink() and v9fs_vfs_link() __getname() may fail and return NULL (as pointed out by Coverity 437 & 1220). Signed-off-by: Florin Malita Acked-by: Eric Van Hensbergen Cc: Cc: Latchesar Ionkov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eab03ac7bd3e0da99eb9dc068772a85a5e3f3577 tree 042447058f59b2e485a24a5175a6d7ab83baa9e1 parent 8ad2914d9cc55be651ef3bd676981a72c9001a47 author Stephen Hemminger Sun, 25 Jun 2006 05:48:31 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:15 -0700 [PATCH] Get rid of /proc/sys/proc The table is empty, why does it still exist? Signed-off-by: Stephen Hemminger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ad2914d9cc55be651ef3bd676981a72c9001a47 tree 4bba45d178fd4f48959fccc906b2287c52d09efe parent 5ec3e4b7aefbb8613b27ec4449fa8f9916ab9099 author Randy Dunlap Sun, 25 Jun 2006 05:48:29 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:15 -0700 [PATCH] checkstack: print module names Finding "init_module" high stack usage problems is challenging when there are over 1600 "init_module" functions in the kernel tree, so make checkstack.pl print out the filename where the stack usage occurs. This is useful for code built as loadable modules. For built-in code, it just prints the kernel image file name, like "vmlinux". Examples: (before patch:) 0x0000000d callback: 1928 0xffffffff81678c09 huft_build: 1560 0x0018 init_module: 1512 (after patch:) 0x0000000d callback [divacapi]: 1928 0xffffffff81678c09 huft_build [vmlinux]: 1560 0x0018 init_module [hdaps]: 1512 Also change one if-series to use elsif to cut down on unneeded tests. Signed-off-by: Randy Dunlap Acked-by: Joern Engel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ec3e4b7aefbb8613b27ec4449fa8f9916ab9099 tree 2135d523d08e6b06b5ea79f307b4555915d4aed0 parent 9bf5b4f5f53707aee5813f373279d03920ba6f65 author Atsushi Nemoto Sun, 25 Jun 2006 05:48:29 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:14 -0700 [PATCH] RTC: add rtc-ds1742 driver Add an RTC driver for the Dallas DS1742 RTC chip. [akpm@osdl.org: cleanups, compile fix] Signed-off-by: Atsushi Nemoto Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9bf5b4f5f53707aee5813f373279d03920ba6f65 tree cd4e837dcdf4533d47696afd88ac4842176cdbb3 parent e7a8bb12c24af8e3e4bdf18a7484699acc9dbedb author Atsushi Nemoto Sun, 25 Jun 2006 05:48:28 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:14 -0700 [PATCH] RTC: add rtc-ds1553 driver Add an RTC driver for the Dallas DS1553 RTC chip. [akpm@osdl.org: cleanups, compile fix] Signed-off-by: Atsushi Nemoto Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7a8bb12c24af8e3e4bdf18a7484699acc9dbedb tree b0e942d912bdb2755991bd675c5263c288ed8699 parent 788b1fc619a31ebdbadd3a8863631f59a4bd2944 author Andrew Morton Sun, 25 Jun 2006 05:48:27 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:14 -0700 [PATCH] at91rm9200-rtc-driver-tidy - whitespace fixes (80-col display) - one unneeded cast of void* Cc: Andrew Victor Cc: Alessandro Zummo Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 788b1fc619a31ebdbadd3a8863631f59a4bd2944 tree 8903053fd78c938078ea2b7c30bc1f434507416e parent 8232212e0b4ee4eb3e407f5a9b098f6377820164 author Andrew Victor Sun, 25 Jun 2006 05:48:27 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:14 -0700 [PATCH] AT91RM9200 RTC driver Adds support for the RTC integrated in the Atmel AT91RM9200 SoC. Driver was originally written for 2.4 by Rick Bronson. Then converted to 2.6 ARM RTC API by Steven Scholz. Now converted to the RTC class model. Signed-off-by: Andrew Victor Signed-off-by: Alessandro Zummo Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8232212e0b4ee4eb3e407f5a9b098f6377820164 tree 427b2c0a935e880d0a949f22072af207ade1e793 parent 362600fe60fd18a25b4de8ec544b9e24e77e1484 author Andrew Victor Sun, 25 Jun 2006 05:48:25 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:14 -0700 [PATCH] RTC: Add rtc_year_days() to calculate tm_yday RTC: Add exported function rtc_year_days() to calculate the tm_yday value. Signed-off-by: Andrew Victor Signed-off-by: Alessandro Zummo Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 362600fe60fd18a25b4de8ec544b9e24e77e1484 tree 7dd8c3c518e1b453eb5bd412e69d9d598c680948 parent 9be05b57bd9152b7c26b1599b87aeb42a102f0cf author Raphael Assenat Sun, 25 Jun 2006 05:48:24 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:14 -0700 [PATCH] Add v3020 RTC support This patch adds support for the v3020 RTC from EM Microelectronic. The v3020 RTC is designed to be connected on a bus using only one data bit. Since any data bit may be used, it is necessary to specify this to the driver by passing a struct v3020_platform_data pointer (see include/linux/rtc-v3020.h) to the driver. Part of the following code comes from the kernel patchs produced by Compulab for their products. The original file (available here: http://raph.people.8d.com/misc/emv3020.c) was released under the terms of the GPL license. [akpm@osdl.org: cleanups] Signed-off-by: Raphael Assenat Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9be05b57bd9152b7c26b1599b87aeb42a102f0cf tree c09b9505af968ffaab852c7e09db7b5262f863b9 parent 8e12ecc2b5a4521a338d7681e7d5547080fc6f71 author Jean Delvare Sun, 25 Jun 2006 05:48:23 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:14 -0700 [PATCH] rtc: small documentation update Rtc driver documentation update * Mention the max-user-freq control file. * Add missing header in example code. Signed-off-by: Jean Delvare Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e12ecc2b5a4521a338d7681e7d5547080fc6f71 tree ffa6cfbbc2d461bb965b97482fc53c02cf3e7733 parent 110d693d5898649da606cd6e5f6af4d7f70a405f author Raphael Assenat Sun, 25 Jun 2006 05:48:23 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:14 -0700 [PATCH] Add max6902 RTC support Add support for the MAX6902 SPI RTC chip. Tested on a pxa2xx cpu. The compulab code comes from the kernel patch the produce for their cn-x255 board. (inside a zip file on the http://www.compulab.co.il/x255/html/x255-developer.htm) The original file (drivers/char/max6902.c) was GPL, which is of course an appropriate licence: /* * max6902.c * * Driver for MAX6902 RTC * * Copyright (C) 2004 Compulab Ltd. * * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. * * */ For reference, you can get the original file here: http://raph.people.8d.com/misc/max6902.c [akpm@osdl.org: cleanups] Signed-off-by: Raphael Assenat Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 110d693d5898649da606cd6e5f6af4d7f70a405f tree a46b06a383d8a9eda59d7c7e17e8694798769800 parent 56f10c634e145d75e45b56a73f59fb6dff1caa8e author Alessandro Zummo Sun, 25 Jun 2006 05:48:20 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:14 -0700 [PATCH] rtc subsystem: add capability checks Centralize CAP_SYS_XXX checks to avoid duplicate code and missing checks in the drivers. Signed-off-by: Alessandro Zummo Cc: Richard Purdie Cc: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56f10c634e145d75e45b56a73f59fb6dff1caa8e tree d8a845dccfaf16dc7ef59d1ad9192a6b6923e6ff parent 9c0c570576d02000063e28faadcce8c07396755d author Alessandro Zummo Sun, 25 Jun 2006 05:48:20 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:13 -0700 [PATCH] rtc subsystem, fix capability checks in kernel interface Remove commented capability checks and add some others. Signed-off-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c0c570576d02000063e28faadcce8c07396755d tree a8ffc618199ea4f91df839642cc7223868364ff0 parent 655066c3835e7b51794c4d56f042eb78b5a79f53 author G. Liakhovetski Sun, 25 Jun 2006 05:48:18 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:13 -0700 [PATCH] drivers/acorn/char/pcf8583.[hc] vs. RTC subsystem A port of the driver for the pcf8583 i2c rtc controller to the generic RTC framework by Alessandro Zummo. Based on drivers/acorn/char/{pcf8583.[hc],i2c.c}. Hopefully, acorn can be converted too to use this driver in the future. Signed-off-by: G. Liakhovetski Signed-off-by: Alessandro Zummo Cc: Russell King Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 655066c3835e7b51794c4d56f042eb78b5a79f53 tree 25d2a104d5c77c58994f3c96aa08bf83bd1f8116 parent 1abb0dc92d706e8c73c7a62ca813738fe2259a7f author Atsushi Nemoto Sun, 25 Jun 2006 05:48:17 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:13 -0700 [PATCH] RTC: rtc-dev UIE emulation Import genrtc's RTC UIE emulation (CONFIG_GEN_RTC_X) to rtc-dev driver with slight adjustments/refinements. This makes UIE-less rtc drivers work better with programs doing read/poll on /dev/rtc, such as hwclock. This emulation should not harm rtc drivers with UIE support, since rtc_dev_ioctl() calls underlaying rtc driver's ioctl() first. Signed-off-by: Atsushi Nemoto Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1abb0dc92d706e8c73c7a62ca813738fe2259a7f tree fb7d8d35431ba09db1c94f2211c56dad64c6687e parent 3eecd1dc57971b2beff699b3704058866c25dedc author David Brownell Sun, 25 Jun 2006 05:48:17 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:13 -0700 [PATCH] "RTC-framework" driver for DS1307 and similar RTC chips This is an "RTC-framework" driver for DS1307 and similar RTC chips, It should be a full replacement for the existing ds1337.c driver (using the older RTC glue), giving a net increase in the number of RTC chips that work out-of-the-box. There's a whole cluster of RTCs that are very similar, but the 1337 driver was a bit too picky to work with most of them. Still no support for RTC alarm IRQs (on chips that support them). Signed-off-by: David Brownell Signed-off-by: James Chapman Signed-off-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3eecd1dc57971b2beff699b3704058866c25dedc tree 9d07a73acdbc705e7cac2eb1a8057f4127df7ed5 parent 3b9c04106b70e46803c69d13d5da32f6129fa76d author Jesper Juhl Sun, 25 Jun 2006 05:48:16 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:13 -0700 [PATCH] Correct sa'K' description in sysrq.txt sysrq SAK is described as being something you should mistake for SAK from c2 compliant systems - whoops. What's meant is that it should *not* be mistaken as such. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b9c04106b70e46803c69d13d5da32f6129fa76d tree b0405d1823ea30cdc07cd5ab5361d39b262e531e parent e5dcd90b53d601a04482db9800336a0ccf190880 author Jan Engelhardt Sun, 25 Jun 2006 05:48:15 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:13 -0700 [PATCH] printk time parameter Currently, enabling/disabling printk timestamps is only possible through reboot (bootparam) or recompile. I normally do not run with timestamps (since syslog handles that in a good manner), but for measuring small kernel delays (e.g. irq probing - see parport thread) I needed subsecond precision, but then again, just for some minutes rather than all kernel messages to come. The following patch adds a module_param() with which the timestamps can be en-/disabled in a live system through /sys/modules/printk/parameters/printk_time. Signed-off-by: Jan Engelhardt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5dcd90b53d601a04482db9800336a0ccf190880 tree b84936f569134612797cfa069401fe88dcac152d parent 3419b23a919698f75944d3e0d97eb1d9c51e4bb6 author Wu Fengguang Sun, 25 Jun 2006 05:48:14 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:13 -0700 [PATCH] radixtree: normalize radix_tree_tag_get() return value In radix_tree_tag_get(), return normalized value of 0/1, as indicated by its comment. Signed-off-by: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3419b23a919698f75944d3e0d97eb1d9c51e4bb6 tree e1b4b6aad754c6a40137c0a563d823074501da2d parent 4ad3bcf3146aa12f41262bb5dd1d9f1778e085b1 author Davide Libenzi Sun, 25 Jun 2006 05:48:14 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:13 -0700 [PATCH] epoll: use unlocked wqueue operations A few days ago Arjan signaled a lockdep red flag on epoll locks, and precisely between the epoll's device structure lock (->lock) and the wait queue head lock (->lock). Like I explained in another email, and directly to Arjan, this can't happen in reality because of the explicit check at eventpoll.c:592, that does not allow to drop an epoll fd inside the same epoll fd. Since lockdep is working on per-structure locks, it will never be able to know of policies enforced in other parts of the code. It was decided time ago of having the ability to drop epoll fds inside other epoll fds, that triggers a very trick wakeup operations (due to possibly reentrant callback-driven wakeups) handled by the ep_poll_safewake() function. While looking again at the code though, I noticed that all the operations done on the epoll's main structure wait queue head (->wq) are already protected by the epoll lock (->lock), so that locked-style functions can be used to manipulate the ->wq member. This makes both a lock-acquire save, and lockdep happy. Running totalmess on my dual opteron for a while did not reveal any problem so far: http://www.xmailserver.org/totalmess.c Signed-off-by: Davide Libenzi Cc: Arjan van de Ven Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ad3bcf3146aa12f41262bb5dd1d9f1778e085b1 tree ee96a92430d5684b81f22c7b7b142b416f1ebd44 parent 21730eed11de42f22afcbd43f450a1872a0b5ea1 author Alexey Dobriyan Sun, 25 Jun 2006 05:48:13 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:13 -0700 [PATCH] nbd: endian annotations Signed-off-by: Alexey Dobriyan Cc: Paul Clements Cc: Jens Axboe Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21730eed11de42f22afcbd43f450a1872a0b5ea1 tree f695865bce3b87bbc9e1f0a8e61eaeecf8442b06 parent 42225a359aa8094242651191ad0ac9c338503d81 author Valerie Henson Sun, 25 Jun 2006 05:48:12 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:12 -0700 [PATCH] Make EXT2_DEBUG work again This patch makes EXT2_DEBUG work again. Due to lack of proper include file, EXT2_DEBUG was undefined in bitmap.c and ext2_count_free() is left out. Moved to balloc.c and removed bitmap.c entirely. Second, debug versions of ext2_count_free_{inodes/blocks} reacquires superblock lock. Moved lock into callers. Signed-off-by: Val Henson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42225a359aa8094242651191ad0ac9c338503d81 tree 39267729bd3e1a0029db587fe5596b4e31d8da67 parent 9de9adb615bddbdb786273c41ec3c03837e32fa5 author Alexey Dobriyan Sun, 25 Jun 2006 05:48:11 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:12 -0700 [PATCH] emu10k1: mark midi_spinlock as used Why is it marked unused when in fact it's used? Signed-off-by: Alexey Dobriyan Cc: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9de9adb615bddbdb786273c41ec3c03837e32fa5 tree d9c37e52c032f9bbb2da5f55868a79b299e58d25 parent eab98702afa567927c9b052499b43acad2f25a1c author Andrew Morton Sun, 25 Jun 2006 05:48:10 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:12 -0700 [PATCH] for_each_cpu_mask() warning fix On UP, this: cpumask_t mask = node_to_cpumask(numa_node_id()); for_each_cpu_mask(cpu, mask) does this: mm/readahead.c: In function `node_readahead_aging': mm/readahead.c:850: warning: unused variable `mask' which is unpleasantly fixed by this: Acked-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eab98702afa567927c9b052499b43acad2f25a1c tree 622b1b52b4107ac15d89312c6fbe9ffbb9bdba00 parent 74bb6a09b2e1e69d91eb6069eb4a7f0c06b84812 author H. Peter Anvin Sun, 25 Jun 2006 05:48:10 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:12 -0700 [PATCH] Make sysctl obligatory except under CONFIG_EMBEDDED Make makes sysctl non-optional unless EMBEDDED is set. There are a number of interfaces exposed via sysctl, enough that it has to be considered core kernel functionality at this point. Signed-off-by: H. Peter Anvin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74bb6a09b2e1e69d91eb6069eb4a7f0c06b84812 tree f55af6ec05bd7f547abf4cf9384e94570076d8c3 parent 69755652c92106855b4b096b7c2935b59e6252c6 author Ingo Molnar Sun, 25 Jun 2006 05:48:09 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:11 -0700 [PATCH] introduce WARN_ON_ONCE(cond) Add WARN_ON_ONCE(cond) to print once-per-bootup messages. [rostedt@goodmis.org: improve code generation] Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Steven Rostedt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69755652c92106855b4b096b7c2935b59e6252c6 tree 099dfc77c2bf177439433783962bba945c15ff80 parent bd40cddae2211950c81c41f25a818189f80fd0b5 author H. Peter Anvin Sun, 25 Jun 2006 05:48:08 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:11 -0700 [PATCH] Make procfs obligatory except under CONFIG_EMBEDDED Make procfs non-optional unless EMBEDDED is set, just like sysfs. procfs is already de facto required for a large subset of Linux functionality. Signed-off-by: H. Peter Anvin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd40cddae2211950c81c41f25a818189f80fd0b5 tree 7568908eb5a049308aa0ad42ef31f080add0ef21 parent 43d23f9039fc810ecd621f1e4f9d578eadce058a author Randy Dunlap Sun, 25 Jun 2006 05:48:08 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:10 -0700 [PATCH] kernel-doc: mm/readhead fixup Put short function description for read_cache_pages() on one line as needed by kernel-doc. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43d23f9039fc810ecd621f1e4f9d578eadce058a tree be241eb5a8e6010f1f8ca9e960bc9838b70d6779 parent 1c2bf374a4b8c2e1a3e6ff3a64fb67272a8cd2e2 author Mingming Cao Sun, 25 Jun 2006 05:48:07 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:10 -0700 [PATCH] ext3_fsblk_t: the rest of in-kernel filesystem blocks conversion Convert the ext3 in-kernel filesystem blocks to ext3_fsblk_t. Convert the rest of all unsigned long type in-kernel filesystem blocks to ext3_fsblk_t, and replace the printk format string respondingly. Signed-off-by: Mingming Cao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c2bf374a4b8c2e1a3e6ff3a64fb67272a8cd2e2 tree abb4e01a4bc146183d5cf1f0e18c1aa6e847aa5e parent cedfb178ada245b6c52a654936b34d7996e26a1d author Mingming Cao Sun, 25 Jun 2006 05:48:06 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:10 -0700 [PATCH] ext3_fsblk_t: filesystem, group blocks and bug fixes Some of the in-kernel ext3 block variable type are treated as signed 4 bytes int type, thus limited ext3 filesystem to 8TB (4kblock size based). While trying to fix them, it seems quite confusing in the ext3 code where some blocks are filesystem-wide blocks, some are group relative offsets that need to be signed value (as -1 has special meaning). So it seem saner to define two types of physical blocks: one is filesystem wide blocks, another is group-relative blocks. The following patches clarify these two types of blocks in the ext3 code, and fix the type bugs which limit current 32 bit ext3 filesystem limit to 8TB. With this series of patches and the percpu counter data type changes in the mm tree, we are able to extend exts filesystem limit to 16TB. This work is also a pre-request for the recent >32 bit ext3 work, and makes the kernel to able to address 48 bit ext3 block a lot easier: Simply redefine ext3_fsblk_t from unsigned long to sector_t and redefine the format string for ext3 filesystem block corresponding. Two RFC with a series patches have been posted to ext2-devel list and have been reviewed and discussed: http://marc.theaimsgroup.com/?l=ext2-devel&m=114722190816690&w=2 http://marc.theaimsgroup.com/?l=ext2-devel&m=114784919525942&w=2 Patches are tested on both 32 bit machine and 64 bit machine, <8TB ext3 and >8TB ext3 filesystem(with the latest to be released e2fsprogs-1.39). Tests includes overnight fsx, tiobench, dbench and fsstress. This patch: Defines ext3_fsblk_t and ext3_grpblk_t, and the printk format string for filesystem wide blocks. This patch classifies all block group relative blocks, and ext3_fsblk_t blocks occurs in the same function where used to be confusing before. Also include kernel bug fixes for filesystem wide in-kernel block variables. There are some fileystem wide blocks are treated as int/unsigned int type in the kernel currently, especially in ext3 block allocation and reservation code. This patch fixed those bugs by converting those variables to ext3_fsblk_t(unsigned long) type. Signed-off-by: Mingming Cao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cedfb178ada245b6c52a654936b34d7996e26a1d tree 3f8d2c3b5a37438e8fa00da93877bc006354ee0d parent b9bcf9c117b0a39f7e59c9682a7b32a9253c0544 author Randy Dunlap Sun, 25 Jun 2006 05:48:05 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:09 -0700 [PATCH] megaraid_mbox: fix section mismatch warnings Fix section warning: WARNING: drivers/scsi/megaraid/megaraid_mbox.o - Section mismatch: reference to .init.text: from .text between 'megaraid_probe_one' (at offset 0x171e) and 'megaraid_queue_command' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9bcf9c117b0a39f7e59c9682a7b32a9253c0544 tree bd87511b73ffeffad05d501eae50ee0b82ffe93d parent ad4063b0b2ffd7c8359b62c830e88152fc39ab20 author Randy.Dunlap Sun, 25 Jun 2006 05:48:05 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:09 -0700 [PATCH] wd7000: fix section mismatch warnings From: Randy Dunlap Fix section mismatch in wd7000 driver: WARNING: drivers/scsi/wd7000.o - Section mismatch: reference to .init.text: from .text after 'wd7000_detect' (at offset 0xa5d) WARNING: drivers/scsi/wd7000.o - Section mismatch: reference to .init.text: from .text after 'wd7000_detect' (at offset 0xab6) WARNING: drivers/scsi/wd7000.o - Section mismatch: reference to .init.text: from .text after 'wd7000_detect' (at offset 0xb67 Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad4063b0b2ffd7c8359b62c830e88152fc39ab20 tree 8bfc0132bd7bf851dbc495b4f9a7460904d332b8 parent 11e64757f9fb32f13f51596bbf01988f42fca764 author Ben Dooks Sun, 25 Jun 2006 05:48:03 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:09 -0700 [PATCH] AX88796 parallel port driver Driver for the simple parallel port interface on the Asix AX88796 chip on an platform_bus. [akpm@osdl.org: x86_64 build fix] Signed-off-by: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11e64757f9fb32f13f51596bbf01988f42fca764 tree 9fab5ffe96db5dae318d04f8979a3883ff35df5b parent 7c12d81134b130ccd4c286b434ca48c4cda71a2f author Matt Helsley Sun, 25 Jun 2006 05:48:03 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:09 -0700 [PATCH] Remove unecessary NULL check in kernel/acct.c copy_process() appears to be the only caller of acct_clear_integrals() and does not pass in NULL task pointers. Remove the unecessary check. Signed-off-by: Matt Helsley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c12d81134b130ccd4c286b434ca48c4cda71a2f tree 32f1451ef52d568d57c75da28313069dc675a206 parent 01408c4939479ec46c15aa7ef6e2406be50eeeca author NeilBrown Sun, 25 Jun 2006 05:48:02 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:09 -0700 [PATCH] Make copy_from_user_inatomic NOT zero the tail on i386 As described in a previous patch and documented in mm/filemap.h, copy_from_user_inatomic* shouldn't zero out the tail of the buffer after an incomplete copy. This patch implements that change for i386. For the _nocache version, a new __copy_user_intel_nocache is defined similar to copy_user_zeroio_intel_nocache, and this is ultimately used for the copy. For the regular version, __copy_from_user_ll_nozero is defined which uses __copy_user and __copy_user_intel - the later needs casts to reposition the __user annotations. If copy_from_user_atomic is given a constant length of 1, 2, or 4, then we do still zero the destintion on failure. This didn't seem worth the effort of fixing as the places where it is used really don't care. Signed-off-by: Neil Brown Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Ralf Baechle Cc: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01408c4939479ec46c15aa7ef6e2406be50eeeca tree 106ee144cc7214cc5cb78bc35a49fc654ef16fe9 parent 5f507d9e05b4dbfee34f3d967623ad3fbf0f28b3 author NeilBrown Sun, 25 Jun 2006 05:47:58 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:09 -0700 [PATCH] Prepare for __copy_from_user_inatomic to not zero missed bytes The problem is that when we write to a file, the copy from userspace to pagecache is first done with preemption disabled, so if the source address is not immediately available the copy fails *and* *zeros* *the* *destination*. This is a problem because a concurrent read (which admittedly is an odd thing to do) might see zeros rather that was there before the write, or what was there after, or some mixture of the two (any of these being a reasonable thing to see). If the copy did fail, it will immediately be retried with preemption re-enabled so any transient problem with accessing the source won't cause an error. The first copying does not need to zero any uncopied bytes, and doing so causes the problem. It uses copy_from_user_atomic rather than copy_from_user so the simple expedient is to change copy_from_user_atomic to *not* zero out bytes on failure. The first of these two patches prepares for the change by fixing two places which assume copy_from_user_atomic does zero the tail. The two usages are very similar pieces of code which copy from a userspace iovec into one or more page-cache pages. These are changed to remove the assumption. The second patch changes __copy_from_user_inatomic* to not zero the tail. Once these are accepted, I will look at similar patches of other architectures where this is important (ppc, mips and sparc being the ones I can find). This patch: There is a problem with __copy_from_user_inatomic zeroing the tail of the buffer in the case of an error. As it is called in atomic context, the error may be transient, so it results in zeros being written where maybe they shouldn't be. In the usage in filemap, this opens a window for a well timed read to see data (zeros) which is not consistent with any ordering of reads and writes. Most cases where __copy_from_user_inatomic is called, a failure results in __copy_from_user being called immediately. As long as the latter zeros the tail, the former doesn't need to. However in *copy_from_user_iovec implementations (in both filemap and ntfs/file), it is assumed that copy_from_user_inatomic will zero the tail. This patch removes that assumption, so that after this patch it will be safe for copy_from_user_inatomic to not zero the tail. This patch also adds some commentary to filemap.h and asm-i386/uaccess.h. After this patch, all architectures that might disable preempt when kmap_atomic is called need to have their __copy_from_user_inatomic* "fixed". This includes - powerpc - i386 - mips - sparc Signed-off-by: Neil Brown Cc: David Howells Cc: Anton Altaparmakov Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Ralf Baechle Cc: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f507d9e05b4dbfee34f3d967623ad3fbf0f28b3 tree 3980edaeac02db4a4e6c5b2e1bb603c2533ebd33 parent 3b364b8d584b94777f8446a943b3c65e75e758f8 author Andreas Mohr Sun, 25 Jun 2006 05:47:57 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:09 -0700 [PATCH] constify libcrc32c table constify a medium-large CRC code table. Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b364b8d584b94777f8446a943b3c65e75e758f8 tree 423b5a0f5b8ea77deffa053443911b226fcb0ab1 parent 43b0bc00fdbf2f1503a57f0c2c1338438c5d2805 author Andreas Mohr Sun, 25 Jun 2006 05:47:56 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:08 -0700 [PATCH] constify parts of kernel/power/ Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43b0bc00fdbf2f1503a57f0c2c1338438c5d2805 tree 1009ac1c764b21c50f96e2a108a2736504d9588a parent dc851a0fd2736e8dc3e90bd990cb911a0013da67 author Chris Wright Sun, 25 Jun 2006 05:47:55 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:08 -0700 [PATCH] cpuset: remove extra cpuset_zone_allowed check in __alloc_pages This is redundant with check in wakeup_kswapd. Signed-off-by: Chris Wright Acked-by: Paul Jackson Acked-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc851a0fd2736e8dc3e90bd990cb911a0013da67 tree 715f381d67be16d27fd656eb1dd8d5dd3a52c10a parent 8ea2c2ecfcc1f31eaba8d1995b2e734ba821806a author David Wilder Sun, 25 Jun 2006 05:47:55 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:08 -0700 [PATCH] Updated kdump documentation Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ea2c2ecfcc1f31eaba8d1995b2e734ba821806a tree 80f87b4b84897c795941f97f56311abf72f46ecf parent 8a7f7c9307962ffdf81561ec8742fde1fad9fe10 author Jesper Juhl Sun, 25 Jun 2006 05:47:54 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:08 -0700 [PATCH] moxa: partial CodingStyle cleanup & spelling fixes Do a *partial* CodingStyle cleanup, correct some spelling in printk()'s && convert C++ comments to C comments - in moxa driver. Signed-off-by: Jesper Juhl Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a7f7c9307962ffdf81561ec8742fde1fad9fe10 tree cd2a2e0764a3e57a6ea99e0967379031f68ea3d6 parent 56e139f62bd7b82430cfcf01fcbd42e1d84fb738 author Jesper Juhl Sun, 25 Jun 2006 05:47:53 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:08 -0700 [PATCH] moxa: remove pointless check of 'tty' argument vs NULL Remove pointless check of 'tty' argument vs NULL from moxa driver. Signed-off-by: Jesper Juhl Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56e139f62bd7b82430cfcf01fcbd42e1d84fb738 tree e29ec21f9d8be0426b754dc1523a4abd7eb489a6 parent d2e5b13c4a7c68fdbcf389c9fffc12cfa2c185af author Jesper Juhl Sun, 25 Jun 2006 05:47:52 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:08 -0700 [PATCH] moxa: remove pointless casts Signed-off-by: Jesper Juhl Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2e5b13c4a7c68fdbcf389c9fffc12cfa2c185af tree 8e82fbc922646a754918de5381e5e0d4efcc896e parent e8f1c6227a0bc9b1e3a7e87cd31f650a909f647f author Theodore Ts'o Sun, 25 Jun 2006 05:47:52 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:07 -0700 [PATCH] ext3: remove inconsistent space before exclamation point in mount code This was reported as Debian bug #336604. Signed-off-by: "Theodore Ts'o" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8f1c6227a0bc9b1e3a7e87cd31f650a909f647f tree 7cca3fbb4f03f054d9f6886e0062f84f11cc9dfb parent f16fdadba28add689b567cf03c21dd6dec8e43be author Theodore Ts'o Sun, 25 Jun 2006 05:47:51 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:07 -0700 [PATCH] ext3: fix memory leak when the journal file is corrupted Signed-off-by: "Theodore Ts'o" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f16fdadba28add689b567cf03c21dd6dec8e43be tree 2beb4c826cb075f9569e709238ea13ceda5e9984 parent fcd5df35882b128ef3e160fab3074e6fe7ae501b author Theodore Ts'o Sun, 25 Jun 2006 05:47:50 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:07 -0700 [PATCH] ext2: clean up dead code from mount code The variable i is guaranteed to be the same as db_count given the previous for loop. So get rid of it since it's dead code. Signed-off-by: "Theodore Ts'o" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fcd5df35882b128ef3e160fab3074e6fe7ae501b tree 2ffa30054f510e0fdca988d18ab28d6df12c3f06 parent b61367732fc273977cc3fb85c272ce1a7bb1f533 author Mingming Cao Sun, 25 Jun 2006 05:47:50 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:07 -0700 [PATCH] Avoid disk sector_t overflow for >2TB ext3 filesystem If ext3 filesystem is larger than 2TB, and sector_t is a u32 (i.e. CONFIG_LBD not defined in the kernel), the calculation of the disk sector will overflow. Add check at ext3_fill_super() and ext3_group_extend() to prevent mount/remount/resize >2TB ext3 filesystem if sector_t size is 4 bytes. Verified this patch on a 32 bit platform without CONFIG_LBD defined (sector_t is 32 bits long), mount refuse to mount a 10TB ext3. Signed-off-by: Mingming Cao Acked-by: Andreas Dilger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b61367732fc273977cc3fb85c272ce1a7bb1f533 tree 92aa6fc7f58b65f322f32612741c64347bc57152 parent 232acbcf5304c29f5bb03b0dddeaefd0f98ef45e author Andrew Morton Sun, 25 Jun 2006 05:47:49 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:07 -0700 [PATCH] schedule_on_each_cpu(): reduce kmalloc() size schedule_on_each_cpu() presently does a large kmalloc - 96 kbytes on 1024 CPU 64-bit. Rework it so that we do one 8192-byte allocation and then a pile of tiny ones, via alloc_percpu(). This has a much higher chance of success (100% in the current VM). This also has the effect of reducing the memory requirements from NR_CPUS*n to num_possible_cpus()*n. Cc: Christoph Lameter Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 232acbcf5304c29f5bb03b0dddeaefd0f98ef45e tree a5ddf8cf470c25d00dba942003a20625b02a68f2 parent 05189497d10c715bf41c05fb2fd89aa2cf7602f1 author Randy Dunlap Sun, 25 Jun 2006 05:47:48 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:07 -0700 [PATCH] kernel-doc: script cleanups Fix indentation. Quote a brace '{' so that vi won't be fooled by it. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05189497d10c715bf41c05fb2fd89aa2cf7602f1 tree 505d66eb295267c4b744434fba33171729335d22 parent 5d18639a833e9f034b055dcbb16a980be627f475 author Randy Dunlap Sun, 25 Jun 2006 05:47:47 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:07 -0700 [PATCH] kernel-doc: drop leading space in sections Drop leading space of kernel-doc section contents. "Section" data (contents) are split from the section header (e.g., Note: below is a section header: * Note: list_empty on entry does not return true after this, the entry is * in an undefined state. ). Currently the data/contents begins with a space and is left that way, which causes it to look bad when printed (in text mode; see example below), so just remove the leading space. Note: list_empty on entry does not return true after this, the entry is in an undefined state. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d18639a833e9f034b055dcbb16a980be627f475 tree 48f849e4218f61db636221971c378688dc2c0d45 parent d616e09ab33aa4d013a93c9b393efd5cebf78521 author Chris Wedgwood Sun, 25 Jun 2006 05:47:46 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:06 -0700 [PATCH] EDD isn't EXPERIMENTAL anymore Lots of people use this. Apparently RH has for over 18 months so lets drop EXPERIMENTAL. Signed-off-by: Chris Wedgwood Cc: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d616e09ab33aa4d013a93c9b393efd5cebf78521 tree 13837ef8dc9e955c621d798235c064218b56361d parent bc64863814b14a4f75884746e68d3bf9f96b3559 author Andrew Morton Sun, 25 Jun 2006 05:47:46 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:06 -0700 [PATCH] pdflush: handle resume wakeups pdflush is carefully designed to ensure that all wakeups have some corresponding work to do - if a woken-up pdflush thread discovers that it hasn't been given any work to do then this is considered an error. That all broke when swsusp came along - because a timer-delivered wakeup to a frozen pdflush thread will just get lost. This causes the pdflush thread to get lost as well: the writeback timer is supposed to be re-armed by pdflush in process context, but pdflush doesn't execute the callout which does this. Fix that up by ignoring the return value from try_to_freeze(): jsut proceed, see if we have any work pending and only go back to sleep if that is not the case. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc64863814b14a4f75884746e68d3bf9f96b3559 tree 4f44a0690231ee9bd98a200fdf0c25f17bcb2095 parent dbe217af3be08346f4b1abb885c2d9ec29c98fac author Andrew Morton Sun, 25 Jun 2006 05:47:45 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:06 -0700 [PATCH] cpqarray section fix WARNING: drivers/block/cpqarray.o - Section mismatch: reference to .init.text: from .text between 'cpqarray_register_ctlr' (at offset 0xe98) and 'alloc_cpqarray_hba' WARNING: drivers/block/cpqarray.o - Section mismatch: reference to .init.text: from .text between 'cpqarray_register_ctlr' (at offset 0xe9c) and 'alloc_cpqarray_hba' Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbe217af3be08346f4b1abb885c2d9ec29c98fac tree 493ee2547ba3095d7aa468d6ddffc1a82f18ce56 parent 8e3a67a99231f9f3f476bc3449e93c9a6a17f2e0 author Alan Cox Sun, 25 Jun 2006 05:47:44 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:06 -0700 [PATCH] IDE CD end-of media error fix This is a patch from Alan that fixes a real ide-cd.c regression causing bogus "Media Check" failures for perfectly valid Fedora install ISOs, on certain CD-ROM drives. This is a forward port to 2.6.16 (from RHEL) of the minimal changes for the end of media problem. It may not be sufficient for some controllers (promise notably) and it does not touch the locking so the error path locking is as horked as in mainstream. From: Ingo Molnar I have ported the patch to 2.6.17-rc4 and tested it by provoking end-of-media IO errors with an unaligned ISO image. Unlike the vanilla kernel, the patched kernel interpreted the error condition correctly with 512 byte granularity: hdc: command error: status=0x51 { DriveReady SeekComplete Error } hdc: command error: error=0x54 { AbortedCommand LastFailedSense=0x05 } ide: failed opcode was: unknown ATAPI device hdc: Error: Illegal request -- (Sense key=0x05) Illegal mode for this track or incompatible medium -- (asc=0x64, ascq=0x00) The failed "Read 10" packet command was: "28 00 00 04 fb 78 00 00 06 00 00 00 00 00 00 00 " end_request: I/O error, dev hdc, sector 1306080 Buffer I/O error on device hdc, logical block 163260 Buffer I/O error on device hdc, logical block 163261 Buffer I/O error on device hdc, logical block 163262 the unpatched kernel produces an incorrect error dump: hdc: command error: status=0x51 { DriveReady SeekComplete Error } hdc: command error: error=0x54 { AbortedCommand LastFailedSense=0x05 } ide: failed opcode was: unknown end_request: I/O error, dev hdc, sector 1306080 Buffer I/O error on device hdc, logical block 163260 hdc: command error: status=0x51 { DriveReady SeekComplete Error } hdc: command error: error=0x54 { AbortedCommand LastFailedSense=0x05 } ide: failed opcode was: unknown end_request: I/O error, dev hdc, sector 1306088 Buffer I/O error on device hdc, logical block 163261 hdc: command error: status=0x51 { DriveReady SeekComplete Error } hdc: command error: error=0x54 { AbortedCommand LastFailedSense=0x05 } ide: failed opcode was: unknown end_request: I/O error, dev hdc, sector 1306096 Buffer I/O error on device hdc, logical block 163262 I do not have the right type of CD-ROM drive to reproduce the end-of-media data corruption bug myself, but this same patch in RHEL solved it. Signed-off-by: Ingo Molnar Cc: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Jens Axboe Cc: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e3a67a99231f9f3f476bc3449e93c9a6a17f2e0 tree c61f89a407b261b74a7eca70388c22e8f6db7744 parent fe96e57d77481c8c1b6b0381d7e086870ac394fa author Randy Dunlap Sun, 25 Jun 2006 05:47:43 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:06 -0700 [PATCH] list.h doc: change "counter" to "cursor" Use loop "cursor" instead of loop "counter" for list iterator descriptions. They are not counters, they are pointers or positions. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe96e57d77481c8c1b6b0381d7e086870ac394fa tree cff217baf9eeebe74b030adcc8c62cfcc01515cc parent dbf492d6c1a1bf5a8bda40274f479119f4c42ca4 author Randy Dunlap Sun, 25 Jun 2006 05:47:42 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:06 -0700 [PATCH] fix list.h kernel-doc kernel-doc: Put all short function descriptions on one line or if they are too long, omit the short description & add a Description: section for them. Change some list iterator descriptions to use "current" point instead of "existing" point. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbf492d6c1a1bf5a8bda40274f479119f4c42ca4 tree 21f63aa351d91c6991f41a9b9d04c7d543837c51 parent 83cc5ed3c4c65fc4c3729a5cec2111ede1ebf85e author Pavel Machek Sun, 25 Jun 2006 05:47:42 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:06 -0700 [PATCH] nbd: kill obsolete changelog, add GPL nbd abuses file header as a changelog (and obsolete one, too), and fails to mention GPL. This fixes it. Signed-off-by: Pavel Machek Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83cc5ed3c4c65fc4c3729a5cec2111ede1ebf85e tree ea2b6b04117ad88c41a5059bdaf36a7a505808c0 parent 76a8ad293912cd2f01eca075d80cd0ddec30c627 author Adrian Bunk Sun, 25 Jun 2006 05:47:41 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:06 -0700 [PATCH] kernel/sys.c: cleanups - proper prototypes for the following functions: - ctrl_alt_del() (in include/linux/reboot.h) - getrusage() (in include/linux/resource.h) - make the following needlessly global functions static: - kernel_restart_prepare() - kernel_kexec() [akpm@osdl.org: compile fix] Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76a8ad293912cd2f01eca075d80cd0ddec30c627 tree 1ff683dcd5b1351b403d3efe701d0dd9eddcd773 parent 8ae6e163c1b637e1cb125613726ffbd31ca44fdf author Michael Ellerman Sun, 25 Jun 2006 05:47:40 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:05 -0700 [PATCH] Make printk work for really early debugging Currently printk is no use for early debugging because it refuses to actually print anything to the console unless cpu_online(smp_processor_id()) is true. The stated explanation is that console drivers may require per-cpu resources, or otherwise barf, because the system is not yet setup correctly. Fair enough. However some console drivers might be quite happy running early during boot, in fact we have one, and so it'd be nice if printk understood that. So I added a flag (which I would have called CON_BOOT, but that's taken) called CON_ANYTIME, which indicates that a console is happy to be called anytime, even if the cpu is not yet online. Tested on a Power 5 machine, with both a CON_ANYTIME driver and a bogus console driver that BUG()s if called while offline. No problems AFAICT. Built for i386 UP & SMP. Signed-off-by: Michael Ellerman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ae6e163c1b637e1cb125613726ffbd31ca44fdf tree 28a0f2be841d9b8ff0ab86a3706acce41ac0b6f9 parent dcd96379613a3cbe87c30e1c20122ecdcdf3a4b8 author Deepak Saxena Sun, 25 Jun 2006 05:47:38 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:05 -0700 [PATCH] Add driver for ARM AMBA PL031 RTC Add a driver for the ARM PL031 RTC found on some ARM SOCs. The driver is fairly trivial as the RTC only provides a read/write and alarm capability. [akpm@osdl.org: compile fix] Signed-off-by: Deepak Acked-by: Alessandro Zummo Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcd96379613a3cbe87c30e1c20122ecdcdf3a4b8 tree a993e3a14340feb966312078c79e7b9fc1bddbb3 parent a04ee14636fa339c4609766bd6173629d4f9026e author Daniel Walker Sun, 25 Jun 2006 05:47:37 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:05 -0700 [PATCH] idetape gcc 4.1 warning fix In both the read and write cases it will return an error if copy_{from/to}_user faults. However, I let the driver try to read/write as much as it can just as it normally would , then finally it returns an error if there was one. This was the most straight forward way to handle the error , since there isn't a clear way to clean up the buffers on error . I moved retval in idetape_chrdev_write() down into the actual code blocks since it's really once used there, and it conflicted with my ret variable. Fixes the following warning, drivers/ide/ide-tape.c: In function ‘idetape_copy_stage_from_user’: drivers/ide/ide-tape.c:2662: warning: ignoring return value of ‘copy_from_user’, declared with attribute warn_unused_result drivers/ide/ide-tape.c: In function ‘idetape_copy_stage_to_user’: drivers/ide/ide-tape.c:2689: warning: ignoring return value of ‘copy_to_user’, declared with attribute warn_unused_result Signed-off-by: Daniel Walker Cc: Alan Cox Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a04ee14636fa339c4609766bd6173629d4f9026e tree 2a0e960d35f9cc586d128578adbf4a11aac45e40 parent 515decdccf81cfbf5273d7f0085aea954ecd26c4 author Jan Engelhardt Sun, 25 Jun 2006 05:47:36 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:05 -0700 [PATCH] openpromfs: factorize out "Move" "common code" out to PTR_NOD, which does the conversion from private pointer to node number. This is to reduce potential casting/conversion errors due to redundancy. (The naming PTR_NOD follows PTR_ERR, turning a pointer into xyz.) [akpm@osdl.org: cleanups] Signed-off-by: Jan Engelhardt Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 515decdccf81cfbf5273d7f0085aea954ecd26c4 tree c111b7976b8699c41216b1e40488e569088e3e71 parent 0928d68056fa25456830b1de9f0ee89bc37447cd author Jan Engelhardt Sun, 25 Jun 2006 05:47:35 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:05 -0700 [PATCH] openpromfs: remove unnecessary casts Remove unnecessary casts in fs/openpromfs/inode.c Signed-off-by: Jan Engelhardt Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0928d68056fa25456830b1de9f0ee89bc37447cd tree eafca87385013b4ff11a11192de048a0e0a0b3b3 parent 2e6113908fe76a06295cb243f1f2f0eea055b0c2 author Jan Engelhardt Sun, 25 Jun 2006 05:47:35 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:05 -0700 [PATCH] openpromfs: fix missing NUL tchars is not '\0'-terminated so the strtoul may run into problems. Fix that. Also make tchars as big as a long in hexadecimal form would take rather than just 16. Signed-off-by: Jan Engelhardt Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e6113908fe76a06295cb243f1f2f0eea055b0c2 tree 4c96b49de408c0813a148db1e5c35c4acf1f0dc6 parent 59cc185ada89245204c658ebcf64422968736672 author Adrian Bunk Sun, 25 Jun 2006 05:47:34 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:05 -0700 [PATCH] drivers/char/applicom.c: proper module_{init,exit} Convert the driver to use module_{init,exit}. Signed-off-by: Adrian Bunk Acked-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59cc185ada89245204c658ebcf64422968736672 tree 042e46cfe90c2ad5b711e2791b05f73ab1fe7725 parent a2926b1449bcc3d348e2228114b04869dc2f3986 author Markus Armbruster Sun, 25 Jun 2006 05:47:33 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:04 -0700 [PATCH] oprofile: convert from semaphores to mutexes Signed-off-by: Markus Armbruster Cc: Philippe Elie Cc: John Levon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2926b1449bcc3d348e2228114b04869dc2f3986 tree 175f542cced7975960cc313b375d64b27d622560 parent 138bb68ac9d49b0ea7eeecb3a245dc4e20f181da author Andrew Morton Sun, 25 Jun 2006 05:47:32 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:04 -0700 [PATCH] msnd section fix WARNING: sound/oss/msnd.o - Section mismatch: reference to .init.text:msnd_register from __ksymtab between '__ksymtab_msnd_register' (at offset 0x0) and '__ksymtab_msnd_unregister' This symbol is exported. It'll oops if the driver is nonmodular and the caller is modular. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 138bb68ac9d49b0ea7eeecb3a245dc4e20f181da tree 5918b8b5e8fa13a85879b48b4201e716c16c0e05 parent 098d5af7be694c66af44093f7217da3d22af1057 author Adrian Bunk Sun, 25 Jun 2006 05:47:32 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:04 -0700 [PATCH] fs/ufs/inode.c: make 2 functions static Make two needlessly global functions static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 098d5af7be694c66af44093f7217da3d22af1057 tree 6bd0fddb63e63bab540b14edc5b7591abc2d91ba parent ee3ffd6c126323693b3b32a71a1f1acfce30bd66 author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:31 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:04 -0700 [PATCH] ufs: ubh_ll_rw_block cleanup In ufs code there is function: ubh_ll_rw_block, it has parameter how many ufs_buffer_head it should handle, but it always called with "1" on the place of this parameter. This patch removes unused parameter of "ubh_ll_wr_block". Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee3ffd6c126323693b3b32a71a1f1acfce30bd66 tree 942b653ebc46c5c4f246ddee8a89b154122f1493 parent 577a82752f95a5680d7c14569ffd3fd630d9fb22 author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:30 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:04 -0700 [PATCH] ufs: make fsck -f happy ufs super block contains some statistic about file systems, like amount of directories, free blocks, inodes and so on. UFS1 hold this information in one location and uses 32bit integers for such information, UFS2 hold statistic in another location and uses 64bit integers. There is transition variant, if UFS1 has type 44BSD and flags field in super block has some special value this mean that we work with statistic like UFS2 does. and this also means that nobody care about old(UFS1) statistic. So if start fsck against such file system, after usage linux ufs driver, it found error: at now only UFS1 like statistic is updated. This patch should fix this. Also it contains some minor cleanup: CodingSytle and remove unused variables. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 577a82752f95a5680d7c14569ffd3fd630d9fb22 tree de2edd4f9f0126d8799bbbe9926290c94cb14eee parent 647b7e87b56f594daf648f44abfbeeb5eb6a9457 author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:30 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:04 -0700 [PATCH] ufs: fsync implementation Presently ufs doesn't support "fsync", this make some applications unhappy, for example vim. This patch fixes this situation. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 647b7e87b56f594daf648f44abfbeeb5eb6a9457 tree 2a81679a2a9f7ee0a0ad984fbae4d43be050fd51 parent f391475812ba39afa322c835217ffe936f5e754a author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:29 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:04 -0700 [PATCH] ufs: one way to access super block Super block of UFS usually has size >512, because of fragment size may be 512, this cause some problems. Currently, there are two methods to work with ufs super block: 1) split structure which describes ufs super blocks into structures with size <=512 2) use one structure which describes ufs super block, and hope that array of "buffer_head" which holds "super block", has such construction: bh[n]->b_data + bh[n]->b_size == bh[n + 1]->b_data The second variant may cause some problems in the future, and usage of two variants cause unnecessary code duplication. This patch remove the second variant. Also patch contains some CodingStyle fixes. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f391475812ba39afa322c835217ffe936f5e754a tree d5bf0a5ec79b0bebe87988734c316b18360f42a8 parent 96710b29e05f3b470bc4206366021b56e28d5208 author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:28 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:04 -0700 [PATCH] ufs: missed brelse and wrong baseblk This patch fixes two bugs, which introduced by previous patches: 1) Missed "brelse" 2) Sometimes "baseblk" may be wrongly calculated, if i_size is equal to zero, which lead infinite cycle in "mpage_writepages". Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96710b29e05f3b470bc4206366021b56e28d5208 tree fad4aeb5679b4f901068387df49cf85049d15350 parent 022a6dc5f461a30615bcd1687569abeee7ef8ba2 author Andrew Morton Sun, 25 Jun 2006 05:47:28 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:04 -0700 [PATCH] ufs: printk warning fixes fs/ufs/super.c: In function `ufs_print_super_stuff': fs/ufs/super.c:103: warning: unsigned int format, different type arg (arg 2) fs/ufs/super.c: In function `ufs2_print_super_stuff': fs/ufs/super.c:147: warning: unsigned int format, different type arg (arg 2) fs/ufs/super.c: In function `ufs_print_cylinder_stuff': fs/ufs/super.c:175: warning: unsigned int format, different type arg (arg 2) Cc: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 022a6dc5f461a30615bcd1687569abeee7ef8ba2 tree 8f16f7d70aa443f0d53bed70ac8633ec6febd87c parent 2e006393ba5b599d9c43f94f8d8989e68131433e author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:27 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:03 -0700 [PATCH] ufs: zero metadata Presently if we allocate several "metadata" blocks (pointers to indirect blocks for example), we fill with zeroes only the first block. This cause some problems in "truncate" function. Also this patch remove some unused arguments from several functions and add comments. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e006393ba5b599d9c43f94f8d8989e68131433e tree 541161158464b388db66093ec9eb25425b0e2d5e parent 50aa4eb0b978f4a0283471c776ed812269ac8af5 author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:26 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:03 -0700 [PATCH] ufs: unlock_super without lock ufs_free_blocks function looks now in so way: if (err) goto failed; lock_super(); failed: unlock_super(); So if error happen we'll unlock not locked super. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50aa4eb0b978f4a0283471c776ed812269ac8af5 tree eab23004eac1e89ea87f189c95bdb7c9dbe93ca3 parent dd187a2603d9904ddc410441348f0cfc558a5233 author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:26 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:03 -0700 [PATCH] ufs: i_blocks wrong count At now UFS code uses DQUOT_* mechanism, but it also update inode->i_blocks manually, this cause wrong i_blocks value. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd187a2603d9904ddc410441348f0cfc558a5233 tree a3859f88d1f458a18d31a231f03c955393282255 parent abf5d15fd2e52517dd56a17a846d5a1f900b7db4 author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:25 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:03 -0700 [PATCH] ufs: little directory lookup optimization This patch make little optimization of ufs_find_entry like "ext2" does. Save number of page and reuse it again in the next call. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abf5d15fd2e52517dd56a17a846d5a1f900b7db4 tree ea537760c201cea57b468044dc733e06781ece2b parent 5afb3145c9a733166174e1f5a07c46410b5c4091 author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:24 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:03 -0700 [PATCH] ufs: easy debug Currently to turn on debug mode "user" has to edit ~10 files, to turn off he has to do it again. This patch introduce such changes: 1)turn on(off) debug messages via ".config" 2)remove unnecessary duplication of code 3)make "UFSD" macros more similar to function 4)fix some compiler warnings Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5afb3145c9a733166174e1f5a07c46410b5c4091 tree ed0b764a4bae09f4d4d6e5f18e0a77103794de94 parent 3e41f597b1595479e4a1b2e6b17b3542120ef165 author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:24 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:03 -0700 [PATCH] ufs: Unmark CONFIG_UFS_FS_WRITE as BROKEN To find new bugs, I suggest revert this patch: http://lkml.org/lkml/2006/1/31/275 in -mm tree. So others can test "write support" of UFS. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e41f597b1595479e4a1b2e6b17b3542120ef165 tree a4adfd190f25b6b896ae04e9d4cbd6c4d94c872c parent 9695ef16ed4e00b59303f39f9a4a422a2c6a3b89 author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:23 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:02 -0700 [PATCH] ufs: not usual amounts of fragments per block The writing to UFS file system with block/fragment!=8 may cause bogus behaviour. The problem in "ufs_bitmap_search" function, which doesn't work correctly in "block/fragment!=8" case. The idea is stolen from BSD code. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9695ef16ed4e00b59303f39f9a4a422a2c6a3b89 tree fba8946e86a523a5d53936cf5ec9e0a150037f73 parent b71034e5e67d1577424cebe7bbb7d0ce134a4cd8 author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:22 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:02 -0700 [PATCH] ufs: wrong type cast There are two ugly macros in ufs code: #define UCPI_UBH ((struct ufs_buffer_head *)ucpi) #define USPI_UBH ((struct ufs_buffer_head *)uspi) when uspi looks like struct { struct ufs_buffer_head ; } and USPI_UBH has some sence, ucpi looks like struct { struct not_ufs_buffer_head; } To prevent bugs in future, this patch convert macros to inline function and fix "ucpi" structure. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b71034e5e67d1577424cebe7bbb7d0ce134a4cd8 tree 4e4ffe95db731bbdc81d086d2b4462b3ab5867c2 parent 826843a347cc8fd596a4c73d3fbdf04a1f130b8a author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:22 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:02 -0700 [PATCH] ufs: directory and page cache: from blocks to pages Change function in fs/ufs/dir.c and fs/ufs/namei.c to work with pages instead of straight work with blocks. It fixed such bugs: * for i in `seq 1 1000`; do touch $i; done - crash system * mkdir create directory without "." and ".." entries Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 826843a347cc8fd596a4c73d3fbdf04a1f130b8a tree f9511e70a57bd2c6432bdbd8fa6957881121266b parent 6ef4d6bf86a82965896eaa1a189177239ec2bbab author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:21 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:02 -0700 [PATCH] ufs: directory and page cache: install aops This series of patches finished "bugs fixing" mentioned here http://lkml.org/lkml/2006/1/31/275 . The main bugs: * for i in `seq 1 1000`; do touch $i; done - crash system * mkdir create directory without "." and ".." entries The suggested solution is work with page cache instead of straight work with blocks. Such solution has following advantages * reduce code size and its complexity * some global locks go away * fix bugs The most part of code is stolen from ext2, because of it has similar directory structure. Patches testes with UFS1 and UFS2 file systems. This patch installs i_mapping->a_ops for directory inodes and removes some duplicated code. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ef4d6bf86a82965896eaa1a189177239ec2bbab tree 3217c5601d8cf6701f8783ec776aa96d0dd75d4a parent c9a27b5dca52bbd0955e065e49e56eb313d02c34 author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:20 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:01 -0700 [PATCH] ufs: change block number on the fly First of all some necessary notes about UFS by it self: To avoid waste of disk space the tail of file consists not from blocks (which is ordinary big enough, 16K usually), it consists from fragments(which is ordinary 2K). When file is growing its tail occupy 1 fragment, 2 fragments... At some stage decision to allocate whole block is made and all fragments are moved to one block. How this situation was handled before: ufs_prepare_write ->block_prepare_write ->ufs_getfrag_block ->... ->ufs_new_fragments: bh = sb_bread bh->b_blocknr = result + i; mark_buffer_dirty (bh); This is wrong solution, because: - it didn't take into consideration that there is another cache: "inode page cache" - because of sb_getblk uses not b_blocknr, (it uses page->index) to find certain block, this breaks sb_getblk. How this situation is handled now: we go though all "page inode cache", if there are no such page in cache we load it into cache, and change b_blocknr. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9a27b5dca52bbd0955e065e49e56eb313d02c34 tree 6e5223f9ee942e8a55552138aa67ef2a37e01738 parent 2061df0f89201c0abeb4c17d343309c9fae5b861 author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:19 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:01 -0700 [PATCH] ufs: right block allocation * After block allocation, we map it on the same "address" as 8 others blocks * We nullify block several times: once in ufs/block.c and once in block_*write_full_page, and use different "caches" for this. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2061df0f89201c0abeb4c17d343309c9fae5b861 tree a641b77e6197e6416dc043452db347dbfbb4bd3e parent a9adb8dbcd7a337620862106f8c17aeb5e7278c7 author Evgeniy Dushistov Sun, 25 Jun 2006 05:47:18 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:01 -0700 [PATCH] ufs: ufs_trunc_indirect: infinite cycle Currently, ufs write support have two sets of problems: work with files and work with directories. This series of patches should solve the first problem. This patch is similar to http://lkml.org/lkml/2006/1/17/61 this patch complements it. The situation the same: in ufs_trunc_(not direct), we read block, check if count of links to it is equal to one, if so we finish cycle, if not continue. Because of "count of links" always >=2 this operation cause infinite cycle and hang up the kernel. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9adb8dbcd7a337620862106f8c17aeb5e7278c7 tree c70b44cb6576c8034f52244af76a52c887146d4b parent 552c03483e49a69312c9e7384fda9282c991880a author Jesper Juhl Sun, 25 Jun 2006 05:47:17 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:01 -0700 [PATCH] pnp: card_probe(): fix memory leak We can leak `clink' if drv->probe == 0. Signed-off-by: Jesper Juhl Cc: Adam Belay Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 552c03483e49a69312c9e7384fda9282c991880a tree 6c8befc8c1e2335220ff7212e30c9ff31b695da9 parent bbb1747d4e44ce49acc73daa8d66e5f6bd546f1b author Cliff Wickman Sun, 25 Jun 2006 05:47:16 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:01 -0700 [PATCH] fs/freevxfs: cleanup of spelling errors Fix of some spelling errors in fs/freevxfs error messages and comments Signed-off-by: Cliff Wickman Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bbb1747d4e44ce49acc73daa8d66e5f6bd546f1b tree 28e9192804d3335e7585dd34bd4d5d9f236afc27 parent bfe5d834195b3089b8846577311340376cc0f450 author Alan Stern Sun, 25 Jun 2006 05:47:15 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:01 -0700 [PATCH] Allow raw_notifier callouts to unregister themselves Since raw_notifier chains don't benefit from any centralized locking protections, they shouldn't suffer from the associated limitations. Under some circumstances it might make sense for a raw_notifier callout routine to unregister itself from the notifier chain. This patch (as678) changes the notifier core to allow for such things. Signed-off-by: Alan Stern Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bfe5d834195b3089b8846577311340376cc0f450 tree 52470de0fe87ff8372700e3472735cd5c14cee9d parent 6ceab8a936c302c0cea2bfe55617c76e2f5746fa author Paul Mackerras Sun, 25 Jun 2006 05:47:14 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:01 -0700 [PATCH] Define __raw_get_cpu_var and use it There are several instances of per_cpu(foo, raw_smp_processor_id()), which is semantically equivalent to __get_cpu_var(foo) but without the warning that smp_processor_id() can give if CONFIG_DEBUG_PREEMPT is enabled. For those architectures with optimized per-cpu implementations, namely ia64, powerpc, s390, sparc64 and x86_64, per_cpu() turns into more and slower code than __get_cpu_var(), so it would be preferable to use __get_cpu_var on those platforms. This defines a __raw_get_cpu_var(x) macro which turns into per_cpu(x, raw_smp_processor_id()) on architectures that use the generic per-cpu implementation, and turns into __get_cpu_var(x) on the architectures that have an optimized per-cpu implementation. Signed-off-by: Paul Mackerras Acked-by: David S. Miller Acked-by: Ingo Molnar Acked-by: Martin Schwidefsky Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ceab8a936c302c0cea2bfe55617c76e2f5746fa tree bf2d8a37766ce24e96c69474dd7fa12b135dbbe3 parent 0f41a53a6699209216327cd4b506711610ad24c5 author Matt Mackall Sun, 25 Jun 2006 05:47:13 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:00 -0700 [PATCH] random: remove redundant SA_SAMPLE_RANDOM from touchscreen drivers The core input layer is already calling add_input_randomness. Signed-off-by: Matt Mackall Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f41a53a6699209216327cd4b506711610ad24c5 tree 8f10fa4f404053e2bd4cb057fb4d2797c27d8d5a parent 8bd0b97e95d378df57938d4773ad674194278ac1 author Matt Mackall Sun, 25 Jun 2006 05:47:12 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:00 -0700 [PATCH] random: change cpqarray to use add_disk_randomness Disk devices should use add_disk_randomness rather than SA_SAMPLE_RANDOM Signed-off-by: Matt Mackall Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bd0b97e95d378df57938d4773ad674194278ac1 tree a3e27bb7eb4006f52da25cc6118395de9c4c27b7 parent afedfd016a78ea1b678886ab6236acbc7650fcfb author Matt Mackall Sun, 25 Jun 2006 05:47:11 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:00 -0700 [PATCH] random: make CCISS use add_disk_randomness Disk devices should use the add_disk_randomness API rather than SA_SAMPLE_RANDOM. Signed-off-by: Matt Mackall Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afedfd016a78ea1b678886ab6236acbc7650fcfb tree e507606f1f636d5557ca91305b2891070d75b3f1 parent 51849738cf3af4d2c43a657e811a89e7f69eccc2 author Matt Mackall Sun, 25 Jun 2006 05:47:11 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:00 -0700 [PATCH] random: remove SA_SAMPLE_RANDOM from floppy driver The floppy driver is already calling add_disk_randomness as it should, so this was redundant. Signed-off-by: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51849738cf3af4d2c43a657e811a89e7f69eccc2 tree 75329a000346c46d113d15098743ce4edbcd72cd parent f867d2a2e5f3f0ce6356f452cc27b70d577de7c7 author Rob Landley Sun, 25 Jun 2006 05:47:10 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:01:00 -0700 [PATCH] bloat-o-meter: gcc-4 fix Upgrade scripts/bloat-o-meter to handle the names gcc 4 gives static symbols. Signed-off-by: Rob Landley Signed-off-by: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f867d2a2e5f3f0ce6356f452cc27b70d577de7c7 tree 2c098f197a80847510b7f0e98ca2209e89dfd32f parent 5474c120aafe78ca54bf272f7a01107c42da2b21 author Jesper Juhl Sun, 25 Jun 2006 05:47:09 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:59 -0700 [PATCH] ensure NULL deref can't possibly happen in is_exported() If CONFIG_KALLSYMS is defined and if it should happen that is_exported() is given a NULL 'mod' and lookup_symbol(name, __start___ksymtab, __stop___ksymtab) returns 0, then we'll end up dereferencing a NULL pointer. Signed-off-by: Jesper Juhl Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5474c120aafe78ca54bf272f7a01107c42da2b21 tree c1b002a27703ce92c816bfb9844752186e33d403 parent 17660bdd5c1f1a165273c1a59cb5b87670a81cc4 author Michael Hanselmann Sun, 25 Jun 2006 05:47:08 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:59 -0700 [PATCH] Rewritten backlight infrastructure for portable Apple computers This patch contains a total rewrite of the backlight infrastructure for portable Apple computers. Backward compatibility is retained. A sysfs interface allows userland to control the brightness with more steps than before. Userland is allowed to upload a brightness curve for different monitors, similar to Mac OS X. [akpm@osdl.org: add needed exports] Signed-off-by: Michael Hanselmann Acked-by: Benjamin Herrenschmidt Cc: Richard Purdie Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17660bdd5c1f1a165273c1a59cb5b87670a81cc4 tree b3fd7eb221258afc3be00c7d0b8ef2d639868376 parent 200a3d352cd5e0ae8fb96bfcf8103f7b7c60645b author Adrian Bunk Sun, 25 Jun 2006 05:47:06 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:58 -0700 [PATCH] uml: remove dead declaration Became irrelevant when x86_64 unexported ia32_sys_call_table. Signed-off-by: Adrian Bunk Cc: Andi Kleen Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 200a3d352cd5e0ae8fb96bfcf8103f7b7c60645b tree e9db90ac38cbfba0f4a4c541733fc4ebd09c5fd7 parent ebba61d5b05ecfda388dd4c156bafdb78d398055 author Roman Zippel Sun, 25 Jun 2006 05:47:06 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:58 -0700 [PATCH] m68k: convert VME irq code Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ebba61d5b05ecfda388dd4c156bafdb78d398055 tree fbb5b6ab240eb6c5fc34d04808afa2b4fca45ecd parent 77dda339e512c729bb27abd452e6632465490986 author Roman Zippel Sun, 25 Jun 2006 05:47:05 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:58 -0700 [PATCH] m68k: convert sun3 irq code Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77dda339e512c729bb27abd452e6632465490986 tree 6c3bdba69fbf9b27ebf2dfe4e52a78d14d649390 parent 9c5f4afdfbe72d5d1c814ad7286a4524d00c7b96 author Roman Zippel Sun, 25 Jun 2006 05:47:05 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:58 -0700 [PATCH] m68k: convert q40 irq code Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c5f4afdfbe72d5d1c814ad7286a4524d00c7b96 tree 7492a9533010d2016ff90a7372465edebcbb0d20 parent 35353bb8b869f3a0a153d0674cdafbe4f64aaa05 author Roman Zippel Sun, 25 Jun 2006 05:47:04 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:58 -0700 [PATCH] m68k: convert mac irq code Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35353bb8b869f3a0a153d0674cdafbe4f64aaa05 tree 26b9c36b3ad1d03c810c13bb81e159bdbe782b9f parent 734085651c9b80aa3f9e6027b156102de214a0b2 author Roman Zippel Sun, 25 Jun 2006 05:47:03 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:57 -0700 [PATCH] m68k: convert hp300 irq code Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 734085651c9b80aa3f9e6027b156102de214a0b2 tree a3f8c691b0c0298307784fc7e55b6c3c68812a0b parent 0aa78106c661cf6c251fd56e92f0c76a7459d244 author Roman Zippel Sun, 25 Jun 2006 05:47:03 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:57 -0700 [PATCH] m68k: convert atari irq code Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0aa78106c661cf6c251fd56e92f0c76a7459d244 tree 6192cf0a733e47de4e702f48303f61e0a1fecc6f parent 74be8d0835f91f0f77a2f1554dfa7242f1f7b652 author Roman Zippel Sun, 25 Jun 2006 05:47:02 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:57 -0700 [PATCH] m68k: convert apollo irq code Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74be8d0835f91f0f77a2f1554dfa7242f1f7b652 tree 8a761fdba6a921bad34a9f87ed4af4e336c05e55 parent 68387c448b7f2b3e2bfa0f606391cd3b602b1997 author Roman Zippel Sun, 25 Jun 2006 05:47:01 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:57 -0700 [PATCH] m68k: convert amiga irq code Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68387c448b7f2b3e2bfa0f606391cd3b602b1997 tree a6a5d209ae09a3bbaf4e1614ea4b2bd4920e6c56 parent b5dc7840b3ebe9c7967dd8ba73db957767009ff9 author Roman Zippel Sun, 25 Jun 2006 05:47:01 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:57 -0700 [PATCH] m68k: convert generic irq code to irq controller Convert the generic irq code to use irq controller, this gets rid of the machine specific callbacks and gives better control over irq handling without duplicating lots of code. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5dc7840b3ebe9c7967dd8ba73db957767009ff9 tree 0c5d45c592f140937e4e3e49ac9bc4ea8fc2cef7 parent 1d174cfb0f2a8967433e157bae9c2d4dcdee5324 author Roman Zippel Sun, 25 Jun 2006 05:47:00 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:57 -0700 [PATCH] m68k: introduce irq controller Introduce irq controller and use it to manage auto vector interrupts. Introduce setup_irq() which can be used for irq setup. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d174cfb0f2a8967433e157bae9c2d4dcdee5324 tree 18212e31548ff0b86b1faf8d8c25a41c34be1b0b parent 4facfde9f1d7b8a61fb0017460da45e23e60115c author Roman Zippel Sun, 25 Jun 2006 05:47:00 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:57 -0700 [PATCH] m68k: cleanup amiga irq numbering Fix amiga irq numbering, so they are after the generic IRQ_AUTO defines and remove the IRQ_AMIGA_AUTO defines. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4facfde9f1d7b8a61fb0017460da45e23e60115c tree 00da6c7110b4d19869f65ce0e2da085788112060 parent 92445eaaadc1f03f5a177ecc957bda76bf2ba8d5 author Roman Zippel Sun, 25 Jun 2006 05:46:59 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:57 -0700 [PATCH] m68k: cleanup generic irq names Rename IRQ1..IRQ7 to IRQ_AUTO_1..IRQ_AUTO_7 and remove the duplicate defintions. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92445eaaadc1f03f5a177ecc957bda76bf2ba8d5 tree e327dc2b95b3fe34183428314d6b6e0700e9e72b parent f2325ecebc5b7988fd49968bd3a660fd1594dc84 author Roman Zippel Sun, 25 Jun 2006 05:46:58 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:56 -0700 [PATCH] m68k: separate handler for auto and user vector interrupt Use separate entry points for auto and user vector interrupts and cleanup naming a little. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2325ecebc5b7988fd49968bd3a660fd1594dc84 tree e406c6108ae6d4daa4fdf7995636539a9bcb0004 parent 742636f5bfd92ad67f4a48f4b7a2ac655797e0f3 author Roman Zippel Sun, 25 Jun 2006 05:46:58 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:56 -0700 [PATCH] m68k: fix show_registers() Move some of the prints in die_if_kernel() to show_registers() and call that instead of show_stack(), so show_registers() prints now similiar info as other archs. Clean up the function a little. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 742636f5bfd92ad67f4a48f4b7a2ac655797e0f3 tree c3c57dfa4745264b563f99fbb6edc6fa633f9e25 parent b035c96b2da7258bb2bba31812b5f9dda3499f00 author Roman Zippel Sun, 25 Jun 2006 05:46:57 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:56 -0700 [PATCH] m68k: dma API addition Additions to dma API with some small cleanups. Signed-off-by: Richard Hirst Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b035c96b2da7258bb2bba31812b5f9dda3499f00 tree 46c6b4d3ca2351392d12658342e352cb8df0beb3 parent 3921ee21e01ac5faecda640daa6071dc8f0e29c9 author Roman Zippel Sun, 25 Jun 2006 05:46:56 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:56 -0700 [PATCH] m68k: Add the generic dma API functions Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3921ee21e01ac5faecda640daa6071dc8f0e29c9 tree b0bec2533d6d488dcfea88ff5075ce64a8b1bb7f parent a7b1a1a3089aaf1168e3b68a40e98532063d7811 author Roman Zippel Sun, 25 Jun 2006 05:46:56 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:56 -0700 [PATCH] m68k: small flush_icache() cleanup Make flush_icache() an inline function and clean it up a litte. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7b1a1a3089aaf1168e3b68a40e98532063d7811 tree 7d30cea5bbc3bdd1acddb2ac383922cc973dc499 parent 6bf9f755c3f30c81df17fce7d2f8dda11b9516a4 author Roman Zippel Sun, 25 Jun 2006 05:46:55 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:56 -0700 [PATCH] m68k: fix __iounmap for 030 Ignore empty pmd entry during iomap (these are the holes between the mappings). Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6bf9f755c3f30c81df17fce7d2f8dda11b9516a4 tree 79e44842ef7377829ee008ff1349a526a240c00e parent 53617825ccf3ff8a71e6efcf3dcf58885ed6f3e5 author Roman Zippel Sun, 25 Jun 2006 05:46:54 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:56 -0700 [PATCH] m68k: fix constraints of the signal functions and some cleanup Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53617825ccf3ff8a71e6efcf3dcf58885ed6f3e5 tree b653ea903472f2653840a16d729f3b36bec6fd5e parent caad3c2a15dfa2e0da8cf51a57c052372123483c author Roman Zippel Sun, 25 Jun 2006 05:46:53 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:56 -0700 [PATCH] m68k: fix uaccess.h for gcc-3.x gcc-3.x has a few problems detecting a constant parameter. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit caad3c2a15dfa2e0da8cf51a57c052372123483c tree c9321da5eaa1e71c682aa6f598cff48e4c1406c1 parent 186989177e627c2571a3026d39ea1433e4ddc097 author Chuck Ebbert <76306.1226@compuserve.com> Sun, 25 Jun 2006 05:46:53 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:55 -0700 [PATCH] i386: cpu_relax() in crash.c and doublefault.c Add cpu_relax() to infinite loops in crash.c and doublefault.c. This is the safest change. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 186989177e627c2571a3026d39ea1433e4ddc097 tree facbda2b471468dfc3b483c6711094e8495e0eec parent e75eac33b5c7f797e4b2ddcb39183cf268e26822 author Andreas Mohr Sun, 25 Jun 2006 05:46:52 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:55 -0700 [PATCH] cpu_relax(): smpboot.c Add cpu_relax() to various smpboot.c init loops. cpu_relax() always implies a barrier (according to Arjan), so remove those as well. Signed-off-by: Andreas Mohr Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e75eac33b5c7f797e4b2ddcb39183cf268e26822 tree 3c87328055c5975ca9d69df56dcc4a1d9066352c parent e6a1530d692d6a60cdf15dfbcfea07f5324d7b9f author Jeremy Fitzhardinge Sun, 25 Jun 2006 05:46:50 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:55 -0700 [PATCH] Clean up and refactor i386 sub-architecture setup Clean up and refactor i386 sub-architecture setup. This change moves all the code from the asm-i386/mach-*/setup_arch_pre/post.h headers, into arch/i386/mach-*/setup.c. mach-*/setup_arch_pre.h is renamed to setup_arch.h, and contains only things which should be in header files. It is purely code-motion; there should be no functional changes at all. Several functions in arch/i386/kernel/setup.c needed to be made non-static so that they're visible to the code in mach-*/setup.c. asm-i386/setup.h is used to hold the prototypes for these functions. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Chris Wright Cc: Zachary Amsden Cc: Chris Wright Cc: Christian Limpach Cc: Martin Bligh Cc: James Bottomley Cc: Andrey Panin Cc: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6a1530d692d6a60cdf15dfbcfea07f5324d7b9f tree bb34a4d745eb7f7e8d3de40b171fac17822ee8ac parent 7b2259b3e53f128c10a9fded0965e69d4a949847 author Christoph Lameter Sun, 25 Jun 2006 05:46:49 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:55 -0700 [PATCH] Allow migration of mlocked pages Hugh clarified the role of VM_LOCKED. So we can now implement page migration for mlocked pages. Allow the migration of mlocked pages. This means that try_to_unmap must unmap mlocked pages in the migration case. Signed-off-by: Christoph Lameter Acked-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b2259b3e53f128c10a9fded0965e69d4a949847 tree c1827144c22dd49775190e05de791531e9fd21fd parent 68402ddc677005ed1b1359bbc1f279548cfc0928 author Christoph Lameter Sun, 25 Jun 2006 05:46:48 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:55 -0700 [PATCH] page migration: Support a vma migration function Hooks for calling vma specific migration functions With this patch a vma may define a vma->vm_ops->migrate function. That function may perform page migration on its own (some vmas may not contain page structs and therefore cannot be handled by regular page migration. Pages in a vma may require special preparatory treatment before migration is possible etc) . Only mmap_sem is held when the migration function is called. The migrate() function gets passed two sets of nodemasks describing the source and the target of the migration. The flags parameter either contains MPOL_MF_MOVE which means that only pages used exclusively by the specified mm should be moved or MPOL_MF_MOVE_ALL which means that pages shared with other processes should also be moved. The migration function returns 0 on success or an error condition. An error condition will prevent regular page migration from occurring. On its own this patch cannot be included since there are no users for this functionality. But it seems that the uncached allocator will need this functionality at some point. Signed-off-by: Christoph Lameter Cc: Hugh Dickins Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68402ddc677005ed1b1359bbc1f279548cfc0928 tree 83da62a2b55e2ea7e0c46ed79c0d6498d36e1942 parent 9f1a3cfcffaed2fbb3206179295c79ca8289f5c3 author Christoph Lameter Sun, 25 Jun 2006 05:46:47 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:55 -0700 [PATCH] mm: remove VM_LOCKED before remap_pfn_range and drop VM_SHM Remove VM_LOCKED before remap_pfn range from device drivers and get rid of VM_SHM. remap_pfn_range() already sets VM_IO. There is no need to set VM_SHM since it does nothing. VM_LOCKED is of no use since the remap_pfn_range does not place pages on the LRU. The pages are therefore never subject to swap anyways. Remove all the vm_flags settings before calling remap_pfn_range. After removing all the vm_flag settings no use of VM_SHM is left. Drop it. Signed-off-by: Christoph Lameter Acked-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f1a3cfcffaed2fbb3206179295c79ca8289f5c3 tree d7adeab100ff8e2fe0b64fa5b2c9ef09ec60c842 parent 09a9a45dc62fef5f46a0dc98a3cefdb464cc4aaa author Zach Brown Sun, 25 Jun 2006 05:46:46 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:54 -0700 [PATCH] AOP_TRUNCATED_PAGE victims in read_pages() belong in the LRU AOP_TRUNCATED_PAGE victims in read_pages() belong in the LRU Nick Piggin rightly pointed out that the introduction of AOP_TRUNCATED_PAGE to read_pages() was wrong to leave A_T_P victim pages in the page cache but not put them in the LRU. Failing to do so hid them from the VM. A_T_P just means that the aop method unlocked the page rather than performing IO. It would be very rare that the page was truncated between the unlock and testing A_T_P. So we leave the pages in the LRU for likely reuse soon rather than backing them back out of the page cache. We do this by matching the behaviour before the A_T_P introduction which added pages to the LRU regardless of what ->readpage() did. This doesn't include the unrelated cleanup in Nick's initial fix which changed read_pages() to return void to match its only caller's behaviour of ignoring errors. Signed-off-by: Nick Piggin Signed-off-by: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09a9a45dc62fef5f46a0dc98a3cefdb464cc4aaa tree 6ed1877420d2af9a2ac71cbafe0c515fc257b409 parent fb1bb34d45400f12e0a33f8c487b3795674908a7 author Stefan Richter Sun, 25 Jun 2006 05:46:44 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:54 -0700 [PATCH] ieee1394: nodemgr: do not peek into struct semaphore Also revert patch "frv: ieee1394 is borken on frv", as it no longer is. Signed-off-by: Stefan Richter Cc: David Howells Cc: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb1bb34d45400f12e0a33f8c487b3795674908a7 tree 11c593c83eff5a83999f4feee0d8937d1f575712 parent 1e48275adc8c94c3281e646c8beb829f8e6f5bfc author Andrew Morton Sun, 25 Jun 2006 05:46:43 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:54 -0700 [PATCH] remove for_each_cpu() Convert a few stragglers over to for_each_possible_cpu(), remove for_each_cpu(). Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e48275adc8c94c3281e646c8beb829f8e6f5bfc tree 19714abfe022baaa130f30151c01fde6c55d7937 parent dfd8317d3340f03bc06eba6b58f0ec0861da4a13 author Andrew Morton Sun, 25 Jun 2006 05:46:42 -0700 committer Linus Torvalds Sun, 25 Jun 2006 10:00:54 -0700 [PATCH] more for_each_cpu() removal It's going away. I wonder if this code really meant to iterate across not-present, not-online CPUs. Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f90f00a358fe887fe5c3454897521064bdace7cc tree 6c1bc938b045602c37ac9ddda90f2424660d9617 parent bbe5d235ee201705530a7153b57e141cd77d818b author Steve French Sun, 25 Jun 2006 15:59:32 +0000 committer Steve French Sun, 25 Jun 2006 15:59:32 +0000 [CIFS] Fix compile warning when CONFIG_CIFS_EXPERIMENTAL is off Signed-off-by: Steve French commit bbe5d235ee201705530a7153b57e141cd77d818b tree e98c31b4cb2ced6357a87a02596f9ecdbd6dbb26 parent 189acaaef81b1d71aedd0d28810de24160c2e781 parent dfd8317d3340f03bc06eba6b58f0ec0861da4a13 author Steve French Sun, 25 Jun 2006 15:57:32 +0000 committer Steve French Sun, 25 Jun 2006 15:57:32 +0000 Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit 801194e3bcf7cde163b23c6279c559e69cb4ca57 tree 194576773e93d8491df7c341e284986c3338e2d7 parent 405040a78b33e39edf4180fc993b9608f07d3c41 author Russell King Sun, 25 Jun 2006 12:01:48 +0100 committer Russell King Sun, 25 Jun 2006 12:01:48 +0100 [ARM] Remove MODE_(SVC|IRQ|FIQ|USR) and DEFAULT_FIQ DEFAULT_FIQ was entirely unused. MODE_* are just redefinitions of *_MODE. Use *_MODE instead. Signed-off-by: Russell King commit 76a9f26c9e40e9c0ed5dc8f0cedd74e733f0088d tree 8e2db4ba9263e92d264ef469c7dac28078f63874 parent 9bf2aa129a107a0e9e2a5318d35aca731ae7e666 parent dfd8317d3340f03bc06eba6b58f0ec0861da4a13 author Trond Myklebust Sun, 25 Jun 2006 06:44:44 -0400 committer Trond Myklebust Sun, 25 Jun 2006 06:44:44 -0400 Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ commit 9bf2aa129a107a0e9e2a5318d35aca731ae7e666 tree a639597d29b316cc2d24ce5e3982ca7fc21bded4 parent 6ab86aa13045e7f6742af0b3c3c45f952f9fbb8d author Alexey Dobriyan Sun, 25 Jun 2006 02:41:28 -0700 committer Trond Myklebust Sun, 25 Jun 2006 06:39:35 -0400 nfs: remove nfs_put_link() Signed-off-by: Alexey Dobriyan Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Trond Myklebust commit 6ab86aa13045e7f6742af0b3c3c45f952f9fbb8d tree d301f1faaa3e62459edde714cb0c3d4a67a4f8cf parent d75d54147db9db5194040bd1c5022df6ba36ee48 author Andrew Morton Sun, 25 Jun 2006 02:41:27 -0700 committer Trond Myklebust Sun, 25 Jun 2006 06:38:47 -0400 nfs-build-fix-99 fs/built-in.o:(__param+0x20): undefined reference to `nfs_idmap_cache_timeout' fs/built-in.o:(__param+0x48): undefined reference to `nfs_callback_set_tcpport' Cc: Alexey Dobriyan Cc: Andreas Gruenbacher Cc: Andy Adamson Cc: Chuck Lever Cc: David Howells Cc: J. Bruce Fields Cc: Manoj Naik Cc: Marc Eshel Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Trond Myklebust commit d75d54147db9db5194040bd1c5022df6ba36ee48 tree 4bb7c7db88edd31b57958850aa16bc8ea297e017 parent ccf01ef7aa9c6c293a1c64c27331a2ce227916ec author Andrew Morton Sun, 25 Jun 2006 02:41:26 -0700 committer Trond Myklebust Sun, 25 Jun 2006 06:38:11 -0400 git-nfs-build-fixes Fix various problems with nfs4 disabled. And various other things. In file included from fs/nfs/inode.c:50: fs/nfs/internal.h:24: error: static declaration of 'nfs_do_refmount' follows non-static declaration include/linux/nfs_fs.h:320: error: previous declaration of 'nfs_do_refmount' was here fs/nfs/internal.h:65: warning: 'struct nfs4_fs_locations' declared inside parameter list fs/nfs/internal.h:65: warning: its scope is only this definition or declaration, which is probably not what you want fs/nfs/internal.h: In function 'nfs4_path': fs/nfs/internal.h:97: error: 'struct nfs_server' has no member named 'mnt_path' fs/nfs/inode.c: In function 'init_once': fs/nfs/inode.c:1116: error: 'struct nfs_inode' has no member named 'open_states' fs/nfs/inode.c:1116: error: 'struct nfs_inode' has no member named 'delegation' fs/nfs/inode.c:1116: error: 'struct nfs_inode' has no member named 'delegation_state' fs/nfs/inode.c:1116: error: 'struct nfs_inode' has no member named 'rwsem' distcc[26452] ERROR: compile fs/nfs/inode.c on g5/64 failed make[1]: *** [fs/nfs/inode.o] Error 1 make: *** [fs/nfs/inode.o] Error 2 make: *** Waiting for unfinished jobs.... In file included from fs/nfs/nfs3xdr.c:26: fs/nfs/internal.h:24: error: static declaration of 'nfs_do_refmount' follows non-static declaration include/linux/nfs_fs.h:320: error: previous declaration of 'nfs_do_refmount' was here fs/nfs/internal.h:65: warning: 'struct nfs4_fs_locations' declared inside parameter list fs/nfs/internal.h:65: warning: its scope is only this definition or declaration, which is probably not what you want fs/nfs/internal.h: In function 'nfs4_path': fs/nfs/internal.h:97: error: 'struct nfs_server' has no member named 'mnt_path' distcc[26486] ERROR: compile fs/nfs/nfs3xdr.c on g5/64 failed make[1]: *** [fs/nfs/nfs3xdr.o] Error 1 make: *** [fs/nfs/nfs3xdr.o] Error 2 In file included from fs/nfs/nfs3proc.c:24: fs/nfs/internal.h:24: error: static declaration of 'nfs_do_refmount' follows non-static declaration include/linux/nfs_fs.h:320: error: previous declaration of 'nfs_do_refmount' was here fs/nfs/internal.h:65: warning: 'struct nfs4_fs_locations' declared inside parameter list fs/nfs/internal.h:65: warning: its scope is only this definition or declaration, which is probably not what you want fs/nfs/internal.h: In function 'nfs4_path': fs/nfs/internal.h:97: error: 'struct nfs_server' has no member named 'mnt_path' distcc[26469] ERROR: compile fs/nfs/nfs3proc.c on bix/32 failed make[1]: *** [fs/nfs/nfs3proc.o] Error 1 make: *** [fs/nfs/nfs3proc.o] Error 2 **FAILED** Cc: Alexey Dobriyan Cc: Andreas Gruenbacher Cc: Andy Adamson Cc: Chuck Lever Cc: David Howells Cc: J. Bruce Fields Cc: Manoj Naik Cc: Marc Eshel Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Trond Myklebust commit 405040a78b33e39edf4180fc993b9608f07d3c41 tree 6ef511fb4370c4eecc2743234bdd9aade281be86 parent 800d8b5c4b322798414100c253524aaf1bb9cb86 author Russell King Sun, 25 Jun 2006 11:37:09 +0100 committer Russell King Sun, 25 Jun 2006 11:37:09 +0100 [ARM] Remove save_lr/restore_pc macros As for RETINSTR/LOADREGS macros, these were for compatibility with 26-bit ARMs. No longer required, so remove them. Signed-off-by: Russell King commit 800d8b5c4b322798414100c253524aaf1bb9cb86 tree 19b90bd9a0feb1f0bc4789749e4afdd6e27dd9c9 parent 1b93a71755f2b15450b3e3045dab58a633e37b18 author Russell King Sun, 25 Jun 2006 11:31:22 +0100 committer Russell King Sun, 25 Jun 2006 11:31:22 +0100 [ARM] Remove partial non-v6 binutils compatibility proc-v6 contains some compatibility to be able to use the V6 "cps" instruction. However, the kernel makes use of this instruction elsewhere extensively, so there's no point keeping this compatibility anymore. Signed-off-by: Russell King commit ccf01ef7aa9c6c293a1c64c27331a2ce227916ec tree 421fa29aedff988e392f92780637553e275d37a0 parent 82b145c5a572f7fa7211dffe2097234dc91bcecc author Trond Myklebust Sun, 25 Jun 2006 06:27:31 -0400 committer Trond Myklebust Sun, 25 Jun 2006 06:27:31 -0400 Merge branch 'odirect' commit 1b93a71755f2b15450b3e3045dab58a633e37b18 tree 0d19367dbea9d083f9e374a21a8e82595392de98 parent 7999d8d7a611bee902446939952859caf1367c25 author Russell King Sun, 25 Jun 2006 11:23:45 +0100 committer Russell King Sun, 25 Jun 2006 11:23:45 +0100 [ARM] Remove LOADREGS macro As for RETINSTR, LOADREGS is a left-over from the 26-bit days. Remove it. Signed-off-by: Russell King commit 7999d8d7a611bee902446939952859caf1367c25 tree 98dd4b81951f25b60012f2d91203fab3e0fd9010 parent dfd8317d3340f03bc06eba6b58f0ec0861da4a13 author Russell King Sun, 25 Jun 2006 11:17:23 +0100 committer Russell King Sun, 25 Jun 2006 11:17:23 +0100 [ARM] Remove RETINSTR macro RETINSTR is a left-over from the days when we had 26-bit and 32-bit CPU support integrated into the same tree. Since this is no longer the case, we can now remove RETINSTR. Signed-off-by: Russell King commit 7477ddaa4d2d69bbcd49e12990af158dbb03f2f2 tree 5ae1e5289fe57c55e11dfeb341d2ed5d539d55ff parent a50d913f48b21aa22d31469e953fd6428540bf5b author Andrew Morton Wed, 21 Jun 2006 01:29:38 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:25 -0300 V4L/DVB (4210b): git-dvb: tea575x-tuner build fix In file included from sound/i2c/other/tea575x-tuner.c:30: include/sound/tea575x-tuner.h:36: error: field 'vd' has incomplete type include/sound/tea575x-tuner.h:37: error: field 'fops' has incomplete type sound/i2c/other/tea575x-tuner.c:89: warning: 'struct inode' declared inside parameter list sound/i2c/other/tea575x-tuner.c:89: warning: its scope is only this definition or declaration, which is probably not what you want sound/i2c/other/tea575x-tuner.c: In function 'snd_tea575x_ioctl': sound/i2c/other/tea575x-tuner.c:91: warning: implicit declaration of function 'video_devdata' sound/i2c/other/tea575x-tuner.c:91: warning: initialization makes pointer from integer without a cast sound/i2c/other/tea575x-tuner.c:92: warning: implicit declaration of function 'video_get_drvdata' sound/i2c/other/tea575x-tuner.c:92: warning: initialization makes pointer from integer without a cast sound/i2c/other/tea575x-tuner.c:96: warning: implicit declaration of function '_IOR' sound/i2c/other/tea575x-tuner.c:96: error: syntax error before 'struct' sound/i2c/other/tea575x-tuner.c:99: error: 'v' undeclared (first use in this function) sound/i2c/other/tea575x-tuner.c:99: error: (Each undeclared identifier is reported only once sound/i2c/other/tea575x-tuner.c:99: error: for each function it appears in.) sound/i2c/other/tea575x-tuner.c:108: warning: implicit declaration of function 'copy_to_user' sound/i2c/other/tea575x-tuner.c:112: warning: implicit declaration of function '_IOWR' sound/i2c/other/tea575x-tuner.c:112: error: syntax error before 'struct' sound/i2c/other/tea575x-tuner.c:115: warning: implicit declaration of function 'copy_from_user' sound/i2c/other/tea575x-tuner.c: At top level: sound/i2c/other/tea575x-tuner.c:129: error: syntax error before 'case' sound/i2c/other/tea575x-tuner.c:146: warning: type defaults to 'int' in declaration of 'snd_tea575x_set_freq' sound/i2c/other/tea575x-tuner.c:146: warning: parameter names (without types) in function declaration sound/i2c/other/tea575x-tuner.c:146: error: conflicting types for 'snd_tea575x_set_freq' sound/i2c/other/tea575x-tuner.c:62: error: previous definition of 'snd_tea575x_set_freq' was here sound/i2c/other/tea575x-tuner.c:146: warning: data definition has no type or storage class sound/i2c/other/tea575x-tuner.c:147: error: syntax error before 'return' sound/i2c/other/tea575x-tuner.c:151: error: syntax error before '&' token sound/i2c/other/tea575x-tuner.c:152: error: syntax error before '.' token sound/i2c/other/tea575x-tuner.c:152: warning: type defaults to 'int' in declaration of 'strcpy' sound/i2c/other/tea575x-tuner.c:152: warning: function declaration isn't a prototype sound/i2c/other/tea575x-tuner.c:152: error: conflicting types for 'strcpy' sound/i2c/other/tea575x-tuner.c:152: warning: data definition has no type or storage class sound/i2c/other/tea575x-tuner.c: In function 'snd_tea575x_init': sound/i2c/other/tea575x-tuner.c:194: warning: implicit declaration of function 'video_set_drvdata' sound/i2c/other/tea575x-tuner.c:197: error: 'video_exclusive_open' undeclared (first use in this function) sound/i2c/other/tea575x-tuner.c:198: error: 'video_exclusive_release' undeclared (first use in this function) sound/i2c/other/tea575x-tuner.c:200: warning: implicit declaration of function 'video_register_device' sound/i2c/other/tea575x-tuner.c:200: error: 'VFL_TYPE_RADIO' undeclared (first use in this function) sound/i2c/other/tea575x-tuner.c: In function 'snd_tea575x_exit': sound/i2c/other/tea575x-tuner.c:215: warning: implicit declaration of function 'video_unregister_device' distcc[7333] ERROR: compile sound/i2c/other/tea575x-tuner.c on x/32 failed make[1]: *** [sound/i2c/other/tea575x-tuner.o] Error 1 Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit a50d913f48b21aa22d31469e953fd6428540bf5b tree fa8f04dc0522734951e38f051e526d858cb6d68a parent b3bd5be8d4a3502898a561e8fa43febe04b6ff50 author Andrew Morton Wed, 21 Jun 2006 01:57:39 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:25 -0300 V4L/DVB (4210a): git-dvb versus matroxfb drivers/video/matrox/matroxfb_base.c: In function 'matroxfb_ioctl': drivers/video/matrox/matroxfb_base.c:1140: error: 'VIDIOC_S_CTRL_OLD' undeclared (first use in this function) drivers/video/matrox/matroxfb_base.c:1140: error: (Each undeclared identifier is reported only once drivers/video/matrox/matroxfb_base.c:1140: error: for each function it appears in.) Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit b3bd5be8d4a3502898a561e8fa43febe04b6ff50 tree aab1972dbd4436e07f47ada004917f0da14beceb parent b57e5578f913a304e97cb66aa0044a894ca47f2f author Mauro Carvalho Chehab Sat, 24 Jun 2006 08:20:05 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:25 -0300 V4L/DVB (4209): Added some BTTV PCI IDs for newer boards Signed-off-by: Mauro Carvalho Chehab commit b57e5578f913a304e97cb66aa0044a894ca47f2f tree 2f0210661e2f42e10e121311092b6cd1c948914a parent 45f87a21735804760dd7db0e2e3c609c332b15e3 author Mauro Carvalho Chehab Fri, 23 Jun 2006 16:13:56 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:24 -0300 Fixes some sync issues between V4L/DVB development and GIT Some changes didn't went ok to -git, probably due to changes at merging patches. Signed-off-by: Mauro Carvalho Chehab commit 45f87a21735804760dd7db0e2e3c609c332b15e3 tree d5902f45a9c7e06d0ee086cb7a001daf3f7e4e49 parent 153962364dc6fa4a24571885fbe76506d8968610 author Michael Krufky Thu, 22 Jun 2006 21:47:07 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:24 -0300 V4L/DVB (4206): Cx88-blackbird: always set encoder height based on tvnorm->id Removed the switch..case block in blackbird_probe for setting encoder height based on video standard. All blackbird devices can rely on tvnorm->id to retrieve this information from the cx2388x video decoder - tuner_formats should not be used to determine the encoding video standard. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 153962364dc6fa4a24571885fbe76506d8968610 tree 78eca883cd190dbb2bf94b6337ac1d57951a757b parent 0ccac4af1a8f22e2e96d89b9bf8766dc7286a972 author Mauro Carvalho Chehab Fri, 23 Jun 2006 16:13:56 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:24 -0300 V4L/DVB (4205): Merge tda9887 module into tuner. Most uses a tda988[5/6/7] IF demodulator as part of the device. Having this as a separate stuff makes harder to configure it, since there are some tda9887 options that are tuner-dependent and should be bound into tuner-types structures. This patch merges tda9887 module into tuner. More work is required to make tuner-types to properly use it. Signed-off-by: Mauro Carvalho Chehab commit 0ccac4af1a8f22e2e96d89b9bf8766dc7286a972 tree b9ad80d1c0dcb78a4655a9524c98e1a750f69b7d parent 45ad9f8b44b06bf1e91b4b3c338406c2233f0482 author Hans Verkuil Fri, 23 Jun 2006 15:52:50 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:24 -0300 V4L/DVB (4203): Explicitly set the enum values. It's better to use explicit enums. It reduces the chance of someone inserting new enums in the middle which would break things. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 45ad9f8b44b06bf1e91b4b3c338406c2233f0482 tree b2cccb49543bcb7289d084a803c44354fcb64115 parent 54aa9a21ca03cf41d911ada969e86f27ce58bab9 author Hans Verkuil Wed, 21 Jun 2006 17:04:13 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:23 -0300 V4L/DVB (4202): allow selecting CX2341x port mode CX2341X port was always set to 'memory', but 'streaming' is also possible ivtv uses the memory (DMA) interface with the CX2341X, while pvrusb2 and cx88-blackbird use the streaming interface. This setting is now selectable by the driver. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 54aa9a21ca03cf41d911ada969e86f27ce58bab9 tree 11e5fc0bfe170c4b8ce132a4475e346f84d0f429 parent cc7bc648690d4e6f3992cfadb18a4c7e0181e6ea author Hans Verkuil Mon, 19 Jun 2006 18:00:06 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:23 -0300 V4L/DVB (4200): Disable bitrate_mode when encoding mpeg-1. MPEG-1 always uses CBR, so make the BITRATE_MODE control inactive. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cc7bc648690d4e6f3992cfadb18a4c7e0181e6ea tree 35e50975f6e03449e4337843d88cfff792f52861 parent f81cf7533b4b8411a0d2fa943adcede340dfdab6 author Hans Verkuil Mon, 19 Jun 2006 17:53:08 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:23 -0300 V4L/DVB (4199): Add cx2341x-specific control array to cx2341x.c Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f81cf7533b4b8411a0d2fa943adcede340dfdab6 tree 0274c8adcd34b8a074dfcf3cffceb2267cafa85b parent 86b79d662453b0f0107d03cc939dd737d6076436 author Hans Verkuil Sun, 18 Jun 2006 16:54:20 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:23 -0300 V4L/DVB (4198): Avoid newer usages of obsoleted experimental MPEGCOMP API Put old MPEGCOMP API under #if __KERNEL__ and issue warnings when used. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 86b79d662453b0f0107d03cc939dd737d6076436 tree f61a827c0d10a93a93a948ab66ee602777fc8eb2 parent f022156b33ffa32c26a86540fe4f6fe56cff0963 author Hans Verkuil Sun, 18 Jun 2006 16:40:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:23 -0300 V4L/DVB (4197): Port new MPEG API to saa7134-empress with saa6752hs Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f022156b33ffa32c26a86540fe4f6fe56cff0963 tree ba896ea08b1215135986fe353a39bfbd0db2f5de parent 54f577b7f46f48b8bea0bd5eb8c42d711b3e006f author Hans Verkuil Sun, 18 Jun 2006 16:11:06 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:22 -0300 V4L/DVB (4196): Port cx88-blackbird to the new MPEG API. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 54f577b7f46f48b8bea0bd5eb8c42d711b3e006f tree c091a214f10db8466feac1901ae3612fbbfd17c3 parent 18318e00040e0a5c783f6d79c136c2141b779dbd author Hans Verkuil Sun, 18 Jun 2006 14:56:12 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:22 -0300 V4L/DVB (4193): Update cx2341x fw encoding API doc. Based on recent tests it turned out that some features are not implemented. This has now been documented. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 18318e00040e0a5c783f6d79c136c2141b779dbd tree 17939de5ef7387dfd80a288ed4221ba1eeb1d31a parent 5d1a9ae6d9d7fc14b2259cd550eb87364a21190a author Hans Verkuil Sun, 18 Jun 2006 14:49:52 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:22 -0300 V4L/DVB (4192): Use control helpers for saa7115, cx25840, msp3400. Replace hardcoded control description by the standard ones supplied by v4l2-common. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5d1a9ae6d9d7fc14b2259cd550eb87364a21190a tree b55c57026f69fc127508a30859edebde87713f1e parent 9cb2318b885d2039eeb3eb5394fa215046be058f author Hans Verkuil Sun, 18 Jun 2006 14:40:30 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:22 -0300 V4L/DVB (4191): Add CX2341X MPEG encoder module. Adds the cx2341x.c module that handles the programming of the Conexant cx23415/6 MPEG encoder chip used by cx88-blackbird, pvrusb2 and ivtv. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 9cb2318b885d2039eeb3eb5394fa215046be058f tree 2289616dbbbd60ac93ce56e43c0eaec27bf65604 parent 0597691456cf3b08974d9949e4caa830e1d3c520 author Hans Verkuil Sun, 18 Jun 2006 14:11:08 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:21 -0300 V4L/DVB (4190): Add helper functions for control processing to v4l2-common. Control processing is often duplicated in the various drivers. Unfortunately, simple things like the names of controls are often different between drivers, even though it is the same controls. Adding in the new extended controls and the need for having control helper functions became apparent. Several functions have now been added to v4l2-common to do things like filling the v4l2_queryctrl and v4l2_querymenu structs, to check for valid control input and to move to the next control when enumerating over all controls. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0597691456cf3b08974d9949e4caa830e1d3c520 tree e70e6b89eb1d5dad01bd5f58ef715a72efbfba13 parent 4f341712120abde54d9113856e9118e6580d7061 author Hans Verkuil Sun, 18 Jun 2006 13:43:28 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:21 -0300 V4L/DVB (4189): Add videodev support for VIDIOC_S/G/TRY_EXT_CTRLS. videodev.c copies the control list specified in struct v4l2_ext_controls to kernel space. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4f341712120abde54d9113856e9118e6580d7061 tree d608333d0e8ba41b0e74c7de2dcc17885af0e7be parent 442d15d5d8ba6a39d0c883585d68503e949a2fe1 author Hans Verkuil Sun, 18 Jun 2006 13:27:19 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:21 -0300 V4L/DVB (4188): Add new MPEG control/ioctl definitions to videodev2.h The old, experimental, VIDIOC_S/G_CODEC API to pass MPEG parameters is now obsolete and is replaced by 'extended controls' which offer more flexibility and are hopefully more future proof. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 442d15d5d8ba6a39d0c883585d68503e949a2fe1 tree fda2a8895e00911f9a9e04ba1b4b147c2428f224 parent ceee526617a805eea908a59fced26635634c9035 author Cameron Hutchinson Wed, 21 Jun 2006 18:45:31 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:21 -0300 V4L/DVB (4186): Add support for the DNTV Live! mini DVB-T card. Signed-off-by: Cameron Hutchinson Signed-off-by: Mauro Carvalho Chehab commit ceee526617a805eea908a59fced26635634c9035 tree 3ca73e96a4862eda971fc532cc04390223e56126 parent 9ce8b68fc036275986f005b38660d5d1795af8e8 author Yeasah Pell Wed, 21 Jun 2006 18:28:13 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:20 -0300 V4L/DVB (4185): Conditionally enable 5 byte diseqc commands Signed-off-by: Yeasah Pell Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 9ce8b68fc036275986f005b38660d5d1795af8e8 tree c46db1fb3ee80472d1e22bfa6236935adf134c9f parent 1fd57f60f81147dc70f8249da62af48fe451f2b1 author Adrian Bunk Wed, 21 Jun 2006 18:06:34 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:20 -0300 V4L/DVB (4184): Static variables mustn't be EXPORT_SYMBOL 'ed Signed-off-by: Adrian Bunk Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 1fd57f60f81147dc70f8249da62af48fe451f2b1 tree 0df29fab00f5377f55fd61e83007422e1ed9d6ed parent 1f19456d9760431f3a888b21fff035f875ddd189 author Manu Abraham Wed, 21 Jun 2006 17:03:42 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:20 -0300 V4L/DVB (4182): Comment out MMI functions for now Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 1f19456d9760431f3a888b21fff035f875ddd189 tree 4c699f84ad532ebd9e84ed20d112469c1e594552 parent 3e357fd8a29cbcf91badd2a6d3b8ef5d4cb05025 author Henrik Sjoberg Wed, 21 Jun 2006 16:33:21 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:20 -0300 V4L/DVB (4181): Fix CA Info and Application Info Signed-off-by: Henrik Sjoberg Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 3e357fd8a29cbcf91badd2a6d3b8ef5d4cb05025 tree a6884a37dd80110362d4a0ee306887b36c3a89cd parent cdd4208c059e01d4cdc10a538bbbebbb60aa9b9f author Manu Abraham Wed, 21 Jun 2006 15:06:49 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:20 -0300 V4L/DVB (4180): Initial go at MMI Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit cdd4208c059e01d4cdc10a538bbbebbb60aa9b9f tree ca943bf4d1918b34f614f9bd336673e7399db15e parent 7ef53b1ab739b09a39271998ab14605769697292 author Manu Abraham Wed, 21 Jun 2006 10:41:45 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:19 -0300 V4L/DVB (4179): VLF fixes for DCT Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 7ef53b1ab739b09a39271998ab14605769697292 tree 5e60f68d5b0ad043415172b5e1c4202f08fe1beb parent 63ad4e445d683fc1bee748171a7fcb589546bf04 author Manu Abraham Wed, 21 Jun 2006 10:41:41 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:19 -0300 V4L/DVB (4178): Replace NEWTUNE with TS188 Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 63ad4e445d683fc1bee748171a7fcb589546bf04 tree 46868ceff6747454a10db50e12d82e40b74e058b parent 77e0be12100a3d40abfa46ef54c323b6cfff41ed author Manu Abraham Wed, 21 Jun 2006 10:41:37 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:19 -0300 V4L/DVB (4177): DCTNEW and ATSC fixes Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 77e0be12100a3d40abfa46ef54c323b6cfff41ed tree e0fd08dc93099a49e999404328fefc9082c64a9c parent b32474cb8341bb828f2c2800d5dd615b7cd02182 author Sigmund Augdal Helberg Wed, 21 Jun 2006 10:35:48 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:19 -0300 V4L/DVB (4176): Bug-fix: Fix memory overflow Do not overflow kernel memory when more than BT878_MAX devices are present. Signed-off-by: Sigmund Augdal Helberg Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit b32474cb8341bb828f2c2800d5dd615b7cd02182 tree 9b443927d9290d3fa02539fda2ece4477998f7b8 parent de1e6ec9f21ebd65d779524b614307291228a623 author Manu Abraham Wed, 21 Jun 2006 10:28:31 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:18 -0300 V4L/DVB (4175): Fix a bug in tuner detection Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit de1e6ec9f21ebd65d779524b614307291228a623 tree 3460e3af4e42253bd683d686fe39d69798140a1f parent 9500c7b05b1a618a32d49a249c28c98bcb039e35 author Manu Abraham Wed, 21 Jun 2006 10:28:27 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:18 -0300 V4L/DVB (4174): Distinguish between STV0299 and MB86A15 based NIM's Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 9500c7b05b1a618a32d49a249c28c98bcb039e35 tree ff88102936f960452c57af0b5ce4120ee4595c15 parent 6cd94745fb3b97fb6ecd730c0aa9d1fb4fdf9c10 author Manu Abraham Wed, 21 Jun 2006 10:28:23 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:18 -0300 V4L/DVB (4173): Dprintk macro beautification Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 6cd94745fb3b97fb6ecd730c0aa9d1fb4fdf9c10 tree 90fdce0529efb508f6ba5c7bc5066c9b6bf7f6f7 parent 5aef20aeff7e9b0741ecc80365a3f7416900e494 author Sigmund Augdal Helberg Wed, 21 Jun 2006 10:28:19 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:18 -0300 V4L/DVB (4172): Remove spurious newlines in dprintk's. Add dst(card-num) as prefix in dprintk Signed-off-by: Sigmund Augdal Helberg Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 5aef20aeff7e9b0741ecc80365a3f7416900e494 tree 01dfc6c53845b70202da375510716a7703ca3a63 parent 3da2f4c0c64f4267594016c7bda3cc13fe7c95fb author Manu Abraham Wed, 21 Jun 2006 10:28:16 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:18 -0300 V4L/DVB (4171): Fix Daughterboard detection Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 3da2f4c0c64f4267594016c7bda3cc13fe7c95fb tree 70beb31b72e8e6a1f5e3161b84975dda36758512 parent 4e7024bd3278f14fdc435e6ff11c37cee752de99 author Bryan Scott Wed, 21 Jun 2006 10:28:12 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:17 -0300 V4L/DVB (4170): ATSC typecheck bugfix Signed-off-by: Bryan Scott Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 4e7024bd3278f14fdc435e6ff11c37cee752de99 tree ce6301757eac50b3fc26f82f3e96e1ad0515f872 parent 1da5e8d3cf561508ddbc62283e65dc079d750550 author Manu Abraham Wed, 21 Jun 2006 10:28:09 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:17 -0300 V4L/DVB (4169): Add more Firmware and Tuner names Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 1da5e8d3cf561508ddbc62283e65dc079d750550 tree 980810117d075b8eb543c65598be1c74f1cb1938 parent 364f255af783a105b262eae018f0cad68e186681 author Manu Abraham Wed, 21 Jun 2006 10:28:05 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:17 -0300 V4L/DVB (4168): ATSC tuner doesn't have variable length field Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 364f255af783a105b262eae018f0cad68e186681 tree 1fe87d02376c1a9eebaf9cc29e48473c33d9b4d8 parent 351634d27a90a7668554452f4ba1688043aa1128 author Manu Abraham Wed, 21 Jun 2006 10:28:01 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:17 -0300 V4L/DVB (4167): Add Board Names Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 351634d27a90a7668554452f4ba1688043aa1128 tree a31f684b0f712244741f0b45fa2a8d89c006c9f6 parent b633c6d6a39a1cb78091fb04f093b16bdf8cbf59 author Manu Abraham Wed, 21 Jun 2006 10:27:57 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:17 -0300 V4L/DVB (4166): Fix string length Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit b633c6d6a39a1cb78091fb04f093b16bdf8cbf59 tree 94c75cbf9df9cabc8a3099b621b72b7114055991 parent 396cffd63ed460ae2544d62745fabd22296af99a author Manu Abraham Wed, 21 Jun 2006 10:27:53 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:16 -0300 V4L/DVB (4165): Add in tuner names Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 396cffd63ed460ae2544d62745fabd22296af99a tree f898cbe3639afae4d4c32f10f2f7fff9d3961101 parent 1c4e7339e55af69bad55eb9a8f9d5b03a552020b author Manu Abraham Wed, 21 Jun 2006 10:27:49 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:16 -0300 V4L/DVB (4164): Add DVB-S specific demod names Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 1c4e7339e55af69bad55eb9a8f9d5b03a552020b tree ff65bbfc9fefdeb208cd65fd8564cec614acb2e5 parent c65f1c57094273144c614dc9f199c5decf7d27db author Manu Abraham Wed, 21 Jun 2006 10:27:46 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:16 -0300 V4L/DVB (4163): Initialize ATSC frontend Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit c65f1c57094273144c614dc9f199c5decf7d27db tree 464f36aaa30d89eb75c3b7cb780aa7dd15299edc parent cdd393ccbf99c0465b1db0b3f5a5687fb1340250 author Manu Abraham Wed, 21 Jun 2006 10:27:40 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:15 -0300 V4L/DVB (4162): Explicit defining of type is not necessary with MULTI_FE Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit cdd393ccbf99c0465b1db0b3f5a5687fb1340250 tree 73309d6e5220698aefa4844bcca2f391f028ae28 parent 0249ef16fa1eb4a85411d0e1b6e6a906e26ed1ac author Manu Abraham Wed, 21 Jun 2006 10:27:36 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:15 -0300 V4L/DVB (4161): Utilize the device specific algorithm callbacks Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 0249ef16fa1eb4a85411d0e1b6e6a906e26ed1ac tree 01e44bb2357acd99a851d2feafea23271475cc95 parent 8cfba6301c3c7e0d3332e237b99fefc0db001163 author Manu Abraham Wed, 21 Jun 2006 10:27:31 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:15 -0300 V4L/DVB (4160): Use device specific algorithms Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 8cfba6301c3c7e0d3332e237b99fefc0db001163 tree 4c04d234e7c232a2ca8a0a9bf46f0a7f7afbb4e0 parent 2e506a0faff0caa62e4c9531611684ff61cf1ca4 author Manu Abraham Wed, 21 Jun 2006 10:27:26 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:15 -0300 V4L/DVB (4159): Implement tuning algorithm as a module parameter Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 2e506a0faff0caa62e4c9531611684ff61cf1ca4 tree 4044f4e09f0d7cd6d49b3a4295e30bc927745aef parent ed3d1065a4aa7b1e8e5d35ece0eeeafa5bfa6bd1 author Manu Abraham Wed, 21 Jun 2006 10:27:20 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:15 -0300 V4L/DVB (4158): Make ASIC RESET Conditional Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit ed3d1065a4aa7b1e8e5d35ece0eeeafa5bfa6bd1 tree 2ce6a014cb86b6f7444e22b15a276eb5c2fb7aaa parent bc7386ba43c4e06e1fdf150c37ea6cbd778fb00c author Manu Abraham Wed, 21 Jun 2006 10:27:15 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:14 -0300 V4L/DVB (4157): Add support for VP-3250 ATSC card Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit bc7386ba43c4e06e1fdf150c37ea6cbd778fb00c tree 1f65bcf4ffbad4abd2455ded19fef3a0748102de parent 4821fb1d8447a5786ea12c861b4ab5f69d400bfa author Manu Abraham Wed, 21 Jun 2006 10:27:05 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:14 -0300 V4L/DVB (4156): Add basic ATSC support to DST Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 4821fb1d8447a5786ea12c861b4ab5f69d400bfa tree f1b81060f0bdc80aae84aeecf5bb9e458ee2003e parent bafefc0cf8e4b34fbb159ea2e2aef2358ebff935 author Manu Abraham Wed, 21 Jun 2006 10:27:00 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:14 -0300 V4L/DVB (4155): ATSC frontend support Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit bafefc0cf8e4b34fbb159ea2e2aef2358ebff935 tree b4099efa66238c30f0bd94a2a4c7c86c30c5fe59 parent 7597e8e71f897449a26d5a32eedc09f8e76ae52a author Jesper Juhl Fri, 23 Jun 2006 13:27:36 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:14 -0300 V4L/DVB (4154): Fix use-after-free bug in cpia2 driver The coverity checker detected a use-after-free error in drivers/media/video/cpia2/cpia2_v4l.c::cpia2_close() (coverity error #1281). What happens is that we lock cam->busy_lock, then proceed to free resources, and in the case of (--cam->open_count == 0) we finish off by doing a kfree(cam) and then at the end of the function we do a mutex_unlock(&cam->busy_lock) which will explode since it'll dereference the free'd `cam' : ... mutex_lock(&cam->busy_lock); ... if (--cam->open_count == 0) { ... if (!cam->present) { video_unregister_device(dev); kfree(cam); } } mutex_unlock(&cam->busy_lock); <--- PROBLEM, cam no longer around. ... Since this only happens in the case of open_count going down to zero I don't see a problem with just releasing the mutex after unregistering the device and just before the kfree(). In this case there is nothing around that we can race against; we are in the release method, open_count is zero, (!cam->present) and the device has just been unregistered, so letting go of the mutex at this point looks safe to me. Patch below to implement that solution. Acked-by: Randy Dunlap Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 7597e8e71f897449a26d5a32eedc09f8e76ae52a tree 115a36cb148f08172dc811f701a6a7e5012e9fa8 parent ec675bce403b46570e6ab93eb9a226e966de1010 author Michael Krufky Thu, 22 Jun 2006 23:13:06 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:14 -0300 V4L/DVB (4150): Cx88: clear EN_I2SIN_ENABLE bit for ASUS PVR-416 to enable audio clear EN_I2SIN_ENABLE bit for ASUS PVR-416 to enable audio streaming in both raw video and blackbird mpeg encoder modes. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit ec675bce403b46570e6ab93eb9a226e966de1010 tree 498e551ea95e5300b76d2e23dd866bbb78e4c49b parent c18cb01ca139716a39f4fb92286b6096e8b3f968 author Dave Jones Fri, 23 Jun 2006 09:01:42 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:13 -0300 V4L/DVB (4149): Fix up funky logic in dvb Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit c18cb01ca139716a39f4fb92286b6096e8b3f968 tree f62cb4909578ee77ceab06f0f4946b29d41def84 parent b20c3cf0c225df1445fa220de175b8d9bc1c3659 author Mauro Carvalho Chehab Fri, 23 Jun 2006 07:05:22 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:13 -0300 V4L/DVB (4148): Fix userbits debug prints Previously, it were showing the pointer value, instead of the setted bits. Signed-off-by: Mauro Carvalho Chehab commit b20c3cf0c225df1445fa220de175b8d9bc1c3659 tree 8b0495c4d9e16473b5effa14a03a959f14254a52 parent dc46ace15e50cb8af3f3072c00aaf3429770b0e2 author Adrian Bunk Fri, 23 Jun 2006 06:49:34 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:13 -0300 V4L/DVB (4147): Drivers/media/video/pwc/: make code static This patch makes the following needlessly global code static: - pwc-ctrl.c: pwc_get_leds() - pwc_preferred_compression Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit dc46ace15e50cb8af3f3072c00aaf3429770b0e2 tree d377bbf06a1c7a3c2bd2af2aefaf15ec0f9c8505 parent 65271bff0fb11557d04d389df728d12dfba75dc3 author Adrian Bunk Fri, 23 Jun 2006 06:42:44 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:13 -0300 V4L/DVB (4146): Drivers/media/video/vivi.c: make 2 functions static Make two needlessly global functions static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 65271bff0fb11557d04d389df728d12dfba75dc3 tree cc33c538d04b42779b918bf5eec1386ae50a36a3 parent 1138ead47c4cb367cdb8fe6e41724eac0aa3a60b author Michael Krufky Wed, 21 Jun 2006 16:04:33 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:12 -0300 V4L/DVB (4144): Cx88: add support for FusionHDTV 3 Gold (original revision) Add support for FusionHDTV 3 Gold (original revision), using the card definition for FusionHDTV3 Gold-Q Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 1138ead47c4cb367cdb8fe6e41724eac0aa3a60b tree 6ddfebdc0775cfd8fd03315ae47bda3f166eda44 parent b63535f4058eca81b64485c885610008784d2bb0 author Michael Krufky Mon, 19 Jun 2006 09:54:00 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:12 -0300 V4L/DVB (4135): Cx88-tvaudio.c must #include Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit b63535f4058eca81b64485c885610008784d2bb0 tree c5cfdaeda152cb96fa9749a7ff5b40b48168b344 parent 0f4b56807b443927600112c1351a181ce664929c author Ricardo Cerqueira Sun, 18 Jun 2006 00:21:49 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:12 -0300 V4L/DVB (4132): Don't kill cx88 DMA sound on channel change There's a call at cx88-tvaudio to reset DMA sound on channel change; that call was killing cx88-alsa whenever the channel was changed, resulting in no sound. Remove those calls if cx88-alsa is selected to be compiled. Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit 0f4b56807b443927600112c1351a181ce664929c tree e0ae6341b005aaa2256eb2a99fe7c79feba50ef0 parent c2eaa68f7950ef51ce480766bc11eb8b3c20c90a author Ricardo Cerqueira Sun, 18 Jun 2006 00:19:22 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:12 -0300 V4L/DVB (4131): Fix cx88-alsa vs IRQ remote conflict cx88-alsa was resetting the card on load, causing the IRQ IR handler to go away (maybe others, too). There's no actual need to reset the card, though, so that line was removed Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit c2eaa68f7950ef51ce480766bc11eb8b3c20c90a tree d550f12cb606a2db66d429d04601780d6c9194de parent 8ca4deb259f17a9a209030baa36aca39ec03ceaf author Ricardo Cerqueira Sun, 18 Jun 2006 00:17:35 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:12 -0300 V4L/DVB (4130): Fix card cx88 #50 remote There was an unmasked bit in the keycodes that was causing random behaviour (the code could be N or N+1). Masked that bit now. Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit 8ca4deb259f17a9a209030baa36aca39ec03ceaf tree 585fd443c6965dab0a198a4e99aa412cccb6c2a6 parent 87057d29f84b031f2e84ac78be5caa51a96f678e author Michael Krufky Tue, 20 Jun 2006 15:56:02 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:11 -0300 V4L/DVB (4124): Kconfig: fix description for saa7115 module This Kconfig description is incorrect, due to a previous merge a while back. CONFIG_SAA711X builds module saa7115, which is the newer module, and is not obsoleted. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 87057d29f84b031f2e84ac78be5caa51a96f678e tree 3e703869472e4e62d891d74cf6c3f155ae6e3374 parent cebdd4136d704f9afeb67e9685dfd398a6a2e655 author Mac Michaels Tue, 20 Jun 2006 09:18:13 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:11 -0300 V4L/DVB (4122): Lgdt330x: fix missing line in VSB snr decoding logic - fix missing line in VSB snr decoding logic for lgdt3303 Signed-off-by: Mac Michaels Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit cebdd4136d704f9afeb67e9685dfd398a6a2e655 tree 3e2230988fe5c92ac3be873f33beec8091d34f56 parent 5e2fb0824a5aa42c8d1b1b177ab287e84685be39 author Michael Krufky Tue, 20 Jun 2006 09:17:48 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:10 -0300 V4L/DVB (4121): Update cardlist documentation Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 5e2fb0824a5aa42c8d1b1b177ab287e84685be39 tree 79e7c3fca59938b113ab9e46cd01e2c873d8576b parent 657de3cd32285831a56f9f96deb85c64205c42fc author Mauro Carvalho Chehab Tue, 20 Jun 2006 15:03:19 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:10 -0300 V4L/DVB (4120): Ovcamship position at Kconfig changed Ovcamship is used only on some USB webcams (OV511 and W9968CF) Bettet to leave this item just after those webcams. Signed-off-by: Mauro Carvalho Chehab commit 657de3cd32285831a56f9f96deb85c64205c42fc tree 3caea8235cc28ef10affe81277724e5a1adcf02e parent f49ba8d7cd252eac19004e2ebe18dfffe548c2c3 author Trent Piepho Tue, 20 Jun 2006 00:30:57 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:10 -0300 V4L/DVB (4118): Whitespace cleanups Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit f49ba8d7cd252eac19004e2ebe18dfffe548c2c3 tree a91742f82beba13ce29f673907f06446d6491fad parent 4ceb04e1b1cf724b6ed805955adfbbdfa8a3d436 author Zac Bowling Mon, 19 Jun 2006 19:49:20 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:10 -0300 V4L/DVB (4115): Saa7134 card (LifeView3000 NTSC) Add detection for the LifeView3000 NTSC model (right now the PAL version is the only one in there, which is sort of annoying for me living in the US and all.. sigh...) This is one of those things that I like to classify "as a works for me so take it or leave it" :-) . Not that worried because its an $18 video capture card that didn't look it was selling to well in the US, but then again who knows. The documentation needs updating too I bet but its behind anyways usually to what is in the code. Signed-off-by: Zac Bowling Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 4ceb04e1b1cf724b6ed805955adfbbdfa8a3d436 tree 474b3c027e8a34699062cf2aff094e7f1a286799 parent 35a303b1d788623939756136d85aecccf2d82686 author Mauro Carvalho Chehab Sat, 17 Jun 2006 08:52:30 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:09 -0300 V4L/DVB (4112): Fix: videodev.c were cleaning the pointer, not the values Signed-off-by: Mauro Carvalho Chehab commit 35a303b1d788623939756136d85aecccf2d82686 tree adfcdb06c9cdb354baadd51b781e4702db1cc0c3 parent 89a58c83f8f1056583f30c4d4258b1fec39bb0e2 author Jose Alberto Reguero Sat, 17 Jun 2006 08:05:41 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:09 -0300 V4L/DVB (4110): Small bug in saa7127.c Fix wrong wss debug info. Signed-off-by: Jose Alberto Reguero Signed-off-by: Mauro Carvalho Chehab commit 89a58c83f8f1056583f30c4d4258b1fec39bb0e2 tree 2add8629720749804558518a59f7c0b93b041632 parent 5dab71b1e85356fdd7cbc29d338ca6c0bd0e4e49 author Mauro Carvalho Chehab Sat, 17 Jun 2006 07:57:03 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:09 -0300 V4L/DVB (4108): Fixes some userspace dependencies at V4L2 public api header Make life easier for distro guys, by removing the need of including at the userspace header. Also, linux/compiler.h is not needed at userspace. Signed-off-by: Mauro Carvalho Chehab commit 5dab71b1e85356fdd7cbc29d338ca6c0bd0e4e49 tree 9d8fa500837febc461e931994b8efccfdd61cb45 parent 81e47e33add6874dc0ee094bd2a672241cbba829 author Trent Piepho Sat, 17 Jun 2006 07:48:03 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:09 -0300 V4L/DVB (4106): Fix problems with AV7110 firmware building Fix missing $() on variable name in dvb/ttpci/Makefile Fix AV7110 firmware dependencies so that parallel builds work correctly. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 81e47e33add6874dc0ee094bd2a672241cbba829 tree 609baf8d96958a22676b3202c169ad3d561ff086 parent 44f7f2b363a33e20ba9812e4a5c16fa7cc07a3ee author Trent Piepho Tue, 20 Jun 2006 01:26:39 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:09 -0300 V4L/DVB (4105): Remove uneeded prototype Uneeded extern prototype is removed, as the function is prototyped at media/v4l2-common.h. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 44f7f2b363a33e20ba9812e4a5c16fa7cc07a3ee tree 7bb99c458b4f29aed429429a20389c1a2709bfb2 parent 0f102910de010bb877cb6b37557b4e7b98b1039d author Trent Piepho Sat, 17 Jun 2006 07:46:31 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:08 -0300 V4L/DVB (4104): Default "yes", no. default y, yes. The Kernel config programs expect 'default y' and don't understand 'default "yes"'. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 0f102910de010bb877cb6b37557b4e7b98b1039d tree fd5478f52422e6c2e27eae681b9f56faa50617f3 parent c2af3cd68e0680a659166d0cecc24afb93b2000e author Michael Krufky Mon, 12 Jun 2006 14:18:26 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:08 -0300 V4L/DVB (4099): Cx88-dvb: clean up long linewraps This patch splits up dvb_pll_attach and isl6421_attach function calls such that the lines do not exceed 80 columns. This patch is purely cosmetic, with no functional change at all. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c2af3cd68e0680a659166d0cecc24afb93b2000e tree 841f742470484a1e9baffa034caef4d5c79e4f4e parent 66dd0fccbdbb77db897dd5870a67cb8022899adc author Michael Krufky Mon, 12 Jun 2006 14:06:22 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:08 -0300 V4L/DVB (4098): Cx88: #ifdef cleanups - moved CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL frontend_attach code up to share the #ifdef block with CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 66dd0fccbdbb77db897dd5870a67cb8022899adc tree 29db27b66ffadc1a9c18c84d657e5a8113816cf8 parent fd174c67253505d6af4a32c6e3d7ec8cbaed320d author Michael Krufky Mon, 12 Jun 2006 13:41:47 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:08 -0300 V4L/DVB (4097): Cx88: add support for DViCO FusionHDTV DVB-T Dual PCI based on zl10353 This patch adds support for a newer version of this device using the zl10353 frontend instead of the mt352 frontend. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fd174c67253505d6af4a32c6e3d7ec8cbaed320d tree 3c81b5210affafd1ebfb54dde2059520312046b8 parent c9ce394017162a90d79a4abc99eed3c7b2aed606 author Michael Krufky Mon, 12 Jun 2006 13:40:37 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:08 -0300 V4L/DVB (4096): CinergyT2: whitespace cleanup Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c9ce394017162a90d79a4abc99eed3c7b2aed606 tree 53d9badd4990e7de98b640a5cc148366ccc1618c parent f14ac0bc455a255c48f9110080e8889c6d65cec2 author Michael Krufky Sun, 11 Jun 2006 04:24:31 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:07 -0300 V4L/DVB (4094): Cxusb: add support for DViCO FusionHDTV DVB-T Dual USB based on zl10353 This patch adds support for a newer version of this device using the zl10353 frontend instead of the mt352 frontend. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f14ac0bc455a255c48f9110080e8889c6d65cec2 tree 0f53313126882618e50182dc98444651affd2a38 parent 774dd5d9bdcbfe2efb3425e8a0be0b4d01a65c26 author Jelle Foks Thu, 09 Mar 2006 17:44:07 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:07 -0300 V4L/DVB (3426): PATCH cx88-mpeg: cx8802_restart_queue() for blackbird Fixes "cx8802_restart_queue: queue is empty" storm in syslog Signed-off-by: Jelle Foks Signed-off-by: Mauro Carvalho Chehab commit 774dd5d9bdcbfe2efb3425e8a0be0b4d01a65c26 tree 61d89fd4b4e952d9d5aa9f62a24371ff78b9641c parent be4f451975c6514a9e12451c2ae2ce91d5673b06 author Dyks, Axel (XL) Sun, 11 Jun 2006 17:14:35 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:07 -0300 V4L/DVB (4090): Fix cinergyt2_poll() to allow non-blocking IO on frontend cinergyt2_poll()" shouldn't return (POLLIN | POLLRDNORM | POLLPRI) when there are no pending events. User space programs that do non-bocking IO using "select()" and/or "poll()" would otherwise produce high system load. Acked-by: Andreas Oberritter Signed-off-by: Axel Dyks Acked-by: Andreas Oberritter Signed-off-by: Mauro Carvalho Chehab commit be4f451975c6514a9e12451c2ae2ce91d5673b06 tree b217deec3af38171343fc25d2d6f10b9798afb62 parent 2ed64eb9e7b4cf27055f78a7bd2ccf33a912d0cd author Ricardo Cerqueira Thu, 08 Jun 2006 17:36:17 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:07 -0300 V4L/DVB (4088): Fixes for card cx88 #50 The description of the card has been updated to it's full name/model. The tuner has also been switched to a more compatible one (radio wasn't working, now it is) Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit 2ed64eb9e7b4cf27055f78a7bd2ccf33a912d0cd tree be2e88bf167c3015a1da9edac94ba863e8f5da6e parent 60110ce2b2ce74d8a49a4600ce58ba0b44f82800 author Mauro Carvalho Chehab Thu, 08 Jun 2006 17:16:46 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:06 -0300 V4L/DVB (4086): There were a cross-reference on cpia and cpia_pp/cpia_usb Those cross-references were generating an error: *** Warning: "cpia_pp_init" [/home/v4l/master/v4l/cpia.ko] undefined! *** Warning: "cpia_usb/_init" [/home/v4l/master/v4l/cpia.ko] undefined! Signed-off-by: Mauro Carvalho Chehab commit 60110ce2b2ce74d8a49a4600ce58ba0b44f82800 tree 79201e7352a93099a2cb54f0c777b11c69d05a9c parent 47ee2f387961cf300ffebfd56faa3a5823586c8b author Lothar Englisch Tue, 06 Jun 2006 16:13:46 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:05 -0300 V4L/DVB (4073): Support for new version of Satelco EasyWatch DVB-S light This patch adds support for Satelco EasyWatch DVB-S light card, a clone of the KNC 1, with PCI subsystem ID 1894:001e Signed-off-by: Lothar Englisch Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 47ee2f387961cf300ffebfd56faa3a5823586c8b tree 85683d26bd388c400dc606f0ebd843cfacc9adbf parent 845f16abad37e2a255ac1c167375f6588502f93f author Michael Krufky Tue, 06 Jun 2006 15:51:38 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:05 -0300 V4L/DVB (4072): Cx88: whitespace cleanup Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 845f16abad37e2a255ac1c167375f6588502f93f tree 2715019d91f4d0f7e309b36ffdb64de223ddf327 parent 5e87efa3b29c105f81fea785babafb098e4e046d author Eric Sesterhenn Tue, 06 Jun 2006 11:20:08 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:05 -0300 V4L/DVB (4070): Zoran strncpy() fix The zoran driver uses strncpy() in an unsafe way. This patch uses the proper sizeof()-1 size parameter. Since all strncpy() targets are initialised with memset() the trailing '\0' is already set. Where std->name was the target for the strncpy() we overwrote 8 Bytes of the std structure with zeros. Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 5e87efa3b29c105f81fea785babafb098e4e046d tree 7782d36699174e5985ee7ddca3860df130b0bbbb parent 839e4a4acb90fd34e3f6765bef6fe03ee82dbc58 author Mauro Carvalho Chehab Mon, 05 Jun 2006 10:26:32 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:05 -0300 V4L/DVB (4068): Removed all references to kernel stuff from videodev.h and videodev2.h The videodev.h and videodev2.h describe the public API for V4L and V4L2. It shouldn't have there any kernel-specific stuff. Those were moved to v4l2-dev.h. This patch removes some uneeded headers and include v4l2-common.h on all V4L driver. This header includes device implementation of V4L2 API provided on v4l2-dev.h as well as V4L2 internal ioctls that provides connections between master driver and its i2c devices. Signed-off-by: Mauro Carvalho Chehab commit 839e4a4acb90fd34e3f6765bef6fe03ee82dbc58 tree 50f3c4529a21ed9b149b60167263093d94bda593 parent c820cc45366377a84a5f66066db4e16b7a6e5b8c author Mauro Carvalho Chehab Sun, 04 Jun 2006 12:15:55 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:04 -0300 V4L/DVB (4067): Fixed cx25840 to work with PAL/M Sub-carrier frequency for PAL/M is slicely different than NTSC/M. Without this patch, colors don't work on PAL/M. Setting method also improved to allow other video standards to be included. Signed-off-by: Mauro Carvalho Chehab commit c820cc45366377a84a5f66066db4e16b7a6e5b8c tree 26ea15ce2b35a200b8ab9f891ff77da1e218b4a3 parent 401998fa96fe18b057af3f906527196522dd2d9d author Mauro Carvalho Chehab Sun, 04 Jun 2006 10:34:12 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:04 -0300 V4L/DVB (4066): Vivi.c were ported to the newer videodev2 format. Several common handling codes were removed. Maybe even more stuff may be handled at common infrastructure. Signed-off-by: Mauro Carvalho Chehab commit 401998fa96fe18b057af3f906527196522dd2d9d tree 32d656e18410ab05204c83b57969db23665e4fe9 parent 7565ab082de88ec274283d6b83980144e520a2fc author Mauro Carvalho Chehab Sun, 04 Jun 2006 10:06:18 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:04 -0300 V4L/DVB (4065): Several improvements at videodev.c Videodev now is capable of better handling V4L2 api, by processing V4L2 ioctls and using callbacks to the driver. The drivers should be migrated to the newer way and the older one will be obsoleted soon. Signed-off-by: Mauro Carvalho Chehab commit 7565ab082de88ec274283d6b83980144e520a2fc tree fe822a6824e542cc1231a9d8b85600bebc07c35d parent dd00b1e02081b4b543dac3619cc9c7f26c4bced4 author Mauro Carvalho Chehab Sun, 04 Jun 2006 09:11:13 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:04 -0300 V4L/DVB (4064): No drivers should use VIDIOC_*_OLD V4L core functions handle VIDIOC_*_OLD older ioctls. Signed-off-by: Mauro Carvalho Chehab commit dd00b1e02081b4b543dac3619cc9c7f26c4bced4 tree 3c02178c31d9c2acfa69e107972c17ec383ec77b parent 52398efcfa77aeb7e95ef99c9edadd909eb562a5 author Adrian Bunk Mon, 29 May 2006 12:31:44 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:03 -0300 V4L/DVB (4060): Make dvb/b2c2/flexcop-fe-tuner.c:alps_tdee4_stv0297_tuner_set_params() static This patch makes the needlessly global alps_tdee4_stv0297_tuner_set_params() static. Signed-off-by: Adrian Bunk Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 52398efcfa77aeb7e95ef99c9edadd909eb562a5 tree 3f9e7aa81030587f6fad5516705150452afdbbbf parent 2de873e630b9385c6cd5896753335c5bf4829f0c author Michael Krufky Fri, 26 May 2006 02:13:15 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:03 -0300 V4L/DVB (4058): Bttv: add autodetection support for Osprey 230 - use eeprom data to detect Osprey 230 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2de873e630b9385c6cd5896753335c5bf4829f0c tree d95fd36f5b3b50b83f062851415e82c463723704 parent 4bd6e9d968af68c73bee92bd93cd56937e2e80d8 author Malcolm Valentine Mon, 29 May 2006 13:56:24 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:03 -0300 V4L/DVB (4057): Cx88: IR remote support for DTV2000H Adds support for the Y0400052 remote supplied with this card. In addition to adding a number of buttons to the current winfast definition, it enables all the keys currently masked out with #ifdef 0. It is supplied separately as it remaps two keys from the current definition, The teletext button now sends KEY_TEXT instead of KEY_SUBTITLE, as that keycode is used by the subtitle button. KEY_BACK was changed to KEY_LAST to group it with KEY_NEXT. Other then that the keys don't overlap, so this should support several different versions of the Leadtek remotes. Signed-off-by: Malcolm Valentine Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 4bd6e9d968af68c73bee92bd93cd56937e2e80d8 tree 22728facba1d8d735885afe73dc292eed53cc0d4 parent bc53f78306a70d58e26f93d40ce19e61297cc18f author Malcolm Valentine Mon, 29 May 2006 13:51:59 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:03 -0300 V4L/DVB (4056): Cx88: Add basic support for Leadtek Winfast DTV2000H card Add DVB-T and PAL-G television support for Winfast DTV2000H Signed-off-by: Malcolm Valentine Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit bc53f78306a70d58e26f93d40ce19e61297cc18f tree bd9d095e00c6fe5b18093f39b4130a01b383e1ba parent 741b5bb6498e09178f14a3a5b2cc46e9970f46ed author Michael Krufky Sun, 28 May 2006 01:43:35 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:02 -0300 V4L/DVB (4053): KWorld HardwareMpegTV XPert: enable s-video/composite video inputs - Enabled s-video and composite video inputs. - Updated comments to reflect the current support for this card. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 741b5bb6498e09178f14a3a5b2cc46e9970f46ed tree e59711ad577b2839d5b935deef3ac502ebe28631 parent 3e3bf277f1d2487307227e2c5329763cf3af44bc author Mauro Carvalho Chehab Sun, 28 May 2006 15:45:54 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:02 -0300 V4L/DVB (4052): Wrong syntax: instead of bool, it was written boolean Signed-off-by: Mauro Carvalho Chehab commit 3e3bf277f1d2487307227e2c5329763cf3af44bc tree 9e3534c6279437c7520feca3725e3e5d20246147 parent 88ca8ed0b7f2f04a055ff3c389f398ba3ad3d27d author Christopher Neufeld Wed, 24 May 2006 10:16:45 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:00 -0300 V4L/DVB (4050): Add NTSC sliced VBI support to the cx25840 module. NTSC sliced VBI support by Christopher Neufeld with additional fixes by Hans Verkuil . Signed-off-by: Christopher Neufeld Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 88ca8ed0b7f2f04a055ff3c389f398ba3ad3d27d tree 03964b1b5ca2bee2be790647efa3d922201b1710 parent a22f1cbc2d3acd99986e96092109f6ced0f0022e author Scott Alfter Sat, 20 May 2006 16:04:31 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:00 -0300 V4L/DVB (4048): Add support for the Texas Instruments TLV320AIC23B audio codec Signed-off-by: Scott Alfter Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit a22f1cbc2d3acd99986e96092109f6ced0f0022e tree 8a01d0bd98db15858499548f5cf5e9c14c50215e parent c003d467bd71a7da22554e0d812a646ab58abea5 author Randy Dunlap Fri, 26 May 2006 10:32:13 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:00 -0300 V4L/DVB (4047): Doc. sources: expose video4linux/ Documentation/video4linux/: Expose example and tool source files in the Documentation/ directory in their own files instead of being buried (almost hidden) in readme/txt files. This will make them more visible/usable to users who may need to use them, to developers who may need to test with them, and to janitors who would update them if they were more visible. Also, if any of these possibly should not be in the kernel tree at all, it will be clearer that they are here and we can discuss if they should be removed. Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit c003d467bd71a7da22554e0d812a646ab58abea5 tree 2e66ab6cd7cce4a741d6ccfbc1d964b8d141f187 parent dea74869f3c62b0b7addd67017b22b394e942aac author David Mosberger-Tang Fri, 26 May 2006 10:28:13 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:05:00 -0300 V4L/DVB (4046): Trivial videodev2.h patch linux/videodev2.h uses types such as __u8 but it fails to include . Within the kernel, that's not a problem because already includes . However, there are user apps that try to include videodev2.h (e.g., ekiga) and at least on ia64, it causes compilation failures since doesn't get included for any other reason, leaving __u8 etc. undefined. The attached patch fixes the problem for me. Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit dea74869f3c62b0b7addd67017b22b394e942aac tree d1a597caea6615c76f34896cc832fd1371f2e776 parent 332bed5fc25ab0eb84215ecd89a4acd48219eee0 author Patrick Boettcher Sun, 14 May 2006 05:01:31 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:42 -0300 V4L/DVB (4028): Change dvb_frontend_ops to be a real field instead of a pointer field inside dvb_frontend The dvb_frontend_ops is a pointer inside dvb_frontend. That's why every demod-driver is having a field of dvb_frontend_ops in its private-state-struct and using the reference for filling the pointer-field in dvb_frontend. - It saves at least two lines of code per demod-driver, - reduces object size (one less dereference per frontend_ops-access), - be coherent with dvb_tuner_ops, - makes it a little bit easier for newbies to understand how it works and - avoids stupid mistakes because you would have to copy the dvb_frontend_ops always, before you could assign the static pointer directly, which was dangerous. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 332bed5fc25ab0eb84215ecd89a4acd48219eee0 tree 84145b98ee43babae232457b45de2a90de7f7f22 parent 2938d7800f2ea2f8ad88d5b241cbda868875e965 author Patrick Boettcher Sun, 14 May 2006 04:49:00 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:41 -0300 V4L/DVB (4027): Fixes after dvb_tuner_ops-conversion Some of the dvb_tuner_ops-pointer were set before having a dvb_frontend creating. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 2938d7800f2ea2f8ad88d5b241cbda868875e965 tree 28b796cc6329ad761a6620670f3173f2acdc767d parent 6e2040900467f3a80a3be558c7094ff022fb8cb4 author Michael Krufky Tue, 23 May 2006 18:39:29 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:39 -0300 V4L/DVB (4043): Miropcm20: fix sub-optimal header inclusion for sound/oss/aci.h Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 6e2040900467f3a80a3be558c7094ff022fb8cb4 tree fd74fbd68e226749174c2aba6bd6761668696054 parent 680543c5d2756ad3496f8ef197ba8825b78d6840 author Michael Krufky Tue, 23 May 2006 17:41:31 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:38 -0300 V4L/DVB (4042): Documentation: whitespace cleanup Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 680543c5d2756ad3496f8ef197ba8825b78d6840 tree b3ce796bbb5855351194a2850467dd79198483aa parent d6144028af6b151018c50c160e794a4d7f686333 author Ricardo Cerqueira Mon, 22 May 2006 07:44:02 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:37 -0300 V4L/DVB (4038): New cx88 card #50: NPG Tech RealTV Added support for a new cx88 card, including it's remote Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit d6144028af6b151018c50c160e794a4d7f686333 tree 39f1596643e5a394398a319fd31758169e6cf32f parent 0463f12c5cdc3d5577002826c302471b95b2532c author Mauro Carvalho Chehab Fri, 19 May 2006 13:08:09 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:36 -0300 V4L/DVB (4036): Fix some compilation warnings Signed-off-by: Mauro Carvalho Chehab commit 0463f12c5cdc3d5577002826c302471b95b2532c tree d63dd02cfe8ec2cc424bedc84c3e461d8a7977b5 parent 976e3483799ce5f718753d67454378d46500f0da author Andrew de Quincey Tue, 16 May 2006 17:22:02 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:34 -0300 V4L/DVB (4032): Fix Pinnacle 300i I had broken the mt352 tuning when a non-directly connected PLL was used - uncommon, but this is what is used on the pinnacle card. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 976e3483799ce5f718753d67454378d46500f0da tree 5cea343af1ad3fb802bfef632422c82ac06c09a1 parent 9bbe076f364aa7ba8c2e49e417a76d628ffb164c author Patrick Boettcher Sun, 14 May 2006 13:29:48 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:33 -0300 V4L/DVB (4030): Minor code cleanup on the genpix-module Minor code cleanup on the genpix-module. Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 9bbe076f364aa7ba8c2e49e417a76d628ffb164c tree 895a6b68aadc353156bfc7aa6f9ae70fe1429dcb parent 6daa4f86e9a01da6296f4c2bf40f8180a22718a8 author Alan Nisota Sun, 14 May 2006 13:23:56 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:32 -0300 V4L/DVB (4029): [PATCH] Genpix 8PSK->USB driver (Take 2) This is a patch which includes support for the GENPIX 8PSK->USB module. The board supports QPSK, BPSK and 8PSK decoding (though I don't think it will be DVB-S2 compliant) With the following patch, the boad is equivalent to a budget card (no CA Module) The patch which adds 8psk suppot will follow, but is seperate, as it requires DVB-S2 support More info on the board can be found at www.genpix-electronics.com (and they host the requisite firmwares there as well) Signed off by: Alan Nisota Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 6daa4f86e9a01da6296f4c2bf40f8180a22718a8 tree b4dbf2846082e5c39681a625aff37572923c2f05 parent b93eedb62e358588c5e595b07fb85efa1f597a9f author Ricardo Cerqueira Thu, 18 May 2006 12:19:57 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:30 -0300 V4L/DVB (4026): Bttv-gpio-irq is no longer used, remove it This functionality was used when remote control input for BTTV was handled by a standalone module, to hook some functions of that module into the main bttv core. Since that module is now extinct, this can go away Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit b93eedb62e358588c5e595b07fb85efa1f597a9f tree ec3ffd9ccd6136d752efa1dbea9235dbd85ed7f8 parent e48a9c6283c1ca2565167f0b4bce4d0be7f49fae author Sylvain Pasche Sat, 25 Mar 2006 23:14:42 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:28 -0300 V4L/DVB (4023): Subject: Pinnacle PCTV grey remote control support This adds support for the older (?) Pinnacle PCTV remotes (with all buttons colored in grey). There's no autodetection for the type of remote, though; saa7134 defaults to the colored one, to use the grey remote the "pinnacle_remote=1" option must be passed to the saa7134 module Signed-off-by: Sylvain Pasche Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit e48a9c6283c1ca2565167f0b4bce4d0be7f49fae tree 9784d3fb1ba0ac5c5d9d651737a78d23449ad51e parent a31246220c4681387799d435ee1d48e65db6d5f6 author jayakumar.video@gmail.com Wed, 17 May 2006 15:01:07 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:27 -0300 V4L/DVB (4018): Usbvideo/quickcam_messenger driver v4l Adds a usbvideo driver for the Logitech Quickcam Messenger USB webcam. Signed-off-by: Jaya Kumar Signed-off-by: Mauro Carvalho Chehab commit a31246220c4681387799d435ee1d48e65db6d5f6 tree 762d8a761bf499b3ac1e7faf2d2cffe363704801 parent 8397703ee0cc9ca27df5c058f60c4d4f1dc69595 author Angelo Marconi Tue, 09 May 2006 18:27:48 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:25 -0300 V4L/DVB (4016): Cx88-blackbird: add support for ProLink Pixelview Playtv@P7000 - Add support for ProLink Pixelview Playtv@P7000 Raw video and MPEG encoded video confirmed to work properly. SVideo, Composite and FM inputs are untested - disabled for now. Signed-off-by: Angelo Marconi Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 8397703ee0cc9ca27df5c058f60c4d4f1dc69595 tree a4c3e7c3715778eb2ce6ef0981fcebea5499f3ec parent 19b7ad314897cf4a2122208c6b9a372c50308c19 author Trent Piepho Fri, 12 May 2006 20:36:24 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:23 -0300 V4L/DVB (4014): Remove the spagetti code gotos that aren't useful Some code had pointless gotos that just didn't make any sense. They didn't make the code smaller, or faster, or easier to understand. Signed-off-by: Trent Piepho Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 19b7ad314897cf4a2122208c6b9a372c50308c19 tree f42cb9f89d7ec14816fb9c24b01c59da0590bf84 parent cd20ca9f194323c74ecccf15a3f5ff6c44effe69 author Per Dalén Fri, 12 May 2006 20:31:51 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:22 -0300 V4L/DVB (4013): Change the sweeprate for TT C1500 using QAM64 This patch changes the sweeprate for TT C1500 using QAM64. It has been proven to work using QAM64 at a SRate of 6875 for the two Signed-off-by: Mauro Carvalho Chehab commit cd20ca9f194323c74ecccf15a3f5ff6c44effe69 tree 36e8ad6eab353a34dec9713f9bfbfb7c5060a844 parent 9a10655ffa20b596fd162b1c96301f3bed752918 author Andrew de Quincey Fri, 12 May 2006 20:31:51 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:21 -0300 V4L/DVB (4012): Fix cx24123 diseqc Rework diseqc support to be more in line with the other demod drivers. Fix Nova-S-Plus/Nova-SE2 diseqc. Cleanup API. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 9a10655ffa20b596fd162b1c96301f3bed752918 tree 260cd005db42e1d872128c964d5c7c069682b493 parent 2e2aef7d5a8ac9d1c9b2c07a9fc96a7908d51d72 author Andrew de Quincey Fri, 12 May 2006 20:31:51 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:20 -0300 V4L/DVB (4011): Fix PLL refactoring breakage to WinTV NOVA T USB 2 driver The calls to set the pll ops were in the wrong place - moved them. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 2e2aef7d5a8ac9d1c9b2c07a9fc96a7908d51d72 tree d47a4f56440fff50e9b4f719328fb9502a5d2736 parent c0c044a71f3d0a0a73c954b389cbc4b55ed4c2ba author Hans Verkuil Sat, 29 Apr 2006 12:26:46 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:18 -0300 V4L/DVB (4008): Audio soft reset improvements The soft reset (de)assert commands where not at the right place. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c0c044a71f3d0a0a73c954b389cbc4b55ed4c2ba tree e6b2a43722b66dd8bd4f1934b2f2fde9f46e36ec parent e2b8cf4ced47465b24d6fe911714827475fb0412 author Hans Verkuil Sat, 29 Apr 2006 12:11:18 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:17 -0300 V4L/DVB (4006): Stop/start microcontroller when changing sampling frequency Stop/start microcontroller when changing sampling frequency to prevent tinny audio. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e2b8cf4ced47465b24d6fe911714827475fb0412 tree adc3dcf673c084ad58f3ace0c11d44141cd892a4 parent 3eb731705556b643df2cbae1bc98976335451548 author Hans Verkuil Sat, 22 Apr 2006 10:22:46 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:16 -0300 V4L/DVB (4005): Add support for the cx25836/7 video decoder. Signed-off-by: Scott Alfter Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3eb731705556b643df2cbae1bc98976335451548 tree a7495548ba45f84425ae014cf7bda2a127f8db1a parent 419ac5d466db4dba3eb6bd79ffe993b4a4e81b4f author Trent Piepho Tue, 23 May 2006 23:54:44 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:15 -0300 V4L/DVB (4002): Adjust VBI offset to match value reported in VBI format The actual offset of the start of VBI data is incorrectly documented for both the cx2388x and bt8x8. For the cx2388x, it appears to be about 220 to 224 + VBI_V_DEL*2. The driver has been incorrectly reporting an offset of 244. This patch adjusts VBI_V_DEL to 10, so that the offset of 244 is correct. This is the same offset as the bttv driver, and expected by some software. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 419ac5d466db4dba3eb6bd79ffe993b4a4e81b4f tree 87b7c933be8606f1b6169f0b1e3ad4f39335758a parent 7f2c8a9c5377bf48dcf1d1df7df11a3ef442c505 author Michael Schimek Mon, 22 May 2006 10:32:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:14 -0300 V4L/DVB (4001): Cx88 NTSC VBI fixes VBI (Closed Caption, CC) capturing never worked in NTSC mode with the cx88 driver. They were tested with libzvbi and a patched version of tvtime. Signed-off-by: Michael H. Schimek Signed-off-by: Mauro Carvalho Chehab commit 7f2c8a9c5377bf48dcf1d1df7df11a3ef442c505 tree ac8c910a9ce5dcd6c92911a2cd62d10910cbf933 parent cbee936f472d2d7fb42bb595acf8c451cdb73759 author Christoph Pfister Mon, 22 May 2006 10:32:09 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:11 -0300 V4L/DVB (3996): Make the table static Signed-off-by: Christoph Pfister Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit cbee936f472d2d7fb42bb595acf8c451cdb73759 tree f5c4e5b84783b4e784540f754be8aa76e64143f3 parent fc066478605330d929a90101be02efa2822f3cc0 author Manu Abraham Mon, 22 May 2006 10:32:08 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:10 -0300 V4L/DVB (3995): Add missing include Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit fc066478605330d929a90101be02efa2822f3cc0 tree 7ced1b75556bacc907499d186cdab2377672dce9 parent da22d0e758bf011be5921421bf490ce69c387784 author Michael Krufky Mon, 22 May 2006 10:32:05 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:09 -0300 V4L/DVB (3991): Cx88: add autodetection for another Twinhan VP-3054 board. Added autodetection for PCI subsystem id 1822:0019 to use the card definition for CX88_BOARD_DNTV_LIVE_DVB_T_PRO Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit da22d0e758bf011be5921421bf490ce69c387784 tree 87923892b62d43df67913d50ecb3424a8ee2facd parent 5c1208ba457a1668c81868060c08496a2d053be0 author Christoph Pfister Mon, 22 May 2006 10:32:04 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:08 -0300 V4L/DVB (3988): Add math routines required by DVB demods Signed-off-by: Christoph Pfister Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 5c1208ba457a1668c81868060c08496a2d053be0 tree 293abaefbcb991b6f6d645447ff41aaea3428f11 parent 48c35756a762e2d569dfd9ab2f24d1b63ea657b9 author Andrew de Quincey Mon, 22 May 2006 10:32:02 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:06 -0300 V4L/DVB (3984): Fix CI interface on KNC1 DVBT and DVBC cards These cards need special handling for CI - reinitialising the frontend device when the CI module is reset. Additionally the tda10021 needs to be set into a different transport stream mode when a CI module is present. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 48c35756a762e2d569dfd9ab2f24d1b63ea657b9 tree f055c4377781e29313be20d15ecd9a5421071a88 parent 2544bf2d619d09b564fbdd451fe4b1ba798f9c03 author Michael Krufky Mon, 22 May 2006 10:32:00 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:05 -0300 V4L/DVB (3982): Cx88-blackbird: use encoder firmware filename defined in cx2341x.h Since the filename of the cx23416 encoder firmware image is defined in cx2341x.h, we don't need to explicitly define it in cx88-blackbird.c anymore. This changeset removes BLACKBIRD_FIRM_ENC_FILENAME, replacing all occurrances with CX2341X_FIRM_ENC_FILENAME. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2544bf2d619d09b564fbdd451fe4b1ba798f9c03 tree d3c6f67a413db292e0a9bf93a1e2efcb25dfc491 parent 07f640f0ddd72e6158fca7f0694dbaf95cee4d2c author Valentin Zagura Mon, 22 May 2006 10:31:59 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:04 -0300 V4L/DVB (3973): Cx88-blackbird: pause the encoder during frequency change Added code to cx88-blackbird.c to treat the VIDIOC_S_FREQUENCY ioctl to stop mpeg stream before changing the frequency and restart it after. It seems that the mpeg stream needs to be paused while changing the channel frequency, otherwise the mpeg encoder enters into a bad state, producing artifacts. Signed-off-by: Valentin Zagura Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 07f640f0ddd72e6158fca7f0694dbaf95cee4d2c tree 0286cbf42dcb6b2b1869b3c663c375e858e4cf4b parent 861018a6a9b55ca1a5bf8cd0ff2d47944ce88827 author Mauro Carvalho Chehab Mon, 22 May 2006 10:31:57 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:01 -0300 V4L/DVB (3973a): Return value is ssize_t This patch fix a difference between v4l/dvb tree and kernel tree. Signed-off-by: Mauro Carvalho Chehab commit 861018a6a9b55ca1a5bf8cd0ff2d47944ce88827 tree e513ad8de57f62e663169e398629346f851e0009 parent 855dbada9b551d12a63754b92f67e34c113adf34 author Michael Krufky Mon, 22 May 2006 10:31:55 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 02:00:00 -0300 V4L/DVB (3971): Cx88-blackbird: use standard filename for cx23416 firmware cx88-blackbird uses the same encoder firmware for the cx23416 chip that is used by ivtv and pvrusb2. This patch alters the driver to expect the cx23416 encoder firmware to be located in the file, "v4l-cx2341x-enc.fw", instead of using "blackbird-fw-enc.bin" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 855dbada9b551d12a63754b92f67e34c113adf34 tree 075878261e7e3b171952e62a899ced3e1226304c parent d762052e1eafd95f3b4622e1990f40dfd0d45b0f author Michael Krufky Mon, 22 May 2006 10:31:54 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:59 -0300 V4L/DVB (3970): Cx88-blackbird: use firmware api commands defined in cx2341x.h This patch removes all of the BLACKBIRD_API #define's, instead using the equivalent CX2341X_ENC #define's in cx2341x.h Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit d762052e1eafd95f3b4622e1990f40dfd0d45b0f tree 54242da4b9ff2244c914ee34ccdac11aadd6b83e parent f6320bd3df5964619346bac77b36d03c5a82f6fd author Mauro Carvalho Chehab Mon, 22 May 2006 10:31:52 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:58 -0300 V4L/DVB (3968): Fix checking logic for a broken xawtv version moved from if to ifndef. Also added such tests at gentree script. Gentree updated to its latest version. Signed-off-by: Mauro Carvalho Chehab commit f6320bd3df5964619346bac77b36d03c5a82f6fd tree 1a293e3ad89d4d4db1b486fad8cc383a20c932dd parent 7923dee035ec81f6e4ad696e3edddbdd34d37873 author Mauro Carvalho Chehab Mon, 22 May 2006 10:31:50 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:57 -0300 V4L/DVB (3968a): Remove compatibility check for I2C_PEC Signed-off-by: Mauro Carvalho Chehab commit 7923dee035ec81f6e4ad696e3edddbdd34d37873 tree b3b4d5b3bd7719062818e8cf2a71f945db95d62c parent 18232ca61b4c73b849850200a5e6ec40517f35ab author akpm@osdl.org Mon, 22 May 2006 10:31:49 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:55 -0300 V4L/DVB (3967): Pwc-dec23 oops fix drivers/media/video/pwc/pwc-dec23.c: In function `pwc_dec23_decompress': drivers/media/video/pwc/pwc-dec23.c:885: warning: null argument where non-null required (arg 2) Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 18232ca61b4c73b849850200a5e6ec40517f35ab tree db62beb024d77bac0bb4351a01535d71cb0bc227 parent adcb0fa2504aac35e0ed285147b11e75a6db34c7 author Christian Praehauser Mon, 22 May 2006 10:31:47 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:54 -0300 V4L/DVB (3966): Core: ULE fixes and RFC4326 additions Fix some problems regarding support for Unidirectional Lightweight Encapsulation (ULE) in dvbnet.c. The original ULE code was based on a draft. In the meantime, ULE has been published in RFC 4326 (ftp://ftp.rfc-editor.org/in-notes/rfc4326.txt). With these fixes, and some additions (which are included in the patch), the decaps code should now be complient to RFC4326. Signed-off-by: Christian Praehauser Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit adcb0fa2504aac35e0ed285147b11e75a6db34c7 tree 1f1bee13f3e3fea4ad91f30a622776143aa299c1 parent a9686e0d204e3faa544434c709ccb599f8165252 author Adrian Bunk Mon, 22 May 2006 10:31:42 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:53 -0300 V4L/DVB (3963): Em28xx/: possible cleanups This patch contains the following possible cleanups: - make the following needlessly global functions static: - em28xx-core.c: em28xx_accumulator_set() - em28xx-core.c: em28xx_capture_area_set() - em28xx-core.c: em28xx_scaler_set() - em28xx-core.c: em28xx_isocIrq() - remove the following unused EXPORT_SYMBOL's: - em28xx-cards.c: em28xx_boards - em28xx-cards.c: em28xx_bcount - em28xx-cards.c: em28xx_id_table Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit a9686e0d204e3faa544434c709ccb599f8165252 tree 5641cf2bd9a5c4e4f4fec7fd0214b207a5277f25 parent ebfbc305bda90deadf73898493c707cce3b465e6 author Andrew de Quincey Mon, 22 May 2006 10:31:40 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:52 -0300 V4L/DVB (3935): Add missing pll gate control calls I'd missed some of these out, breaking the av7110 tuning. I then checked for more and added them in where necessary. They may not actually be necessary in all these locations, but if not, they'll simply have no effect. Add small delay to stv0299 pll gate control to fix tuning problems. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit ebfbc305bda90deadf73898493c707cce3b465e6 tree a4be91c35ee8b5f28cf2291412c7a6ca4b3feb17 parent 447d6fb8ccdc3a581a13fe4b5a62c384dc9fd36a author Mauro Carvalho Chehab Mon, 22 May 2006 10:31:38 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:50 -0300 V4L/DVB (3809c): Added cx2341x header file Date: There are several drivers now using those cx2341x registers. This patch creates a separate header for those registers. Signed-off-by: Mauro Carvalho Chehab commit 447d6fb8ccdc3a581a13fe4b5a62c384dc9fd36a tree 24163c66d1d1f27241c2a5c640175f3f7f42ce31 parent b8d4c235d50f8512bbc9d67730c24da3309b0307 author Mauro Carvalho Chehab Mon, 22 May 2006 10:31:37 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:48 -0300 V4L/DVB (3809b): Added missing docs at kernel tree Date: From: Mauro Carvalho Chehab There are some docs at V4L/DVB tree that were never included at kernel. This patch includes those docs. Signed-off-by: Mauro Carvalho Chehab commit b8d4c235d50f8512bbc9d67730c24da3309b0307 tree 9af461a3b198bfd6856ab510044363b34a7d7be4 parent 21c2858235a81ce4fa1862432eb0c98d8dbdee1e author Thomas Kaiser Thu, 27 Apr 2006 21:45:20 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:46 -0300 V4L/DVB (3934): Support new dvb-ttusb-budget boards with stv0297 Added config switch to stv0297 to control i2c STOP during write behaviour. Update frontend init in dvb-ttusb-budget. Enable i2c STOP on other users of stv0297. Signed-off-by: Thomas Kaiser Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 21c2858235a81ce4fa1862432eb0c98d8dbdee1e tree 7a06d90877c8379bb373b15f916d8f591c5df7ec parent d020542fdaaa69e3061e15d096f11fbc4aeeb93f author Andrew de Quincey Thu, 27 Apr 2006 21:45:09 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:44 -0300 V4L/DVB (3933): Add isl6421 module Driver for the ISL6421 LNB chip Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit d020542fdaaa69e3061e15d096f11fbc4aeeb93f tree 06566c4d1718ed5178109a2627ded473710814d4 parent 972c3517b792520a513d0ecd897ac6719e46fe0d author Andrew de Quincey Thu, 27 Apr 2006 21:45:01 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:43 -0300 V4L/DVB (3932): Convert lnbp21 to a module Convert lnbp21.h into a linux kernel module. Fix up previous users to use it. Convert dvb-ttusb-budget to use it. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 972c3517b792520a513d0ecd897ac6719e46fe0d tree 3dfb64c1829175648f5396e3df92ea3bbe3f4eb6 parent 9a8e10e034b268237af77e7ce73a54251eaf9fe2 author Adrian Bunk Thu, 27 Apr 2006 21:06:50 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:40 -0300 V4L/DVB (3931): Vivi.c: possible cleanups This patch contains the following possible cleanup: - make needlessly global functions static - remove unused #ifndef kzalloc kzalloc() #define - remove inline's from functions Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 9a8e10e034b268237af77e7ce73a54251eaf9fe2 tree b20be9c8b715a4728c63c00c703f27252a37bdf0 parent 6b3ccab75ce082f7d63a43903ebd75da4266f77e author Mauro Carvalho Chehab Thu, 27 Apr 2006 18:34:03 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:39 -0300 V4L/DVB (3929): Compilation for DVB_AV7110_FIRMWARE seems to be weird Some systems use a previous config information to generate a default config. This seems to cause troubles on some systems. This patch also fixes compilation for AV7110 firmware inside V4L/DVB tree. Signed-off-by: Mauro Carvalho Chehab commit 6b3ccab75ce082f7d63a43903ebd75da4266f77e tree 866d08667706310aaf7151a9802595fb44a7b63f parent 159f8a6eda8c2ee359bb87bf62be70da2da14918 author Andrew de Quincey Thu, 20 Apr 2006 12:01:47 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:38 -0300 V4L/DVB (3895): Additional frontend_init safety checks Don't try and set the tuner ops if the demod was not detected. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 159f8a6eda8c2ee359bb87bf62be70da2da14918 tree a1f503deb064b1c6e9cdc43b67ddfa3b9dd4c37d parent bd4956b8ec2075e965492647e0c7006a36efe5d9 author Andrew de Quincey Wed, 19 Apr 2006 18:31:03 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:37 -0300 V4L/DVB (3894): Fix tda10046 tuning I'd missed the i2c gate ctrl function out of the tda10046, so tuning didn't work Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit bd4956b8ec2075e965492647e0c7006a36efe5d9 tree 66d5ebecc0cdc84543cae07ca16a5d1a20aefb90 parent b12faeffb179e5397c7c443b0e86e447891125a6 author Andrew de Quincey Tue, 18 Apr 2006 21:38:49 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:34 -0300 V4L/DVB (3893): Convert calls from _pllbuf() to _calc_reg() Johannes Stezenbach suggested this change - definite improvement. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit b12faeffb179e5397c7c443b0e86e447891125a6 tree 9272db1e96be3d3d425f91fdd9201ac74294419b parent 56e0314d7bf56ada38f16edc44bec61741975b4d author Andrew de Quincey Tue, 18 Apr 2006 17:47:12 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:33 -0300 V4L/DVB (3888): Convert cxusb to refactored tuner code Rename pll calls to appropriate tuner calls. Remove pll functions from demod structures. Hook tuner call into tuner_ops. Attach dvb-pll where possible. Signed-off-by: Mauro Carvalho Chehab commit 56e0314d7bf56ada38f16edc44bec61741975b4d tree b97e11adbcd053175e49bd3ee4f8e03deb229467 parent 30fa61a5ee91bc546f9ebea70c7abda04b5b3e1e author Andrew de Quincey Tue, 18 Apr 2006 17:47:12 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:32 -0300 V4L/DVB (3886): Convert flexcop-fe-tuner to refactored tuner code Rename pll calls to appropriate tuner calls. Remove pll functions from demod structures. Hook tuner call into tuner_ops. Attach dvb-pll where possible. Add pll gate control calls where appropriate. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 30fa61a5ee91bc546f9ebea70c7abda04b5b3e1e tree 82eccc6649f0f02d102b1494ddd37c48b5fc33bc parent 9c26c8b169f4a7e2db9a3d5abd3ba74ea032dafd author Michael Krufky Thu, 27 Apr 2006 01:31:26 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:31 -0300 V4L/DVB (3920): Dvb: rename dvb_pll_tdvs_tua6034 to dvb_pll_lg_tdvs_h06xf Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9c26c8b169f4a7e2db9a3d5abd3ba74ea032dafd tree ae33f9bbcd91ea5a7e7cf77e42631a1d2bed5c84 parent fbe60daac4c34e39d1ca69684bcb76e62461ac21 author Michael Krufky Thu, 27 Apr 2006 01:29:17 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:29 -0300 V4L/DVB (3919): V4l: rename TUNER_LG_TDVS_H062F to TUNER_LG_TDVS_H06XF Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fbe60daac4c34e39d1ca69684bcb76e62461ac21 tree d399de101564f542681223a45c47caffcab71da0 parent a87cde0bfbf0020a5d0a80f94a80fc1470546999 author Martin Samuelsson Thu, 27 Apr 2006 10:17:00 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:28 -0300 V4L/DVB (3916): AverMedia 6 Eyes AVS6EYES support Add support for the AverMedia 6 Eyes MJPEG card. - Updated drivers/media/video/Kconfig with AVS6EYES options. - Added CONFIG_VIDEO_ZORAN_AVS6EYES to drivers/media/video/Makefile. - Added I2C_DRIVERID_BT866 and I2C_DRIVERID_KS0127 to include/linux/i2c-id.h - Added drivers/media/video/ks0127.c, imported and modified from the Marvel project. - Added drivers/media/video/ks0127.h, imported and modified from the Marvel project. - Added drivers/media/video/bt866.c, ported from a 2.4 version by Christer Weinigel. - Added AVS6EYES to drivers/media/video/zoran_card.c - Added input_mux to all cards in drivers/media/video/zoran_card.c - Added input mux module parameter to drivers/media/video/zoran_card.c - Added AVS6EYES to card_type in drivers/media/video/zoran.h - Added input_mux to card_info in drivers/media/video/zoran.h - Upped BUZ_MAX_INPUT in drivers/media/video/zoran.h from 8 to 16, as the AVS6EYES has 10. - Updated Documentation/video4linux/Zoran with information about AVS6EYES. Signed-off-by: Martin Samuelsson Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit a87cde0bfbf0020a5d0a80f94a80fc1470546999 tree fbfde92494794a11bcef89d633f6c5eb22fd354b parent 81ad3428660d06f8faa45eacdf6eb0f1424cd404 author Luca Risolia Wed, 26 Apr 2006 10:19:49 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:26 -0300 V4L/DVB (3906): ZC0301 driver updates This is a patch fixing a small bug in zc0301_start_transfer() introduced in the ZC0301 driver v1.04. Signed-off-by: Luca Risolia Signed-off-by: Mauro Carvalho Chehab commit 81ad3428660d06f8faa45eacdf6eb0f1424cd404 tree 85198fc8728ca8d5c5c014fd5e09f2750230b428 parent d3b9d6217e8f96d220a94bb5eebc786b62af817b author Michael Krufky Mon, 24 Apr 2006 23:21:46 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:25 -0300 V4L/DVB (3900): Rename fe_lgh06xf.h to lg_h06xf.h Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit d3b9d6217e8f96d220a94bb5eebc786b62af817b tree 7370323b7cd8267694a5e13539c30b5dbfa52349 parent f6adb91c9e9b12b727cf6afb95282d759d103743 author Andrew de Quincey Tue, 25 Apr 2006 05:36:19 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:22 -0300 V4L/DVB (3898): Fix dvb-usb tuner code I had forgotten to rename some of the tuner functions in the refactoring. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit f6adb91c9e9b12b727cf6afb95282d759d103743 tree 151f1c81b936c09eb4de6bbfd75b43747cbcd37b parent f54376e275415588d5cb1c54b9edf895391efd71 author Andrew de Quincey Tue, 18 Apr 2006 21:37:20 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:21 -0300 V4L/DVB (3892): Trim documentation Trim excess documentation down to the essentials. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit f54376e275415588d5cb1c54b9edf895391efd71 tree 66aaaf107319cf1dbedfb02309fc687038fae234 parent 8dec073225b0926a26656f416a8d32573205a78f author Andrew de Quincey Tue, 18 Apr 2006 17:56:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:20 -0300 V4L/DVB (3891): Convert cx88-dvb to refactored tuner code Rename pll calls to appropriate tuner calls. Remove pll functions from demod structures. Hook tuner call into tuner_ops. Attach dvb-pll where possible. Add pll gate control calls where appropriate. Sort out the hybrid cards to work with the revamped mt352/sl10353 demods supporting external tuners. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 8dec073225b0926a26656f416a8d32573205a78f tree 0ab93538c8e369bd7f52c5348d0a5db9a550ec4f parent 4e2eccae27d13d756826533e7cd1214b5825d97c author Andrew de Quincey Tue, 18 Apr 2006 17:47:12 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:18 -0300 V4L/DVB (3890): Add support for non-attached tuners to zl10353 Add no_tuner setting like in mt352. Update to use correct tuner API calls. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 4e2eccae27d13d756826533e7cd1214b5825d97c tree 0f305b462d4b58f5d2860abfbee7dd8a33545661 parent 74aa7a29fea916cb40c98c38e885cc2087c78774 author Andrew de Quincey Tue, 18 Apr 2006 17:47:12 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:17 -0300 V4L/DVB (3889): Sort out support for non-attached tuners on mt352 Make it use set_params/pllbuf as appropriate so it works with dvb_pll_attach()ed tuners. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 74aa7a29fea916cb40c98c38e885cc2087c78774 tree 1d09dc7d0142f674c6ef892837f63a8f4a08ddcb parent 272bc4db791bc49d50d5f77f24c688be6d1907f8 author Andrew de Quincey Tue, 18 Apr 2006 17:47:12 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:16 -0300 V4L/DVB (3887): Convert bt8xx to refactored tuner code Rename pll calls to appropriate tuner calls. Remove pll functions from demod structures. Hook tuner call into tuner_ops. Attach dvb-pll where possible. Add pll gate control calls where appropriate. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 272bc4db791bc49d50d5f77f24c688be6d1907f8 tree d617d3868f282e85674e34ddac1e380e173b3bab parent a263394b4866a89860d7b5dbcacf33a32f00d206 author Andrew de Quincey Tue, 18 Apr 2006 17:47:12 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:15 -0300 V4L/DVB (3885): Convert dvb-pll to be a refactored tuner Rename pll calls to appropriate tuner calls. Remove pll functions from demod structures. Hook tuner call into tuner_ops. Remove BUG_ON() and convert to a soft error. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit a263394b4866a89860d7b5dbcacf33a32f00d206 tree b4363628f63be84cdf2f11fc5f1c734f6019c7df parent aac9ee95ad655593b5b7438714be5a485dc7cb73 author Andrew de Quincey Tue, 18 Apr 2006 17:47:12 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:13 -0300 V4L/DVB (3884): Convert dibusb* to refactored tuner code Hook tuner call into tuner_ops. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit aac9ee95ad655593b5b7438714be5a485dc7cb73 tree ad5b091b3f029c89274197fdbb92fa913a8868d5 parent 2546b62ee70b2fc0e06814cfdb0ad586356d7a05 author Andrew de Quincey Tue, 18 Apr 2006 17:47:12 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:12 -0300 V4L/DVB (3883): Convert digtv to refactored tuner code Rename pll calls to appropriate tuner calls. Remove pll functions from demod structures. Hook tuner call into tuner_ops. Add pll gate control calls where appropriate. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 2546b62ee70b2fc0e06814cfdb0ad586356d7a05 tree 5035c0b6daf4f5cc30d6cc511f7ab3e7a9cbf151 parent ee6a2cb65c67c3d87478469f04fd023632dca345 author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:11 -0300 V4L/DVB (3882): Convert dvb-usb/umt-010 to refactored tuner code Hook tuner call into tuner_ops. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit ee6a2cb65c67c3d87478469f04fd023632dca345 tree de62a3ead3349c8f38a75b9cdbb4c906347cf319 parent 651b81be154ccf001890e77fbd45cdcac079e253 author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:10 -0300 V4L/DVB (3881): Convert core dvb-usb pll code to refactored tuner code Rename pll calls to appropriate tuner calls. Add pll gate control calls where appropriate. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 651b81be154ccf001890e77fbd45cdcac079e253 tree eaeeb814234b0f3c61fed95601dc35e02a9e0382 parent a79ddae9fe993adab8d728a7a2a6a4038f0861c8 author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:09 -0300 V4L/DVB (3880): Convert dvb-ttusb-budget to refactored tuner code Rename pll calls to appropriate tuner calls. Remove pll functions from demod structures. Hook tuner call into tuner_ops. Add pll gate control calls where appropriate. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit a79ddae9fe993adab8d728a7a2a6a4038f0861c8 tree 03ad02e4c4b5684106960c0061385cec2f25c4fd parent 2d15fd2f01fc76dc6856a5c551e32e4510f2b492 author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:07 -0300 V4L/DVB (3879): Convert saa7134-dvb to refactored tuner code Rename pll calls to appropriate tuner calls. Remove pll functions from demod structures. Hook tuner call into tuner_ops. Attach dvb-pll where possible. Add pll gate control calls where appropriate. Move europa specific code from tda1104x into card driver using ops overrides (this is how it should ebe done instead of hacking card specific code into the demod driver). Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 2d15fd2f01fc76dc6856a5c551e32e4510f2b492 tree fa79693219375d724b84f39ca7c3bc5d914eb3f8 parent e87d41c4952ceef7a9f760f38f9343d015279662 author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:06 -0300 V4L/DVB (3878): Convert ttpci/budget-patch to refactored tuner code Rename pll calls to appropriate tuner calls. Remove pll functions from demod structures. Hook tuner call into tuner_ops. Add pll gate control calls where appropriate. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit e87d41c4952ceef7a9f760f38f9343d015279662 tree f3c5623d83d3351361f01fed526fa2cf6f26f9cd parent 0f591d409b63999ee8053df9cfbedd77bfbf3b22 author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:05 -0300 V4L/DVB (3877): Convert ttpci/budget-av to refactored tuner code Rename pll calls to appropriate tuner calls. Remove pll functions from demod structures. Hook tuner call into tuner_ops. Add pll gate control calls where appropriate. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 0f591d409b63999ee8053df9cfbedd77bfbf3b22 tree 207fa0412cf5c1ca2e95cf86083206e9dd134ff0 parent 067145bdd41bcb090510c73cc6ecd7b09213f038 author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:04 -0300 V4L/DVB (3876): Convert ttpci/budget-ci to refactored tuner code Rename pll calls to appropriate tuner calls. Remove pll functions from demod structures. Hook tuner call into tuner_ops. Add pll gate control calls where appropriate. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 067145bdd41bcb090510c73cc6ecd7b09213f038 tree 4c05df6ad2ed987ebed986a294a22e2d76803e09 parent fa006d86716891657dc8cc9b330b546d1899a7b4 author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:02 -0300 V4L/DVB (3875): Convert ttpci/budget to refactored tuner code Rename pll calls to appropriate tuner calls. Remove pll functions from demod structures. Hook tuner call into tuner_ops. Add pll gate control calls where appropriate. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit fa006d86716891657dc8cc9b330b546d1899a7b4 tree 36a2853a41d994f88ab6322da547db0e57591b91 parent 4b4c9150dafda804a24885683162a898bcc564f2 author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:01 -0300 V4L/DVB (3874): Convert ttpci/av7110 to refactored tuner code Rename pll calls to appropriate tuner calls. Remove pll functions from demod structures. Hook tuner call into tuner_ops. Add pll gate control calls where appropriate. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 4b4c9150dafda804a24885683162a898bcc564f2 tree 2ab0b3e161538fc480d052cbf0dafa643ca0fb2b parent c72bf909c1d65c4a95fee8c42cf47a5f5a5ff246 author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:59:00 -0300 V4L/DVB (3873): Convert pluto2 to refactored tuner code Rename pll calls to appropriate tuner calls. Remove pll functions from demod structures. Hook tuner call into tuner_ops. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit c72bf909c1d65c4a95fee8c42cf47a5f5a5ff246 tree 6856ee9694b61f384362df5df7a3c3355b93f033 parent 02269f37727901e326adf52d61512e4f00c85597 author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:59 -0300 V4L/DVB (3872): Convert bsbe1/bsru6 to refactored tuner code Convert to tuner_ops call API. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 02269f37727901e326adf52d61512e4f00c85597 tree e6f1555f63f9a848538cd7394ab92b6284e4991e parent 261143ff12eadbf17d7497cd471f70cacaca9586 author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:57 -0300 V4L/DVB (3871): Convert lgdt330x to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 261143ff12eadbf17d7497cd471f70cacaca9586 tree 9f077103230415f09426cc050d379f6574cab742 parent 20b14562852a0d0327b86283d7391f45aa9293ef author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:56 -0300 V4L/DVB (3870): Convert dib3000* to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 20b14562852a0d0327b86283d7391f45aa9293ef tree bd2050a2ed68f24e6cd0ad52fe429f187a9d8b4e parent e994b8d97807536a0f02cff87058d284b29810b7 author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:55 -0300 V4L/DVB (3869): Convert cx24123 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit e994b8d97807536a0f02cff87058d284b29810b7 tree ce0a5d8362fd1534f04a9b1cf6518780161de3d7 parent 605ee41c432e550a4e6a4f6fd82013b2989e36a3 author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:54 -0300 V4L/DVB (3868): Convert zl10353 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Use standardised pllbuf call. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 605ee41c432e550a4e6a4f6fd82013b2989e36a3 tree c7979943fb4649618ccceebd3b343fd5cd4b8743 parent 638a3fba39748b63bdfa391bd65144e487a02e3c author Andrew de Quincey Tue, 18 Apr 2006 17:47:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:54 -0300 V4L/DVB (3867): Convert nxt6000 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Add i2c gate control function. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 638a3fba39748b63bdfa391bd65144e487a02e3c tree f9c4c5da4736074dff8cce10acc00c21469429a4 parent 44d92aa7817efa8f9f80f3bde2279221890a4cd2 author Andrew de Quincey Tue, 18 Apr 2006 17:47:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:53 -0300 V4L/DVB (3866): Convert nxt200x to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Standardise the calls used to retrieve tuner data. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 44d92aa7817efa8f9f80f3bde2279221890a4cd2 tree 2c1b8714203a4503d609a5435e458e1ef6f84e82 parent 089e980939ae4f0ff14d1fe816885aa8f00c6e75 author Andrew de Quincey Tue, 18 Apr 2006 17:47:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:52 -0300 V4L/DVB (3865): Convert or51132 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove dvb-pll code - done elsewhere now. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 089e980939ae4f0ff14d1fe816885aa8f00c6e75 tree 32f663f59af20a2beb0a6a290d0095755e81baad parent 81d8a8da8233eb63f783eb3241805ab629b15907 author Andrew de Quincey Tue, 18 Apr 2006 17:47:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:51 -0300 V4L/DVB (3864): Convert dvb_dummy_fe to refactored tuner code Make it call the tuner calls - in case someone wants to use it to develop a tuner without a demod. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 81d8a8da8233eb63f783eb3241805ab629b15907 tree 880c3020b37f96dd34edf36a975650b012b8481a parent f1e809191c6b960aef721aa6aa8a8c103039d937 author Andrew de Quincey Tue, 18 Apr 2006 17:47:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:50 -0300 V4L/DVB (3863): Convert cx24110 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Remove unneeded sleep function completely. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit f1e809191c6b960aef721aa6aa8a8c103039d937 tree 779885302da1f24d2dd6d087dc4c3adc87c4836e parent d1544ecb3b0589089ddb928affa7bd4255f9442e author Andrew de Quincey Tue, 18 Apr 2006 17:47:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:49 -0300 V4L/DVB (3862): Convert tda10021 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Add i2c gate control function. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit d1544ecb3b0589089ddb928affa7bd4255f9442e tree 9566aea55f2ef8dccabb87532abe9f0e089997f7 parent b800aae382bc3f79045ea544ad77bf03398d4443 author Andrew de Quincey Tue, 18 Apr 2006 17:47:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:47 -0300 V4L/DVB (3861): Convert mt352 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointer from structure. Use standardised pllbuf function. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit b800aae382bc3f79045ea544ad77bf03398d4443 tree c8749343a904f926d41662abf9c3cb67eecac882 parent a98af2246b3d0e85566b3b489ffbc8018b21b4a3 author Andrew de Quincey Tue, 18 Apr 2006 17:47:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:46 -0300 V4L/DVB (3860): Convert l64871 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit a98af2246b3d0e85566b3b489ffbc8018b21b4a3 tree c623cf3b886fdff23157c57310977f311f408a95 parent 74349bef1a5b5a287721a42bec08c226b095e8b0 author Andrew de Quincey Tue, 18 Apr 2006 17:47:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:45 -0300 V4L/DVB (3859): Convert s5h1420 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Add i2c gate control function. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 74349bef1a5b5a287721a42bec08c226b095e8b0 tree 410f251b3fce7a8e94120576ddd5f9fc25ddc839 parent e9f9c0d87b1d532b82618bc154246e2dba20934b author Andrew de Quincey Tue, 18 Apr 2006 17:47:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:44 -0300 V4L/DVB (3858): Convert tda1004x to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Add i2c gate control function. Remove europa specific hack (moved into appropriate card driver) Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit e9f9c0d87b1d532b82618bc154246e2dba20934b tree 295476e0cc4dbe0308a2888ddef4a1de85f492cb parent 085542dc8611d969ef698120c98288e24d5f4f9d author Andrew de Quincey Tue, 18 Apr 2006 17:47:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:42 -0300 V4L/DVB (3857): Convert sp8870 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Add i2c gate control function. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 085542dc8611d969ef698120c98288e24d5f4f9d tree 6bb447fb9bc4e7c6b1f08cd6f4070d164bdf3b0a parent 53a8ee3e903659482e009481ab51d6a6572e6a57 author Andrew de Quincey Tue, 18 Apr 2006 17:47:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:41 -0300 V4L/DVB (3856): Convert sp887x to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Add i2c gate control function. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 53a8ee3e903659482e009481ab51d6a6572e6a57 tree 18b67dc32c20b63192053501c9327427d6b78910 parent 66292ebee9c30e05d5df0229b2fa966883082cd3 author Andrew de Quincey Tue, 18 Apr 2006 17:47:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:40 -0300 V4L/DVB (3855): Convert stv0299 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Add i2c gate control function. Remove extra exported function. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 66292ebee9c30e05d5df0229b2fa966883082cd3 tree de6c1b150ebd177aab4d5435409b5b9def99989f parent 58b119e8a94e2f734cd3e43d1225281ed2d47c11 author Andrew de Quincey Tue, 18 Apr 2006 17:47:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:39 -0300 V4L/DVB (3854): Convert ves1x93 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Add i2c gate control function. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 58b119e8a94e2f734cd3e43d1225281ed2d47c11 tree ad71844263c0a9955ae146549d61176729f077d9 parent d21eac0385dd11d3118ffd374451916fa413c0df author Andrew de Quincey Tue, 18 Apr 2006 17:47:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:38 -0300 V4L/DVB (3853): Convert ves1820 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit d21eac0385dd11d3118ffd374451916fa413c0df tree d4fa7e3d701e873ffcdcaa4c65bbe766933b695a parent 58ac7d36179e27d82e067752b792b1cc573fc590 author Andrew de Quincey Tue, 18 Apr 2006 17:47:09 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:36 -0300 V4L/DVB (3851): Convert tda8083 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 58ac7d36179e27d82e067752b792b1cc573fc590 tree fbd23af32dc21f395e77740baba757379db27154 parent a81870e00bf502db2c579dcb9721adab3775ba58 author Andrew de Quincey Tue, 18 Apr 2006 17:47:09 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:35 -0300 V4L/DVB (3850): Convert stv0297 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Add i2c gate control function. Remove extra exported pll gate control function. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit a81870e00bf502db2c579dcb9721adab3775ba58 tree f235348748b929e42aadc6a2dd5314fa6308b689 parent 0244422220f149d2e930deab89515fd5ca9a6bdd author Andrew de Quincey Tue, 18 Apr 2006 17:47:09 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:35 -0300 V4L/DVB (3849): Convert mt312 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Add i2c gate control function. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 0244422220f149d2e930deab89515fd5ca9a6bdd tree d8cbaf0fc00002b1161115b23919978ed380b848 parent 5becb3b045c21001eeeec37bae0738d8ede3a882 author Andrew de Quincey Tue, 18 Apr 2006 17:47:09 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:34 -0300 V4L/DVB (3848): Convert cx22702 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Add i2c gate control function. Remove dvb-pll support - done elsewhere now. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 5becb3b045c21001eeeec37bae0738d8ede3a882 tree 3d41b04cbbc210342a75d9ffa950f21ecb3600bc parent 7eef5dd6daecf3ee305116c9cf41ae7166270c4c author Andrew de Quincey Tue, 18 Apr 2006 17:47:09 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:32 -0300 V4L/DVB (3847): Convert cx22700 to refactored tuner code Convert to tuner_ops calls. Remove pll function pointers from structure. Remove unneeded tuner calls. Add i2c gate control function. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 7eef5dd6daecf3ee305116c9cf41ae7166270c4c tree 0abee619372a014ce4c3ec41a0ed01008c756807 parent 7c25039dbb45f3e6a34dabe715107d34d298dc40 author Andrew de Quincey Tue, 18 Apr 2006 17:47:09 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:31 -0300 V4L/DVB (3845): DVB core changes for PLL refactoring Add tuner_ops structure. Add calls into dvb_frontend to support the new tuner architecture. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 7c25039dbb45f3e6a34dabe715107d34d298dc40 tree 861fd1121e5648d29c021b4d42d0b2abe800f5dc parent 55bbcdefc525236bd6ed691456923322be4a82c7 author Michael Krufky Tue, 18 Apr 2006 17:47:08 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:30 -0300 V4L/DVB (3844): B2c2-flexcop: use fe_lgh06xf.h - removed duplicated tuning code for LG TDVS H061F Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 55bbcdefc525236bd6ed691456923322be4a82c7 tree 82fc5c2412ea8e5af585d4b76aed94285b168366 parent 7e557743360104cf71aab1f34df58ef5e7d0b042 author Michael Krufky Tue, 18 Apr 2006 17:47:08 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:29 -0300 V4L/DVB (3843): Cxusb: use fe_lgh06xf.h - removed duplicated tuning code for LG TDVS H064F Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7e557743360104cf71aab1f34df58ef5e7d0b042 tree 9d0f64fe735a3cebcb0c821f61cb2c71f63a68f1 parent 3d043661064b37f54e8123d17b436aea05da19d6 author Michael Krufky Tue, 18 Apr 2006 17:47:08 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:28 -0300 V4L/DVB (3842): Cx88-dvb: use fe_lgh06xf.h - removed duplicated tuning code for LG TDVS H062F/H064F Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 3d043661064b37f54e8123d17b436aea05da19d6 tree 7d0c9662bba21817e1fe24a7878ed72a464f0b19 parent 8f611b87f437703b95b725afe0388e4fb9cd6587 author Michael Krufky Tue, 18 Apr 2006 17:47:08 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:26 -0300 V4L/DVB (3841): Dvb-bt8xx: use fe_lgh06xf.h - removed duplicated tuning code for LG TDVS H064F Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 8f611b87f437703b95b725afe0388e4fb9cd6587 tree 4b56ea3a26421c84aaa365528df5786c33431ad1 parent 0230185d337be9810eeaf4a873fa1fa9f7bc52bf author Michael Krufky Tue, 18 Apr 2006 17:47:08 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:25 -0300 V4L/DVB (3840): Create standalone fe_lgh064f header move all pll_set functions for lg-tdvs-h06xf atsc tuners to a standalone header Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0230185d337be9810eeaf4a873fa1fa9f7bc52bf tree b6c97d58318195539581e1af3fd93266b79e2e99 parent 2b455db6d456ef2d44808a8377fd3bc832e08317 author Luca Risolia Mon, 24 Apr 2006 11:28:23 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:24 -0300 V4L/DVB (3838): ZC0301 driver updates ZC0301 driver updates: - Add support for PB-0330 image sensor - Generic documentation cleanups and updates Signed-off-by: Luca Risolia Signed-off-by: Mauro Carvalho Chehab commit 2b455db6d456ef2d44808a8377fd3bc832e08317 tree b7b7bcabd53f9bb58d7f69eb6d012735dacd31c7 parent d9e12f25cf538d103426946121d214dff332efbb author Luc Saillard Mon, 24 Apr 2006 10:29:46 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:20 -0300 V4L/DVB (3835): [PATCH] update pwc driver Add v4l2 compatibility Include the decompressor (legal problem has been resolv by Alan Cox) Faster decoder and easier to maintain, optimize, ... Can export to userland compressed stream Support more cameras, lot of bugs are fixed. Signed-off-by: Luc Saillard Signed-off-by: Mauro Carvalho Chehab commit d9e12f25cf538d103426946121d214dff332efbb tree 62767d340fc1716fddc993df602c62238d76ddd8 parent 0b5f56d67821587495eb47014750e2ae7373d635 author Michael Krufky Sat, 22 Apr 2006 16:15:11 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:19 -0300 V4L/DVB (3830): Fix display name for LG TDVS-H06xF This patch fixes the display name for LG TDVS-H06xF tuners in both tuner and dvb-pll modules. Changing the names of the actual pll_desc struct and tuner definitions has been held back until after the dvb tuner refactoring gets merged. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0b5f56d67821587495eb47014750e2ae7373d635 tree 811e988facd9eda40c315f8a7cf4dcffc35e9434 parent 6fe00b0ed10833a3faf18319be10620ed565bd24 author Valentin Zagura Thu, 20 Apr 2006 22:56:25 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:18 -0300 V4L/DVB (3827): Cx88-blackbird: clean up the buffers when closing the MPEG stream This patch cleans up the buffer queue when the MPEG stream is closed, preventing the message, 'cx8802_timeout' Signed-off-by: Valentin Zagura Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 6fe00b0ed10833a3faf18319be10620ed565bd24 tree 35b15546d2b490faa10412989ab705d0ab721c7c parent 01a9cd99cfd5b91ca38df74db60629d76e83cb94 author Adrian Bunk Wed, 19 Apr 2006 20:49:28 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:16 -0300 V4L/DVB (3820): Drivers/media/dvb/dvb-usb/: possible cleanups - make the following needlessly global struct static: dvb-usb/cxusb.c: cxusb_mt352_config Signed-off-by: Adrian Bunk Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 01a9cd99cfd5b91ca38df74db60629d76e83cb94 tree abb7de8220116d41cf14810e581b01509ebd9634 parent c344933af5a8610d71bd0d92fe43a1519ed72ed8 author Michael Krufky Tue, 18 Apr 2006 00:22:09 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:15 -0300 V4L/DVB (3817): KWorld HardwareMpegTV XPert: set encoder video standard based on tvnorm The KWorld HardwareMpegTV XPert uses a multistandard tuner, tda8290 + tda8275. Without checking the video standard in blackbird_probe, the encoder defaults to PAL, even if the incoming video stream is NTSC. This patch checks the video standard set by the cx2388x decoder, and sets the encoding height and frame accordingly. This patch is designed to only affect the KWorld HardwareMpegTV XPert. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c344933af5a8610d71bd0d92fe43a1519ed72ed8 tree d82bcdd85c83a2f8483c35b88dd813b6642c8fbb parent 8d6cdd235d19c3bb1f86f40bf0305049c1a61955 author Hans Verkuil Wed, 19 Apr 2006 18:50:35 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:14 -0300 V4L/DVB (3814): Add support for Samsung TCPG 6121P30A PAL tuner. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8d6cdd235d19c3bb1f86f40bf0305049c1a61955 tree 722fc0ba60efd92e3e588c03d355c6f1628e6086 parent 3febc04d42d4a0bda64af0c929fdb871370e2a7a author Michael Krufky Sun, 16 Apr 2006 13:19:24 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:13 -0300 V4L/DVB (3811): Cxusb: lgh064f: set auxiliary byte in pll_set This changeset removes pll_init, and instead sets the tuner auxiliary byte in pll_set. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 3febc04d42d4a0bda64af0c929fdb871370e2a7a tree 40e06584337e9f4893576186a1599857fd795270 parent 1b77c54ee11ebe36ce4d0fe805e50aaafa6304b4 author Michael Krufky Sun, 16 Apr 2006 12:17:34 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:11 -0300 V4L/DVB (3810): KWorld HardwareMpegTV XPert: Enable Blackbird MPEG encoder support - clear I2SIN to deliver the audio stream to the cx23416 mpeg encoder. - enable blackbird support on the KWorld HardwareMpegTV XPert Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 1b77c54ee11ebe36ce4d0fe805e50aaafa6304b4 tree 6a02f82320387aaf197d0bce061f270ec00dc5de parent 8a17ef975648ce96b6a83b872b6ff4be6fdcd2a4 author Andrew Morton Thu, 27 Apr 2006 12:01:18 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:10 -0300 V4L/DVB (3809a): Remove compat stuff for DMX_GET_EVENT The ioctl were removed by: V4L/DVB (3727): Remove DMX_GET_EVENT and associated data structures due to the ioctl DMX_GET_EVENT has never been implemented, and also scrambling events can't be generated in a useful way by the hardware. This patch removes the corresponding entry at fs/compat_ioctl.c Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 8a17ef975648ce96b6a83b872b6ff4be6fdcd2a4 tree 29f16ce9b0e47e8bfc640ada6e411764a60d5016 parent 707f813729a87e4368532e0a53349192ddabb2e1 author Michael Krufky Thu, 13 Apr 2006 18:43:50 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:09 -0300 V4L/DVB (3807): Cx88-blackbird: fix typo BLACKBIRD_FIELD1_SAA7115 was repeated. Corrected version reads: blackbird_api_cmd(dev, BLACKBIRD_API_SET_CAPTURE_LINES, 2, 0, BLACKBIRD_FIELD1_SAA7115, BLACKBIRD_FIELD2_SAA7115 ) Thanks-to: Valentin Zagura for pointing this out. Acked-by: Hans Verkuil Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 707f813729a87e4368532e0a53349192ddabb2e1 tree 9682f38d824424ef6d6779f9fec0d3d72fc7e036 parent 473f54276a814810d4a06616b223a7d6829e1ad5 author Michael Krufky Thu, 13 Apr 2006 17:41:52 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:08 -0300 V4L/DVB (3806): Cx88-blackbird: allow proper detection of PAL vs. NTSC video standard - removed test for CX88_BOARD_HAUPPAUGE_ROSLYN prior to determining whether the video standard in use is NTSC or PAL. Acked-by: Hans Verkuil Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 473f54276a814810d4a06616b223a7d6829e1ad5 tree 9e19e6496553d4efb55c5c21e256688990d14785 parent 7a3165a1520c608f10a66588ab48275e1ce253f5 author Andrew de Quincey Thu, 13 Apr 2006 17:29:07 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:07 -0300 V4L/DVB (3805): Fix KNC1 card frontend detection Since I reordered the CI/frontend detection, it turns out the frontend needs to have a GPIO set to power it on; otherwise frontend init fails. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 7a3165a1520c608f10a66588ab48275e1ce253f5 tree 09be3f17b46a64d847b13fec32f6d047ea20736f parent b3038304c91aa710fe651c7f42568e252fc54908 author Michael Krufky Thu, 13 Apr 2006 13:06:28 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:05 -0300 V4L/DVB (3801): Cx88-tvaudio: replace 'if' with 'switch..case' This patch cleans up a potential mess that has yet to occur in the card-specific part of cx88-tvaudio.c that sets sound input from external adc. It may be a good idea to move this setting into cx88-cards.c in the future. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit b3038304c91aa710fe651c7f42568e252fc54908 tree d3e2778fddb86770b5e81a0e703efd015cc133a8 parent 7d0dc26952fe0b49f9139f3264318abf195fe596 author Valentin Zagura Thu, 13 Apr 2006 12:41:43 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:04 -0300 V4L/DVB (3800): Cx88: added support for KWorld MCE 200 Deluxe This patch adds support for KWorld MCE 200 Deluxe. Raw video is working perfectly, MPEG capture using cx88-blackbird is also working, but the quality could be improved. svideo and radio until they can be tested also. Signed-off-by: Valentin Zagura Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7d0dc26952fe0b49f9139f3264318abf195fe596 tree 2613934803f0fb93657280a50ee145609acfefa6 parent 5d7dc8c4f667070dbc9a65e93b0e88ba9d19f22a author Trent Piepho Sun, 09 Apr 2006 18:48:04 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:03 -0300 V4L/DVB (3757): Fix alignment after the replacement from semaphore to muxex Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 5d7dc8c4f667070dbc9a65e93b0e88ba9d19f22a tree 4e35b2211bcea39a5645016d25e92fe33cc34e5e parent a8558577ff5562fe52c2c493e5bbc3dcdec7ce2f author Adrian Bunk Tue, 11 Apr 2006 10:26:57 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:58:02 -0300 V4L/DVB (3770): Kill drivers/media/common/saa7146_vv_ksyms.c This patch moves the EXPORT_SYMBOL's from drivers/media/common/saa7146_vv_ksyms.c to the files with the actual functions. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit a8558577ff5562fe52c2c493e5bbc3dcdec7ce2f tree 3986c366234fbc14325ff9517c4ad2a9d87ab5b6 parent ed7f36b6c68a18260798b16ba48ad7b22f54c2e6 author Uwe Bugla Tue, 11 Apr 2006 10:21:37 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:59 -0300 V4L/DVB (3769): Fix a type error in dvb_frontend.c Signed-off-by: Uwe Bugla Signed-off-by: Mauro Carvalho Chehab commit ed7f36b6c68a18260798b16ba48ad7b22f54c2e6 tree 1e1c0ffb0047d9889ccaa8be551b1e07c64dda1e parent 8c99024b88b5da3a73f0575dad98527c9a278d1b author Uwe Bugla Tue, 11 Apr 2006 10:20:34 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:58 -0300 V4L/DVB (3768): Fix a tab error in cx14110.c, dprintk Signed-off-by: Uwe Bugla Signed-off-by: Mauro Carvalho Chehab commit 8c99024b88b5da3a73f0575dad98527c9a278d1b tree ad4715143aeee52429b7ac3bf1ff485a5a3af66b parent 20fe4f6599ed300ebd5ef5ef20545a1297c094fa author Michael Krufky Tue, 11 Apr 2006 01:46:46 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:57 -0300 V4L/DVB (3765): Dvb-bt8xx: add support for DViCO FusionHDTV DVB-T Lite 2nd revision This patch adds support for the new revision of the DViCO FusionHDTV DVB-T Lite, based on the zl10353 demod instead of mt352. Both mt352 and zl10353 revisions of this card have the same PCI subsystem ID. Acked-by: Chris Pascoe Ack'd-by: Manu Abraham Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 20fe4f6599ed300ebd5ef5ef20545a1297c094fa tree da8c4771e8f454b3b8fb8381aaa93ffaf3af91f8 parent d09dbf92ada861244056d914a8f68b8be99891ed author Michael Krufky Mon, 10 Apr 2006 09:40:40 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:56 -0300 V4L/DVB (3764): Lgdt330x: update supported cards list in comments - pcHDTV HD5500 ATSC/QAM uses LG DT3303 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit d09dbf92ada861244056d914a8f68b8be99891ed tree 3746d352f1d3df6a069c7b740717706ec50a1981 parent 76d313bfea356550a614be51454d526e5090014d author Andrew de Quincey Mon, 10 Apr 2006 09:27:37 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:55 -0300 V4L/DVB (3762): Add sysfs device links to dvb devices Currently in /sys/class/dvb/dvbX.demuxY/ we have: dev uevent With the patch, we have (for a PCI DVB device): dev device -> ../../../devices/pci0000:00/0000:00:1e.0/0000:03:0d.0 uevent So userspace tools can (finally) work out which physical device a DVB adapter refers to. Previously you had to kinda look through dmesg and hope that it hadn't been dumped out of the buffer. This makes debugging a lot easier if the system has been up for a long time! This is done by adding an extra 'struct device *' parameter to dvb_register_adapter(). It will work with any kind of standard linux 'device'. Additionally, if someone has an embedded system which does things differently, they can simply supply 'NULL' and the behaviour will be as before - the link will simply not appear. Ack'd-by: Manu Abraham Acked-by: Michael Krufky Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 76d313bfea356550a614be51454d526e5090014d tree a9dc3634ea19f2eb01b6579678623191429610b6 parent 4286c6f65ec01efa8f5108cadea402ecf3b12279 author Trent Piepho Mon, 10 Apr 2006 09:27:08 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:54 -0300 V4L/DVB (3761): Silence some dprintk's in cx88-mpeg Changeset 395c7c4d8f0c changed several dprintks from level 1 to level 0 (always on). They generate four lines every time DMA starts, which don't containing any information with a use outside of debugging. This turns them back to level 1. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 4286c6f65ec01efa8f5108cadea402ecf3b12279 tree 080fc6a8f55f0ed1c9b06b5ee8421225ebe21b5b parent dcdda65fd5e70a698dd3d7e65762e178290284b7 author Mauro Carvalho Chehab Sat, 08 Apr 2006 16:06:16 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:53 -0300 V4L/DVB (3753): Whitespace cleanups at media/radio Signed-off-by: Mauro Carvalho Chehab commit dcdda65fd5e70a698dd3d7e65762e178290284b7 tree 32a1249838e7b93861b3d2f0d70813e9c9f4b9ab parent 0dbbc0a7ce1acc3a20857f25aa656bf2f5925766 author Andrew de Quincey Thu, 06 Apr 2006 10:37:56 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:52 -0300 V4L/DVB (3741): Budget-core doesn't check if register adapter fails If you have more than DVB_MAX_ADAPTERS in your machine, this causes an oops. Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 0dbbc0a7ce1acc3a20857f25aa656bf2f5925766 tree 2e1b36a538b4438b784b92a2ae54fa75afc14d1b parent e142e7c4186821f03890ff223925cdc7fc963742 author Trent Piepho Thu, 06 Apr 2006 06:03:09 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:50 -0300 V4L/DVB (3739): Add support for FE_GET_FRONTEND to or51132 frontend Adds the FE_GET_FRONTEND ioctl to the or51132 frontend. Current modulation is read from the hardware, while frequency is taken from the driver's state. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit e142e7c4186821f03890ff223925cdc7fc963742 tree 3107a5e4ea9c7a7203824bd3d27b879ecc26d935 parent da215d22d82d547c5312f61ac9881ad571e67eea author Michael Krufky Fri, 07 Apr 2006 03:24:54 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:49 -0300 V4L/DVB (3736): Cx88 cleanup: move CX88_BOARD_PCHDTV_HD5500 to the end of the cards array - new cards should always be added to the end of the list. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit da215d22d82d547c5312f61ac9881ad571e67eea tree bb5f951cd219acb8fe4f97e5608ad4ddb078e0c7 parent 62838084b4c4c83cd511893132e2d8da84f48813 author Rusty Scott Fri, 07 Apr 2006 02:21:31 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:48 -0300 V4L/DVB (3735): Add support for pcHDTV HD5500 ATSC/QAM Added card definitions for the pcHDTV HD5500 ATSC/QAM card Signed-off-by: Rusty Scott Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 62838084b4c4c83cd511893132e2d8da84f48813 tree 9abb37c5cd1b76fbef5b1b9c852309c6671cf00d parent 68ef505e31bb182131c208d139c9b6da33d8d330 author Andreas Oberritter Wed, 05 Apr 2006 16:36:51 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:47 -0300 V4L/DVB (3727): Remove DMX_GET_EVENT and associated data structures The ioctl DMX_GET_EVENT has never been implemented. I guess no software is using it because of its lack of implementation. Future software won't use it, too, because this API doesn't make much sense the way it is: Frontend events have their own different API. Scrambling events can't be generated in a useful way by the hardware I know of. Signed-off-by: Andreas Oberritter Signed-off-by: Mauro Carvalho Chehab commit 68ef505e31bb182131c208d139c9b6da33d8d330 tree 4642f894d30c8f90f76cf02226c59506627e6627 parent 87184554722b9d06154d70a48aa63ad744ef3fa9 author Trent Piepho Tue, 04 Apr 2006 09:30:33 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:45 -0300 V4L/DVB (3724): Remove a wee bit of cruft A few lines that do nothing in the or51132 frontend, removed. Signed-off-by: Trent Piepho Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 87184554722b9d06154d70a48aa63ad744ef3fa9 tree 53bfab40c8e6f32175c6d773fb1d2e7e85a867bd parent 005b541f884975544594ceb8f2ff81b623500745 author Trent Piepho Tue, 04 Apr 2006 09:30:29 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:44 -0300 V4L/DVB (3723): Avoid unnecessary firmware re-loads in or51132 frontend As QAM_64, QAM_256, and QAM_AUTO all use the same firmware, switching between these modulations doesn't require a firmware re-load. This also fixes a mishandled error condition, in which the firmware file is loaded into the kernel, the clock mode is changed, but then the firmware upload to the device fails. The modulation change is aborted, but the clock mode would still be changed. Signed-off-by: Trent Piepho Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit 005b541f884975544594ceb8f2ff81b623500745 tree f579de689af2d61488698959770bc82df3f47d22 parent d147ed2aa46c3cfcbfeadb5d689e80b14cf1f160 author Trent Piepho Tue, 04 Apr 2006 01:56:30 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:43 -0300 V4L/DVB (3721): Fix spelling It's "Terrestrial" Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit d147ed2aa46c3cfcbfeadb5d689e80b14cf1f160 tree 24e6f78ee0ad9751999bd3fc862cfa8733c2a837 parent c3291069c2c22c3154e0809345f34ec9962d7d24 author Michael Krufky Mon, 03 Apr 2006 01:29:09 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:42 -0300 V4L/DVB (3720): Fix spelling error / typo in comments Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c3291069c2c22c3154e0809345f34ec9962d7d24 tree cb75bb62c84fb7b271cd3d48ada0f9175a3c22f1 parent 2e7c6dc3989136844eb63e05f9e4dc6608a763c6 author Michael Krufky Sun, 02 Apr 2006 19:11:10 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:40 -0300 V4L/DVB (3718): Removed trailing newlines Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2e7c6dc3989136844eb63e05f9e4dc6608a763c6 tree 1c4e6e02a9cc379a458d9290ab0539963c40d6ab parent c7c0b34c27bbf0671807e902fbfea6270c8f138d author Mauro Carvalho Chehab Mon, 03 Apr 2006 07:53:40 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:39 -0300 V4L/DVB (3715): Change all emails to the currently used one. Signed-off-by: Mauro Carvalho Chehab commit c7c0b34c27bbf0671807e902fbfea6270c8f138d tree 2d44aae2ae76ee47ca12262967ac5711bcc047b6 parent b7f8292c96463810edfecff70dd4631d47e5a36b author Hans Verkuil Sun, 02 Apr 2006 13:35:00 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:38 -0300 V4L/DVB (3712): Fix video input setting of em28xx, use _INT_S_VIDEO_ROUTING in tvp5150 - Use new routing input defines in em28xx-cards.c - Fix S-Video settings for tvp5150-based cards (input was copied from saa7115 based cards and worked only because S-Video was selected in the default: case) - Replace VIDIOC_S_INPUT by VIDIOC_INT_S_VIDEO_ROUTING in em28xx-video.c - Remove the now obsolete VIDIOC_S_INPUT handler in saa7115.c - Add VIDIOC_INT_G/S_VIDEO_ROUTING in tvp5150.c - Add new media/tvp5150.h with the routing defines. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b7f8292c96463810edfecff70dd4631d47e5a36b tree 02b1cfb3f753ea82c6fa51c901420074875be355 parent 2eb606db1134ce860cc0cbf8b533b6315d182e21 author Hans Verkuil Sun, 02 Apr 2006 12:50:42 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:36 -0300 V4L/DVB (3711): Add support for VIDIOC_INT_S_CRYSTAL_FREQ internal command. Some saa7115-based cards use a different crystal frequency and a different audio clock generation. Add a new VIDIOC_INT_S_CRYSTAL_FREQ command to be able to set these values. Also change the default APLL setting to 0. It makes no sense to have the audio clock independent from the video clock, this can lead to audio/video synchronization problems. Setting this to 0 is also consistent with the old saa7114.c source and the way the Hauppauge Windows driver sets it. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2eb606db1134ce860cc0cbf8b533b6315d182e21 tree 1b0d026b77bc7d1cb9f3d9f60dd4fb7ac655333f parent 0ead09180a0620eaef761da84259262bfcf21090 author Hans Verkuil Sun, 02 Apr 2006 08:21:02 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:34 -0300 V4L/DVB (3709): Improve line-in handling - improve handling of the EXTERN input: don't start an unnecessary carrier scan - improve the LOG_STATUS output - ensure that a carrier scan is started again when switching back to the tuner. - set correct prescale for L-NICAM Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0ead09180a0620eaef761da84259262bfcf21090 tree 15d954e51e5b40cf4d5930708fe98076adb1063a parent dfd8317d3340f03bc06eba6b58f0ec0861da4a13 author Trent Piepho Sun, 02 Apr 2006 20:40:33 -0300 committer Mauro Carvalho Chehab Sun, 25 Jun 2006 01:57:33 -0300 V4L/DVB (3708a): Clean up some cruft in or51132 frontend There is some old code in the or51133 firmware loading function that has no effect. Left a comment to in case it helps someone trying to reverse engineer the chip. Signed-off-by: Trent Piepho Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab commit dfd8317d3340f03bc06eba6b58f0ec0861da4a13 tree 43bd5c93ad045355687c26beb0983fcf6ca18a6b parent 83626b01275d0228516b4d97da008328fc37c934 parent c0897856553d45aee1780bed455b7c2e888dd64b author Linus Torvalds Sat, 24 Jun 2006 17:48:14 -0700 committer Linus Torvalds Sat, 24 Jun 2006 17:48:14 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: (25 commits) [ARM] 3648/1: Update struct ucontext layout for coprocessor registers [ARM] Add identifying number for non-rt sigframe [ARM] Gather common sigframe saving code into setup_sigframe() [ARM] Gather common sigframe restoration code into restore_sigframe() [ARM] Re-use sigframe within rt_sigframe [ARM] Merge sigcontext and sigmask members of sigframe [ARM] Replace extramask with a full copy of the sigmask [ARM] Remove rt_sigframe puc and pinfo pointers [ARM] 3647/1: S3C24XX: add Osiris to the list of simtec pm machines [ARM] 3645/1: S3C2412: irq support for external interrupts [ARM] 3643/1: S3C2410: Add new usb clocks [ARM] 3642/1: S3C24XX: Add machine SMDK2413 [ARM] 3641/1: S3C2412: Fixup gpio register naming [ARM] 3640/1: S3C2412: Use S3C24XX_DCLKCON instead of S3C2410_DCLKCON [ARM] 3639/1: S3C2412: serial port support [ARM] 3638/1: S3C2412: core clocks [ARM] 3637/1: S3C24XX: Add mpll clock, and set as fclk parent [ARM] 3636/1: S3C2412: Add selection of CPU_ARM926 [ARM] 3635/1: S3C24XX: Add S3C2412 core cpu support [ARM] 3633/1: S3C24XX: s3c2410 gpio bugfix - wrong pin nos ... commit 83626b01275d0228516b4d97da008328fc37c934 tree 7414f0b4ee877e10e40671df03425e362dd43c43 parent abb1cf3cb9532d824c8bda00a111adb106dd457d author Linus Torvalds Sat, 24 Jun 2006 17:47:09 -0700 committer Linus Torvalds Sat, 24 Jun 2006 17:47:09 -0700 Revert "[PATCH] usb: drivers/usb/core/devio.c dereferences a userspace pointer" This reverts commit 786dc1d3d7333f269e17d742886eac2188a2d9cc. As Al so eloquently points out, the patch is crap. The old code was fine, the new code was bogus. It never dereferenced a user pointer, the "->" operator was to an array member, which gives the _address_ of the member (in user space), not an actual dereference at all. Signed-off-by: Linus Torvalds commit c0897856553d45aee1780bed455b7c2e888dd64b tree acbee1a7cedca5087c3500f991a7de69b68da6b1 parent e11c910b5bcc1dbc38a5af7a24be2812fc956b27 parent 85fe068123aa11d3477ce88c7d365e233b1f2e10 author Russell King Sat, 24 Jun 2006 23:53:01 +0100 committer Russell King Sat, 24 Jun 2006 23:53:01 +0100 Merge signal handler branch commit 85fe068123aa11d3477ce88c7d365e233b1f2e10 tree 2b4d4a255737dc3b2bc031e0853902637250e125 parent ca195cfec9fff622a61b1b72534e73360747f735 author Daniel Jacobowitz Sat, 24 Jun 2006 23:46:21 +0100 committer Russell King Sat, 24 Jun 2006 23:46:21 +0100 [ARM] 3648/1: Update struct ucontext layout for coprocessor registers Patch from Daniel Jacobowitz In order for userspace to find saved coprocessor registers, move them from struct rt_sigframe into struct ucontext. Also allow space for glibc's sigset_t, so that userspace and kernelspace can use the same ucontext layout. Define the magic numbers for iWMMXt in the header file for easier reference. Include the size of the coprocessor data in the magic numbers. Also define magic numbers and layout for VFP, not yet saved. Signed-off-by: Daniel Jacobowitz Signed-off-by: Russell King commit 070b98bfda3d27269519067c1c67eaef695f3e0c tree e389ac93cadba08a955bae1baf0f2513867e6067 parent e838db685fcfd2e9a0548ffc5cb9447e6c3c11be author Sam Ravnborg Sun, 25 Jun 2006 00:07:55 +0200 committer Sam Ravnborg Sun, 25 Jun 2006 00:07:55 +0200 kbuild: trivial fixes in Makefile Signed-off-by: Sam Ravnborg commit e838db685fcfd2e9a0548ffc5cb9447e6c3c11be tree 980366e83c7bf2c9ece3f0ad77eb62dc8ee8fbc5 parent 6803dc0ea85ad21b2cb3ec88decff5e27d7a390b author Masatake YAMATO Thu, 22 Jun 2006 12:21:20 +0900 committer Sam Ravnborg Sat, 24 Jun 2006 23:52:05 +0200 kbuild: adding symbols in Kconfig and defconfig to TAGS I'm using TAGS generated from "make TAGS" to read the kernel source code. When I met a ifdef block #ifdef CONFIG_FOO ... #endif in the soruce code I would like to know the meaning CONFIG_FOO to decide whether I should read inside the ifdef block or not. meaning CONFIG_FOO is well documented in Kconfig. So it is nice if I can jump to CONFIG_FOO entry in Kconfig from "#ifdef CONFIG_FOO" with the tag jump. Here is the patch to add symbols in Kconfig and defconfig to TAGS in "make TAGS" operation. Signed-off-by: Masatake YAMATO Signed-off-by: Sam Ravnborg commit abb1cf3cb9532d824c8bda00a111adb106dd457d tree fd62d48b5057e36a476a8aa80ff5ea3fe337b4da parent b464f5794619bbe98a92e1bc4180986e39615ac4 parent c499aeb08cb24bed60e5bfc80720597bcf1a720d author Linus Torvalds Sat, 24 Jun 2006 14:48:43 -0700 committer Linus Torvalds Sat, 24 Jun 2006 14:48:43 -0700 Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: radeon constify radeon microcode Add i915 ioctls to configure pipes for vblank interrupt. drm: update radeon to 1.25 add r200 vertex program support drm: radeon add a tcl state flush before accessing tcl vector space commit b464f5794619bbe98a92e1bc4180986e39615ac4 tree 50f6df06a582b1c6b563af7ffd736a365a7941dd parent b9d8be7828e974f076717f0da608d052440fe192 parent 0fe6e2d2928e089d16ec5ed7ba634c1d60916020 author Linus Torvalds Sat, 24 Jun 2006 14:48:35 -0700 committer Linus Torvalds Sat, 24 Jun 2006 14:48:35 -0700 Merge branch 'intelfb-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6 * 'intelfb-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6: intelfb delousing commit b9d8be7828e974f076717f0da608d052440fe192 tree d4bc4d3e13f816a76b1a02bde922ee7ad0dbdbd9 parent d02f40e81e003be6ddba5c176f2e40ea290c3729 parent 1812fd40725c13cf050c29791a6dd35d593eb8d8 author Linus Torvalds Sat, 24 Jun 2006 14:48:24 -0700 committer Linus Torvalds Sat, 24 Jun 2006 14:48:24 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (40 commits) [SPARC64]: Update defconfig. [SPARC64]: Make auxio a real driver. [PARPORT] sunbpp: Convert to new SBUS device framework. [Documentation]: Update probing info in sbus_drivers.txt [SCSI] qlogicpti: Convert to new SBUS device framework. [SCSI] esp: Fix bug in esp_remove_common. [NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find(). [NET] myri_sbus: Kill unused next_module struct member. [NET] myri_sbus: Convert to new SBUS device layer. [NET] sunqe: Convert to new SBUS driver layer. [NET] sunbmac: Convert over to new SBUS device framework. [NET] sunlance: Convert to new SBUS driver framework. [NET] sunhme: Convert to new SBUS driver framework. [NET] sunhme: Kill __sparc__ and __sparc_v9__ ifdefs. [SCSI] sparc: Port esp to new SBUS driver layer. [SOUND] sparc: Port amd7930 to new SBUS device layer. [SBUS]: Rewrite and plug into of_device framework. [SPARC]: Port of_device layer and make ebus use it. [SPARC]: Port sparc64 in-kernel device tree code to sparc32. [SPARC64]: Add of_device layer and make ebus/isa use it. ... commit d02f40e81e003be6ddba5c176f2e40ea290c3729 tree 9a8147cc77bc6fead512abf6dfce25d4c38fa6b2 parent eb71c87a492b7090ff9e8ac46912c480a1687e38 author Linus Torvalds Sat, 24 Jun 2006 14:32:18 -0700 committer Linus Torvalds Sat, 24 Jun 2006 14:47:59 -0700 Enable minimal per-device resume tracing This is the minimal resume trace code to find which device resume (if any) results in problems. Usually, you'd use the information this generates as a starting point to adding more fine-grained trace event points. Signed-off-by: Linus Torvalds commit 6803dc0ea85ad21b2cb3ec88decff5e27d7a390b tree e4041b76ed21bd835018be3e8bbc5e2c1d76ce74 parent 15fde6751886fd972a64ed65ba49db309919c504 author Sam Ravnborg Sat, 24 Jun 2006 23:46:54 +0200 committer Sam Ravnborg Sat, 24 Jun 2006 23:46:54 +0200 kbuild: replace abort() with exit(1) We have had no use of the coredump file for a long time. So just exit(1) and avoid coredumping. Signed-off-by: Sam Ravnborg commit eb71c87a492b7090ff9e8ac46912c480a1687e38 tree 1136213dee0f942866b6c2c65de7e7c63ca94fda parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 author Linus Torvalds Sat, 24 Jun 2006 14:27:42 -0700 committer Linus Torvalds Sat, 24 Jun 2006 14:44:01 -0700 Add some basic resume trace facilities Considering that there isn't a lot of hw we can depend on during resume, this is about as good as it gets. This is x86-only for now, although the basic concept (and most of the code) will certainly work on almost any platform. Signed-off-by: Linus Torvalds commit 15fde6751886fd972a64ed65ba49db309919c504 tree 513c1eec2135f65ba0d980627346f7c07ad2b897 parent 3041e47e8b08d51188b2cbdbd9c1e6f43314c8f1 author Andreas Gruenbacher Tue, 09 May 2006 20:37:30 +0200 committer Sam Ravnborg Sat, 24 Jun 2006 23:42:46 +0200 kbuild: support for %.symtypes files Here is a patch that adds a new -T option to genksyms for generating dumps of the type definition that makes up the symbol version hashes. This allows to trace modversion changes back to what caused them. The dump format is the name of the type defined, followed by its definition (which is almost C): s#list_head struct list_head { s#list_head * next , * prev ; } The s#, u#, e#, and t# prefixes stand for struct, union, enum, and typedef. The exported symbols do not define types, and thus do not have an x# prefix: nfs4_acl_get_whotype int nfs4_acl_get_whotype ( char * , t#u32 ) The symbol type defintion of a single file can be generated with: make fs/jbd/journal.symtypes If KBUILD_SYMTYPES is defined, all the *.symtypes of all object files that export symbols are generated. The single *.symtypes files can be combined into a single file after a kernel build with a script like the following: for f in $(find -name '*.symtypes' | sort); do f=${f#./} echo "/* ${f%.symtypes}.o */" cat $f echo done \ | sed -e '\:UNKNOWN:d' \ -e 's:[,;] }:}:g' \ -e 's:\([[({]\) :\1:g' \ -e 's: \([])},;]\):\1:g' \ -e 's: $::' \ $f \ | awk ' /^.#/ { if (defined[$1] == $0) { print $1 next } defined[$1] = $0 } { print } ' When the kernel ABI changes, diffing individual *.symtype files, or the combined files, against each other will show which symbol changes caused the ABI changes. This can save a tremendous amount of time. Dump the types that make up modversions Signed-off-by: Andreas Gruenbacher Signed-off-by: Sam Ravnborg commit ca195cfec9fff622a61b1b72534e73360747f735 tree a98ce000e4ad01909155cad73e1ce5d1ff150117 parent aca6ca10974aa78adfb47291722ce851160213e4 author Russell King Sat, 24 Jun 2006 22:41:09 +0100 committer Russell King Sat, 24 Jun 2006 22:41:09 +0100 [ARM] Add identifying number for non-rt sigframe GDB couldn't reliably tell the difference between the old and new non-rt sigframes, so provide it with a number at the beginning which will never appear in the old sigframe, and hence provide gdb with a reliable way to tell the two apart. Signed-off-by: Russell King commit 3041e47e8b08d51188b2cbdbd9c1e6f43314c8f1 tree 9cdfff6223bd5d1ee03fbf8d036501cf711c03cd parent ac031f26e89cc04fc7504f31ae137857eb83a051 author Roman Zippel Sun, 18 Jun 2006 21:09:09 -0700 committer Sam Ravnborg Sat, 24 Jun 2006 23:32:37 +0200 kbuild: fix silentoldconfig recursion kconfig-fix-config-dependencies causes this: make CC=cc KBUILD_VERBOSE=1 -C /usr/src/25 SUBDIRS=/home/akpm/NVIDIA-Linux-x86_64-1.0-8762-pkg2/usr/src/nv modules make -f /usr/src/devel/Makefile silentoldconfig make -f /usr/src/devel/Makefile silentoldconfig make -f /usr/src/devel/Makefile silentoldconfig The basic problem is if we compile external modules, config-targets isn't set which can cause recursive calls to silentoldconfig to update the kernel configuration. Bail out and ask the user to update manually. Signed-off-by: Sam Ravnborg commit e11c910b5bcc1dbc38a5af7a24be2812fc956b27 tree 38fb4c1b23bf2085cd0b05db9c85e3b91819130f parent c1e08adc86f886ba0ad7c8f29c240d6e833e7ec7 parent c9b949a734adef5d05cbaa0b0546b924ca517155 author Russell King Sat, 24 Jun 2006 22:21:49 +0100 committer Russell King Sat, 24 Jun 2006 22:21:49 +0100 Merge S3C24xx branch commit c1e08adc86f886ba0ad7c8f29c240d6e833e7ec7 tree 67e66ff524c6d51c61475a3c0df7d8d4850b4284 parent 52e3e772a098274df3c6f5f1ad58cd7fe24089bf parent 1f64eb379cfc95d5f627b779685f7ac6721df322 author Russell King Sat, 24 Jun 2006 22:21:35 +0100 committer Russell King Sat, 24 Jun 2006 22:21:35 +0100 Merge ep93xx branch commit ac031f26e89cc04fc7504f31ae137857eb83a051 tree 688a89949e477a0cb12b21b44ace0df03593230d parent 468d949401d729b28eed6ea5be25695c5731d3f1 author Theodore Ts'o Wed, 21 Jun 2006 20:53:09 -0400 committer Sam Ravnborg Sat, 24 Jun 2006 23:16:45 +0200 kbuild: add option for stripping modules while installing them Add option for stripping modules while installing them. This function adds support for stripping modules while they are being installed. CONFIG_DEBUG_KERNEL (which will probably become more popular as developers use kdump) causes the size of the installed modules to grow by a factor of 9 or so. Some kernel package systems solve this problem by stripping the debug information from /lib/modules after running "make modules_install", but that may not work for people who are installing directly into /lib/modules --- root partitions that were sized to handle 16 megs worth of modules may not be quite so happy with 145 megs of modules, so the "make modules_install" never succeeds. This patch allows such users to request modules_install to strip the modules as they are installed. Signed-off-by: "Theodore Ts'o" Signed-off-by: Sam Ravnborg commit 468d949401d729b28eed6ea5be25695c5731d3f1 tree 5bd6c4265471c7d747386e74f813dbb2f644c73b parent c5e3003381f4e39773a1758a9eb68dff9740a56c author Al Viro Fri, 23 Jun 2006 23:22:43 +0100 committer Sam Ravnborg Sat, 24 Jun 2006 23:14:05 +0200 kbuild: kill some false positives from modpost Signed-off-by: Al Viro Signed-off-by: Sam Ravnborg commit c5e3003381f4e39773a1758a9eb68dff9740a56c tree dc19c3e6b1ffad15272f52bceddadc20f905e993 parent e5c44fd88c146755da6941d047de4d97651404a9 author Ram Pai Fri, 23 Jun 2006 16:44:38 -0700 committer Sam Ravnborg Sat, 24 Jun 2006 23:14:02 +0200 kbuild: export-symbol usage report generator The following patch provides the ability to generate a report of (1) All the exported symbols and their in-kernel-module usage count (2) For each module, lists the modules and their exported symbols, on which it depends. the report can be generated by executing: perl scripts/export_report The tool warns if the modules are not build using MODVERSIONING. Signed-off-by: Ram Pai Signed-off-by: Sam Ravnborg commit e5c44fd88c146755da6941d047de4d97651404a9 tree e97c72787b08f9576eb14242483b09ce8850934e parent 216b2f1f718d653795024a085636d063693dd9a9 author Sam Ravnborg Sat, 24 Jun 2006 22:50:18 +0200 committer Sam Ravnborg Sat, 24 Jun 2006 23:13:59 +0200 kbuild: fix make -rR breakage make failed to supply the filename when using make -rR and using $(*F) to get target filename without extension. This bug was not reproduceable in small scale but using: $(basename $(notdir $@)) fixes it with same functionality. Signed-off-by: Sam Ravnborg commit c9b949a734adef5d05cbaa0b0546b924ca517155 tree 030a98d23fd379139efd1d30f0c8fe885ceb0ca6 parent a019f4a9a7b4ec4986918e9aefa06815cf77b714 author Ben Dooks Sat, 24 Jun 2006 21:22:35 +0100 committer Russell King Sat, 24 Jun 2006 21:22:35 +0100 [ARM] 3647/1: S3C24XX: add Osiris to the list of simtec pm machines Patch from Ben Dooks Enable power management for Simtec Osiris Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a019f4a9a7b4ec4986918e9aefa06815cf77b714 tree 52f98219bc0d86e6c55e48513a6dcfa93a0cb44c parent 22346aea8d39372d6fd207468701e90bf546b882 author Ben Dooks Sat, 24 Jun 2006 21:21:37 +0100 committer Russell King Sat, 24 Jun 2006 21:21:37 +0100 [ARM] 3645/1: S3C2412: irq support for external interrupts Patch from Ben Dooks Move the decoding of the IRQ_EXT4 and above out of the entry macro, and into an chained irq handler as the EXTINT registers move depending on the CPU being used. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 22346aea8d39372d6fd207468701e90bf546b882 tree ceb871ca3512e5b0bbaeed74f4e497aace197a9a parent 66c594098db1ee885f486a684b66937e28e792b1 author Ben Dooks Sat, 24 Jun 2006 21:21:36 +0100 committer Russell King Sat, 24 Jun 2006 21:21:36 +0100 [ARM] 3643/1: S3C2410: Add new usb clocks Patch from Ben Dooks Make the S3C2410 use the same usb clock naming as the S3C2412 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 66c594098db1ee885f486a684b66937e28e792b1 tree 9be95a4fe527d163cee085162e5ffeaec5e6cc50 parent 44cc7c9c15124c4506da96304e5f9eb88200fc35 author Ben Dooks Sat, 24 Jun 2006 21:21:35 +0100 committer Russell King Sat, 24 Jun 2006 21:21:35 +0100 [ARM] 3642/1: S3C24XX: Add machine SMDK2413 Patch from Ben Dooks Add basic support for the Samsung/Aiji SMDK2413 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 44cc7c9c15124c4506da96304e5f9eb88200fc35 tree 911dcdfc55ed609a79f7c1c23c918e709b6e3cdf parent 46491c94d39a519178ba8c6b5b5d6a839210124d author Ben Dooks Sat, 24 Jun 2006 21:21:33 +0100 committer Russell King Sat, 24 Jun 2006 21:21:33 +0100 [ARM] 3641/1: S3C2412: Fixup gpio register naming Patch from Ben Dooks The current S3C2412 has used to moving S3C24XX_ for the generic form of an register has been moved from the S3C2410. Fixup S3C2410_EXTINTx and S3C2410_EINFLTx to S3C24XX_EXTINTx and S3C24XX_EXTINTx Depends on Patch #3635/1, Patch #3640/1 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 46491c94d39a519178ba8c6b5b5d6a839210124d tree a2b803640a19edfc4d1919b8f49d3304e5a20a55 parent 73e55cb3b3549d0174d1dadb755200938232e8d0 author Ben Dooks Sat, 24 Jun 2006 21:21:32 +0100 committer Russell King Sat, 24 Jun 2006 21:21:32 +0100 [ARM] 3640/1: S3C2412: Use S3C24XX_DCLKCON instead of S3C2410_DCLKCON Patch from Ben Dooks The current S3C2412 support has moved to using S3C24XX_DCLKCON unless the specific DCLKCON is required (S3C2412_DCLKCON or S3C2410_DKCLKCON) Move the few places using S3C2410_DCLKCON to S3C24XX_DCLKCON Depends on Patch #3635/1 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 73e55cb3b3549d0174d1dadb755200938232e8d0 tree 041dc51100fae9a8da403a69a7d966f99c578bc9 parent 736855f0c748dacb624070b8d6ffffe4532cf4dc author Ben Dooks Sat, 24 Jun 2006 21:21:32 +0100 committer Russell King Sat, 24 Jun 2006 21:21:32 +0100 [ARM] 3639/1: S3C2412: serial port support Patch from Ben Dooks Serial port support for the on-board UART blocks on the Samsung S3C2412 and S3C2413 UARTs. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 736855f0c748dacb624070b8d6ffffe4532cf4dc tree 273afc6674a29fa8e79b073c37d076846e200c3b parent 513846f82829efd5bab5359bdc33509e6386fd49 author Ben Dooks Sat, 24 Jun 2006 21:21:31 +0100 committer Russell King Sat, 24 Jun 2006 21:21:31 +0100 [ARM] 3638/1: S3C2412: core clocks Patch from Ben Dooks Clock support for the clocks on the Samsung S3C2412 and S3C2413 SoCs. This provides clock enables and parent selection for all the standard clocks. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 513846f82829efd5bab5359bdc33509e6386fd49 tree d04dec7a504f62ab4f37726a227fab19f1b51e39 parent 3434d9d9fc0fec0b96ab128ee0d743b6a0d90160 author Ben Dooks Sat, 24 Jun 2006 21:21:29 +0100 committer Russell King Sat, 24 Jun 2006 21:21:29 +0100 [ARM] 3637/1: S3C24XX: Add mpll clock, and set as fclk parent Patch from Ben Dooks Update the clocks with the MPLL clock, and use it as the parent. Also export these to the rest of arch/arm/mach-s3c2410 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 3434d9d9fc0fec0b96ab128ee0d743b6a0d90160 tree 4d085e1ba319b979a1d9053fd78569db8493edf3 parent 68d9ab394f06f95fd4ca612c08edf13e410fd8d0 author Ben Dooks Sat, 24 Jun 2006 21:21:28 +0100 committer Russell King Sat, 24 Jun 2006 21:21:28 +0100 [ARM] 3636/1: S3C2412: Add selection of CPU_ARM926 Patch from Ben Dooks Select CONFIG_CPU_ARM926 when CONFIG_CPU_S3C2412 is selected. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 68d9ab394f06f95fd4ca612c08edf13e410fd8d0 tree ad5fc04b5b3c319134db680bebc9a552d88375fc parent a3ff55026e59687040f00fc35680fc0e774859f4 author Ben Dooks Sat, 24 Jun 2006 21:21:27 +0100 committer Russell King Sat, 24 Jun 2006 21:21:27 +0100 [ARM] 3635/1: S3C24XX: Add S3C2412 core cpu support Patch from Ben Dooks Add support for the Samsung S3C2412 and S3C2413 range of SoCs. This patch contains the core identification, debug macros, and basic register updates to get these to build. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a3ff55026e59687040f00fc35680fc0e774859f4 tree 41fe003d4e2dddd794b989bc4bfde5ebfb2f8838 parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 author Ben Dooks Sat, 24 Jun 2006 21:21:26 +0100 committer Russell King Sat, 24 Jun 2006 21:21:26 +0100 [ARM] 3633/1: S3C24XX: s3c2410 gpio bugfix - wrong pin nos Patch from Ben Dooks The s3c2410 gpio functions have a pair of bugs where the code is using the pin function definitions instead of the pin gpio numbers. Also remove the changelog Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 82b145c5a572f7fa7211dffe2097234dc91bcecc tree 35689aa653d29f17681f13d89d592c88e7c112e5 parent 06cf6f2ed0b19629700794727d86ed57b9c0583e author Chuck Lever Tue, 20 Jun 2006 12:57:03 -0400 committer Trond Myklebust Sat, 24 Jun 2006 13:11:39 -0400 NFS: alloc nfs_read/write_data as direct I/O is scheduled Re-arrange the logic in the NFS direct I/O path so that nfs_read/write_data structs are allocated just before they are scheduled, rather than allocating them all at once before we start scheduling requests. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 06cf6f2ed0b19629700794727d86ed57b9c0583e tree 20630465974dc9391af486d8609aae077701b596 parent 9c93ab7dff5eb22027ab15010557bb73f9b44c99 author Chuck Lever Tue, 20 Jun 2006 12:56:49 -0400 committer Trond Myklebust Sat, 24 Jun 2006 13:11:39 -0400 NFS: Eliminate nfs_get_user_pages() Neil Brown observed that the kmalloc() in nfs_get_user_pages() is more likely to fail if the I/O is large enough to require the allocation of more than a single page to keep track of all the pinned pages in the user's buffer. Instead of tracking one large page array per dreq/iocb, track pages per nfs_read/write_data, just like the cached I/O path does. An array for pages is already allocated for us by nfs_readdata_alloc() (and the write and commit equivalents). This is also required for adding support for vectored I/O to the NFS direct I/O path. The original reason to pin the user buffer and allocate all the NFS data structures before trying to schedule I/O was to ensure all needed resources are allocated on the client before starting to send requests. This reduces the chance that resource exhaustion on the client will cause a short read or write. On the other hand, for an application making very large application I/O requests, this means that it will be nearly impossible for the application to make forward progress on a resource-limited client. Thus, moving the buffer pinning functionality into the I/O scheduling loops should be good for scalability. The next patch will do the same for NFS data structure allocation. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 9c93ab7dff5eb22027ab15010557bb73f9b44c99 tree 654a010c2aa161d0f9f49d7137410aaca1ebd2ba parent 51a7bc6caec94bab256b272bffd24d00ea81c698 author Chuck Lever Tue, 20 Jun 2006 12:56:31 -0400 committer Trond Myklebust Sat, 24 Jun 2006 13:11:39 -0400 NFS: refactor nfs_direct_free_user_pages Clean-up and fix a minor bug: the logic was dirtying page cache pages on both read and write operations. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 51a7bc6caec94bab256b272bffd24d00ea81c698 tree 29e19b93449e6affb53a737b73ddec847e21cc50 parent fedb595c66e1fbd5acafe0d43b7e95c13c936d61 author Chuck Lever Tue, 20 Jun 2006 12:56:16 -0400 committer Trond Myklebust Sat, 24 Jun 2006 13:11:39 -0400 NFS: remove user_addr, user_count, and pos from nfs_direct_req Make the user_addr, user_count, and pos parameters explicit to the scheduler routines, and remove the fields from nfs_direct_req. The iovec API will be passing in a series of these, not just one set. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit fedb595c66e1fbd5acafe0d43b7e95c13c936d61 tree e865ecc2399c09b7164c2f2c13a2c5c10c8d4de1 parent b1c5921c5b715c207d7fe77cd7aaafbb322f09f5 author Chuck Lever Tue, 20 Jun 2006 12:55:45 -0400 committer Trond Myklebust Sat, 24 Jun 2006 13:11:38 -0400 NFS: "open code" the NFS direct write rescheduler An NFSv3/v4 client must reschedule on-the-wire writes if the writes are UNSTABLE, and the server reboots before the client can complete a subsequent COMMIT request. To support direct asynchronous scatter-gather writes, the write rescheduler in fs/nfs/direct.c must not depend on the I/O parameters in the controlling nfs_direct_req structure. iovecs can be somewhat arbitrarily complex, so there could be an unbounded amount of information to save for a rarely encountered requirement. Refactor the direct write rescheduler so it uses information from each nfs_write_data structure to reschedule writes, instead of caching that information in the controlling nfs_direct_req structure. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit b1c5921c5b715c207d7fe77cd7aaafbb322f09f5 tree c8a56c56740efa728b7d3b935b6cb09330a4817f parent 816724e65c72a90a44fbad0ef0b59b186c85fa90 author Chuck Lever Tue, 20 Jun 2006 12:55:19 -0400 committer Trond Myklebust Sat, 24 Jun 2006 13:11:38 -0400 NFS: Separate functions for counting outstanding NFS direct I/Os Factor out the logic that increments and decrements the outstanding I/O count. This will be a commonly used bit of code in upcoming patches. Also make this an atomic_t again, since it will be very often manipulated outside dreq->spin lock. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 816724e65c72a90a44fbad0ef0b59b186c85fa90 tree 421fa29aedff988e392f92780637553e275d37a0 parent 70ac4385a13f78bc478f26d317511893741b05bd parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 author Trond Myklebust Sat, 24 Jun 2006 08:41:41 -0400 committer Trond Myklebust Sat, 24 Jun 2006 13:07:53 -0400 Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ Conflicts: fs/nfs/inode.c fs/super.c Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch 'VFS: Permit filesystem to override root dentry on mount' commit 52e3e772a098274df3c6f5f1ad58cd7fe24089bf tree 74af07ddbdc188b4d572e8586c0911dfafd3c336 parent fc8ea7a1eae3034505f70f02981d33bbc1284a86 author Andrew Victor Sat, 24 Jun 2006 09:58:14 +0100 committer Russell King Sat, 24 Jun 2006 10:34:48 +0100 [ARM] 3631/1: Remove legacy __mem_isa() definitions Patch from Andrew Victor Remove the remaining legacy __mem_isa() definitions for the ARM platforms. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit fc8ea7a1eae3034505f70f02981d33bbc1284a86 tree 57abfb6469bc5f6a5e8f0742be19798a781b8753 parent 3da4bd2bfc672a484d2a5df9f89b79f5e1e634dc author Lennert Buytenhek Sat, 24 Jun 2006 09:57:14 +0100 committer Russell King Sat, 24 Jun 2006 10:34:29 +0100 [ARM] 3644/1: ixp2000: export gpio_line_config() Patch from Lennert Buytenhek Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 1f64eb379cfc95d5f627b779685f7ac6721df322 tree df793338e6fe4b9f1623055cd39a00711e3e0f10 parent 1d81eedb8f6c13c262a70b8167530ec24b09c0ff author Lennert Buytenhek Sat, 24 Jun 2006 10:33:03 +0100 committer Russell King Sat, 24 Jun 2006 10:33:03 +0100 [ARM] 3646/1: ep93xx: instantiate ep93xx-ohci platform device Patch from Lennert Buytenhek The ep93xx ohci bits have been merged into the gregkh-2.6 tree, which means that they will probably go upstream soon, so make the core ep93xx code instantiate an appropriate ep93xx-ohci platform device. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 1d81eedb8f6c13c262a70b8167530ec24b09c0ff tree 12b1231f90127b117cdd88c8240c002e57460c3e parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 author Lennert Buytenhek Sat, 24 Jun 2006 10:33:02 +0100 committer Russell King Sat, 24 Jun 2006 10:33:02 +0100 [ARM] 3634/1: ep93xx: initial implementation of the clk_* API Patch from Lennert Buytenhek Add an initial implementation of the clk_* API for the cirrus ep93xx to the tree. The initial implementation is somewhat minimal, with the intention of extending it as we go along. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 3da4bd2bfc672a484d2a5df9f89b79f5e1e634dc tree be998210c8f123e138fa47ede373f07b70324d20 parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 author Lennert Buytenhek Sat, 24 Jun 2006 09:57:13 +0100 committer Russell King Sat, 24 Jun 2006 09:57:13 +0100 [ARM] 3632/1: iwmmxt: fix up argument comment for iwmmxt_task_restore() Patch from Lennert Buytenhek Commit d6551e884cf66de072b81f8b6d23259462c40baf forgot to update the description of what goes into r2 when calling iwmmxt_task_restore(). Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit c499aeb08cb24bed60e5bfc80720597bcf1a720d tree a0fdc43db1b379650e913dbe46947b7e3a5b9adb parent 702880f24373dfb31edb0bcd997ff924d07decc3 author Dave Airlie Sat, 24 Jun 2006 17:37:48 +1000 committer Dave Airlie Sat, 24 Jun 2006 17:37:48 +1000 drm: radeon constify radeon microcode From: Tilman (DRM CVS) Signed-off-by: Dave Airlie commit 702880f24373dfb31edb0bcd997ff924d07decc3 tree ce78f61ee3b9b71d97bed31437af84c5fa0682da parent d6fece051a4ef330922bfafb9d64e3e133e3a8a6 author Dave Airlie Sat, 24 Jun 2006 17:07:34 +1000 committer Dave Airlie Sat, 24 Jun 2006 17:32:58 +1000 Add i915 ioctls to configure pipes for vblank interrupt. i915 vblanks can be generated from either pipe a or b, however a disabled pipe generates no interrupts. This change allows the X server to select which pipe generates vblank interrupts. From: Keith Packard via DRM CVS Signed-off-by: Dave Airlie commit d6fece051a4ef330922bfafb9d64e3e133e3a8a6 tree f75c1a4d4f5324ab21f08cf753c849e33f3365e4 parent f2a2279ffc0dfd27f6909184a29910e40ae7eebd author Dave Airlie Sat, 24 Jun 2006 17:04:07 +1000 committer Dave Airlie Sat, 24 Jun 2006 17:32:10 +1000 drm: update radeon to 1.25 add r200 vertex program support Add support for r200 vertex programs (R200_EMIT_VAP_PVS_CNTL, and new packet type for making it possible to address whole tcl vector space and have a larger count) From: Roland Scheidegger (DRM CVS) Signed-off-by: Dave Airlie commit f2a2279ffc0dfd27f6909184a29910e40ae7eebd tree e1e9e8a652256a6fd25a595f429f88a39543b3f2 parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 author Dave Airlie Sat, 24 Jun 2006 16:55:34 +1000 committer Dave Airlie Sat, 24 Jun 2006 17:32:04 +1000 drm: radeon add a tcl state flush before accessing tcl vector space Do a tcl state flush before accessing tcl vector space. This fixes some more problems with flickering (bug #6637). drm may not be appropriate place for this, since doing that flush there might both be overkill and insufficient in some cases. However, it's hard to figure out when that flush is needed, so this has to suffice. There does not seem to be a performance penalty associated with it. From: Roland Scheidegger (DRM CVS) Signed-off-by: Dave Airlie commit 0fe6e2d2928e089d16ec5ed7ba634c1d60916020 tree 00b045e1d693d2dfa5a8e89e7129592f176ae902 parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 author Al Viro Fri, 23 Jun 2006 06:05:39 +0100 committer Dave Airlie Sat, 24 Jun 2006 17:22:17 +1000 intelfb delousing ring_head is offset in card memory, not iomem pointer. Fixed, removed fuckloads of amazingly bogus casts somebody had sprinkled all over the place. Signed-off-by: Al Viro Signed-off-by: Dave Airlie commit 1812fd40725c13cf050c29791a6dd35d593eb8d8 tree 7ae54e7908a80a00badd73a35285a3dba55218ef parent b5ba0740f852f4ad86ba7f21267bc77027d60703 author David S. Miller Fri, 23 Jun 2006 23:17:48 -0700 committer David S. Miller Fri, 23 Jun 2006 23:17:48 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit b5ba0740f852f4ad86ba7f21267bc77027d60703 tree efdcf4d668dd3b65ca1ef9f2898134ff4122da62 parent 4f62d158a32d9f470377a7bd6dcb797b42afe5f3 author David S. Miller Fri, 23 Jun 2006 22:46:49 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:21 -0700 [SPARC64]: Make auxio a real driver. Signed-off-by: David S. Miller commit 4f62d158a32d9f470377a7bd6dcb797b42afe5f3 tree 728af64e1de30a6049d03f1799f094fb1dda75f7 parent 9eccf1b3121f7e407d3159908f29252887194a16 author David S. Miller Fri, 23 Jun 2006 22:22:13 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:19 -0700 [PARPORT] sunbpp: Convert to new SBUS device framework. Signed-off-by: David S. Miller commit 9eccf1b3121f7e407d3159908f29252887194a16 tree da29cdcbe783e62dfffde79c77d0f0f846960272 parent 3d4253d9afabd6d42c33812a839ba67b8c9bbe49 author David S. Miller Fri, 23 Jun 2006 22:12:39 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:17 -0700 [Documentation]: Update probing info in sbus_drivers.txt Signed-off-by: David S. Miller commit 3d4253d9afabd6d42c33812a839ba67b8c9bbe49 tree 3816c3159f32135ff3265cf7e64793bf0ea9b744 parent 7bd5ed5dd4f12ba56c99c9b5a8838afbf121f397 author David S. Miller Fri, 23 Jun 2006 22:00:34 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:15 -0700 [SCSI] qlogicpti: Convert to new SBUS device framework. Signed-off-by: David S. Miller commit 7bd5ed5dd4f12ba56c99c9b5a8838afbf121f397 tree aff1f778fe94307880cf9b6b972fe7aafd924252 parent 96399487ad84b0d935923fe3652943159f36fb64 author David S. Miller Fri, 23 Jun 2006 21:58:34 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:13 -0700 [SCSI] esp: Fix bug in esp_remove_common. Do not try to kfree(esp), scsi_host_put() takes care of that. Signed-off-by: David S. Miller commit 96399487ad84b0d935923fe3652943159f36fb64 tree 97e82724bb3473abbb7c5e47766260d6bd26df92 parent c0442209e41b3453736ef974ee709a6ae15d99fb author David S. Miller Fri, 23 Jun 2006 21:36:46 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:11 -0700 [NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find(). Signed-off-by: David S. Miller commit c0442209e41b3453736ef974ee709a6ae15d99fb tree 73db3fed40a9541db01e7b633555f8b258956e4d parent a46c30fd62636d5d0f4209fed79c99c01dd58218 author David S. Miller Fri, 23 Jun 2006 21:33:44 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:09 -0700 [NET] myri_sbus: Kill unused next_module struct member. Signed-off-by: David S. Miller commit a46c30fd62636d5d0f4209fed79c99c01dd58218 tree 2d9558e47d70d1c137752b24779a30ce7ed7d124 parent ecba38abfdaf012713b661177c2a6db12bb996c3 author David S. Miller Fri, 23 Jun 2006 21:32:48 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:07 -0700 [NET] myri_sbus: Convert to new SBUS device layer. Signed-off-by: David S. Miller commit ecba38abfdaf012713b661177c2a6db12bb996c3 tree 66803ba6b032d3ebd41bba37b3979fc0b056b377 parent 52a34c7fe43afcbcd0e1ecfdef6b3dfdb9a90180 author David S. Miller Fri, 23 Jun 2006 21:23:01 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:04 -0700 [NET] sunqe: Convert to new SBUS driver layer. Signed-off-by: David S. Miller commit 52a34c7fe43afcbcd0e1ecfdef6b3dfdb9a90180 tree 8977d6e367aa344e1d7a1ce008265af3a6848370 parent c2d81e63ced3e81b8b71087b9af44da26171ba36 author David S. Miller Fri, 23 Jun 2006 18:48:04 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:02 -0700 [NET] sunbmac: Convert over to new SBUS device framework. Signed-off-by: David S. Miller commit c2d81e63ced3e81b8b71087b9af44da26171ba36 tree d9b889d7b0fa34055a37680a63766a56bf202438 parent 050bbb196392b9c178f82b1205a23dd2f915ee93 author David S. Miller Fri, 23 Jun 2006 18:39:40 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:00 -0700 [NET] sunlance: Convert to new SBUS driver framework. Signed-off-by: David S. Miller commit 050bbb196392b9c178f82b1205a23dd2f915ee93 tree 7558fc040ea5cfedefd56f0e5412b15ee23d8228 parent 9e326acf567b605cf4177081cc7367c24ec10a66 author David S. Miller Fri, 23 Jun 2006 18:21:02 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:58 -0700 [NET] sunhme: Convert to new SBUS driver framework. And make it a real PCI driver too. Signed-off-by: David S. Miller commit 9e326acf567b605cf4177081cc7367c24ec10a66 tree 96a175748a36eeaa181ae3ce87ef19c47dc1d73b parent 411aa5540536feace62c97478a8ea5dab7469377 author David S. Miller Fri, 23 Jun 2006 17:31:12 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:56 -0700 [NET] sunhme: Kill __sparc__ and __sparc_v9__ ifdefs. Use CONFIG_SPARC and CONFIG_SPARC64 instead. Signed-off-by: David S. Miller commit 411aa5540536feace62c97478a8ea5dab7469377 tree 7aef2cb7f15734027d8f88b96826692e57f3fc94 parent 69b5c4f18b2ceab3da9e854d02f8d9a2aa5b8431 author David S. Miller Fri, 23 Jun 2006 17:29:28 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:54 -0700 [SCSI] sparc: Port esp to new SBUS driver layer. This also turns the driver into a new-style scsi driver. Signed-off-by: David S. Miller commit 69b5c4f18b2ceab3da9e854d02f8d9a2aa5b8431 tree c95b10216256a209de6ab3150eccf60ec0f2e116 parent 576c352e89e57cfa6c9f493e549d10d86f60a0cf author David S. Miller Fri, 23 Jun 2006 16:23:12 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:52 -0700 [SOUND] sparc: Port amd7930 to new SBUS device layer. Signed-off-by: David S. Miller commit 576c352e89e57cfa6c9f493e549d10d86f60a0cf tree 4f393f05beef86284a037b106bfb353ff0d72c8a parent fd5314311634245172d40ccb418d89dac91d6ad6 author David S. Miller Fri, 23 Jun 2006 15:55:45 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:50 -0700 [SBUS]: Rewrite and plug into of_device framework. I severely apologize, I was still learning how to program in C when I wrote this stuff 10 years ago... Signed-off-by: David S. Miller commit fd5314311634245172d40ccb418d89dac91d6ad6 tree a157e4f2ec03316d733de1ff5c64254d8068d078 parent 942a6bdd1c4d2419a42be77ba1c964e4ba8dae9e author David S. Miller Fri, 23 Jun 2006 15:55:17 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:47 -0700 [SPARC]: Port of_device layer and make ebus use it. Signed-off-by: David S. Miller commit 942a6bdd1c4d2419a42be77ba1c964e4ba8dae9e tree b1a432a83aff7b88d301d4932ff75e5078b8c347 parent a2bd4fd17926d715a470fbe0ebe05128ba410984 author David S. Miller Fri, 23 Jun 2006 15:53:31 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:45 -0700 [SPARC]: Port sparc64 in-kernel device tree code to sparc32. Signed-off-by: David S. Miller commit a2bd4fd17926d715a470fbe0ebe05128ba410984 tree 3e39a2f6aaf3a628b955067ef3668cae3456de03 parent 8cd24ed4f8031636fb5dacb04adee9e02556ecd5 author David S. Miller Fri, 23 Jun 2006 01:44:10 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:43 -0700 [SPARC64]: Add of_device layer and make ebus/isa use it. Sparcspkr and power drivers are converted, to make sure it works. Eventually the SBUS device layer will use this as a sub-class. I really cannot cut loose on that bit until sparc32 is given the same infrastructure. Signed-off-by: David S. Miller commit 8cd24ed4f8031636fb5dacb04adee9e02556ecd5 tree 8a58e54a4181adf91d0ee2c4af6a92be7427f7cb parent 92c4e22593c22eb0943b232c61c98b517081637d author David S. Miller Thu, 22 Jun 2006 22:08:58 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:41 -0700 [SPARC64]: Expand of_*() interfaces some more. Import some more stuff from powerpc. Add of_device_is_compatible(), and of_find_compatible_node(). Export some more of the other routines to modules. Signed-off-by: David S. Miller commit 92c4e22593c22eb0943b232c61c98b517081637d tree f1988604cf022ef0617b1f3b6c930b7c86f4ebe6 parent 25c7581bcdd11cf9b82a8ef062a10bea310cc9e9 author David S. Miller Thu, 22 Jun 2006 20:23:56 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:38 -0700 [SPARC64]: Kill unused local vars in map_prom_timers(). Signed-off-by: David S. Miller commit 25c7581bcdd11cf9b82a8ef062a10bea310cc9e9 tree c88f4ee5e91fa7921ff13627f373e1bfbcec8b81 parent 44bdef5e8f2e64ba5974b587989a829d57126bad author David S. Miller Thu, 22 Jun 2006 20:21:22 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:36 -0700 [SPARC64]: Kill off some more prom_getproperty() remnants. The remaining ones occur before we have imported the device tree. Signed-off-by: David S. Miller commit 44bdef5e8f2e64ba5974b587989a829d57126bad tree 9a024374403bc06942cfd908565b4a3a0fa12e76 parent cecc4e9222c4e2bca59834750e493eea6be97613 author David S. Miller Thu, 22 Jun 2006 20:04:30 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:34 -0700 [SPARC64]: Convert Cheetah memory controller driver to in-kernel PROM tree. Signed-off-by: David S. Miller commit cecc4e9222c4e2bca59834750e493eea6be97613 tree 9fd177ac904e4ef091c0322ae9f105210d42916d parent 9c10a58ed634d98114c5717e2da761d8a63f2cd4 author David S. Miller Thu, 22 Jun 2006 19:53:24 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:32 -0700 [SPARC64]: Convert central bus layer to in-kernel PROM device tree. Signed-off-by: David S. Miller commit 9c10a58ed634d98114c5717e2da761d8a63f2cd4 tree cedcda632d937706dec7621a15f3af97b9300791 parent 690c8fd31f1e35985d0f35772fde514da59ec9d1 author David S. Miller Thu, 22 Jun 2006 19:31:11 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:30 -0700 [SPARC64]: Kill ebus/isa range and interrupt mapping struct members. Unused outside of initial bus probe scan. Signed-off-by: David S. Miller commit 690c8fd31f1e35985d0f35772fde514da59ec9d1 tree 8a5a0036b3780a9eb315ea2201a2562570de1ebe parent de8d28b16f5614aeb12bb69c8f9a38578b8d3ada author David S. Miller Thu, 22 Jun 2006 19:12:03 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:28 -0700 [SPARC64]: Use in-kernel PROM tree for EBUS and ISA. Signed-off-by: David S. Miller commit de8d28b16f5614aeb12bb69c8f9a38578b8d3ada tree 152f0930dc099606342e9cc6d9a3892cd9f3f192 parent 765b5f32730cfd2608291e679060b0391570c8b3 author David S. Miller Thu, 22 Jun 2006 16:18:54 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:26 -0700 [SPARC64]: Convert sparc64 PCI layer to in-kernel device tree. One thing this change pointed out was that we really should pull the "get 'local-mac-address' property" logic into a helper function all the network drivers can call. Signed-off-by: David S. Miller commit 765b5f32730cfd2608291e679060b0391570c8b3 tree aff07bf3e34c25da9a2dffabd64d946471277614 parent c2a5a46be4a1c682e18e29e67785126b7610b14d author David S. Miller Thu, 22 Jun 2006 00:49:15 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:23 -0700 [SPARC64]: Must run smp_setup_cpu_possible_map() after paging_init() Otherwise the in-kernel PROM device tree isn't built yet, and therefore the present cpu bits don't get set properly. Signed-off-by: David S. Miller commit c2a5a46be4a1c682e18e29e67785126b7610b14d tree b9101fa7547c9c5d86ff550e6398a8cf7c2f283a parent 486ad10a7e1b2bb61ea9e48c4d9510f50cd74fc5 author David S. Miller Thu, 22 Jun 2006 00:01:56 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:21 -0700 [SPARC64]: Fix for Niagara memory corruption. On some sun4v systems, after netboot the ethernet controller and it's DMA mappings can be left active. The net result is that the kernel can end up using memory the ethernet controller will continue to DMA into, resulting in corruption. To deal with this, we are more careful about importing IOMMU translations which OBP has left in the IO-TLB. If the mapping maps into an area the firmware claimed was free and available memory for the kernel to use, we demap instead of import that IOMMU entry. This is going to cause the network chip to take a PCI master abort on the next DMA it attempts, if it has been left going like this. All tests show that this is handled properly by the PCI layer and the e1000 drivers. Signed-off-by: David S. Miller commit 486ad10a7e1b2bb61ea9e48c4d9510f50cd74fc5 tree eac1b6fe80626767f7bea620b9e06aedc6600b95 parent 07f8e5f358a0b7240f1dad6b3819f2fd1103f159 author David S. Miller Thu, 22 Jun 2006 00:00:00 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:19 -0700 [SPARC64]: Minor bug fix to obp_read_memory(). If we end up zero'ing out the size of one of the entries, pop it out of the array completely because some code that examines these things cannot handle a zero length element properly. Signed-off-by: David S. Miller commit 07f8e5f358a0b7240f1dad6b3819f2fd1103f159 tree 5976cc05de92f27a9cc12a3db31ced5311ac3769 parent 6d307724cb6a6b8466cad4fdf13d8a409bc2433f author David S. Miller Wed, 21 Jun 2006 23:34:02 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:17 -0700 [SPARC64]: Convert cpu_find_by_*() interface to in-kernel PROM device tree. Signed-off-by: David S. Miller commit 6d307724cb6a6b8466cad4fdf13d8a409bc2433f tree 66809731d2a7257f23b8583c69b7bd71a83d634c parent 6760d28bc691bb255c501c9b680f2fc1162258b2 author David S. Miller Wed, 21 Jun 2006 23:07:29 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:15 -0700 [SPARC64]: Add of_getintprop_default(). This encodes a common idiomatic coding pattern used when dealing with integer properties. Signed-off-by: David S. Miller commit 6760d28bc691bb255c501c9b680f2fc1162258b2 tree 8c6a249a56fc2a2eee995dbcb55daf4adf456705 parent 27cc64c7cc9e41788e53655c717aeca2f55f2041 author David S. Miller Wed, 21 Jun 2006 22:56:20 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:13 -0700 [SPARC64]: Convert sun4v virtual-device layer to in-kernel PROM device tree. Signed-off-by: David S. Miller commit 27cc64c7cc9e41788e53655c717aeca2f55f2041 tree 2ea1c64dcbf34013499d12f95fdb9db2b947d43c parent 20edac8ad487b784a286c1e59cc24819cb8d3b86 author David S. Miller Wed, 21 Jun 2006 22:31:08 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:11 -0700 [SPARC64]: Rate limited kernel unaligned trap logging, ala IA64. Signed-off-by: David S. Miller commit 20edac8ad487b784a286c1e59cc24819cb8d3b86 tree 1801d81a1164c07c6d136fd755fe181de4affa7f parent e87dc35020bc555969810452f44bceaf8394eafa author David S. Miller Wed, 21 Jun 2006 22:07:21 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:09 -0700 [SPARC64]: Disable verbose PCI IRQ probing messages by default. Allow them to be enabled with "pci=irq_verbose" on the boot command line. Signed-off-by: David S. Miller commit e87dc35020bc555969810452f44bceaf8394eafa tree b58f14d41f8e147f6ddc2d9657a88813fdb73bdf parent aaf7cec2769942035985716452107fc5ba0b11f6 author David S. Miller Wed, 21 Jun 2006 18:18:47 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:07 -0700 [SPARC64]: Use in-kernel OBP device tree for PCI controller probing. It can be pushed even further down, but this is a first step. Signed-off-by: David S. Miller commit aaf7cec2769942035985716452107fc5ba0b11f6 tree 4f4bc5278ef41e016b97b6860d30fa773db7fee2 parent 372b07bb5a13f8a1b8a3ce49cd76d39a79dbd3bd author David S. Miller Wed, 21 Jun 2006 16:33:54 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:04 -0700 [SPARC64]: Add of_find_node_by_{name,type}(). Signed-off-by: David S. Miller commit 372b07bb5a13f8a1b8a3ce49cd76d39a79dbd3bd tree 934af50f039921411e2ab6f4678b083f2b8c7eed parent 8fae097debdf8ac9b66d220ac258535ea09f3898 author David S. Miller Wed, 21 Jun 2006 15:35:28 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:02 -0700 [SPARC64]: Import OBP device tree into kernel data structures. The basic framework is based on the PowerPC OF code. This code even tries to get the device addressing components correct in the full path names. Signed-off-by: David S. Miller commit 8fae097debdf8ac9b66d220ac258535ea09f3898 tree 9c022cbf14e9174946a503b116fdf7376b8ce0ce parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 author David S. Miller Tue, 20 Jun 2006 15:23:28 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:00 -0700 [SBUS]: Start cleaning up generic sbus support layer. In particular, move the IRQ probing out to sparc32/sparc64 arch specific code where it belongs. Signed-off-by: David S. Miller commit 4280370efe0e9c527ccd6188d6211a10bcb22b1e tree 34c1e614b5802b63ce1d803a0ea619e1ff334f55 parent 4092e256ca35e62b431ebad4e0c42c6360acee08 author Adrian Bunk Fri, 23 Jun 2006 12:55:46 +0200 committer Dave Jones Sat, 24 Jun 2006 01:54:14 -0400 [AGPGART] remove unused variable This patch removes an unused variable. Signed-off-by: Adrian Bunk Signed-off-by: Dave Jones commit d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 tree 1c91f0dd294b14edb6058d1236a65b997f7ed2a2 parent 6edad161cd4dfe1df772e7a74ab63cab53b5e8c1 author Dave Jones Sat, 24 Jun 2006 00:33:08 -0400 committer Linus Torvalds Fri, 23 Jun 2006 21:37:34 -0700 [PATCH] fix typo in acpi video brightness changes. Prevent possible null dereference due to misplaced ; Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 6edad161cd4dfe1df772e7a74ab63cab53b5e8c1 tree 389d6daa728b2ba1bd8c2180cab705706449f62a parent 236ee8c33277ab48671995f26dc68a4639936418 parent 0dd4b21f517e138ea113db255645fbae1bf5eef3 author Linus Torvalds Fri, 23 Jun 2006 15:58:44 -0700 committer Linus Torvalds Fri, 23 Jun 2006 15:58:44 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (258 commits) [libata] conversion to new debug scheme, part 1 of $N [PATCH] libata: Add ata_scsi_dev_disabled [libata] Add host lock to struct ata_port [PATCH] libata: implement per-dev EH action mask eh_info->dev_action[] [PATCH] libata-dev: move the CDB-intr DMA blacklisting [PATCH] ahci: disable NCQ support on vt8251 [libata] ahci: add JMicron PCI IDs [libata] sata_nv: add PCI IDs [libata] ahci: Add NVIDIA PCI IDs. [PATCH] libata: convert several bmdma-style controllers to new EH, take #3 [PATCH] sata_via: convert to new EH, take #3 [libata] sata_nv: s/spin_lock_irqsave/spin_lock/ in irq handler [PATCH] sata_nv: add hotplug support [PATCH] sata_nv: convert to new EH [PATCH] sata_nv: better irq handlers [PATCH] sata_nv: simplify constants [PATCH] sata_nv: kill struct nv_host_desc and nv_host [PATCH] sata_nv: kill not-working hotplug code [libata] Update docs to reflect current driver API [PATCH] libata: add host_set->next for legacy two host_sets case, take #3 ... commit 236ee8c33277ab48671995f26dc68a4639936418 tree d32c005a5a20bbfdd72be17308e80a746cdce52e parent 8cf60e04a131310199d5776e2f9e915f0c468899 author Tony Luck Fri, 23 Jun 2006 13:49:25 -0700 committer Tony Luck Fri, 23 Jun 2006 13:49:25 -0700 [IA64] fix ia64 build (fadt_descriptor) arch/ia64/kernel/acpi.c got forgotten when include/acpi/actbl.h got a cleanup. Signed-off-by: Tony Luck commit 8cf60e04a131310199d5776e2f9e915f0c468899 tree 373a68e88e6737713a0a5723d552cdeefffff929 parent 1323523f505606cfd24af6122369afddefc3b09d parent 95eaa5fa8eb2c345244acd5f65b200b115ae8c65 author Tony Luck Fri, 23 Jun 2006 13:46:23 -0700 committer Tony Luck Fri, 23 Jun 2006 13:46:23 -0700 Auto-update from upstream commit 95eaa5fa8eb2c345244acd5f65b200b115ae8c65 tree 22e7c6949f9d930ec4f97460b9df6cf7738c1de7 parent a5cf4b9a02cb9b8ac16eaafb0fcd7fd24215146e author Nicolas Pitre Fri, 23 Jun 2006 11:40:53 -0400 committer Linus Torvalds Fri, 23 Jun 2006 08:47:27 -0700 [PATCH] fix silly ARM non-EABI build error My bad. Signed-off-by: Nicolas Pitre Signed-off-by: Linus Torvalds commit a5cf4b9a02cb9b8ac16eaafb0fcd7fd24215146e tree 3ec6a7706074f0e4c04977fed4944373077b6fd7 parent 138a0128c01899ee8492858a50856b90d0d9d815 author Andrew Morton Fri, 23 Jun 2006 04:01:35 -0700 committer Linus Torvalds Fri, 23 Jun 2006 08:47:27 -0700 [PATCH] s390_hypfs filesystem: get_sb_single() fix Update hypfs for dhowells API changes. Cc: Pekka Enberg Cc: Ingo Oeser Cc: Joern Engel Cc: Martin Schwidefsky Cc: Michael Holzheu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 138a0128c01899ee8492858a50856b90d0d9d815 tree 9f9865b39e7e65c2bb6763f0ad9d7b02aba59b33 parent 8269730b389d4793348d521140f9c76fb1828249 author Andrew Morton Fri, 23 Jun 2006 03:31:19 -0700 committer Linus Torvalds Fri, 23 Jun 2006 08:47:27 -0700 [PATCH] cpufreq build fix drivers/cpufreq/cpufreq_ondemand.c: In function 'do_dbs_timer': drivers/cpufreq/cpufreq_ondemand.c:374: warning: implicit declaration of function 'lock_cpu_hotplug' drivers/cpufreq/cpufreq_ondemand.c:381: warning: implicit declaration of function 'unlock_cpu_hotplug' drivers/cpufreq/cpufreq_conservative.c: In function 'do_dbs_timer': drivers/cpufreq/cpufreq_conservative.c:425: warning: implicit declaration of function 'lock_cpu_hotplug' drivers/cpufreq/cpufreq_conservative.c:432: warning: implicit declaration of function 'unlock_cpu_hotplug' Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8269730b389d4793348d521140f9c76fb1828249 tree c10c9441a16265f698dd4a38014c9d3026ee07c0 parent dd67d051529387f6e44d22d1d5540ef281965fdd author Andi Kleen Wed, 21 Jun 2006 14:48:09 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [BLOCK] Fix bounce limit address check Do a safer check for when to enable DMA. Currently we enable ISA DMA for cases that do not need it, resulting in OOM conditions when ZONE_DMA runs out of space. Signed-off-by: Jens Axboe commit dd67d051529387f6e44d22d1d5540ef281965fdd tree 80457f9a2ad3e562b179e40f5c8d51b4f24d6d9e parent 9e94cd4fd1812bab45237f998b3c6fa1b24023fd author Jens Axboe Wed, 21 Jun 2006 09:36:18 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] rbtree: support functions used by the io schedulers They all duplicate macros to check for empty root and/or node, and clearing a node. So put those in rbtree.h. Signed-off-by: Jens Axboe commit 9e94cd4fd1812bab45237f998b3c6fa1b24023fd tree e196939ff1df56179387f0ec440cc9ce52cf1f55 parent fd61af0384014ca29428ace7c17a978b755aeddd author Jens Axboe Tue, 20 Jun 2006 15:01:12 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] splice: retrieve mapping after locking the page Otherwise we could be racing with truncate/mapping removal. Problem found/fixed by Nick Piggin , logic rewritten by me. Signed-off-by: Jens Axboe commit fd61af0384014ca29428ace7c17a978b755aeddd tree c7aa5ca9b91383b7c97199189214fa86a6a51b4f parent caaa5f9f0a75d1dc5e812e69afdbb8720e077fd3 author Jens Axboe Fri, 16 Jun 2006 15:35:39 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] cfq-iosched: rq update fixes - Remember to set ->last_sector so that the cfq_choose_req() logic works correctly. - Remove redundant call to cfq_choose_req() Signed-off-by: Jens Axboe commit caaa5f9f0a75d1dc5e812e69afdbb8720e077fd3 tree 07aba6bac5a57cb3efd23762acfd719e255775ab parent 35e6077cb16f93517ba5a51ba849b186d2474d60 author Jens Axboe Fri, 16 Jun 2006 11:23:00 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] cfq-iosched: many performance fixes This is a collection of patches that greatly improve CFQ performance in some circumstances. - Change the idling logic to only kick in after a request is done and we are deciding what to do. Before the idling included the request service time, so it was hard to adjust. Now it's true think/idle time. - Take advantage of TCQ/NCQ/queueing for seeky sync workloads, but keep it in control for sync and sequential (or close to) workloads. - Expire queues immediately and move on to other busy queues, if we are not going to idle after the current one finishes. - Don't rearm idle timer if there are no busy queues. Just leave the system idle. Signed-off-by: Jens Axboe commit 35e6077cb16f93517ba5a51ba849b186d2474d60 tree 215bcf3548d80365b3cd3673feddf6a8f8ba9fbc parent b17fd9bceb99610f6dc7998c9a4ed6b71520be2b author Jens Axboe Wed, 14 Jun 2006 09:10:45 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] cfq-iosched: correctly set ioprio on both targets Patch originally from Vasily Tarasov If you set io-priority of process 1 using sys_ioprio_set system call by another process 2 (like ionice do), then cfq_init_prio_data() function sets priority of process 2 (current) on queue of process 1 and clears the flag, that designates change of ioprio. So the process 1 will work like with priority of process 2. I propose not to call cfq_init_prio_data() on io-priority change, but only mark queue as queue with changed prority. Every time when new request comes cfq-scheduler checks for this flag and atomaticaly changes priority of queue to new value. Signed-off-by: Jens Axboe commit b17fd9bceb99610f6dc7998c9a4ed6b71520be2b tree 13cb21955ce4677360c72f7120fee311f16ca3c7 parent 8f34ee75decb80007ba77bba5a7384eadff4866d author Jens Axboe Mon, 19 Jun 2006 10:06:48 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] Make CFQ the default IO scheduler Signed-off-by: Jens Axboe commit 8f34ee75decb80007ba77bba5a7384eadff4866d tree 63d6d4a613d0c7d2269e2dec01975d58b1e97a31 parent ad3caddaa1708e506f20b8e25a4a8ae586fc7d5b author Jens Axboe Tue, 13 Jun 2006 09:02:34 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] Rearrange a few struct request members This saves 8 bytes of data in 64-bit archs. Signed-off-by: Jens Axboe commit ad3caddaa1708e506f20b8e25a4a8ae586fc7d5b tree 60a79c55a71ed3ef7bc9daaea694995b034eb044 parent b31dc66a54ad986b6b73bdc49c8efc17cbad1833 author Jens Axboe Tue, 13 Jun 2006 08:46:57 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] Get rid of struct request request_pm_state member The IDE power management can just use the ->end_io_data member to store it's data. Signed-off-by: Jens Axboe commit b31dc66a54ad986b6b73bdc49c8efc17cbad1833 tree 5591383c1cbffe11512da889c971f899333f1a44 parent 271f18f102c789f59644bb6c53a69da1df72b2f4 author Jens Axboe Tue, 13 Jun 2006 08:26:10 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] Kill PF_SYNCWRITE flag A process flag to indicate whether we are doing sync io is incredibly ugly. It also causes performance problems when one does a lot of async io and then proceeds to sync it. Part of the io will go out as async, and the other part as sync. This causes a disconnect between the previously submitted io and the synced io. For io schedulers such as CFQ, this will cause us lost merges and suboptimal behaviour in scheduling. Remove PF_SYNCWRITE completely from the fsync/msync paths, and let the O_DIRECT path just directly indicate that the writes are sync by using WRITE_SYNC instead. Signed-off-by: Jens Axboe commit 271f18f102c789f59644bb6c53a69da1df72b2f4 tree f3593b5dbc90da69a91a69fb170c2600775703f7 parent acf421755593f7d7bd9352d57eda796c6eb4fa43 author Jens Axboe Tue, 13 Jun 2006 08:08:38 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:38 +0200 [PATCH] cfq-iosched: Don't set the queue batching limits We cannot update them if the user changes nr_requests, so don't set it in the first place. The gains are pretty questionable as well. The batching loss has been shown to decrease throughput. Signed-off-by: Jens Axboe commit acf421755593f7d7bd9352d57eda796c6eb4fa43 tree 08fe234e5a28556ef32d29de1d3045cfe94a931c parent fda151d9feafc0e8418f23c716587c44394fcdbf author Dave Jones Mon, 12 Jun 2006 14:20:58 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:38 +0200 [PATCH] remove dead code from elevator switching We already drop the refcount in elevator_exit(), and as we're setting 'e' to NULL, we'll never take that branch anyway. Finally, as 'e' is a local var that isn't referenced afterwards, setting it to NULL is pointless. Signed-off-by: Dave Jones Signed-off-by: Jens Axboe commit fda151d9feafc0e8418f23c716587c44394fcdbf tree 741684efbeb8b5fe881e28875bba5d619482561b parent a038e2536472b4dd932399b5277e65f188811de5 author Alexey Dobriyan Mon, 05 Jun 2006 12:09:50 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:38 +0200 [PATCH] blktrace_api.h: endian annotations Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit a038e2536472b4dd932399b5277e65f188811de5 tree 15b311da1a9aa36b24f98ae914456ecb90e247f3 parent bae386f7884aa3720cc7880b36a41a1d2b9c327b author Paolo 'Blaisorblade' Giarrusso Mon, 05 Jun 2006 12:09:01 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:38 +0200 [PATCH] blk_start_queue() must be called with irq disabled - add warning The queue lock can be taken from interrupts so it must always be taken with irq disabling primitives. Some primitives already verify this. blk_start_queue() is called under this lock, so interrupts must be disabled. Also document this requirement clearly in blk_init_queue(), where the queue spinlock is set. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit bae386f7884aa3720cc7880b36a41a1d2b9c327b tree e6ea0627160dc009cd825e44489583028c83791f parent 199f4c9f76fd8b030405abddf294e771f888de03 author Akinobu Mita Mon, 24 Apr 2006 21:12:59 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:38 +0200 [PATCH] iosched: use hlist for request hashtable Use hlist instead of list_head for request hashtable in deadline-iosched and as-iosched. It also can remove the flag to know hashed or unhashed. Signed-off-by: Akinobu Mita Signed-off-by: Jens Axboe block/as-iosched.c | 45 +++++++++++++++++++-------------------------- block/deadline-iosched.c | 39 ++++++++++++++++----------------------- 2 files changed, 35 insertions(+), 49 deletions(-) commit 199f4c9f76fd8b030405abddf294e771f888de03 tree ee4f104a7562e1fd76882bc40f2de7d90812e1df parent 37224470c8c6d90a4062e76a08d4dc1fcf91fc89 parent ca6bb5d7ab22ac79f608fe6cbc6b12de6a5a19f0 author Linus Torvalds Fri, 23 Jun 2006 08:00:01 -0700 committer Linus Torvalds Fri, 23 Jun 2006 08:00:01 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NET]: Require CAP_NET_ADMIN to create tuntap devices. [NET]: fix net-core kernel-doc [TCP]: Move inclusion of to correct place in [IPSEC]: Handle GSO packets [NET]: Added GSO toggle [NET]: Add software TSOv4 [NET]: Add generic segmentation offload [NET]: Merge TSO/UFO fields in sk_buff [NET]: Prevent transmission after dev_deactivate [IPV6] ADDRCONF: Fix default source address selection without CONFIG_IPV6_PRIVACY [IPV6]: Fix source address selection. [NET]: Avoid allocating skb in skb_pad commit 37224470c8c6d90a4062e76a08d4dc1fcf91fc89 tree 627f537177bf8e951c12bec04c4a85f0125f5ece parent e83319510b04dd51a60da8a0b4ccf8b92b3ab1ad parent ae6c859b7dcd708efadf1c76279c33db213e3506 author Linus Torvalds Fri, 23 Jun 2006 07:52:36 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:52:36 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (65 commits) ACPI: suppress power button event on S3 resume ACPI: resolve merge conflict between sem2mutex and processor_perflib.c ACPI: use for_each_possible_cpu() instead of for_each_cpu() ACPI: delete newly added debugging macros in processor_perflib.c ACPI: UP build fix for bugzilla-5737 Enable P-state software coordination via _PDC P-state software coordination for speedstep-centrino P-state software coordination for acpi-cpufreq P-state software coordination for ACPI core ACPI: create acpi_thermal_resume() ACPI: create acpi_fan_suspend()/acpi_fan_resume() ACPI: pass pm_message_t from acpi_device_suspend() to root_suspend() ACPI: create acpi_device_suspend()/acpi_device_resume() ACPI: replace spin_lock_irq with mutex for ec poll mode ACPI: Allow a WAN module enable/disable on a Thinkpad X60. sem2mutex: acpi, acpi_link_lock ACPI: delete unused acpi_bus_drivers_lock sem2mutex: drivers/acpi/processor_perflib.c ACPI add ia64 exports to build acpi_memhotplug as a module ACPI: asus_acpi_init(): propagate correct return value ... Manual resolve of conflicts in: arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c include/acpi/processor.h commit e83319510b04dd51a60da8a0b4ccf8b92b3ab1ad tree e51972f61ee5e84b7312ae609352588b45462526 parent eefe85ee350ece1bdf3e9a61e941d3394a528660 author Bob Copeland Fri, 23 Jun 2006 02:06:09 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:09 -0700 [PATCH] docs: update sparse.txt with CHECK_ENDIAN Update the sparse documentation to omit the -Wbitwise flag example (as it is now passed by default), and document the kernel defines to enable endianness checking. Signed-off-by: Bob Copeland Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eefe85ee350ece1bdf3e9a61e941d3394a528660 tree 7ed531a7946a6d715622a7d39be9042c03de961d parent 98bd34eaf1a7d1f2ed9c4e5d3a9664d3dcdd2159 author Constantine Sapuntzakis Fri, 23 Jun 2006 02:06:08 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:09 -0700 [PATCH] drivers/block/loop.c: don't return garbage if LOOP_SET_STATUS not called While writing a version of losetup, I ran into the problem that the loop device was returning total garbage. It turns out the problem was that this losetup was only issuing the LOOP_SET_FD ioctl and not issuing a subsequent LOOP_SET_STATUS ioctl. This losetup didn't have any special status to set, so it left out the call. The deeper cause is that loop_set_fd sets the transfer function to NULL, which causes no transfer to happen lo_do_transfer. This patch fixes the problem by setting transfer to transfer_none in loop_set_fd. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98bd34eaf1a7d1f2ed9c4e5d3a9664d3dcdd2159 tree d14de7352fa3d0be85401c472e9a58afab03dadf parent 125e18745f16685f69a34fd6130d47598fc4bf54 author Mike Miller Fri, 23 Jun 2006 02:06:07 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:09 -0700 [PATCH] make kernel warn about incorrectly sized partitions Sometimes partitions claim to be larger than the reported capacity of a disk device. This patch makes the kernel warn about those partitions. We still permit these patitions to be used. Quoting Andries Brouwer : Case 1: The kernel is mistaken about the size of the disk. (There are commands to clip a disk to a certain capacity, there are jumpers to tell a disk that it should report a certain capacity etc. Usually this is because of BIOS bugs. In bad cases the machine will crash in the BIOS and hence fail to boot if the disk reports full capacity.) In such cases actually accessing the blocks of the partition may work fine, or may work fine after running an unclip utility. I wrote "setmax" some years ago precisely for this reason. Case 2: There was a messy partition table (maybe just a rounding error) but the actual filesystem on the partition is contained in the physical disk. Now using the filesystem goes without problem. Case 3: Both partition and filesystem extend beyond the end of the disk. In forensic or debugging situations one often uses a copy of the start of a disk. Now access beyond the end gives an expected I/O error. Signed-off-by: Mike Miller Signed-off-by: Stephen Cameron Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 125e18745f16685f69a34fd6130d47598fc4bf54 tree c97ed94b0525a572efa1bd4990a55b18be5d781d parent 78ce89c92bc6eaf5933b5664bff64253a7103bd7 author Eric Sesterhenn Fri, 23 Jun 2006 02:06:06 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:08 -0700 [PATCH] More BUG_ON conversion Signed-off-by: Eric Sesterhenn Signed-off-by: Alexey Dobriyan Cc: Bartlomiej Zolnierkiewicz Cc: Alan Cox Cc: James Bottomley Acked-by: "Salyzyn, Mark" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78ce89c92bc6eaf5933b5664bff64253a7103bd7 tree edaadf283127c1a74bfe3aa7b165c1cf45d14347 parent cdaad343b561cdeb38b0578bb038eb5e87ed5551 author Jan Kara Fri, 23 Jun 2006 02:06:05 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:08 -0700 [PATCH] JBD: split checkpoint lists Split the checkpoint list of the transaction into two lists. In the first list we keep the buffers that need to be submitted for IO. In the second list are kept buffers that were already submitted and we just have to wait for the IO to complete. This should simplify a handling of checkpoint lists a bit and can eventually be also a performance gain. Signed-off-by: Jan Kara Cc: Mark Fasheh Cc: "Stephen C. Tweedie" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cdaad343b561cdeb38b0578bb038eb5e87ed5551 tree e9f43e14114b7bb46d3175df92a1de5643b2f976 parent 908dcecda1d18803b5823f30e6c47d2882dc0cf1 author Peter Hagervall Fri, 23 Jun 2006 02:06:04 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:08 -0700 [PATCH] Sparse fixes for synclink_cs Mark a few non-exported functions static. Signed-off-by: Peter Hagervall Cc: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 908dcecda1d18803b5823f30e6c47d2882dc0cf1 tree 2e40b7484baa65af9aa4460ae958d445725f484f parent a5d6839b75ca4a29b5e0a5595914a8715e8f746d author Jan Beulich Fri, 23 Jun 2006 02:06:00 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:08 -0700 [PATCH] adjust handle_IRR_event() return type Correct the return type of handle_IRQ_event() (inconsistency noticed during Xen development), and remove redundant declarations. The return type adjustment required breaking out the definition of irqreturn_t into a separate header, in order to satisfy current include order dependencies. Signed-off-by: Jan Beulich Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Russell King Cc: Ian Molton Cc: Mikael Starvik Cc: Yoshinori Sato Cc: Hirokazu Takata Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: William Lee Irwin III Cc: "David S. Miller" Cc: Miles Bader Cc: Geert Uytterhoeven Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5d6839b75ca4a29b5e0a5595914a8715e8f746d tree 8bb38547046d71b42b687e7c07350fe02d9b3d63 parent 226a6b84aaaf1fac7a5d41cf4e7387fd9ba895d5 author Adrian Bunk Fri, 23 Jun 2006 02:05:59 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:08 -0700 [PATCH] drivers/md/raid6algos.c: fix a NULL dereference This patch fixes a NULL dereference spotted by the Coverity checker. Signed-off-by: Adrian Bunk Cc: "H. Peter Anvin" Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 226a6b84aaaf1fac7a5d41cf4e7387fd9ba895d5 tree f1d72ef1145ddbd108c2701e1154fb81e078adb3 parent 3439dd86e34580384d3b58cf8d54a9283cd7a342 author Randy Dunlap Fri, 23 Jun 2006 02:05:58 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:08 -0700 [PATCH] CodingStyle: add typedefs chapter Add a chapter on typedefs, copied from an email from Linus to lkml on Feb. 3, 2006. (Subject: Re: [RFC][PATCH 1/5] Virtualization/containers: startup) Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3439dd86e34580384d3b58cf8d54a9283cd7a342 tree b421244c25d96e83a744576ad543587339e581fb parent 626ab0e69d376fa07599af669af8ba92d58e87c1 author Porpoise Fri, 23 Jun 2006 02:05:56 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:08 -0700 [PATCH] When CONFIG_BASE_SMALL=1, cascade() may enter an infinite loop When CONFIG_BASE_SAMLL=1, cascade() in may enter the infinite loop. Because of CONFIG_BASE_SMALL=1(TVR_BITS=6 and TVN_BITS=4), the list base->tv5 may cascade into base->tv5. So, the kernel enters the infinite loop in the function cascade(). I created a test module to verify this bug, and a patch to fix it. #include #include #include #include #if 0 #include #else #define kdb_printf printk #endif #define TVN_BITS (CONFIG_BASE_SMALL ? 4 : 6) #define TVR_BITS (CONFIG_BASE_SMALL ? 6 : 8) #define TVN_SIZE (1 << TVN_BITS) #define TVR_SIZE (1 << TVR_BITS) #define TVN_MASK (TVN_SIZE - 1) #define TVR_MASK (TVR_SIZE - 1) #define TV_SIZE(N) (N*TVN_BITS + TVR_BITS) struct timer_list timer0; struct timer_list dummy_timer1; struct timer_list dummy_timer2; void dummy_timer_fun(unsigned long data) { } unsigned long j=0; void check_timer_base(unsigned long data) { kdb_printf("check_timer_base %08x\n",jiffies); mod_timer(&timer0,(jiffies & (~0xFFF)) + 0x1FFF); } int init_module(void) { init_timer(&timer0); timer0.data = (unsigned long)0; timer0.function = check_timer_base; mod_timer(&timer0,jiffies+1); init_timer(&dummy_timer1); dummy_timer1.data = (unsigned long)0; dummy_timer1.function = dummy_timer_fun; init_timer(&dummy_timer2); dummy_timer2.data = (unsigned long)0; dummy_timer2.function = dummy_timer_fun; j=jiffies; j&=(~((1< Cc: Matt Mackall Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 626ab0e69d376fa07599af669af8ba92d58e87c1 tree a995e0231e61fab63568bc7bade81dc20c1dae09 parent 54e73770357142e297c916c7865f5fca7499f69c author Oleg Nesterov Fri, 23 Jun 2006 02:05:55 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] list: use list_replace_init() instead of list_splice_init() list_splice_init(list, head) does unneeded job if it is known that list_empty(head) == 1. We can use list_replace_init() instead. Signed-off-by: Oleg Nesterov Acked-by: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54e73770357142e297c916c7865f5fca7499f69c tree a37b768005eee1fdf6e0ae3051098c51f918785f parent cb259f07b1daacafac3b12ecd7f180faf7e506b0 author Oleg Nesterov Fri, 23 Jun 2006 02:05:54 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] list: introduce list_replace() helper list_replace() is similar to list_replace_rcu(), but unlike list_replace_rcu() it could be used when list_empty(old) == 1 doesn't use barriers Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb259f07b1daacafac3b12ecd7f180faf7e506b0 tree 99aa3cdf02b229d9dac6c5f510f29a7f22504f77 parent f5befceb5cfecba49fdf61f8e0eb4d453200eac9 author bjdouma Fri, 23 Jun 2006 02:05:53 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] two additions to ./linux/Documentation/ioctl-number.txt Cc: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5befceb5cfecba49fdf61f8e0eb4d453200eac9 tree d44d7b0375408895a686e274a4a336c271184d0a parent 862f5f0133f1c8a179dd93adc03d43f8f7e8bac5 author Brent Casavant Fri, 23 Jun 2006 02:05:52 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] SGI IOC4: Detect IO card variant There are three different IO cards which an SGI IOC4 controller may find itself on. One of these variants does not bring out the IDE and serial signals, so we need to disable attaching the corresponding IOC4 subdrivers to such cards. Cleans up message clutter emitted during device probing. Signed-off-by: Brent Casavant Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 862f5f0133f1c8a179dd93adc03d43f8f7e8bac5 tree 51ef137f4a648859c339988413a19ab3567c032e parent d83015b8f62ee3fcd338f6f009051ed57f77a531 author Randy Dunlap Fri, 23 Jun 2006 02:05:52 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] Doc: add audit & acct to DocBook Fix one audit kernel-doc description (one parameter was missing). Add audit*.c interfaces to DocBook. Add BSD accounting interfaces to DocBook. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d83015b8f62ee3fcd338f6f009051ed57f77a531 tree 11e30548e6b07045f8a17aa4661e1cde6f374b18 parent 55f4e8d156d23709739029afb108932ef94cac94 author Paul E. McKenney Fri, 23 Jun 2006 02:05:51 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] Make RCU API inaccessible to non-GPL Linux kernel modules Remove synchronize_kernel() (deprecated 2-APR-2005 in http://lkml.org/lkml/2005/4/3/11) and makes the RCU API inaccessible to non-GPL Linux kernel modules (as was announced more than one year ago in http://lkml.org/lkml/2005/4/3/8). Tested on x86 and ppc64. Signed-off-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55f4e8d156d23709739029afb108932ef94cac94 tree b8877b3e23dbb82b3fd1fb93ed319a3c5cb1148d parent 915a56d2394f4ef70e9cb7115a9bdad778276338 author Jes Sorensen Fri, 23 Jun 2006 02:05:50 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] kernel/sys.c doesn't need init.h kernel/sys.c doesn't have anything in it relying on linux/init.h - remove the include. Signed-off-by: Jes Sorensen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 915a56d2394f4ef70e9cb7115a9bdad778276338 tree 783e0ab18ae8b0f02294dd50568de1dadbf06620 parent e0f23603fb2607315ce52432cc4225df410828cf author Randy Dunlap Fri, 23 Jun 2006 02:05:49 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] add Doc/SubmitChecklist Provide a checklist of techniques to aid kernel patch submitters in producing healthy patches and in lessening a burden on maintainers. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0f23603fb2607315ce52432cc4225df410828cf tree 7a32b42a64a64488aee0e91ab016d53c353f9482 parent 57ae2508610d50893cb3e3bbb869ff70ff724a2a author NeilBrown Fri, 23 Jun 2006 02:05:48 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] Remove semi-softlockup from invalidate_mapping_pages If invalidate_mapping_pages is called to invalidate a very large mapping (e.g. a very large block device) and if the only active page in that device is near the end (or at least, at a very large index), such as, say, the superblock of an md array, and if that page happens to be locked when invalidate_mapping_pages is called, then pagevec_lookup will return this page and as it is locked, 'next' will be incremented and pagevec_lookup will be called again. and again. and again. while we count from 0 upto a very large number. We should really always set 'next' to 'page->index+1' before going around the loop again, not just if the page isn't locked. Cc: "Steinar H. Gunderson" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57ae2508610d50893cb3e3bbb869ff70ff724a2a tree 33109c6d78be1b6e5db085a57a4509fcfd88ee95 parent deb0e9b234af24f4a827757fae9ff5542a3d2a12 author Andrew Morton Fri, 23 Jun 2006 02:05:47 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] CONFIG_NET=n build fix Cc: Greg KH Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit deb0e9b234af24f4a827757fae9ff5542a3d2a12 tree 5708987407378781ae22bb4c032ffb807e449e91 parent 66f969d064e46e6690c3426e2af846e76fb80e83 author Andrew Morton Fri, 23 Jun 2006 02:05:46 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] connector-exports Put the connector exports at the functions so people can see them in context. Cc: Evgeniy Polyakov Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66f969d064e46e6690c3426e2af846e76fb80e83 tree 3a1ab9196b5811ec287969a36dee12911fbd22f1 parent 481fad483487ea967fe20bbc9e565d787f7bf20f author Pekka Enberg Fri, 23 Jun 2006 02:05:45 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] ipmi: strstrip conversion Switch an open-coded strstrip() to use the new API. Acked-by: Corey Minyard Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 481fad483487ea967fe20bbc9e565d787f7bf20f tree 3a76336443129975d9f7ba99f9a9ea1c494315e5 parent 3fa2164d03fb7af17fcfe4f8800dd754fbd99ff7 author Pekka Enberg Fri, 23 Jun 2006 02:05:44 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] strstrip() API Add a new strstrip() function to lib/string.c for removing leading and trailing whitespace from a string. Cc: Michael Holzheu Acked-by: Ingo Oeser Acked-by: Joern Engel Cc: Corey Minyard Signed-off-by: Pekka Enberg Acked-by: Michael Holzheu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fa2164d03fb7af17fcfe4f8800dd754fbd99ff7 tree 1fd2d9bfaff3bd7ba8c7d6c1e60634f3f799b6c7 parent 1d31a4ea8cf7a2afc7299d1d3d8732ca54a5934e author Matt Helsley Fri, 23 Jun 2006 02:05:44 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] Process Events: License Change Change the license on the process event structure passed between kernel and userspace. Signed-off-by: Matt Helsley Acked-by: Guillaume Thouvenin Acked-by: Nguyen Anh Quynh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d31a4ea8cf7a2afc7299d1d3d8732ca54a5934e tree 74995c3163a0854d37a0a5193177928c2ded9ce8 parent 368a5fa1f28589e6b54588a139ea872d5b4b1914 author Matt Helsley Fri, 23 Jun 2006 02:05:42 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] Process Events - Header Cleanup Move connector header include to precisely where it's needed. Remove unused time.h header file as well. This was leftover from previous iterations of the process events patches. Signed-off-by: Matt Helsley Cc: Guillaume Thouvenin Cc: Nguyen Anh Quynh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 368a5fa1f28589e6b54588a139ea872d5b4b1914 tree 346923893f4814dffb51049f92f81c327374e60c parent 0216bfcffe424a5473daa4da47440881b36c1f41 author Hua Zhong Fri, 23 Jun 2006 02:05:42 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] remove unlikely() in might_sleep_if() The likely() profiling tools show that __alloc_page() causes a lot of misses: ! 132 119193 __alloc_pages():mm/page_alloc.c@937 Because most __alloc_page() calls are not atomic. Signed-off-by: Hua Zhong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0216bfcffe424a5473daa4da47440881b36c1f41 tree 80eaa49bfc644b070e57c251285048992ac6fafc parent 3cbc564024d8f174202f023e8a2991782f6a9431 author Mingming Cao Fri, 23 Jun 2006 02:05:41 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] percpu counter data type changes to suppport more than 2**31 ext3 free blocks counter The percpu counter data type are changed in this set of patches to support more users like ext3 who need more than 32 bit to store the free blocks total in the filesystem. - Generic perpcu counters data type changes. The size of the global counter and local counter were explictly specified using s64 and s32. The global counter is changed from long to s64, while the local counter is changed from long to s32, so we could avoid doing 64 bit update in most cases. - Users of the percpu counters are updated to make use of the new percpu_counter_init() routine now taking an additional parameter to allow users to pass the initial value of the global counter. Signed-off-by: Mingming Cao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3cbc564024d8f174202f023e8a2991782f6a9431 tree 5d523ef9694b7a0bf07d4db58718f4654afa3f04 parent d09042da7284a86ffbdd18695f517a71514ed598 author Ravikiran G Thirumalai Fri, 23 Jun 2006 02:05:40 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] percpu_counters: create lib/percpu_counter.c - Move percpu_counter routines from mm/swap.c to lib/percpu_counter.c Signed-off-by: Ravikiran Thirumalai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d09042da7284a86ffbdd18695f517a71514ed598 tree 09e9a3de71a4a4cf6c8f8cb0c40ec0a916e01cae parent 785d55708c24c28d7646f3d1fe6c9f82fb714311 author Laurent MEYER Fri, 23 Jun 2006 02:05:36 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] fix incorrect SA_ONSTACK behaviour for 64-bit processes - When setting a sighandler using sigaction() call, if the flag SA_ONSTACK is set and no alternate stack is provided via sigaltstack(), the kernel still try to install the alternate stack. This behavior is the opposite of the one which is documented in Single Unix Specifications V3. - Also when setting an alternate stack using sigaltstack() with the flag SS_DISABLE, the kernel try to install the alternate stack on signal delivery. These two use cases makes the process crash at signal delivery. Signed-off-by: Laurent Meyer Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: David Howells Cc: Yoshinori Sato Cc: Geert Uytterhoeven Cc: Roman Zippel Cc: Kyle McMartin Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 785d55708c24c28d7646f3d1fe6c9f82fb714311 tree 3d843be61c44bded726ecccf16312fd45dff3dd5 parent f4e5cc2c44bf760c02875cf48c886c50ec7d2734 author Jesper Juhl Fri, 23 Jun 2006 02:05:35 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] binflt_elf: remove more casts Remove redundant casts from NEW_AUX_ENT() arguments in fs/binfmt_elf.c Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4e5cc2c44bf760c02875cf48c886c50ec7d2734 tree 768df1296b1294c2c84b82f3b0239e5bae3fd5fc parent 11420211b8123d0e2f71945ad022e8eec28ebfce author Jesper Juhl Fri, 23 Jun 2006 02:05:35 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] binfmt_elf: CodingStyle cleanup and remove some pointless casts Do a CodingStyle cleanup of fs/binfmt_elf.c and also remove some pointless casts of kmalloc() return values in the same file. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11420211b8123d0e2f71945ad022e8eec28ebfce tree 079e4ba2e9484af81ed4ef6ae8dd2ecc58dbc6e9 parent 9becde79d2c5e382d955167c07017b5e34b142f0 author Jan Engelhardt Fri, 23 Jun 2006 02:05:34 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] Update devices.txt Update Documentation/devices.txt with a new version from the LANANA site http://www.lanana.org/docs/device-list/devices-2.6+.txt Signed-off-by: Jan Engelhardt Cc: Torben Mathiasen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9becde79d2c5e382d955167c07017b5e34b142f0 tree fb2f84658cf9a8d7c4089262bd545fa809ef84da parent 83d4e6e7fba0b2a01092f0cf14ba2e33bd1253e9 author Jonathan McDowell Fri, 23 Jun 2006 02:05:33 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] leds: Amstrad Delta LED support Use the new LED infrastructure to support the 6 LEDs present on the Amstrad Delta. [akpm@osdl.org: cleanup] Signed-off-by: Jonathan McDowell Ackde-by: Richard Purdie Cc: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83d4e6e7fba0b2a01092f0cf14ba2e33bd1253e9 tree 4fa75ffb35970e27762623edbc1f725171d2b0b5 parent e6022603b9aa7d61d20b392e69edcdbbc1789969 author Andreas Mohr Fri, 23 Jun 2006 02:05:32 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] make noirqdebug/irqfixup __read_mostly, add (un)likely() Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6022603b9aa7d61d20b392e69edcdbbc1789969 tree f94b059e312ea7b2f3c4d0b01939e868ed525fb0 parent 304c4c841a31c780a45d65e389b07706babf5d36 author Andrew Morton Fri, 23 Jun 2006 02:05:32 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] ext3_clear_inode(): avoid kfree(NULL) Steven Rostedt points out that `rsv' here is usually NULL, so we should avoid calling kfree(). Also, fix up some nearby whitespace damage. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 304c4c841a31c780a45d65e389b07706babf5d36 tree d5fed361a127e46c1a99d72ef907e1c6b03a1abe parent 22722051fb6bcbb95c895e68dad10d34a9db7e4d author Andrew Morton Fri, 23 Jun 2006 02:05:31 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] jbd: avoid kfree(NULL) There are a couple of places where JBD has to check to see whether an unneeded memory allocation was performed. Usually it _was_ needed, so we end up calling kfree(NULL). We can micro-optimise that by checking the pointer before calling kfree(). Thanks to Steven Rostedt for identifying this. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22722051fb6bcbb95c895e68dad10d34a9db7e4d tree 2f6e7a7888b4369cb2dd18be1cd4d3b18730280b parent 89d0cf01c0aa9e8241cc3703a359ecd6abf3c28a author Andreas Mohr Fri, 23 Jun 2006 02:05:30 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] x86/powerpc make hardirq_ctx and softirq_ctx __read_mostly The hardirq_ctx and softirq_ctx variables are written to on init only, Signed-off-by: Andreas Mohr Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89d0cf01c0aa9e8241cc3703a359ecd6abf3c28a tree 149611b8bbd430d482299f5b976da6a6cfc1e718 parent d20d04bc9befbd752092b4aa42bb8254a1af0776 author Daniel Walker Fri, 23 Jun 2006 02:05:29 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] invert irq/migration.c brach prediction If you get to that point in the code it means that desc->move_irq is set, pending_irq_cpumask[irq] and cpu_online_map should have a value. Still pretty good chance anding those two you'll still have a value. So these two branch predictors should be inverted. Signed-off-by: Daniel Walker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d20d04bc9befbd752092b4aa42bb8254a1af0776 tree acf5686c7353aab275451e9033f5aa7693c8dc23 parent 94a6735cd67375029c2092e6d46f14b2721e6793 author Jesper Juhl Fri, 23 Jun 2006 02:05:28 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] ISDN: correctly handle isdn_writebuf_stub() errors isdn_writebuf_stub() forgets to detect memory allocation and uaccess errors. And when that's fixed, if a error happens the caller will just keep on looping. So change the caller to detect the error, and to return it. Signed-off-by: Jesper Juhl Cc: Karsten Keil Signed-off-by: Tilman Schmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94a6735cd67375029c2092e6d46f14b2721e6793 tree 1d9479e9c2900cdaf1ec7ded1b7a917c8528a3d8 parent 2eebb1925d25cfd7e7cd2eb18ac4d4e6d189dba0 author Jesper Juhl Fri, 23 Jun 2006 02:05:27 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] i4l: memory leak fix for sc_ioctl(). Fix leak of `rcvmsg' in sc_ioctl(). There are two returns in the switch in sc_ioctl (the SCIOCSTART case) that may leak `rcvmsg'. This patch fixes that by adding a kfree() call at the beginning of that case. Bug found by the coverity checker as #1098 Eric Sesterhenn send me a patch to fix the leak(s) by adding 2 kfree() calls before the returns, I changed that into just a single call at the beginning. Signed-off-by: Jesper Juhl Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2eebb1925d25cfd7e7cd2eb18ac4d4e6d189dba0 tree a4257f771edf0b1809eba1999447692741caeafa parent 9ada7340987aa24395809570840c7c6847044f52 author Jesper Juhl Fri, 23 Jun 2006 02:05:26 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] OSS: cs46xx cleanup and tiny bugfix Here's a patch for cs46xx that - (mostly) cleans up the cs46xx driver according to CodingStyle - removes a bunch of pointless casts - fixes a small, potential use of uninitialized variable, bug - reduces the size of the compiled code by 36 bytes - reduces the size of the source file by 1831 bytes I know I should probably have split this into bits, but since I only thought of that *after* doing all the edits, splitting it up would have been a royal pain. And since these are all pretty trivial changes I thought I'd just submit the one huge patch and hope people could live with it (if not, then just tell me and I'll split it). The bug fix that's in there may be hard to spot, so I'll point it out. It's the - int val, valsave, mapped, ret; + int val, valsave, ret; + int mapped = 0; bit. Without that change we may use `mapped' uninitialized if, in cs_ioctl, the first test of "if(state)" is false and the second "if(state)" test is true. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ada7340987aa24395809570840c7c6847044f52 tree e2a57c184d15cbd2415f4fce35534cf635e9fa9f parent 8e0a43d8fa953179505869ec28de78550246e795 author Jan Kara Fri, 23 Jun 2006 02:05:25 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] jbd: fix BUG in journal_commit_transaction() Fix possible assertion failure in journal_commit_transaction() on jh->b_next_transaction == NULL (when we are processing BJ_Forget list and buffer is not jbddirty). !jbddirty buffers can be placed on BJ_Forget list for example by journal_forget() or by __dispose_buffer() - generally such buffer means that it has been freed by this transaction. Freed buffers should not be reallocated until the transaction has committed (that's why we have the assertion there) but they *can* be reallocated when the transaction has already been committed to disk and we are just processing the BJ_Forget list (as soon as we remove b_committed_data from the bitmap bh, ext3 will be able to reallocate buffers freed by the committing transaction). So we have to also count with the case that the buffer has been reallocated and b_next_transaction has been already set. And one more subtle point: it can happen that we manage to reallocate the buffer and also mark it jbddirty. Then we also add the freed buffer to the checkpoint list of the committing trasaction. But that should do no harm. Non-jbddirty buffers should be filed to BJ_Reserved and not BJ_Metadata list. It can actually happen that we refile such buffers during the commit phase when we reallocate in the running transaction blocks deleted in committing transaction (and that can happen if the committing transaction already wrote all the data and is just cleaning up BJ_Forget list). Signed-off-by: Jan Kara Acked-by: "Stephen C. Tweedie" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e0a43d8fa953179505869ec28de78550246e795 tree 1fc56d6337c487952ab008b8ff063b2a2d48ee02 parent 6e6672604773b9bae44d88d38afdf0763c104b1c author Ingo Molnar Fri, 23 Jun 2006 02:05:23 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] cond_resched() might_sleep() fix add the __might_sleep() check back to cond_resched(). Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e6672604773b9bae44d88d38afdf0763c104b1c tree fa597c1b9d46d3f7ed6743f2230a0ac9813693a7 parent 538c5902b81cc384e93ad3834b6d4a0b3fcb2285 author Prasanna Meda Fri, 23 Jun 2006 02:05:23 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] dup fd error fix Set errorp in dup_fd, it will be used in sys_unshare also. Signed-off-by: Prasanna Meda Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 538c5902b81cc384e93ad3834b6d4a0b3fcb2285 tree 690a8f276814946755ccb8261a8174511104b3f8 parent 5a9d6e0632b867ca71d3ee1e7e5c2365b6711031 author Jean-Luc Leger Fri, 23 Jun 2006 02:05:22 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] clean up default value of IP_DCCP_ACKVEC Default values for boolean and tristate options can only be 'y', 'm' or 'n'. This patch removes wrong default for IP_DCCP_ACKVEC. Signed-off-by: Jean-Luc Leger Cc: Arnaldo Carvalho de Melo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a9d6e0632b867ca71d3ee1e7e5c2365b6711031 tree 65e6d74dc6cc21dc027395fbdd042d9ba992e0b0 parent c7a43575518702fe6829d970c3d04acd91ae5c91 author Jean-Luc Leger Fri, 23 Jun 2006 02:05:21 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] clean up default value of USB_ISP116X_HCD, USB_SL811_HCD and USB_SL811_CS Default values for boolean and tristate options can only be 'y', 'm' or 'n'. This patch removes wrong default for USB_ISP116X_HCD, USB_SL811_HCD and USB_SL811_CS. Signed-off-by: Jean-Luc Leger Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7a43575518702fe6829d970c3d04acd91ae5c91 tree ac3e1fa7b6d51d734ece5abd7e72b79cad149376 parent 1e11d2782b2f8e86d22ad92c75b70ec8cad14dcf author Jean-Luc Leger Fri, 23 Jun 2006 02:05:20 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] clean up default value of SYSCALL_DEBUG Default values for boolean and tristate options can only be 'y', 'm' or 'n'. This patch removes wrong default for SYSCALL_DEBUG. Signed-off-by: Jean-Luc Leger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e11d2782b2f8e86d22ad92c75b70ec8cad14dcf tree c019b56dd2031f33bedcb976c35281836c80c19b parent 260ea1013283d8acbb451459ed1ca560c1445c20 author Jean-Luc Leger Fri, 23 Jun 2006 02:05:19 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] clean up default value of SCHED_SMT Default values for boolean and tristate options can only be 'y', 'm' or 'n'. This patch removes wrong default for SCHED_SMT. Signed-off-by: Jean-Luc Leger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 260ea1013283d8acbb451459ed1ca560c1445c20 tree 35819d28dbfa8600ac0de336147323e660b0390c parent 4a4b69f79ba7286794765a856349e380f984a6cb author Eric W. Biederman Fri, 23 Jun 2006 02:05:18 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] ptrace: document the locking rules After a lot of reading the code and thinking about how it behaves I have managed to figure out what the current ptrace locking rules are. The current code is in much better that it appears at first glance. The troublesome code paths are actually the code paths that violate the current rules. ptrace uses simple exclusive access as it's locking. You can only touch task->ptrace if the task is stopped and you are the ptracer, or if the task is running and are the task itself. Very simple, very easy to maintain. It just needs to be documented so people know not to touch ptrace from elsewhere. Currently we do have a few pieces of code that are in violation of this rule. Particularly the core dump code, and ptrace_attach. But so far the code looks fixable. Signed-off-by: Eric W. Biederman Cc: Oleg Nesterov Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a4b69f79ba7286794765a856349e380f984a6cb tree e437752eb3f53b4e732595815aa5d24ff4bcbaab parent 2da132646358c853d5caf296d079aefc69358d46 author Vadim Lobanov Fri, 23 Jun 2006 02:05:16 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] Poll cleanups/microoptimizations The "count" and "pt" variables are declared and modified by do_poll(), as well as accessed and written indirectly in the do_pollfd() subroutine. This patch pulls all handling of these variables into the do_poll() function, thereby eliminating the odd use of indirection in do_pollfd(). This is done by pulling the "struct pollfd" traversal loop from do_pollfd() into its only caller do_poll(). As an added bonus, the patch saves a few clock cycles, and also adds comments to make the code easier to follow. Signed-off-by: Vadim Lobanov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2da132646358c853d5caf296d079aefc69358d46 tree 253119203069ade4dc11962191cdfd51bc8b783e parent 0ae26f1b3159f3acb21ae1e866c3c7e16edd450f author Adrian Bunk Fri, 23 Jun 2006 02:05:15 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] fs/fat/misc.c: unexport fat_sync_bhs Signed-off-by: Adrian Bunk Acked-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ae26f1b3159f3acb21ae1e866c3c7e16edd450f tree 28a86cc8682ad5b247f597773572e410b9457d72 parent 32797f976d62af709943aae38a9457b5a6dbcd8a author Andrew Morton Fri, 23 Jun 2006 02:05:15 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] mmput() might sleep exit_aio() and exit_mmap() can sleep. But it's easy to accidentally call mmput() from inside locks. Cc: Dave Peterson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32797f976d62af709943aae38a9457b5a6dbcd8a tree 63c71a314678946589d575bcb0559fe727a4daad parent 8d27e9084b372441dc8c9cf361a965ee58032767 author Domen Puncer Fri, 23 Jun 2006 02:05:14 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] Remove CONFIG_PARPORT_ARC, drivers/parport/parport_arc.c It's wasn't referenced in Makefile since at least 2.2.8, unbuildable due to trivial typos and things like DATA_LATCH and arc_write_control() which doesn't exist. Adrian Bunk: adapted the patch to unrelated context changes Signed-off-by: Domen Puncer Signed-off-by: Alexey Dobriyan Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d27e9084b372441dc8c9cf361a965ee58032767 tree fa01bec4e62d494e0a3811d7e29b0b263262f42b parent b0904e147f7cbe4be3b4dae49ddccd627bb66f16 author Xose Vazquez Perez Fri, 23 Jun 2006 02:05:13 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] module.h: updated comments with a new license "Dual MIT/GPL" is also accepted (kernel/module.c), so updated comments. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0904e147f7cbe4be3b4dae49ddccd627bb66f16 tree 81bb0e45d46a3bb038d953f616fd6e32d7ca5e4b parent 75e1fcc0b18df0a65ab113198e9dc0e98999a08c author Adrian Bunk Fri, 23 Jun 2006 02:05:13 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] fs/locks.c: make posix_locks_deadlock() static We can now make posix_locks_deadlock() static. Signed-off-by: Adrian Bunk Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75e1fcc0b18df0a65ab113198e9dc0e98999a08c tree 3ac0d0d3120cbca4ee9734494e2c9a4e0775ac4f parent ff7b86b82083f24b8637dff1528c7101c18c7f39 author Miklos Szeredi Fri, 23 Jun 2006 02:05:12 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] vfs: add lock owner argument to flush operation Pass the POSIX lock owner ID to the flush operation. This is useful for filesystems which don't want to store any locking state in inode->i_flock but want to handle locking/unlocking POSIX locks internally. FUSE is one such filesystem but I think it possible that some network filesystems would need this also. Also add a flag to indicate that a POSIX locking request was generated by close(), so filesystems using the above feature won't send an extra locking request in this case. Signed-off-by: Miklos Szeredi Cc: Trond Myklebust Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff7b86b82083f24b8637dff1528c7101c18c7f39 tree be80c94e4c1410b51190b617fa27caf33b0ba60b parent 39005d022ad221b76dc2de0ac62ef475a796433b author Miklos Szeredi Fri, 23 Jun 2006 02:05:11 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] locks: clean up locks_remove_posix() locks_remove_posix() can use posix_lock_file() instead of doing the lock removal by hand. posix_lock_file() now does exacly the same. The comment about pids no longer applies, posix_lock_file() takes only the owner into account. Signed-off-by: Miklos Szeredi Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39005d022ad221b76dc2de0ac62ef475a796433b tree e0a36fec7076d48764f0588b9ce09ce8e9f067ff parent 0d9a490abe1f69fda220f7866f6f23af41daa128 author Miklos Szeredi Fri, 23 Jun 2006 02:05:10 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] locks: don't do unnecessary allocations posix_lock_file() always allocates new locks in advance, even if it's easy to determine that no allocations will be needed. Optimize these cases: - FL_ACCESS flag is set - Unlocking the whole range Signed-off-by: Miklos Szeredi Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d9a490abe1f69fda220f7866f6f23af41daa128 tree 499b7f9c44bb5a079f8ba303fefba402e603c314 parent 090d2b185d8680fc26a2eaf4245d4171dcf4baf1 author Miklos Szeredi Fri, 23 Jun 2006 02:05:09 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] locks: don't unnecessarily fail posix lock operations posix_lock_file() was too cautious, failing operations on OOM, even if they didn't actually require an allocation. This has the disadvantage, that a failing unlock on process exit could lead to a memory leak. There are two possibilites for this: - filesystem implements .lock() and calls back to posix_lock_file(). On cleanup of files_struct locks_remove_posix() is called which should remove all locks belonging to files_struct. However if filesystem calls posix_lock_file() which fails, then those locks will never be freed. - if a file is closed while a lock is blocked, then after acquiring fcntl_setlk() will undo the lock. But this unlock itself might fail on OOM, again possibly leaking the lock. The solution is to move the checking of the allocations until after it is sure that they will be needed. This will solve the above problem since unlock will always succeed unless it splits an existing region. Signed-off-by: Miklos Szeredi Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 090d2b185d8680fc26a2eaf4245d4171dcf4baf1 tree 67e604e3cd1bad3cfd034bced19a0fbff6a80c30 parent c330dda908b5a46469a997eea90b66f2f9f02b34 author Pekka Enberg Fri, 23 Jun 2006 02:05:08 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] read_mapping_page for address space Add read_mapping_page() which is used for callers that pass mapping->a_ops->readpage as the filler for read_cache_page. This removes some duplication from filesystem code. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c330dda908b5a46469a997eea90b66f2f9f02b34 tree aad52aa4e127c366ca185c2122650d7dbb3437a0 parent 24bbb1faf3f0420eb252dd0fdc1e477b1d4d73bd author Jeff Moyer Fri, 23 Jun 2006 02:05:07 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] Add a sysfs file to determine if a kexec kernel is loaded Create two files in /sys/kernel, kexec_loaded and kexec_crash_loaded. Each file contains a simple boolean value indicating whether the relevant kernel has been loaded into memory. The motivation for this is geared around support. Signed-off-by: Jeff Moyer Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24bbb1faf3f0420eb252dd0fdc1e477b1d4d73bd tree ce7f9358fdeaa4f299cb996e8a1d4224d51ee4c4 parent b9e122c80cd2e10fe18678c63db4717871ed31cf author Michael Holzheu Fri, 23 Jun 2006 02:05:06 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] s390_hypfs filesystem On zSeries machines there exists an interface which allows the operating system to retrieve LPAR hypervisor accounting data. For example, it is possible to get usage data for physical and virtual cpus. In order to provide this information to user space programs, I implemented a new virtual Linux file system named 's390_hypfs' using the Linux 2.6 libfs framework. The name 's390_hypfs' stands for 'S390 Hypervisor Filesystem'. All the accounting information is put into different virtual files which can be accessed from user space. All data is represented as ASCII strings. When the file system is mounted the accounting information is retrieved and a file system tree is created with the attribute files containing the cpu information. The content of the files remains unchanged until a new update is made. An update can be triggered from user space through writing 'something' into a special purpose update file. We create the following directory structure: / update cpus/ type mgmtime ... hyp/ type systems/ cpus/ type mgmtime cputime onlinetime ... cpus/ ... - update: File to trigger update - cpus/: Directory for all physical cpus - cpus//: Directory for one physical cpu. - cpus//type: Type name of physical zSeries cpu. - cpus//mgmtime: Physical-LPAR-management time in microseconds. - hyp/: Directory for hypervisor information - hyp/type: Typ of hypervisor (currently only 'LPAR Hypervisor') - systems/: Directory for all LPARs - systems//: Directory for one LPAR. - systems//cpus//: Directory for the virtual cpus - systems//cpus//type: Typ of cpu. - systems//cpus//mgmtime: Accumulated number of microseconds during which a physical CPU was assigned to the logical cpu and the cpu time was consumed by the hypervisor and was not provided to the LPAR (LPAR overhead). - systems//cpus//cputime: Accumulated number of microseconds during which a physical CPU was assigned to the logical cpu and the cpu time was consumed by the LPAR. - systems//cpus//onlinetime: Accumulated number of microseconds during which the logical CPU has been online. As mount point for the filesystem /sys/hypervisor/s390 is created. The update process is triggered when writing 'something' into the 'update' file at the top level hypfs directory. You can do this e.g. with 'echo 1 > update'. During the update the whole directory structure is deleted and built up again. Cc: Pekka Enberg Cc: Ingo Oeser Cc: Joern Engel Acked-by: Martin Schwidefsky Signed-off-by: Michael Holzheu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9e122c80cd2e10fe18678c63db4717871ed31cf tree 3e29f080ff69dc93d07e41774f2e3c53506ef37c parent 6f36d17a87ea9c2584aa8f649e438334bd69e32f author Jesper Juhl Fri, 23 Jun 2006 02:05:04 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] xtensa: remove verify_area macros verify_area() is still alive on xtensa in 2.6.17-rc3-git13 It would be nice to finally be rid of that function across the board. Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f36d17a87ea9c2584aa8f649e438334bd69e32f tree d7fb30847c42598631cc29f4a5afa2ecd3a9d92d parent f1b5e520bb65e98d27632cd270d931838bd2a5da author Al Viro Fri, 23 Jun 2006 02:05:03 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: windfarm is powerpc-only, don't do it on m68k macs Signed-off-by: Al Viro Cc: Roman Zippel Cc: Geert Uytterhoeven Acked-by: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1b5e520bb65e98d27632cd270d931838bd2a5da tree 4685f12b6e919faabd1bd24a32b180c420aaa47a parent de290166552a037234bca44ed4bcbf4a4e9f5be9 author Al Viro Fri, 23 Jun 2006 02:05:03 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k traps.c constraints Cast is not an lvalue; =r constraint wants an lvalue and really couldn't care whether it's void * or other pointer type. Signed-off-by: Al Viro Cc: Roman Zippel Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de290166552a037234bca44ed4bcbf4a4e9f5be9 tree 57141f6ce3e37e9881259645e44de87b981f5e5f parent d94af931af42152e34539dd4782b1724084a89fb author Jan Altenberg Fri, 23 Jun 2006 02:05:01 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: ptrace.h typo fix Signed-off-by: Jan Altenberg Cc: Geert Uytterhoeven Cc: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d94af931af42152e34539dd4782b1724084a89fb tree 7cf8c1cce891ef6b87635a643fe62ea9d231b474 parent 1a23989475846547e5b7ce14e77f072894aaff54 author Roman Zippel Fri, 23 Jun 2006 02:05:00 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: clean up uaccess.h This uninlines a few large functions in uaccess.h and cleans up the rest. It includes a (hopefully temporary) workaround for the broken typeof of gcc-4.1. Signed-off-by: Roman Zippel Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a23989475846547e5b7ce14e77f072894aaff54 tree 8cc8726619f50ffcb62433e6548fd285da252922 parent 6d2f16a8917eb77a8b79849686159f3a5eae2501 author Finn Thain Fri, 23 Jun 2006 02:04:59 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: m68k mac VIA2 fixes and cleanups Some fixes and cleanups from the linux-mac68k repo. Fix mac_esp by clearing the VIA2 SCSI IRQ flag before the SCSI IRQ handler is invoked. Also fix a race condition caused by unmasking a nubus slot IRQ then setting the relevant nubus_active bit. Signed-off-by: Finn Thain Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d2f16a8917eb77a8b79849686159f3a5eae2501 tree eddcb022e805523873fccf30ce3d9a21d27dc41d parent 2dcf15b78d14c8d92fa1ce1be95b75e8d27ef99f author Roman Zippel Fri, 23 Jun 2006 02:04:59 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: adjust to changed HARDIRQ_MASK Adjust entry.S to the changed HARDIRQ_MASK, add a check to prevent it from silently breaking again. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2dcf15b78d14c8d92fa1ce1be95b75e8d27ef99f tree 782bc7e735f077832c7c6200be1b5454cac6293b parent 882905c7ff81763a3aa3413629f7253b75587cb1 author Roman Zippel Fri, 23 Jun 2006 02:04:58 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: use proper defines for zone initialization MAX_NR_ZONES changed, so use correct defines now. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 882905c7ff81763a3aa3413629f7253b75587cb1 tree 1425504c208f6c06a8817e376b113ae6360b12ef parent 5fa28ea42f28342ca6efaa2d23789f3fec5adff6 author Roman Zippel Fri, 23 Jun 2006 02:04:57 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: wd33c93: extra delay The wd33c93 needs a small delay before a new command can be started. Signed-off-by: Roman Zippel Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fa28ea42f28342ca6efaa2d23789f3fec5adff6 tree 3433408bfa592c8ca93a121422fab5f42e7c3444 parent cb7d390df391402c9630940d5a2ea1571fc5cde2 author Roman Zippel Fri, 23 Jun 2006 02:04:56 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: restore amikbd compatibility with 2.4 Dump the extra mapping in the amikbd interrupt handler, so old Amiga keymaps work again. Amigas need a special keymap anyway, standard keymaps are not usable and recreating all keymaps is simply not worth the trouble. Signed-off-by: Roman Zippel Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb7d390df391402c9630940d5a2ea1571fc5cde2 tree ce2e2406a477a45db3d0e77948f6431e040e81ee parent f6c4192e77dffbc50ee1b9a24a1063ff961aaf04 author Roman Zippel Fri, 23 Jun 2006 02:04:56 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] m68k: print correct stack trace Pass unmodified stack argument to show_trace(). Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6c4192e77dffbc50ee1b9a24a1063ff961aaf04 tree 5bf22818ac9f6adb7cd588986effab63fbf550e7 parent 98317f1271e7fd472983b013c76df6cc15fbef22 author Roman Zippel Fri, 23 Jun 2006 02:04:55 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] m68k: use c99 initializer Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98317f1271e7fd472983b013c76df6cc15fbef22 tree 98aa4a3193044e57fbe918850e2b9eed13904c30 parent 5a232eafedc385249ef1931d186169f9eed2ad93 author Roman Zippel Fri, 23 Jun 2006 02:04:54 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] m68k: Remove some unused definitions in zorro.h These definitions have long been superseded by asm-offsets.h Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a232eafedc385249ef1931d186169f9eed2ad93 tree 440fa3a66ae793f96e8c95942d8fb363ead259eb parent 078517e4118dc60a97c4eda127b849383eb26f8e author Roman Zippel Fri, 23 Jun 2006 02:04:54 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] m68k: cleanup unistd.h Remove long obsolete kernel syscalls, only execve is still used. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 078517e4118dc60a97c4eda127b849383eb26f8e tree 894d17bb1979dc894f12cb22d95507db1330536c parent 2c3e0262e0cb5395fe02cdf27c229ee7414ab0c0 author Roman Zippel Fri, 23 Jun 2006 02:04:53 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] m68k: atyfb_base compile fix for CONFIG_PCI=n The atyfb_driver structure is only available if CONFIG_PCI is set. Signed-off-by: Roman Zippel Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c3e0262e0cb5395fe02cdf27c229ee7414ab0c0 tree d375b705880fc70b8dc5029b81b697936f1bbce7 parent daacf8bc0dd37a6ad3a87d1a667599e15940815e author Roman Zippel Fri, 23 Jun 2006 02:04:51 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] m68k: completely initialize hw_regs_t in ide_setup_ports ide_setup_ports does not completely initialize the hw_regs_t structure which can cause random failures, as the structure is often on the stack. None of the callers expect a partially initialized structure, i.e. none of them do any setup of their own before calling ide_setup_ports(). Signed-off-by: Roman Zippel Cc: Bartlomiej Zolnierkiewicz Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit daacf8bc0dd37a6ad3a87d1a667599e15940815e tree d16b7b89d258b52cb95c00b1b53ce4fe5c379a3e parent e084dbd3a995f99f5444a9046e66d93c1b92c348 author Shaohua Li Fri, 23 Jun 2006 02:04:50 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] move do_suspend_lowlevel to correct segment Move do_suspend_lowlevel to correct segment. If it is in the same hugepage with ro data, mark_rodata_ro will make it unexecutable. Signed-off-by: Shaohua Li Cc: Len Brown Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e084dbd3a995f99f5444a9046e66d93c1b92c348 tree eda6d7537af3fb36c3152f2ff3942fc4d5790efa parent 55b2355eefc2f160246226d4d69fed431173a4d5 author Pavel Machek Fri, 23 Jun 2006 02:04:50 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] swsusp: documentation updates Update documentation a bit, add more machines to video.txt list. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55b2355eefc2f160246226d4d69fed431173a4d5 tree b5ed6dbf3d045443a12de412f9937a6b8dc20840 parent 968808b8956e332e556b1eae9b4f7df77518f53b author Shaohua Li Fri, 23 Jun 2006 02:04:49 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] don't use flush_tlb_all in suspend time flush_tlb_all uses on_each_cpu, which will disable/enable interrupt. In suspend/resume time, this will make interrupt wrongly enabled. Signed-off-by: Shaohua Li Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 968808b8956e332e556b1eae9b4f7df77518f53b tree e90598c5640df24a250aa0beb3e526f2571ed6e2 parent 7bff24e255ee11ecbc304315a252fcbd84f9ffce author Rafael J. Wysocki Fri, 23 Jun 2006 02:04:48 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] swsusp: use less memory during resume Make swsusp allocate only as much memory as needed to store the image data and metadata during resume. Without this patch swsusp additionally allocates many page frames that will conflict with the "original" locations of the image data and are considered as "unsafe", treating them as "eaten" pages (ie. allocated but unusable). The patch makes swsusp allocate as many pages as it'll need to store the data read from the image in one shot, creating a list of allocated "safe" pages, and use the observation that all pages allocated by it are marked with the PG_nosave and PG_nosave_free flags set.  Namely, when it's about to load an image page, swsusp can check whether the page frame corresponding to the "original" location of this page has been allocated (ie. if the page frame has the PG_nosave and PG_nosave_free flags set) and if so, it can load the page directly into this page frame.  Otherwise it uses an allocated "safe" page from the list to store the data that will be copied to their "original" location later on. This allows us to save many page copyings and page allocations during resume and in the future it may allow us to load images greater than 50% of the normal zone. Signed-off-by: Rafael J. Wysocki Acked-by: "Pavel Machek" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bff24e255ee11ecbc304315a252fcbd84f9ffce tree 23397d27bad855d8b46da23ffc3d9ae5cc0c596c parent a938c356d5b007fe6d28251c0ddbf6c11d0d92b5 author Adrian Bunk Fri, 23 Jun 2006 02:04:47 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] kernel/power/snapshot.c: cleanups - make needlessly global functions static - make dummy functions static inline Signed-off-by: Adrian Bunk Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a938c356d5b007fe6d28251c0ddbf6c11d0d92b5 tree e55827ad27bf0a1b3a0cae821219a863c25173b7 parent 3e3318dee0878d42ed62a19c292a2ac284135db3 author Rafael J. Wysocki Fri, 23 Jun 2006 02:04:46 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] swsusp: take lowmem reserves into account swsusp allocates memory from the normal zone, so it cannot use lowmem reserve pages from the lower zones. Therefore it should not count these pages as available to it. Signed-off-by: Rafael J. Wysocki Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e3318dee0878d42ed62a19c292a2ac284135db3 tree ad1656ed3ec0fc71012a14af087fd7fbb4fb601c parent b6370d96e09944c6e3ae8d5743ca8a8ab1f79f6c author Shaohua Li Fri, 23 Jun 2006 02:04:46 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] swsusp: x86_64 mark special saveable/unsaveable pages Pages (Reserved/ACPI NVS/ACPI Data) below end_pfn will be saved/restored by S4 currently. We should mark 'Reserved' pages not saveable. Pages (Reserved/ACPI NVS/ACPI Data) above end_pfn will not be saved/restored by S4 currently. We should save the 'ACPI NVS/ACPI Data' pages. Signed-off-by: Shaohua Li Cc: Pavel Machek Cc: "Rafael J. Wysocki" Cc: Nigel Cunningham Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6370d96e09944c6e3ae8d5743ca8a8ab1f79f6c tree 00f4ca16e06914d11c9ce2d83443f544705f7a77 parent ce4ab0012b32c1a4a1d6e934aeb73bf3151c48d9 author Shaohua Li Fri, 23 Jun 2006 02:04:45 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] swsusp: i386 mark special saveable/unsaveable pages Pages (Reserved/ACPI NVS/ACPI Data) below max_low_pfn will be saved/restored by S4 currently. We should mark 'Reserved' pages not saveable. Pages (Reserved/ACPI NVS/ACPI Data) above max_low_pfn will not be saved/restored by S4 currently. We should save the 'ACPI NVS/ACPI Data' pages. Signed-off-by: Shaohua Li Cc: Pavel Machek Cc: "Rafael J. Wysocki" Cc: Nigel Cunningham Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce4ab0012b32c1a4a1d6e934aeb73bf3151c48d9 tree 83b5ba44e93eeb8b72fe14028ac25943f77844fe parent 82dcaafc92fdfbe2c1d6c50b9f5e17d533caf950 author Shaohua Li Fri, 23 Jun 2006 02:04:44 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] swsusp: add architecture special saveable pages support 1. Add architecture specific pages save/restore support. Next two patches will use this to save/restore 'ACPI NVS' pages. 2. Allow reserved pages 'nosave'. This could avoid save/restore BIOS reserved pages. Signed-off-by: Shaohua Li Cc: Pavel Machek Cc: "Rafael J. Wysocki" Cc: Nigel Cunningham Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82dcaafc92fdfbe2c1d6c50b9f5e17d533caf950 tree 87244d19e2351315f566542152d6760f890041b1 parent 30343d6c3d4e3fe961369e7be19935683e808c88 author Mathieu Chouquet-Stringer Fri, 23 Jun 2006 02:04:40 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] Remove duplicate symbol exports on Alpha WARNING: vmlinux: 'enable_irq' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'disable_irq' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'disable_irq_nosync' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'probe_irq_mask' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'sys_open' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'sys_read' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strstr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'memscan' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'memcmp' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strnlen' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strncmp' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strcmp' exported twice. Previous export was in vmlinux Signed-off-by: Mathieu Chouquet-Stringer Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30343d6c3d4e3fe961369e7be19935683e808c88 tree 61efa604ac9f9d27b950dd16790a583e9e3b1fb4 parent 224f611c1639cb6c134a934dae7f7b9f0ac3b540 author Kirill Smelkov Fri, 23 Jun 2006 02:04:33 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] x86: compile fix for asm-i386/alternatives.h compile fix: needs for 'u8' -- just look at struct alt_instr. My module includes as the first header, and as of 2.6.17 this leads to compilation errors. Signed-off-by: Kirill Smelkov Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 224f611c1639cb6c134a934dae7f7b9f0ac3b540 tree c5fb2f73e606dc172528f15947cef1d9c0df9e13 parent 7e04a1183eac3e6b3570a154c8677fd9184b51e7 author Michal Ludvig Fri, 23 Jun 2006 02:04:32 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] x86: VIA C7 CPU flags New CPU flags for next generation of crypto engine as found in VIA C7 processors. Signed-off-by: Michal Ludvig Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e04a1183eac3e6b3570a154c8677fd9184b51e7 tree c7e65549871504bb4df03982f9a7581aa6417cab parent 722f4f5b2600b8930b63a096e48b878cd6e0e15a author Chuck Ebbert <76306.1226@compuserve.com> Fri, 23 Jun 2006 02:04:31 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] i386: extra checks in show_registers() Sometimes thread_info and task_struct get out-of-sync with each other. Printing task.thread_info in show_registers() can help spot this. And when task_struct is corrupt then task.comm can contain garbage, so only print as many characters as it can hold. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 722f4f5b2600b8930b63a096e48b878cd6e0e15a tree 434c3af4a09ae3c0aa5a29f7bc25f1477ea67832 parent 6444541671bd821b950dbaafee70d65188198aa6 author Roman Zippel Fri, 23 Jun 2006 02:04:31 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:58 -0700 [PATCH] x86: fix __range_ok constraint An immediate operand can't be the destination of the cmpl instruction, so exclude it. Signed-off-by: Roman Zippel Cc: Mattia Dongili Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6444541671bd821b950dbaafee70d65188198aa6 tree bec166679ad3659407bafa0b088c5932461e8928 parent 19964fecf25c17f865dec07ae242b1a40ea93f16 author Zachary Amsden Fri, 23 Jun 2006 02:04:30 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:58 -0700 [PATCH] i386: don't try kprobes for v8086 mode Never allow int3 traps from V8086 mode to enter the kprobes handler. Signed-off-by: Zachary Amsden Cc: Prasanna S Panchamukhi Cc: Ananth N Mavinakayanahalli Cc: Anil S Keshavamurthy Cc: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19964fecf25c17f865dec07ae242b1a40ea93f16 tree e3eae33af9583dd6a7f88f54b2e9e0f5ecd0b74d parent 110cb1d2e343443c4a4b5f7e081928aa4da90f93 author Chuck Ebbert <76306.1226@compuserve.com> Fri, 23 Jun 2006 02:04:29 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:58 -0700 [PATCH] i386: fix get_segment_eip() with vm86 segments We need to check for vm86 mode first before looking at selector privilege bits. Segment limit is always base + 64k and only the low 16 bits of EIP are significant in vm86 mode. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Cc: Andi Kleen Cc: Zachary Amsden Cc: Rohit Seth Acked-by: Ananth N Mavinakayanahalli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 110cb1d2e343443c4a4b5f7e081928aa4da90f93 tree 3bfa03442e95ed7fc4fcc79c97e7bf8cbc8abf22 parent a0de1f0a5038a957d50893db7a0d47e385fb2915 author Andreas Mohr Fri, 23 Jun 2006 02:04:28 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:58 -0700 [PATCH] x86: use proper defines for i8259A I/O Use proper defines instead of open-coded values. Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0de1f0a5038a957d50893db7a0d47e385fb2915 tree 6be2b76aba77067aa35530e4f352006341897c29 parent 9f22271898707aed2f84cc75ab3bd109173cdbbf author Andreas Mohr Fri, 23 Jun 2006 02:04:28 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:58 -0700 [PATCH] x86: constify arch/i386/pci/irq.c constify structs and add one __initdata. Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f22271898707aed2f84cc75ab3bd109173cdbbf tree 773c9c455c881a32ce5a5afd80dfe559ae10dc68 parent 7b0c2d92180dbd9c7cd0c4b9bd38b06bb0f12843 author Andreas Mohr Fri, 23 Jun 2006 02:04:27 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:57 -0700 [PATCH] make ACPI errata __read_mostly Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b0c2d92180dbd9c7cd0c4b9bd38b06bb0f12843 tree 5157857da98668f9473ba95993a623f604a2a5ab parent cefc01130ba2bb0a81abda14b3f00fcc2e70dd43 author Andreas Mohr Fri, 23 Jun 2006 02:04:26 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:57 -0700 [PATCH] x86: make i387 mxcsr_feature_mask __read_mostly Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cefc01130ba2bb0a81abda14b3f00fcc2e70dd43 tree 392da803d2da3804ca0359ffb6a4763d0decd7d2 parent acae9d32436122959667470b84da517d7b1b9c2d author Andreas Mohr Fri, 23 Jun 2006 02:04:26 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:57 -0700 [PATCH] x86: cyrix code CONFIG_PCI fix / add __initdata PCI code was outside of CONFIG_PCI, add __initdata at cyrix_55x0 (since accessed within __init function only). Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit acae9d32436122959667470b84da517d7b1b9c2d tree 4d933c5d4394184240d4cd89f2f5397a4277c21e parent 21528454f6dd18231ae20102f98aa8f51b6ec1b9 author Andreas Mohr Fri, 23 Jun 2006 02:04:25 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:57 -0700 [PATCH] x86: make using_apic_timer __read_mostly Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21528454f6dd18231ae20102f98aa8f51b6ec1b9 tree a167603f42c51c0e1a731ae9629305a11a5b8e44 parent 1b61b910e99059abdd54c93aa70e84e076e33d16 author Chuck Ebbert <76306.1226@compuserve.com> Fri, 23 Jun 2006 02:04:23 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:57 -0700 [PATCH] i386: let usermode execute the "enter" instruction The i386 page fault handler does not allow enough slack when checking for userspace access below the current stack pointer. This prevents use of the enter instruction by user code. Fix this by allowing enough slack for "enter $65535,$31" to execute. Problem reported by Tomasz Malesinski Tested using this program, based on the original from Tomasz: .file "ovflow.S" .version "01.01" gcc2_compiled.: .section .rodata .LC0: .string "asdf\n" .text .align 4 .globl main .type main,@function main: nest_level=0 .rept 30 enter $0,$nest_level nest_level=nest_level+1 .endr enter $65535,$30 enter $65535,$31 addl $-12,%esp pushl $.LC0 call printf addl $16,%esp .L2: .rept 32 leave .endr ret .Lfe1: .size main,.Lfe1-main .ident "GCC: (GNU) 2.95.4 20011002 (Debian prerelease)" Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b61b910e99059abdd54c93aa70e84e076e33d16 tree fe2cd431dc39521a0f2d30e22c9bd3eb3e1bc317 parent afa024c3dbccf026e45121f4b9de54cda48edbea author Zhang Yanmin Fri, 23 Jun 2006 02:04:22 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:57 -0700 [PATCH] x86: kernel irq balance doesn't work On i386, kernel irq balance doesn't work. 1) In function do_irq_balance, after kernel finds the min_loaded cpu but before calling set_pending_irq to really pin the selected_irq to the target cpu, kernel does a cpus_and with irq_affinity[selected_irq]. Later on, when the irq is acked, kernel would calls move_native_irq=>desc->handler->set_affinity to change the irq affinity. However, every function pointed by hw_interrupt_type->set_affinity(unsigned int irq, cpumask_t cpumask) always changes irq_affinity[irq] to cpumask. Next time when recalling do_irq_balance, it has to do cpu_ands again with irq_affinity[selected_irq], but irq_affinity[selected_irq] already becomes one cpu selected by the first irq balance. 2) Function balance_irq in file arch/i386/kernel/io_apic.c has the same issue. [akpm@osdl.org: cleanups] Signed-off-by: Zhang Yanmin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afa024c3dbccf026e45121f4b9de54cda48edbea tree 49882fc3a71bad0872d1230b0cae00050e690ddd parent a03a3e287b119c7bcbcff1d68f81864ce33b1ad2 author Linus Torvalds Fri, 23 Jun 2006 02:04:21 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] x86: call eisa_set_level_irq() in pbibios_lookup_irq() Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a03a3e287b119c7bcbcff1d68f81864ce33b1ad2 tree 9a95f05e533835a57b56645190b60cdd16f134e2 parent b88d4f1d390a6a232938d27d551f24cf08a2c7e0 author Alexey Dobriyan Fri, 23 Jun 2006 02:04:20 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] Don't trigger full rebuild via CONFIG_X86_MCE Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b88d4f1d390a6a232938d27d551f24cf08a2c7e0 tree eb0cf7af51b7049befc632a835722d5ee7660687 parent ba528f2854e8632c8d04ddcd45f06c47bc7188b0 author Ingo Molnar Fri, 23 Jun 2006 02:04:20 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] i386: break out of recursion in stackframe walk If CONFIG_FRAME_POINTERS is enabled, and one does a dump_stack() during early SMP init, an infinite stackdump and a bootup hang happens: [] show_trace+0xd/0xf [] dump_stack+0x15/0x17 [] save_trace+0xc3/0xce [] mark_lock+0x8c/0x4fe [] __lockdep_acquire+0x44e/0xaa5 [] lockdep_acquire+0x68/0x84 [] _spin_lock+0x21/0x2f [] prepare_set+0xd/0x5d [] generic_set_all+0x1d/0x201 [] mtrr_ap_init+0x23/0x3b [] identify_cpu+0x2a7/0x2af [] smp_store_cpu_info+0x2f/0xb4 [] start_secondary+0xb5/0x3ec [] end_of_stack_stop_unwind_function+0x1/0x4 [] end_of_stack_stop_unwind_function+0x1/0x4 [] end_of_stack_stop_unwind_function+0x1/0x4 [] end_of_stack_stop_unwind_function+0x1/0x4 [] end_of_stack_stop_unwind_function+0x1/0x4 [] end_of_stack_stop_unwind_function+0x1/0x4 [] end_of_stack_stop_unwind_function+0x1/0x4 [] end_of_stack_stop_unwind_function+0x1/0x4 [...] Due to "end_of_stack_stop_unwind_function" recursing back to itself in the EBP stackframe-walker. So avoid this type of recursion when walking the stack . Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba528f2854e8632c8d04ddcd45f06c47bc7188b0 tree 39caa13f0c1d2634e2e7947317c965792ee92d32 parent 27b07da7332f03a935cd13b6a6beb780bf19e7a4 author Jan Beulich Fri, 23 Jun 2006 02:04:19 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] fix x86 microcode driver handling of multiple matching revisions When multiple updates matching a given CPU are found in the update file, the action taken by the microcode update driver was inappropriate: - when lower revision microcode was found before matching or higher revision one, the driver would needlessly complain that it would not downgrade the CPU - when microcode matching the currently installed revision was found before newer revision code, no update would actually take place To change this behavior, the driver now concludes about possibly updates and issues messages only when the entire input was parsed. Additionally, this adds back (in different places, and conditionalized upon a new module option) some messages removed by a previous patch. Signed-off-by: Jan Beulich Cc: "Siddha, Suresh B" Cc: Tigran Aivazian Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27b07da7332f03a935cd13b6a6beb780bf19e7a4 tree a00fe04fbf8bb90fc3facb8b6b499f0f9dca3d77 parent 87af2ffd4ccd0e6a2ff316fd008a9bedb4a4cb66 author Alexey Dobriyan Fri, 23 Jun 2006 02:04:18 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] Don't trigger full rebuild via CONFIG_MTRR Only drm, framebuffer, mtrr parts + misc files here and there. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87af2ffd4ccd0e6a2ff316fd008a9bedb4a4cb66 tree 4cd80cf123aa220e5c1c3c534bf09fa8d001ad28 parent a0b4da91f4c5710b9c20219a19e905145647b48b author Andreas Mohr Fri, 23 Jun 2006 02:04:17 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] i386 apm.c optimization - avoid expensive modulo (integer division) which happened since APM_MAX_EVENTS is 20 (non-power-of-2) - kill compiler warnings by initializing two variables - add __read_mostly to some important static variables that are read often (by idle loop etc.) - constify several structures Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0b4da91f4c5710b9c20219a19e905145647b48b tree bd2a6e10d0194601548beaa0a2810fc994ca1d0f parent c22ce143d15eb288543fe9873e1c5ac1c01b69a1 author Adrian Bunk Fri, 23 Jun 2006 02:04:17 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] arch/i386/kernel/apic.c: make modern_apic() static Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c22ce143d15eb288543fe9873e1c5ac1c01b69a1 tree dc7d457b8952fc50dfc90df659b35de4117c61fc parent 7dbdf43cfa635ddc3701cc8d1eab07597cd731c0 author Hiro Yoshioka Fri, 23 Jun 2006 02:04:16 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] x86: cache pollution aware __copy_from_user_ll() Use the x86 cache-bypassing copy instructions for copy_from_user(). Some performance data are Total of GLOBAL_POWER_EVENTS (CPU cycle samples) 2.6.12.4.orig 1921587 2.6.12.4.nt 1599424 1599424/1921587=83.23% (16.77% reduction) BSQ_CACHE_REFERENCE (L3 cache miss) 2.6.12.4.orig 57427 2.6.12.4.nt 20858 20858/57427=36.32% (63.7% reduction) L3 cache miss reduction of __copy_from_user_ll samples % 37408 65.1412 vmlinux __copy_from_user_ll 23 0.1103 vmlinux __copy_user_zeroing_intel_nocache 23/37408=0.061% (99.94% reduction) Top 5 of 2.6.12.4.nt Counted GLOBAL_POWER_EVENTS events (time during which processor is not stopped) with a unit mask of 0x01 (mandatory) count 100000 samples % app name symbol name 128392 8.0274 vmlinux __copy_user_zeroing_intel_nocache 64206 4.0143 vmlinux journal_add_journal_head 59746 3.7355 vmlinux do_get_write_access 47674 2.9807 vmlinux journal_put_journal_head 46021 2.8774 vmlinux journal_dirty_metadata pattern9-0-cpu4-0-09011728/summary.out Counted BSQ_CACHE_REFERENCE events (cache references seen by the bus unit) with a unit mask of 0x3f (multiple flags) count 3000 samples % app name symbol name 69755 4.2861 vmlinux __copy_user_zeroing_intel_nocache 55685 3.4215 vmlinux journal_add_journal_head 52371 3.2179 vmlinux __find_get_block 45504 2.7960 vmlinux journal_put_journal_head 36005 2.2123 vmlinux journal_stop pattern9-0-cpu4-0-09011744/summary.out Counted BSQ_CACHE_REFERENCE events (cache references seen by the bus unit) with a unit mask of 0x200 (read 3rd level cache miss) count 3000 samples % app name symbol name 1147 5.4994 vmlinux journal_add_journal_head 881 4.2240 vmlinux journal_dirty_data 872 4.1809 vmlinux blk_rq_map_sg 734 3.5192 vmlinux journal_commit_transaction 617 2.9582 vmlinux radix_tree_delete pattern9-0-cpu4-0-09011731/summary.out iozone results are original 2.6.12.4 CPU time = 207.768 sec cache aware CPU time = 184.783 sec (three times run) 184.783/207.768=88.94% (11.06% reduction) original: pattern9-0-cpu4-0-08191720/iozone.out: CPU Utilization: Wall time 45.997 CPU time 64.527 CPU utilization 140.28 % pattern9-0-cpu4-0-08191741/iozone.out: CPU Utilization: Wall time 46.878 CPU time 71.933 CPU utilization 153.45 % pattern9-0-cpu4-0-08191743/iozone.out: CPU Utilization: Wall time 45.152 CPU time 71.308 CPU utilization 157.93 % cache awre: pattern9-0-cpu4-0-09011728/iozone.out: CPU Utilization: Wall time 44.842 CPU time 62.465 CPU utilization 139.30 % pattern9-0-cpu4-0-09011731/iozone.out: CPU Utilization: Wall time 44.718 CPU time 59.273 CPU utilization 132.55 % pattern9-0-cpu4-0-09011744/iozone.out: CPU Utilization: Wall time 44.367 CPU time 63.045 CPU utilization 142.10 % Signed-off-by: Hiro Yoshioka Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7dbdf43cfa635ddc3701cc8d1eab07597cd731c0 tree b0f3c8bcd1be31bbb97ced989e19eaf63280da80 parent f2c780c1fdbe5008c902c2d7e37242ac5e60f0b9 author Yoichi Yuasa Fri, 23 Jun 2006 02:04:14 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] mips: fix number of mremap arguments mremap syscall takes 5 arguments. Fixed by Ralf Baechle. Signed-off-by: Ralf Baechle Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2c780c1fdbe5008c902c2d7e37242ac5e60f0b9 tree f2fb215610897e06812548986f3c37a6d6dc38ca parent c52c17622e27876c2395f59cfe342497a399de41 author Sergei Shtylyov Fri, 23 Jun 2006 02:04:13 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] Au1550/1200: add missing PSC #define's, make OSS driver use the proper ones Add missing PSC #define's required for the drivers using PSC on DBAu1550 board (also fixing Au1550 PSC3 address) and all Au1200-based boards as well. Make the OSS driver use the correct PSC definitions fo each board. Signed-off-by: Sergei Shtylyov Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c52c17622e27876c2395f59cfe342497a399de41 tree 460c2a539927bf13e91a77634d592c1d68cf42c8 parent 8ccd05670309084c2dd2003b6840a4becb5acca0 author Al Viro Fri, 23 Jun 2006 02:04:13 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: clean frv unistd.h Remove _syscall invocations that aren't used in the kernel. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ccd05670309084c2dd2003b6840a4becb5acca0 tree 21123b2996a90b0d533f8b31091cfe467e3e952d parent 5e591a55576b60156ac3dbc5087660ed82646d66 author Al Viro Fri, 23 Jun 2006 02:04:12 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: trivial cleanups in frv_ksyms.c Remove duplicate EXPORT_SYMBOL annotations from the FRV arch. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e591a55576b60156ac3dbc5087660ed82646d66 tree 65f4323f7eab9b1c8fbf66c960071a87d10e39ad parent a73df4dfdb0e01a1cbf119416a00e520a5e22306 author Al Viro Fri, 23 Jun 2006 02:04:11 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: Add missing qualifier to memcpy_fromio() prototype The memcpy_fromio() function should have a const qualifier on its source pointer. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a73df4dfdb0e01a1cbf119416a00e520a5e22306 tree 4d75e3a690b9ad781dba21b1e12a1e3533e3028b parent 7f788435568795c4cd29301bb4ccf7aff54f5051 author Al Viro Fri, 23 Jun 2006 02:04:10 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: ieee1394 is borken on frv The ieee1394 assumes it may make direct use of ->count in the semaphore structure. Signed-off-by: Al Viro Signed-off-by: David Howells Cc: Stefan Richter Cc: Ben Collins Cc: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f788435568795c4cd29301bb4ccf7aff54f5051 tree 664b5c222a42da3b44da6b11c18cccc6e13425ce parent ffca11104c06aff1641b9787f9e5b1099187ff83 author Al Viro Fri, 23 Jun 2006 02:04:09 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: NULL noise removal in frv xchg() Clean up the FRV arch's xchg() function. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ffca11104c06aff1641b9787f9e5b1099187ff83 tree b9fb644c7397113f6ac91aad9187cb2f9fe59944 parent 0c426f26cce71626ed39cd7b9496ea7f460ea9d0 author Al Viro Fri, 23 Jun 2006 02:04:09 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: initrd is grossly broken on frv (never built) The FRV arch doesn't currently support initrd, so it should be disabled automatically for the moment. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c426f26cce71626ed39cd7b9496ea7f460ea9d0 tree dcff54163aaf2b5dc5b7e424622df3c5841587b5 parent be2338f3ceb6d80170ebb495190d6aee79d8c7e3 author Al Viro Fri, 23 Jun 2006 02:04:08 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] ext2 XIP won't build without MMU Disable Ext2 XIP if the kernel is configured in no-MMU mode as the former won't build. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be2338f3ceb6d80170ebb495190d6aee79d8c7e3 tree 553d329dfda6160a5511bfb3799c6fb8343d2f5c parent 576132b42647e3facd28e3148a20307fadfd9afc author Al Viro Fri, 23 Jun 2006 02:04:07 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: wrong syscall The FRV arch should use fstatat64 not newfstatat. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 576132b42647e3facd28e3148a20307fadfd9afc tree 3e986e0838df9c11d17a50c06a3a7d0fd9119006 parent 53470aaa02ef3c83187f1ffe0d2cb647274fe397 author Al Viro Fri, 23 Jun 2006 02:04:07 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: misc sparse annotations Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53470aaa02ef3c83187f1ffe0d2cb647274fe397 tree d270412696da4d845be0003d442de0421ffa009e parent 530018bf3d93e04533eec9c6516e3ce8f5310e13 author Al Viro Fri, 23 Jun 2006 02:04:06 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] frv: misc __user annotations Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 530018bf3d93e04533eec9c6516e3ce8f5310e13 tree 6e4d3fdf2762812a520fc769148344d9f1116a08 parent 7ab76d722a0d64369080ec96f0fd9fca2138e3c5 author Al Viro Fri, 23 Jun 2006 02:04:05 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] frv: binfmt_elf_fdpic __user annotations Add __user annotations to binfmt_elf_fdpic. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ab76d722a0d64369080ec96f0fd9fca2138e3c5 tree c28b92f88c5d3e267f3c587c3b170518ae612be5 parent 9e4d11f8630d5350adc5d4d65180e69991c498f8 author Al Viro Fri, 23 Jun 2006 02:04:05 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] frv: sysctl __user annotations Add __user annotations to FRV-specific sysctl stuff. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e4d11f8630d5350adc5d4d65180e69991c498f8 tree d8f05482adf66069f218833ea8f14d9285dae885 parent 3f4cd389c3564caf1eec70957fcbd9d88c995d45 author Al Viro Fri, 23 Jun 2006 02:04:04 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] frv: signal annotations Add annotations to the FRV signal handling for sparse. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f4cd389c3564caf1eec70957fcbd9d88c995d45 tree a7d5870592f04adc4ee2c2e004737a976b28f728 parent a8a77573c9e5345bcf6a963858745cd83c923f44 author Al Viro Fri, 23 Jun 2006 02:04:03 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] frv: basic __iomem annotations Add annotations to the FRV I/O handling functions for sparse. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8a77573c9e5345bcf6a963858745cd83c923f44 tree 04f9bc72aca54effdb2254dd1e0b8ec5fa94f6cf parent 86c3a7645c05a7d06b72653aa4b2bea4e7229d1b author Al Viro Fri, 23 Jun 2006 02:04:03 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] frv: __user infrastructure Add general annotations to the FRV arch for sparse. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86c3a7645c05a7d06b72653aa4b2bea4e7229d1b tree ac68280e9c44dbc6ca4c88dc1e9c72a8f56be95e parent 35601547baf92d984b6e59cf3583649da04baea5 author David Quigley Fri, 23 Jun 2006 02:04:02 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] SELinux: add security_task_movememory calls to mm code This patch inserts security_task_movememory hook calls into memory management code to enable security modules to mediate this operation between tasks. Since the last posting, the hook has been renamed following feedback from Christoph Lameter. Signed-off-by: David Quigley Acked-by: Stephen Smalley Signed-off-by: James Morris Cc: Andi Kleen Acked-by: Christoph Lameter Acked-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35601547baf92d984b6e59cf3583649da04baea5 tree a392501e6e004ed33789dbf3f7a9fe43295439e1 parent 22fb52dd736a62e24c44c50739007496265dc38c author David Quigley Fri, 23 Jun 2006 02:04:01 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] SELinux: add task_movememory hook This patch adds new security hook, task_movememory, to be called when memory owened by a task is to be moved (e.g. when migrating pages to a this hook is identical to the setscheduler implementation, but a separate hook introduced to allow this check to be specialized in the future if necessary. Since the last posting, the hook has been renamed following feedback from Christoph Lameter. Signed-off-by: David Quigley Acked-by: Stephen Smalley Signed-off-by: James Morris Cc: Christoph Lameter Cc: Andi Kleen Acked-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22fb52dd736a62e24c44c50739007496265dc38c tree 06cc6dcff21df6e18f189c6895cf6aa313e7a8ea parent e7834f8fccd791225a1cf91c2c3e740ad8e2e145 author David Quigley Fri, 23 Jun 2006 02:04:00 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] SELinux: add security hook call to mediate attach_task (kernel/cpuset.c) Add a security hook call to enable security modules to control the ability to attach a task to a cpuset. While limited control over this operation is possible via permission checks on the pseudo fs interface, those checks are not sufficient to control access to the target task, which is looked up in this function. The existing task_setscheduler hook is re-used for this operation since this falls under the same class of operations. Signed-off-by: David Quigley Acked-by: Stephen Smalley Signed-off-by: James Morris Acked-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7834f8fccd791225a1cf91c2c3e740ad8e2e145 tree 8f48d03d7b1dc32d326825fef1d1c54117a06ac8 parent 03e68060636e05989ea94bcb671ab633948f328c author David Quigley Fri, 23 Jun 2006 02:03:59 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] SELinux: add security hooks to {get,set}affinity This patch adds LSM hooks into the setaffinity and getaffinity functions to enable security modules to control these operations between tasks with task_setscheduler and task_getscheduler LSM hooks. Signed-off-by: David Quigley Acked-by: Stephen Smalley Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03e68060636e05989ea94bcb671ab633948f328c tree aee5e7b55f31998536dd3a4f54f38caeee6105d6 parent 9216dfad4fc97ab639ef0885efc713f3d7a20d5b author James Morris Fri, 23 Jun 2006 02:03:58 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] lsm: add task_setioprio hook Implement an LSM hook for setting a task's IO priority, similar to the hook for setting a tasks's nice value. A previous version of this LSM hook was included in an older version of multiadm by Jan Engelhardt, although I don't recall it being submitted upstream. Also included is the corresponding SELinux hook, which re-uses the setsched permission in the proccess class. Signed-off-by: James Morris Acked-by: Stephen Smalley Cc: Jan Engelhardt Cc: Chris Wright Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9216dfad4fc97ab639ef0885efc713f3d7a20d5b tree 546e301f3181f56133509327f9c5ed035dd4b50d parent 1b2db9fb7adc4d67d9ce7d16ce79c41ee84730fe author Christoph Lameter Fri, 23 Jun 2006 02:03:57 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] move_pages: fix 32 -> 64 bit compat function The definition of the third parameter is a pointer to an array of virtual addresses which give us some trouble. The existing code calculated the wrong address in the array since I used void to avoid having to specify a type. I now use the correct type "compat_uptr_t __user *" in the definition of the function in kernel/compat.c. However, I used __u32 in syscalls.h. Would have to include compat.h there in order to provide the same definition which would generate an ugly include situation. On both ia64 and x86_64 compat_uptr_t is u32. So this works although parameter declarations differ. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b2db9fb7adc4d67d9ce7d16ce79c41ee84730fe tree d3fc0962ada099d741717d36a3f658c15b20c65a parent b63d64a324056cf3c2f7a1a1fe8134100edbb058 author Christoph Lameter Fri, 23 Jun 2006 02:03:56 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] sys_move_pages: 32bit support (i386, x86_64) sys_move_pages() support for 32bit (i386 plus x86_64 compat layer) Add support for move_pages() on i386 and also add the compat functions necessary to run 32 bit binaries on x86_64. Add compat_sys_move_pages to the x86_64 32bit binary layer. Note that it is not up to date so I added the missing pieces. Not sure if this is done the right way. [akpm@osdl.org: compile fix] Signed-off-by: Christoph Lameter Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b63d64a324056cf3c2f7a1a1fe8134100edbb058 tree 566cca52758aa05c4d2c6227f53e18b39e9f4fe3 parent 742755a1d8ce2b548428f7aacf1758b4bba50080 author Christoph Lameter Fri, 23 Jun 2006 02:03:56 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] sys_move_pages: x86_64 support sys_move_pages support for x86_64 Signed-off-by: Christoph Lameter Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 742755a1d8ce2b548428f7aacf1758b4bba50080 tree 53426657e14dc19a694d418274c9a6f4dcb8a997 parent 95a402c3847cc16f4ba03013cd01404fa0f14c2e author Christoph Lameter Fri, 23 Jun 2006 02:03:55 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] page migration: sys_move_pages(): support moving of individual pages move_pages() is used to move individual pages of a process. The function can be used to determine the location of pages and to move them onto the desired node. move_pages() returns status information for each page. long move_pages(pid, number_of_pages_to_move, addresses_of_pages[], nodes[] or NULL, status[], flags); The addresses of pages is an array of void * pointing to the pages to be moved. The nodes array contains the node numbers that the pages should be moved to. If a NULL is passed instead of an array then no pages are moved but the status array is updated. The status request may be used to determine the page state before issuing another move_pages() to move pages. The status array will contain the state of all individual page migration attempts when the function terminates. The status array is only valid if move_pages() completed successfullly. Possible page states in status[]: 0..MAX_NUMNODES The page is now on the indicated node. -ENOENT Page is not present -EACCES Page is mapped by multiple processes and can only be moved if MPOL_MF_MOVE_ALL is specified. -EPERM The page has been mlocked by a process/driver and cannot be moved. -EBUSY Page is busy and cannot be moved. Try again later. -EFAULT Invalid address (no VMA or zero page). -ENOMEM Unable to allocate memory on target node. -EIO Unable to write back page. The page must be written back in order to move it since the page is dirty and the filesystem does not provide a migration function that would allow the moving of dirty pages. -EINVAL A dirty page cannot be moved. The filesystem does not provide a migration function and has no ability to write back pages. The flags parameter indicates what types of pages to move: MPOL_MF_MOVE Move pages that are only mapped by the process. MPOL_MF_MOVE_ALL Also move pages that are mapped by multiple processes. Requires sufficient capabilities. Possible return codes from move_pages() -ENOENT No pages found that would require moving. All pages are either already on the target node, not present, had an invalid address or could not be moved because they were mapped by multiple processes. -EINVAL Flags other than MPOL_MF_MOVE(_ALL) specified or an attempt to migrate pages in a kernel thread. -EPERM MPOL_MF_MOVE_ALL specified without sufficient priviledges. or an attempt to move a process belonging to another user. -EACCES One of the target nodes is not allowed by the current cpuset. -ENODEV One of the target nodes is not online. -ESRCH Process does not exist. -E2BIG Too many pages to move. -ENOMEM Not enough memory to allocate control array. -EFAULT Parameters could not be accessed. A test program for move_pages() may be found with the patches on ftp.kernel.org:/pub/linux/kernel/people/christoph/pmig/patches-2.6.17-rc4-mm3 From: Christoph Lameter Detailed results for sys_move_pages() Pass a pointer to an integer to get_new_page() that may be used to indicate where the completion status of a migration operation should be placed. This allows sys_move_pags() to report back exactly what happened to each page. Wish there would be a better way to do this. Looks a bit hacky. Signed-off-by: Christoph Lameter Cc: Hugh Dickins Cc: Jes Sorensen Cc: KAMEZAWA Hiroyuki Cc: Lee Schermerhorn Cc: Andi Kleen Cc: Michael Kerrisk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 95a402c3847cc16f4ba03013cd01404fa0f14c2e tree 0fd9b3379f70cc99b2325bccaa150089abf6c8b3 parent aaa994b300a172afafab47938804836b923e5ef7 author Christoph Lameter Fri, 23 Jun 2006 02:03:53 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] page migration: use allocator function for migrate_pages() Instead of passing a list of new pages, pass a function to allocate a new page. This allows the correct placement of MPOL_INTERLEAVE pages during page migration. It also further simplifies the callers of migrate pages. migrate_pages() becomes similar to migrate_pages_to() so drop migrate_pages_to(). The batching of new page allocations becomes unnecessary. Signed-off-by: Christoph Lameter Cc: Hugh Dickins Cc: Jes Sorensen Cc: KAMEZAWA Hiroyuki Cc: Lee Schermerhorn Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aaa994b300a172afafab47938804836b923e5ef7 tree ccc1acf72e9d1dfbd25fa5f8e067a195f93b0319 parent e24f0b8f76cc3dd96f36f5b6a9f020f6c3fce198 author Christoph Lameter Fri, 23 Jun 2006 02:03:52 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] page migration: handle freeing of pages in migrate_pages() Do not leave pages on the lists passed to migrate_pages(). Seems that we will not need any postprocessing of pages. This will simplify the handling of pages by the callers of migrate_pages(). Signed-off-by: Christoph Lameter Cc: Hugh Dickins Cc: Jes Sorensen Cc: KAMEZAWA Hiroyuki Cc: Lee Schermerhorn Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e24f0b8f76cc3dd96f36f5b6a9f020f6c3fce198 tree 2c6ca6f0385d3d36135855f77a0474188cf33842 parent 8f9de51a4a98ba32f839903b7d009788bc2c295d author Christoph Lameter Fri, 23 Jun 2006 02:03:51 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] page migration: simplify migrate_pages() Currently migrate_pages() is mess with lots of goto. Extract two functions from migrate_pages() and get rid of the gotos. Plus we can just unconditionally set the locked bit on the new page since we are the only one holding a reference. Locking is to stop others from accessing the page once we establish references to the new page. Remove the list_del from move_to_lru in order to have finer control over list processing. [akpm@osdl.org: add debug check] Signed-off-by: Christoph Lameter Cc: Hugh Dickins Cc: Jes Sorensen Cc: KAMEZAWA Hiroyuki Cc: Lee Schermerhorn Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f9de51a4a98ba32f839903b7d009788bc2c295d tree 65cde3cd75bfc1df172f53ca956cba4fa4954a4e parent d501e62bc7796e90b0312648e23ac39490dfbf87 author Kirill Korotaev Fri, 23 Jun 2006 02:03:50 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] printk() should not be called under zone->lock This patch fixes printk() under zone->lock in show_free_areas(). It can be unsafe to call printk() under this lock, since caller can try to allocate/free some memory and selfdeadlock on this lock. I found allocations/freeing mem both in netconsole and serial console. This issue was faced in reallity when meminfo was periodically printed for debug purposes and netconsole was used. Signed-off-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d501e62bc7796e90b0312648e23ac39490dfbf87 tree fbeeb75898e9434c0c725738482b9e946f46d5bb parent 485bb99b49a173a22a0bbf4e189465414947ecac author Ralf Baechle Fri, 23 Jun 2006 02:03:50 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] Delete unused definitions of kvaddr_to_nid Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 485bb99b49a173a22a0bbf4e189465414947ecac tree 28d0975d4d205162ce1bd0e52537fc22b766e719 parent 800590f523bf3bde9fa6c8e4d6763e4bf6a2c8ec author Randy Dunlap Fri, 23 Jun 2006 02:03:49 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] kernel-doc for mm/filemap.c mm/filemap.c: - add lots of kernel-doc; - fix some typos and kernel-doc errors; - drop some blank lines between function close and EXPORT_SYMBOL(); Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 800590f523bf3bde9fa6c8e4d6763e4bf6a2c8ec tree 0afbccc4b3648633da42d2c4b79cdb8f756804fd parent 5a4d43615921575b0c8299a5407ce4836e4138fd author Paul Drynoff Fri, 23 Jun 2006 02:03:48 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] slab: kmalloc, kzalloc comments cleanup and fix - Move comments for kmalloc to right place, currently it near __do_kmalloc - Comments for kzalloc - More detailed comments for kmalloc - Appearance of "kmalloc" and "kzalloc" man pages after "make mandocs" [rdunlap@xenotime.net: simplification] Signed-off-by: Paul Drynoff Acked-by: Randy Dunlap Cc: Pekka Enberg Cc: Manfred Spraul Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a4d43615921575b0c8299a5407ce4836e4138fd tree ebe9c4ca8dada54124e6c4507736585ae4d57d0b parent bd1e22b8e0a90f9a91e4c27db14ca15773659bf7 author KAMEZAWA Hiroyuki Fri, 23 Jun 2006 02:03:47 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] update vm_total_pages at memory hotadd Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd1e22b8e0a90f9a91e4c27db14ca15773659bf7 tree 8d32bdc39977af9dd3ba577b1fa34c0106b7f18e parent e0a42726794f71336ff4b26084d453dd597471ce author Andrew Morton Fri, 23 Jun 2006 02:03:47 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] initialise total_memory() earlier Initialise total_memory earlier in boot. Because if for some reason we run page reclaim early in boot, we don't want total_memory to be zero when we use it as a divisor. And rename total_memory to vm_total_pages to avoid naming clashes with architectures. Cc: Yasunori Goto Cc: KAMEZAWA Hiroyuki Cc: Martin Bligh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0a42726794f71336ff4b26084d453dd597471ce tree 31debb23f7cce0510a63755f0c4297086761f623 parent 668e0d8f1a02fd75f1c1e8142a6b08455914242c author Ingo Molnar Fri, 23 Jun 2006 02:03:46 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] mm/slab.c: fix early init assumption The SLAB bootstrap code assumes that the first two kmalloc caches created (the INDEX_AC and INDEX_L3 kmalloc caches) wont be off-slab. But due to AC and L3 structure size increase in lockdep, one of them ended up being off-slab, and subsequently crashing with: Unable to handle kernel NULL pointer dereference at 0000000000000000 RIP: [] kmem_cache_alloc+0x26/0x7d The fix is to introduce a bootstrap flag and to use it to prevent off-slab caches being created so early during bootup. (The calculation for off-slab caches is quite complex so i didnt want to complicate things with introducing yet another INDEX_ calculation, the flag approach is simpler and smaller.) Signed-off-by: Ingo Molnar Cc: Manfred Spraul Cc: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 668e0d8f1a02fd75f1c1e8142a6b08455914242c tree 51fafed7f9260fb969953a89280c77b69a416e84 parent 185606fc6a120dbebffa6d06a559c20ec2b20034 author Hugh Dickins Fri, 23 Jun 2006 02:03:45 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] fix update_mmu_cache in fremap.c There are two calls to update_mmu_cache in fremap.c, both defective. The one in install_page needs to be accompanied by lazy_mmu_prot_update (some other cleanup time, move that into ia64 update_mmu_cache itself); and the one in install_file_pte should be removed since the pte is not present. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 185606fc6a120dbebffa6d06a559c20ec2b20034 tree 6702725dd3da6371d0816dceb1a358a67ae32a99 parent 70af7c5c6492ef6ad137dbff6c4568c73edbcaf0 author Hugh Dickins Fri, 23 Jun 2006 02:03:45 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] remove unused o_flags from do_shmat Remove the unused variable o_flags from do_shmat. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70af7c5c6492ef6ad137dbff6c4568c73edbcaf0 tree 4e8646ba72b14f2bdd94802d42684c00c1a7507c parent 9637a5efd4fbe36164c5ce7f6a0ee68b2bf22b7f author Hugh Dickins Fri, 23 Jun 2006 02:03:44 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] swapoff: use atomic_inc_not_zero() on mm_users Now that we have atomic_inc_not_zero, it's more elegant for try_to_unuse to use that on mm_users: doesn't actually matter at present, but safer to be sure that once mm_users has gone to 0, nothing raises it for an instant. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9637a5efd4fbe36164c5ce7f6a0ee68b2bf22b7f tree 38b86e3e2151e78f952076e36bee4fd7d77e3baf parent bd96b9eb7cfd6ab24ba244360a09980a720874d2 author David Howells Fri, 23 Jun 2006 02:03:43 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] add page_mkwrite() vm_operations method Add a new VMA operation to notify a filesystem or other driver about the MMU generating a fault because userspace attempted to write to a page mapped through a read-only PTE. This facility permits the filesystem or driver to: (*) Implement storage allocation/reservation on attempted write, and so to deal with problems such as ENOSPC more gracefully (perhaps by generating SIGBUS). (*) Delay making the page writable until the contents have been written to a backing cache. This is useful for NFS/AFS when using FS-Cache/CacheFS. It permits the filesystem to have some guarantee about the state of the cache. (*) Account and limit number of dirty pages. This is one piece of the puzzle needed to make shared writable mapping work safely in FUSE. Needed by cachefs (Or is it cachefiles? Or fscache? ). At least four other groups have stated an interest in it or a desire to use the functionality it provides: FUSE, OCFS2, NTFS and JFFS2. Also, things like EXT3 really ought to use it to deal with the case of shared-writable mmap encountering ENOSPC before we permit the page to be dirtied. From: Peter Zijlstra get_user_pages(.write=1, .force=1) can generate COW hits on read-only shared mappings, this patch traps those as mkpage_write candidates and fails to handle them the old way. Signed-off-by: David Howells Cc: Miklos Szeredi Cc: Joel Becker Cc: Mark Fasheh Cc: Anton Altaparmakov Cc: David Woodhouse Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd96b9eb7cfd6ab24ba244360a09980a720874d2 tree 9231d56e83f4ef43a6f664c2b416734318b92084 parent 30c253e6da655d73eb8bfe2adca9b8f4d82fb81e author Con Kolivas Fri, 23 Jun 2006 02:03:42 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] mm: fix swap unused warning If CONFIG_SWAP is not defined we get: mm/vmscan.c: In function ‘remove_mapping’: mm/vmscan.c:387: warning: unused variable ‘swap’ Convert defines in swap.h into blank inline functions to fix this warning and be consistent. Signed-off-by: Con Kolivas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30c253e6da655d73eb8bfe2adca9b8f4d82fb81e tree 97c49ad364855b95ce52d97a62d176a077ff2a85 parent ddc2e812d592457747c4367fb73edcaa8e1e49ff author Andy Whitcroft Fri, 23 Jun 2006 02:03:41 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] sparsemem: record nid during memory present Record the node id as we mark sections for instantiation. Use this nid during instantiation to direct allocations. Signed-off-by: Andy Whitcroft Cc: Mike Kravetz Cc: Dave Hansen Cc: Mel Gorman Cc: Bob Picco Cc: Jack Steiner Cc: Yasunori Goto Cc: Martin Bligh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddc2e812d592457747c4367fb73edcaa8e1e49ff tree 7dc9066c1e43d14f7c495847a9f0b24287806fb2 parent 8d3c138b77f195ca0eee6fb639ae73f5ea9edb6b author Pekka Enberg Fri, 23 Jun 2006 02:03:40 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] slab: verify pointers before free Passing an invalid pointer to kfree() and kmem_cache_free() is likely to cause bad memory corruption or even take down the whole system because the bad pointer is likely reused immediately due to the per-CPU caches. Until now, we don't do any verification for this if CONFIG_DEBUG_SLAB is disabled. As suggested by Linus, add PageSlab check to page_to_cache() and page_to_slab() to verify pointers passed to kfree(). Also, move the stronger check from cache_free_debugcheck() to kmem_cache_free() to ensure the passed pointer actually belongs to the cache we're about to free the object. For page_to_cache() and page_to_slab(), the assertions should have virtually no extra cost (two instructions, no data cache pressure) and for kmem_cache_free() the overhead should be minimal. Signed-off-by: Pekka Enberg Cc: Manfred Spraul Cc: Christoph Lameter Cc: Linus Torvalds Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d3c138b77f195ca0eee6fb639ae73f5ea9edb6b tree 832ac3c87484f5875b3b4afeab1de5eca1115770 parent 04e62a29bf157ce1edd168f2b71b533c80d13628 author Christoph Lameter Fri, 23 Jun 2006 02:03:39 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] page migration: Update documentation Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04e62a29bf157ce1edd168f2b71b533c80d13628 tree 7f0d5a58eeef2c2e08da86dc7141a1ccd050a37d parent 442c9137de8d769053e81d325709dca72f0b5e44 author Christoph Lameter Fri, 23 Jun 2006 02:03:38 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] More page migration: use migration entries for file pages This implements the use of migration entries to preserve ptes of file backed pages during migration. Processes can therefore be migrated back and forth without loosing their connection to pagecache pages. Note that we implement the migration entries only for linear mappings. Nonlinear mappings still require the unmapping of the ptes for migration. And another writepage() ugliness shows up. writepage() can drop the page lock. Therefore we have to remove migration ptes before calling writepages() in order to avoid having migration entries point to unlocked pages. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 442c9137de8d769053e81d325709dca72f0b5e44 tree 200e5ace0310755d88dd1c7597cc0bb540264fe1 parent 6c5240ae7f48c83fcaa8e24fa63e7eb09aba5651 author Christoph Lameter Fri, 23 Jun 2006 02:03:38 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] More page migration: do not inc/dec rss counters If we install a migration entry then the rss not really decreases since the page is just moved somewhere else. We can save ourselves the work of decrementing and later incrementing which will just eventually cause cacheline bouncing. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c5240ae7f48c83fcaa8e24fa63e7eb09aba5651 tree fede2324f4348701e60758d7f894aae4b09cdc9a parent d75a0fcda2cfc71b50e16dc89e0c32c57d427e85 author Christoph Lameter Fri, 23 Jun 2006 02:03:37 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] Swapless page migration: modify core logic Use the migration entries for page migration This modifies the migration code to use the new migration entries. It now becomes possible to migrate anonymous pages without having to add a swap entry. We add a couple of new functions to replace migration entries with the proper ptes. We cannot take the tree_lock for migrating anonymous pages anymore. However, we know that we hold the only remaining reference to the page when the page count reaches 1. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d75a0fcda2cfc71b50e16dc89e0c32c57d427e85 tree cc9dda0a0e53e62c859bf7fcafe7b9c9f6de2352 parent 0697212a411c1dae03c27845f2de2f3adb32c331 author Christoph Lameter Fri, 23 Jun 2006 02:03:36 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] Swapless page migration: rip out swap based logic Rip the page migration logic out. Remove all code that has to do with swapping during page migration. This also guts the ability to migrate pages to swap. No one used that so lets let it go for good. Page migration should be a bit broken after this patch. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0697212a411c1dae03c27845f2de2f3adb32c331 tree 4bedcdb27522f4a42c422e0a8af155501f43a69c parent 8351a6e4785218a2b03c142be92926baff95ba5c author Christoph Lameter Fri, 23 Jun 2006 02:03:35 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] Swapless page migration: add R/W migration entries Implement read/write migration ptes We take the upper two swapfiles for the two types of migration ptes and define a series of macros in swapops.h. The VM is modified to handle the migration entries. migration entries can only be encountered when the page they are pointing to is locked. This limits the number of places one has to fix. We also check in copy_pte_range and in mprotect_pte_range() for migration ptes. We check for migration ptes in do_swap_cache and call a function that will then wait on the page lock. This allows us to effectively stop all accesses to apge. Migration entries are created by try_to_unmap if called for migration and removed by local functions in migrate.c From: Hugh Dickins Several times while testing swapless page migration (I've no NUMA, just hacking it up to migrate recklessly while running load), I've hit the BUG_ON(!PageLocked(p)) in migration_entry_to_page. This comes from an orphaned migration entry, unrelated to the current correctly locked migration, but hit by remove_anon_migration_ptes as it checks an address in each vma of the anon_vma list. Such an orphan may be left behind if an earlier migration raced with fork: copy_one_pte can duplicate a migration entry from parent to child, after remove_anon_migration_ptes has checked the child vma, but before it has removed it from the parent vma. (If the process were later to fault on this orphaned entry, it would hit the same BUG from migration_entry_wait.) This could be fixed by locking anon_vma in copy_one_pte, but we'd rather not. There's no such problem with file pages, because vma_prio_tree_add adds child vma after parent vma, and the page table locking at each end is enough to serialize. Follow that example with anon_vma: add new vmas to the tail instead of the head. (There's no corresponding problem when inserting migration entries, because a missed pte will leave the page count and mapcount high, which is allowed for. And there's no corresponding problem when migrating via swap, because a leftover swap entry will be correctly faulted. But the swapless method has no refcounting of its entries.) From: Ingo Molnar pte_unmap_unlock() takes the pte pointer as an argument. From: Hugh Dickins Several times while testing swapless page migration, gcc has tried to exec a pointer instead of a string: smells like COW mappings are not being properly write-protected on fork. The protection in copy_one_pte looks very convincing, until at last you realize that the second arg to make_migration_entry is a boolean "write", and SWP_MIGRATION_READ is 30. Anyway, it's better done like in change_pte_range, using is_write_migration_entry and make_migration_entry_read. From: Hugh Dickins Remove unnecessary obfuscation from sys_swapon's range check on swap type, which blew up causing memory corruption once swapless migration made MAX_SWAPFILES no longer 2 ^ MAX_SWAPFILES_SHIFT. Signed-off-by: Hugh Dickins Acked-by: Martin Schwidefsky Signed-off-by: Hugh Dickins Signed-off-by: Christoph Lameter Signed-off-by: Ingo Molnar From: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8351a6e4785218a2b03c142be92926baff95ba5c tree 479fe6bcecb38ddc2c34ec812d82e432a79d0dfa parent 2d1db3b1170db4e8bf0531dd636742269c2cf579 author Christoph Lameter Fri, 23 Jun 2006 02:03:33 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] page migration cleanup: move fallback handling into special function Move the fallback code into a new fallback function and make the function behave like any other migration function. This requires retaking the lock if pageout() drops it. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d1db3b1170db4e8bf0531dd636742269c2cf579 tree 1161ed614a55869c278234d7472673fd1a577887 parent c3fcf8a5daacf350f0632e1379414c01f34eeea3 author Christoph Lameter Fri, 23 Jun 2006 02:03:33 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] page migration cleanup: pass "mapping" to migration functions Change handling of address spaces. Pass a pointer to the address space in which the page is migrated to all migration function. This avoids repeatedly having to retrieve the address space pointer from the page and checking it for validity. The old page mapping will change once migration has gone to a certain step, so it is less confusing to have the pointer always available. Move the setting of the mapping and index for the new page into migrate_pages(). Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3fcf8a5daacf350f0632e1379414c01f34eeea3 tree ec7a4cd5d7a2b60ec4539479bb5b24c46b5cf72f parent 5b5c7120e2154239837fad5e3c7b7b781092b19c author Christoph Lameter Fri, 23 Jun 2006 02:03:32 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] page migration cleanup: extract try_to_unmap from migration functions Extract try_to_unmap and rename remove_references -> move_mapping try_to_unmap() may significantly change the page state by for example setting the dirty bit. It is therefore best to unmap in migrate_pages() before calling any migration functions. migrate_page_remove_references() will then only move the new page in place of the old page in the mapping. Rename the function to migrate_page_move_mapping(). This allows us to get rid of the special unmapping for the fallback path. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b5c7120e2154239837fad5e3c7b7b781092b19c tree 733d5e4268a79abb320316d98c15b822f9f55a15 parent e7340f73307abed9283d0a07570d06e228c205dd author Christoph Lameter Fri, 23 Jun 2006 02:03:29 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] page migration cleanup: drop nr_refs in remove_references() Drop nr_refs parameter from migrate_page_remove_references() The nr_refs parameter is not really useful since the number of remaining references is always 1 for anonymous pages without a mapping 2 for pages with a mapping 3 for pages with a mapping and PagePrivate set. Remove the early check for the number of references since we are checking page_mapcount() earlier. Ultimately only the refcount matters after the tree_lock has been obtained. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7340f73307abed9283d0a07570d06e228c205dd tree e786e2d09cfaf670128571029d833d1d27998d59 parent 1d8b85ccf1ed53a71b092fb5d807edf1ea7dabdd author Christoph Lameter Fri, 23 Jun 2006 02:03:29 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] page migration cleanup: remove useless definitions Remove the export for migrate_page_remove_references() and migrate_page_copy() that are unlikely to be used directly by filesystems implementing migration. The export was useful when buffer_migrate_page() lived in fs/buffer.c but it has now been moved to migrate.c in the migration reorg. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d8b85ccf1ed53a71b092fb5d807edf1ea7dabdd tree 9742a9522a9834ee62dcfedc4c31fd76f4a2741e parent 7352349a19e84b28f10668eca9cbb6bbbfa9d38e author Christoph Lameter Fri, 23 Jun 2006 02:03:28 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] page migration cleanup: group functions Reorder functions in migrate.c. Group all migration functions for struct address_space_operations together. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7352349a19e84b28f10668eca9cbb6bbbfa9d38e tree ae9d78f593829f599d3412b11d2c871bcae98be2 parent 111ebb6e6f7bd7de6d722c5848e95621f43700d9 author Christoph Lameter Fri, 23 Jun 2006 02:03:27 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] page migration cleanup: rename "ignrefs" to "migration" migrate is a better name since it is only used by page migration. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 111ebb6e6f7bd7de6d722c5848e95621f43700d9 tree bb00b13001db9be201e9b6d31468a79f4d1240bf parent 4c91c3648c620003cb7b21b8858f36cd6132e168 author OGAWA Hirofumi Fri, 23 Jun 2006 02:03:26 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] writeback: fix range handling When a writeback_control's `start' and `end' fields are used to indicate a one-byte-range starting at file offset zero, the required values of .start=0,.end=0 mean that the ->writepages() implementation has no way of telling that it is being asked to perform a range request. Because we're currently overloading (start == 0 && end == 0) to mean "this is not a write-a-range request". To make all this sane, the patch changes range of writeback_control. So caller does: If it is calling ->writepages() to write pages, it sets range (range_start/end or range_cyclic) always. And if range_cyclic is true, ->writepages() thinks the range is cyclic, otherwise it just uses range_start and range_end. This patch does, - Add LLONG_MAX, LLONG_MIN, ULLONG_MAX to include/linux/kernel.h -1 is usually ok for range_end (type is long long). But, if someone did, range_end += val; range_end is "val - 1" u64val = range_end >> bits; u64val is "~(0ULL)" or something, they are wrong. So, this adds LLONG_MAX to avoid nasty things, and uses LLONG_MAX for range_end. - All callers of ->writepages() sets range_start/end or range_cyclic. - Fix updates of ->writeback_index. It seems already bit strange. If it starts at 0 and ended by check of nr_to_write, this last index may reduce chance to scan end of file. So, this updates ->writeback_index only if range_cyclic is true or whole-file is scanned. Signed-off-by: OGAWA Hirofumi Cc: Nathan Scott Cc: Anton Altaparmakov Cc: Steven French Cc: "Vladimir V. Saveliev" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c91c3648c620003cb7b21b8858f36cd6132e168 tree 6572fedb9a18ba0b31695f1ba30a219621b6f20a parent 58ce1fd5805647a58a050bbbbd2252ea5ecb47b3 author Peter Zijlstra Fri, 23 Jun 2006 02:03:25 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] buglet in radix_tree_tag_set The comment states: 'Setting a tag on a not-present item is a BUG.' Hence if 'index' is larger than the maxindex; the item _cannot_ be presen; it should also be a BUG. Also, this allows the following statement (assume a fresh tree): radix_tree_tag_set(root, 16, 1); to fail silently, but when preceded by: radix_tree_insert(root, 32, item); it would BUG, because the height has been extended by the insert. In neither case was 16 present. Signed-off-by: Peter Zijlstra Acked-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58ce1fd5805647a58a050bbbbd2252ea5ecb47b3 tree 639aa44f21d0176c771b8b6e76d9c7ce9e2d1d19 parent b344e05c585406904c70865e531e02467c4c7931 author Pekka Enberg Fri, 23 Jun 2006 02:03:24 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] slab: redzone double-free detection At present our slab debugging tells us that it detected a double-free or corruption - it does not distinguish between them. Sometimes it's useful to be able to differentiate between these two types of information. Add double-free detection to redzone verification when freeing an object. As explained by Manfred, when we are freeing an object, both redzones should be RED_ACTIVE. However, if both are RED_INACTIVE, we are trying to free an object that was already free'd. Signed-off-by: Manfred Spraul Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b344e05c585406904c70865e531e02467c4c7931 tree 5c9b9be9c35f5921e4796f1bafab810839765354 parent cfd9b7df4abd3257c9e381b0e445817b26a51c0c author Hua Zhong Fri, 23 Jun 2006 02:03:23 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] likely cleanup: remove unlikely in sys_mprotect() With likely/unlikely profiling on my not-so-busy-typical-developmentsystem there are 5k misses vs 2k hits. So I guess we should remove the unlikely. Signed-off-by: Hua Zhong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfd9b7df4abd3257c9e381b0e445817b26a51c0c tree cd419f98fbf555fbcd92baf7ca41d45a8744f071 parent 612d6c19db2fd0dc97b0fa370613ecd4a305ffc3 author Nick Piggin Fri, 23 Jun 2006 02:03:22 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] radix-tree: small Reduce radix tree node memory usage by about a factor of 4 for small files (< 64K). There are pointer traversal and memory usage costs for large files with dense pagecache. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 612d6c19db2fd0dc97b0fa370613ecd4a305ffc3 tree 3ab670895b5c3e389ff922192a572cbfd8159d03 parent 929f97276bcf7f4a95272ed08a85339b98ba210d author Nick Piggin Fri, 23 Jun 2006 02:03:22 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] radix-tree: direct data The ability to have height 0 radix trees (a direct pointer to the data item rather than going through a full node->slot) quietly disappeared with old-2.6-bkcvs commit ffee171812d51652f9ba284302d9e5c5cc14bdfd. On 64-bit machines this causes nearly 600 bytes to be used for every <= 4K file in pagecache. Re-introduce this feature, root tags stored in spare ->gfp_mask bits. Simplify radix_tree_delete's complex tag clearing arrangement (which would become even more complex) by just falling back to tag clearing functions (the pagecache radix-tree never uses this path anyway, so the icache savings will mean it's actually a speedup). On my 4GB G5, this saves 8MB RAM per kernel kernel source+object tree in pagecache. Pagecache lookup, insertion, and removal speed for small files will also be improved. This makes RCU radix tree harder, but it's worth it. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 929f97276bcf7f4a95272ed08a85339b98ba210d tree 4975698af9559279c83e4e268213ed13e3efee9a parent 833423143c3a7c6545e409d65febd0d92deb351b author Dean Nelson Fri, 23 Jun 2006 02:03:21 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] change gen_pool allocator to not touch managed memory Modify the gen_pool allocator (lib/genalloc.c) to utilize a bitmap scheme instead of the buddy scheme. The purpose of this change is to eliminate the touching of the actual memory being allocated. Since the change modifies the interface, a change to the uncached allocator (arch/ia64/kernel/uncached.c) is also required. Both Andrey Volkov and Jes Sorenson have expressed a desire that the gen_pool allocator not write to the memory being managed. See the following: http://marc.theaimsgroup.com/?l=linux-kernel&m=113518602713125&w=2 http://marc.theaimsgroup.com/?l=linux-kernel&m=113533568827916&w=2 Signed-off-by: Dean Nelson Cc: Andrey Volkov Acked-by: Jes Sorensen Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 833423143c3a7c6545e409d65febd0d92deb351b tree 13a1881f1ffd6e546e80a2ec04b1ac44ad145298 parent 762834e8bf46bf41ce9034d062a7c1f8563175f3 author Nick Piggin Fri, 23 Jun 2006 02:03:20 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] mm: introduce remap_vmalloc_range() Add remap_vmalloc_range, vmalloc_user, and vmalloc_32_user so that drivers can have a nice interface for remapping vmalloc memory. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 762834e8bf46bf41ce9034d062a7c1f8563175f3 tree fb134ef41772ba61050a08cc4ed92c50cd057658 parent d6277db4ab271862ed599da08d78961c70f00002 author Yasunori Goto Fri, 23 Jun 2006 02:03:19 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:48 -0700 [PATCH] Unify pxm_to_node() and node_to_pxm() Consolidate the various arch-specific implementations of pxm_to_node() and node_to_pxm() into a single generic version. Signed-off-by: Yasunori Goto Cc: "Luck, Tony" Cc: Andi Kleen Cc: Dave Hansen Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6277db4ab271862ed599da08d78961c70f00002 tree f11b2f82200c95d17e10779b44a6da37bc03965f parent 7a7c381d25067b9a2bfe025dfcb16459daec0373 author Rafael J. Wysocki Fri, 23 Jun 2006 02:03:18 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:48 -0700 [PATCH] swsusp: rework memory shrinker Rework the swsusp's memory shrinker in the following way: - Simplify balance_pgdat() by removing all of the swsusp-related code from it. - Make shrink_all_memory() use shrink_slab() and a new function shrink_all_zones() which calls shrink_active_list() and shrink_inactive_list() directly for each zone in a way that's optimized for suspend. In shrink_all_memory() we try to free exactly as many pages as the caller asks for, preferably in one shot, starting from easier targets.  If slab caches are huge, they are most likely to have enough pages to reclaim.  The inactive lists are next (the zones with more inactive pages go first) etc. Each time shrink_all_memory() attempts to shrink the active and inactive lists for each zone in 5 passes.  In the first pass, only the inactive lists are taken into consideration.  In the next two passes the active lists are also shrunk, but mapped pages are not reclaimed.  In the last two passes the active and inactive lists are shrunk and mapped pages are reclaimed as well. The aim of this is to alter the reclaim logic to choose the best pages to keep on resume and improve the responsiveness of the resumed system. Signed-off-by: Rafael J. Wysocki Signed-off-by: Con Kolivas Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a7c381d25067b9a2bfe025dfcb16459daec0373 tree 4c6cbd121a74e55e6147f0ac0541981d271b8371 parent e1b6aa6f1404f162697650df2cdb6c374b1d6a5b author Christoph Hellwig Fri, 23 Jun 2006 02:03:17 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:48 -0700 [PATCH] slab: stop using list_for_each Use the _entry variant everywhere to clean the code up a tiny bit. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1b6aa6f1404f162697650df2cdb6c374b1d6a5b tree 5d7f93f6d9a315b66fbc2bcfb7cc5d866a7013e9 parent a43a8c39bbb493c9e93f6764b350de2e33e18e92 author Christoph Hellwig Fri, 23 Jun 2006 02:03:17 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:48 -0700 [PATCH] slab: clean up kmem_getpages The last ifdef addition hit the ugliness treshold on this functions, so: - rename the variable i to nr_pages so it's somewhat descriptive - remove the addr variable and do the page_address call at the very end - instead of ifdef'ing the whole alloc_pages_node call just make the __GFP_COMP addition to flags conditional - rewrite the __GFP_COMP comment to make sense Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a43a8c39bbb493c9e93f6764b350de2e33e18e92 tree a3f0042371810ce6d076751d8e403baaa3d2630e parent e8f03d02080b25f53cd6bba8dc3a297803f18c01 author Chen, Kenneth W Fri, 23 Jun 2006 02:03:15 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:48 -0700 [PATCH] tightening hugetlb strict accounting Current hugetlb strict accounting for shared mapping always assume mapping starts at zero file offset and reserves pages between zero and size of the file. This assumption often reserves (or lock down) a lot more pages then necessary if application maps at none zero file offset. libhugetlbfs is one example that requires proper reservation on shared mapping starts at none zero offset. This patch extends the reservation and hugetlb strict accounting to support any arbitrary pair of (offset, len), resulting a much more robust and accurate scheme. More importantly, it won't lock down any hugetlb pages outside file mapping. Signed-off-by: Ken Chen Acked-by: Adam Litke Cc: David Gibson Cc: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8f03d02080b25f53cd6bba8dc3a297803f18c01 tree 64d2731203aa3e90273322620c3b964bba7abed9 parent 6937a25cff818d32d0f9ff58a518c9ab96760aeb author Andreas Dilger Fri, 23 Jun 2006 02:03:14 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:47 -0700 [PATCH] reserve space for swap label Reserve space in the swap disk header for a LABEL and UUID to be specified. This has been possible with util-linux-2.12b (via e2fsprogs 1.36 libblkid), and is used by at least FC3 and later. The kernel doesn't really care about this, but the space shouldn't accidentally be used by something else either. Also make the on-disk structures be fixed-size types, instead of "int", though I don't know of any architecture in use where an "int" isn't the same size as a "__u32" (all current kernel arches have it as "unsigned int"). Signed-off-by: Andreas Dilger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6937a25cff818d32d0f9ff58a518c9ab96760aeb tree 233fd6927556b83818cdb31c1656b1066643d8dc parent fadd8fbd153c12963f8fe3c9ef7f8967f286f98b author Dave Peterson Fri, 23 Jun 2006 02:03:13 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:47 -0700 [PATCH] mm: fix typos in comments in mm/oom_kill.c This fixes a few typos in the comments in mm/oom_kill.c. Signed-off-by: David S. Peterson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fadd8fbd153c12963f8fe3c9ef7f8967f286f98b tree 547cdee6203b769773521118a4dd19e95a7ef3fd parent 67de648211fa041fe08a0c25241a4980bbb90698 author KAMEZAWA Hiroyuki Fri, 23 Jun 2006 02:03:13 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:47 -0700 [PATCH] support for panic at OOM This patch adds panic_on_oom sysctl under sys.vm. When sysctl vm.panic_on_oom = 1, the kernel panics intead of killing rogue processes. And if vm.panic_on_oom is 0 the kernel will do oom_kill() in the same way as it does today. Of course, the default value is 0 and only root can modifies it. In general, oom_killer works well and kill rogue processes. So the whole system can survive. But there are environments where panic is preferable rather than kill some processes. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67de648211fa041fe08a0c25241a4980bbb90698 tree 94f737e0fed7c40dc59e94f05d6851e490082068 parent 6811378e7d8b9aa4fca2a1ca73d24c9d67c9cb12 author Andy Whitcroft Fri, 23 Jun 2006 02:03:12 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:47 -0700 [PATCH] squash duplicate page_to_pfn and pfn_to_page We have architectures where the size of page_to_pfn and pfn_to_page are significant enough to overall image size that they wish to push them out of line. However, in the process we have grown a second copy of the implementation of each of these routines for each memory model. Share the implmentation exposing it either inline or out-of-line as required. Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6811378e7d8b9aa4fca2a1ca73d24c9d67c9cb12 tree 37f2f5a2bf2e60848a571f8f43685c7406d7b238 parent cca448fe92246fb59efe55ba2e048ded0971a9af author Yasunori Goto Fri, 23 Jun 2006 02:03:11 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] wait_table and zonelist initializing for memory hotadd: update zonelists In current code, zonelist is considered to be build once, no modification. But MemoryHotplug can add new zone/pgdat. It must be updated. This patch modifies build_all_zonelists(). By this, build_all_zonelist() can reconfig pgdat's zonelists. To update them safety, this patch use stop_machine_run(). Other cpus don't touch among updating them by using it. In old version (V2 of node hotadd), kernel updated them after zone initialization. But present_page of its new zone is still 0, because online_page() is not called yet at this time. Build_zonelists() checks present_pages to find present zone. It was too early. So, I changed it after online_pages(). Signed-off-by: Yasunori Goto Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cca448fe92246fb59efe55ba2e048ded0971a9af tree 9663651686508b62a061851927f0b330200c40b1 parent 718127cc3170454f4aa274fdd2f1e01574fecd66 author Yasunori Goto Fri, 23 Jun 2006 02:03:10 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] wait_table and zonelist initializing for memory hotadd: wait_table initialization Wait_table is initialized according to zone size at boot time. But, we cannot know the maixmum zone size when memory hotplug is enabled. It can be changed.... And resizing of wait_table is hard. So kernel allocate and initialzie wait_table as its maximum size. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 718127cc3170454f4aa274fdd2f1e01574fecd66 tree 8b42a48248d6508b8369718deef6b1af3ea82dbf parent 86356ab147669bd3bcb2149fd9561d1280835c24 author Yasunori Goto Fri, 23 Jun 2006 02:03:10 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] wait_table and zonelist initializing for memory hotadd: add return code for init_current_empty_zone When add_zone() is called against empty zone (not populated zone), we have to initialize the zone which didn't initialize at boot time. But, init_currently_empty_zone() may fail due to allocation of wait table. So, this patch is to catch its error code. Changes against wait_table is in the next patch. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86356ab147669bd3bcb2149fd9561d1280835c24 tree bedc7113593e0f6a91aff18bb506fc3327516d81 parent 02b694dea473ad3db1e2d1b14c1fef8fbd92e5e6 author Yasunori Goto Fri, 23 Jun 2006 02:03:09 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] wait_table and zonelist initializing for memory hotadd: change to meminit for build_zonelist Change definitions of some functions and data from __init to __meminit. These functions and data can be used after bootup by this patch to be used for hot-add codes. Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02b694dea473ad3db1e2d1b14c1fef8fbd92e5e6 tree a39451192b589486d70f4d989f9b7f19ef889db0 parent 3c5a87f476bed45616e7e543dcaea4440c77bf93 author Yasunori Goto Fri, 23 Jun 2006 02:03:08 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] wait_table and zonelist initializing for memory hotadd: change name of wait_table_size() This is just to rename from wait_table_size() to wait_table_hash_nr_entries(). Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c5a87f476bed45616e7e543dcaea4440c77bf93 tree 0ff4c86ef594f7bfad9937095b69aab5e70b4174 parent 4776874ff096cd410382c0eca5d75f69c9dfa58f author Christoph Lameter Fri, 23 Jun 2006 02:03:08 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] migration: remove unnecessary PageSwapCache checks Remove two unnecessary PageSwapCache checks. The page refcount is raised and therefore page migration cannot occur in both functions. Signed-off-by: Christoph Lameter Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4776874ff096cd410382c0eca5d75f69c9dfa58f tree 50501cc3d909b03c1e792ac203aa3b56641cd226 parent f886ed443fedb109e2062988bf120a531f0ec80a author Pekka Enberg Fri, 23 Jun 2006 02:03:07 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] slab: page mapping cleanup Clean up slab allocator page mapping a bit. The memory allocated for a slab is physically contiguous so it is okay to assume struct pages are too so kill the long-standing comment. Furthermore, rename set_slab_attr to slab_map_pages and add a comment explaining why its needed. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f886ed443fedb109e2062988bf120a531f0ec80a tree 379858e1b4fc28c266f041902477ee41069171e4 parent 729bd0b74ce9ac6c829109052fcd565f5c366ca5 author Andrew Morton Fri, 23 Jun 2006 02:03:06 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] PG_uncached is ia64 only As Nick points out, only ia64 uses PG_uncached. So we can push it up into the higher bits of the lower half of page->flags and make room for another flag on 32-bit machines. Cc: "Luck, Tony" Cc: Jesse Barnes Cc: Jes Sorensen Cc: Nick Piggin Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 729bd0b74ce9ac6c829109052fcd565f5c366ca5 tree cfb2660d6107251f63f7480e193aca7c280ca5ab parent 4da5eda0dca9730f59f391230304526ab4bffec7 author Pekka Enberg Fri, 23 Jun 2006 02:03:05 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] slab: extract cache_free_alien from __cache_free Move alien object freeing to cache_free_alien() to reduce #ifdef clutter in __cache_free(). Signed-off-by: Pekka Enberg Acked-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4da5eda0dca9730f59f391230304526ab4bffec7 tree 948701e336ec4ca2742b69f7197b89aa61df27d2 parent cb2b95e1c6b56e3d2369d3a5f4bc97f4fa180683 author Christoph Lameter Fri, 23 Jun 2006 02:03:04 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:45 -0700 [PATCH] Page Migration: Make do_swap_page redo the fault It is better to redo the complete fault if do_swap_page() finds that the page is not in PageSwapCache() because the page migration code may have replaced the swap pte already with a pte pointing to valid memory. do_swap_page() may interpret an invalid swap entry without this patch because we do not reload the pte if we are looping back. The page migration code may already have reused the swap entry referenced by our local swp_entry. Signed-off-by: Christoph Lameter Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb2b95e1c6b56e3d2369d3a5f4bc97f4fa180683 tree 121d3fcd539f7d62887949840307ac26aadaa9e4 parent 6f0419e06a3b151ab616a31accdabef41dc2d1b0 author Andy Whitcroft Fri, 23 Jun 2006 02:03:01 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:45 -0700 [PATCH] zone handle unaligned zone boundaries The buddy allocator has a requirement that boundaries between contigious zones occur aligned with the the MAX_ORDER ranges. Where they do not we will incorrectly merge pages cross zone boundaries. This can lead to pages from the wrong zone being handed out. Originally the buddy allocator would check that buddies were in the same zone by referencing the zone start and end page frame numbers. This was removed as it became very expensive and the buddy allocator already made the assumption that zones boundaries were aligned. It is clear that not all configurations and architectures are honouring this alignment requirement. Therefore it seems safest to reintroduce support for non-aligned zone boundaries. This patch introduces a new check when considering a page a buddy it compares the zone_table index for the two pages and refuses to merge the pages where they do not match. The zone_table index is unique for each node/zone combination when FLATMEM/DISCONTIGMEM is enabled and for each section/zone combination when SPARSEMEM is enabled (a SPARSEMEM section is at least a MAX_ORDER size). Signed-off-by: Andy Whitcroft Cc: Dave Hansen Cc: Mel Gorman Cc: Yasunori Goto Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f0419e06a3b151ab616a31accdabef41dc2d1b0 tree a297e66f7fe2ba2bc68b560eb7fa55fd5047e10b parent d6938d1b2768fbf94d1091207d334ef7df786e5a author KAMEZAWA Hiroyuki Fri, 23 Jun 2006 02:03:00 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:45 -0700 [PATCH] for_each_possible_cpu: xfs for_each_cpu() actually iterates across all possible CPUs. We've had mistakes in the past where people were using for_each_cpu() where they should have been iterating across only online or present CPUs. This is inefficient and possibly buggy. We're renaming for_each_cpu() to for_each_possible_cpu() to avoid this in the future. This patch replaces for_each_cpu with for_each_possible_cpu. in xfs. Signed-off-by: KAMEZAWA Hiroyuki Acked-by: Nathan Scott Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6938d1b2768fbf94d1091207d334ef7df786e5a tree a0b7ea4375ef9802f4fbd7eef2f6b5f960f77079 parent 726c334223180e3c0197cc980a432681370d4baf author David Howells Fri, 23 Jun 2006 02:02:59 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:45 -0700 [PATCH] XFS: Use the dentry passed to statfs() to limit the scope of the results Enable XFS to limit the statfs() results to the project quota covering the dentry used as a base for call. Signed-off-by: David Howells Signed-off-by: Nathan Scott Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 726c334223180e3c0197cc980a432681370d4baf tree 8327b354bb3dc959a6606051ae6f8d4d035e38a2 parent 454e2398be9b9fa30433fccc548db34d19aa9958 author David Howells Fri, 23 Jun 2006 02:02:58 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:45 -0700 [PATCH] VFS: Permit filesystem to perform statfs with a known root dentry Give the statfs superblock operation a dentry pointer rather than a superblock pointer. This complements the get_sb() patch. That reduced the significance of sb->s_root, allowing NFS to place a fake root there. However, NFS does require a dentry to use as a target for the statfs operation. This permits the root in the vfsmount to be used instead. linux/mount.h has been added where necessary to make allyesconfig build successfully. Interest has also been expressed for use with the FUSE and XFS filesystems. Signed-off-by: David Howells Acked-by: Al Viro Cc: Nathan Scott Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 454e2398be9b9fa30433fccc548db34d19aa9958 tree 1f61cb0c3716a33b661cfc8977e9beeb480a322c parent 1ad5544098a69d7dc1fa508cbb17e13a7a952fd8 author David Howells Fri, 23 Jun 2006 02:02:57 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:45 -0700 [PATCH] VFS: Permit filesystem to override root dentry on mount Extend the get_sb() filesystem operation to take an extra argument that permits the VFS to pass in the target vfsmount that defines the mountpoint. The filesystem is then required to manually set the superblock and root dentry pointers. For most filesystems, this should be done with simple_set_mnt() which will set the superblock pointer and then set the root dentry to the superblock's s_root (as per the old default behaviour). The get_sb() op now returns an integer as there's now no need to return the superblock pointer. This patch permits a superblock to be implicitly shared amongst several mount points, such as can be done with NFS to avoid potential inode aliasing. In such a case, simple_set_mnt() would not be called, and instead the mnt_root and mnt_sb would be set directly. The patch also makes the following changes: (*) the get_sb_*() convenience functions in the core kernel now take a vfsmount pointer argument and return an integer, so most filesystems have to change very little. (*) If one of the convenience function is not used, then get_sb() should normally call simple_set_mnt() to instantiate the vfsmount. This will always return 0, and so can be tail-called from get_sb(). (*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the dcache upon superblock destruction rather than shrink_dcache_anon(). This is required because the superblock may now have multiple trees that aren't actually bound to s_root, but that still need to be cleaned up. The currently called functions assume that the whole tree is rooted at s_root, and that anonymous dentries are not the roots of trees which results in dentries being left unculled. However, with the way NFS superblock sharing are currently set to be implemented, these assumptions are violated: the root of the filesystem is simply a dummy dentry and inode (the real inode for '/' may well be inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries with child trees. [*] Anonymous until discovered from another tree. (*) The documentation has been adjusted, including the additional bit of changing ext2_* into foo_* in the documentation. [akpm@osdl.org: convert ipath_fs, do other stuff] Signed-off-by: David Howells Acked-by: Al Viro Cc: Nathan Scott Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ad5544098a69d7dc1fa508cbb17e13a7a952fd8 tree 60eb468a15572cbecd167286b5a91d22e8bd1710 parent 5fa21d821f6972e70942f2c555ec29dde962bdb2 author Rachita Kothiyal Fri, 23 Jun 2006 02:02:56 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:44 -0700 [PATCH] Fix cdrom being confused on using kdump I have seen the cdrom drive appearing confused on using kdump on certain x86_64 systems. During the booting up of the second kernel, the following message would keep flooding the console, and the booting would not proceed any further. hda: cdrom_pc_intr: The drive appears confused (ireason = 0x01) In this patch, whenever we are hitting a confused state in the interrupt handler with the DRQ set, we end the request and return ide_stopped. Using this I dont see the status error. Signed-off-by: Rachita Kothiyal Acked-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca6bb5d7ab22ac79f608fe6cbc6b12de6a5a19f0 tree 7255df98fa5692c498605d2bd80402ec866f134a parent f4b8ea7849544114e9d3d682df4d400180854677 author David Woodhouse Thu, 22 Jun 2006 16:07:52 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:44 -0700 [NET]: Require CAP_NET_ADMIN to create tuntap devices. The tuntap driver allows an admin to create persistent devices and assign ownership of them to individual users. Unfortunately, relaxing the permissions on the /dev/net/tun device node so that they can actually use those devices will _also_ allow those users to create arbitrary new devices of their own. This patch corrects that, and adjusts the recommended permissions for the device node accordingly. Signed-off-By: David Woodhouse Signed-off-by: David S. Miller commit f4b8ea7849544114e9d3d682df4d400180854677 tree 502e33a7c2edaf9ffe899da39d0e7036128ccc12 parent c8a553ad7f0bf943047943a758cf07017819cb3c author Randy Dunlap Thu, 22 Jun 2006 16:00:11 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:42 -0700 [NET]: fix net-core kernel-doc Warning(/var/linsrc/linux-2617-g4//include/linux/skbuff.h:304): No description found for parameter 'dma_cookie' Warning(/var/linsrc/linux-2617-g4//include/net/sock.h:1274): No description found for parameter 'copied_early' Warning(/var/linsrc/linux-2617-g4//net/core/dev.c:3309): No description found for parameter 'chan' Warning(/var/linsrc/linux-2617-g4//net/core/dev.c:3309): No description found for parameter 'event' Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit c8a553ad7f0bf943047943a758cf07017819cb3c tree df54b3d8c241ca59c1cb626819d06ba5106adc33 parent 09b8f7a93efd4b2c4ef391e2fbf076f28c6d36d6 author David Woodhouse Thu, 22 Jun 2006 14:28:09 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:40 -0700 [TCP]: Move inclusion of to correct place in The new header shouldn't be included from the !__KERNEL__ portion of tcp.h Signed-off-by: David Woodhouse Signed-off-by: David S. Miller commit 09b8f7a93efd4b2c4ef391e2fbf076f28c6d36d6 tree 7168ac18ce0b765e67f0536e13b8628b1c12ad38 parent 37c3185a02d4b85fbe134bf5204535405dd2c957 author Herbert Xu Thu, 22 Jun 2006 03:08:03 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:38 -0700 [IPSEC]: Handle GSO packets This patch segments GSO packets received by the IPsec stack. This can happen when a NIC driver injects GSO packets into the stack which are then forwarded to another host. The primary application of this is going to be Xen where its backend driver may inject GSO packets into dom0. Of course this also can be used by other virtualisation schemes such as VMWare or UML since the tap device could be modified to inject GSO packets received through splice. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 37c3185a02d4b85fbe134bf5204535405dd2c957 tree 7712fb706bb446b5b6a8ae25f365b4e135d9a1fb parent f4c50d990dcf11a296679dc05de3873783236711 author Herbert Xu Thu, 22 Jun 2006 03:07:29 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:36 -0700 [NET]: Added GSO toggle This patch adds a generic segmentation offload toggle that can be turned on/off for each net device. For now it only supports in TCPv4. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit f4c50d990dcf11a296679dc05de3873783236711 tree f4daf1c80fe591d45631e998b0b5d31d6fe76d85 parent f6a78bfcb141f963187464bac838d46a81c3882a author Herbert Xu Thu, 22 Jun 2006 03:02:40 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:33 -0700 [NET]: Add software TSOv4 This patch adds the GSO implementation for IPv4 TCP. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit f6a78bfcb141f963187464bac838d46a81c3882a tree fe30917dea1ab4cc046c6f1b8c1875373040c84a parent 7967168cefdbc63bf332d6b1548eca7cd65ebbcc author Herbert Xu Thu, 22 Jun 2006 02:57:17 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:31 -0700 [NET]: Add generic segmentation offload This patch adds the infrastructure for generic segmentation offload. The idea is to tap into the potential savings of TSO without hardware support by postponing the allocation of segmented skb's until just before the entry point into the NIC driver. The same structure can be used to support software IPv6 TSO, as well as UFO and segmentation offload for other relevant protocols, e.g., DCCP. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 7967168cefdbc63bf332d6b1548eca7cd65ebbcc tree c45759149ae0acdc89d746e556a0ae278d11776d parent d4828d85d188dc70ed172802e798d3978bb6e29e author Herbert Xu Thu, 22 Jun 2006 02:40:14 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:29 -0700 [NET]: Merge TSO/UFO fields in sk_buff Having separate fields in sk_buff for TSO/UFO (tso_size/ufo_size) is not going to scale if we add any more segmentation methods (e.g., DCCP). So let's merge them. They were used to tell the protocol of a packet. This function has been subsumed by the new gso_type field. This is essentially a set of netdev feature bits (shifted by 16 bits) that are required to process a specific skb. As such it's easy to tell whether a given device can process a GSO skb: you just have to and the gso_type field and the netdev's features field. I've made gso_type a conjunction. The idea is that you have a base type (e.g., SKB_GSO_TCPV4) that can be modified further to support new features. For example, if we add a hardware TSO type that supports ECN, they would declare NETIF_F_TSO | NETIF_F_TSO_ECN. All TSO packets with CWR set would have a gso_type of SKB_GSO_TCPV4 | SKB_GSO_TCPV4_ECN while all other TSO packets would be SKB_GSO_TCPV4. This means that only the CWR packets need to be emulated in software. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d4828d85d188dc70ed172802e798d3978bb6e29e tree 11e70b1c93b25c5e2c9a1547e23086fc9a76d287 parent 5e2707fa3aed8c24075087cbaea2628725adbe55 author Herbert Xu Thu, 22 Jun 2006 02:28:18 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:26 -0700 [NET]: Prevent transmission after dev_deactivate The dev_deactivate function has bit-rotted since the introduction of lockless drivers. In particular, the spin_unlock_wait call at the end has no effect on the xmit routine of lockless drivers. With a little bit of work, we can make it much more useful by providing the guarantee that when it returns, no more calls to the xmit routine of the underlying driver will be made. The idea is simple. There are two entry points in to the xmit routine. The first comes from dev_queue_xmit. That one is easily stopped by using synchronize_rcu. This works because we set the qdisc to noop_qdisc before the synchronize_rcu call. That in turn causes all subsequent packets sent to dev_queue_xmit to be dropped. The synchronize_rcu call also ensures all outstanding calls leave their critical section. The other entry point is from qdisc_run. Since we now have a bit that indicates whether it's running, all we have to do is to wait until the bit is off. I've removed the loop to wait for __LINK_STATE_SCHED to clear. This is useless because netif_wake_queue can cause it to be set again. It is also harmless because we've disarmed qdisc_run. I've also removed the spin_unlock_wait on xmit_lock because its only purpose of making sure that all outstanding xmit_lock holders have exited is also given by dev_watchdog_down. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 5e2707fa3aed8c24075087cbaea2628725adbe55 tree 8e70bb71a7ce79c40026caa3f9a5e37295668630 parent 102128e3a27821bdcbacb10f4f2bba253f587ba4 author YOSHIFUJI Hideaki Thu, 22 Jun 2006 01:41:18 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:24 -0700 [IPV6] ADDRCONF: Fix default source address selection without CONFIG_IPV6_PRIVACY We need to update hiscore.rule even if we don't enable CONFIG_IPV6_PRIVACY, because we have more less significant rule; longest match. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 102128e3a27821bdcbacb10f4f2bba253f587ba4 tree bbde6e385045eea27c5e8aeae051ac420a5cda92 parent 5b057c6b1a25d57edf2b4d1e956e50936480a9ff author Åukasz Stelmach Thu, 22 Jun 2006 01:37:19 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:22 -0700 [IPV6]: Fix source address selection. Two additional labels (RFC 3484, sec. 10.3) for IPv6 addreses are defined to make a distinction between global unicast addresses and Unique Local Addresses (fc00::/7, RFC 4193) and Teredo (2001::/32, RFC 4380). It is necessary to avoid attempts of connection that would either fail (eg. fec0:: to 2001:feed::) or be sub-optimal (2001:0:: to 2001:feed::). Signed-off-by: Åukasz Stelmach Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 5b057c6b1a25d57edf2b4d1e956e50936480a9ff tree e641febd6f562e0ed1198c160ff353ab513f0612 parent 5fa21d821f6972e70942f2c555ec29dde962bdb2 author Herbert Xu Fri, 23 Jun 2006 02:06:41 -0700 committer David S. Miller Fri, 23 Jun 2006 02:06:41 -0700 [NET]: Avoid allocating skb in skb_pad First of all it is unnecessary to allocate a new skb in skb_pad since the existing one is not shared. More importantly, our hard_start_xmit interface does not allow a new skb to be allocated since that breaks requeueing. This patch uses pskb_expand_head to expand the existing skb and linearize it if needed. Actually, someone should sift through every instance of skb_pad on a non-linear skb as they do not fit the reasons why this was originally created. Incidentally, this fixes a minor bug when the skb is cloned (tcpdump, TCP, etc.). As it is skb_pad will simply write over a cloned skb. Because of the position of the write it is unlikely to cause problems but still it's best if we don't do it. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 0dd4b21f517e138ea113db255645fbae1bf5eef3 tree c5f9894fb7f9536e1a2149e64c44ca94d3ec063c parent 99ba9e093d058f6dff54f475136018e2e281d50f author Borislav Petkov Fri, 23 Jun 2006 02:29:08 -0400 committer Jeff Garzik Fri, 23 Jun 2006 02:29:08 -0400 [libata] conversion to new debug scheme, part 1 of $N The first 25% of libata-core.c converted to the new debugging scheme. Signed-off-by: (with addition of ATA_MSG_WARN to standard msg_enable by me) Signed-off-by: Jeff Garzik commit 5fa21d821f6972e70942f2c555ec29dde962bdb2 tree fbe0a083ce7fc7ddb58cd452d5598662acac325b parent 8542e5893c2b10b4f6c80149e7dc3fdd2dc38bc6 parent 5d9fd169c9fbdaecdc430431e59bf94ff40b93d3 author Linus Torvalds Thu, 22 Jun 2006 23:09:42 -0700 committer Linus Torvalds Thu, 22 Jun 2006 23:09:42 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: [PATCH] Driver core: fix locking issues with the devices that are attached to classes [PATCH] USB: get USB suspend to work again commit 5d9fd169c9fbdaecdc430431e59bf94ff40b93d3 tree 11afe01918373ecbfe9097b084a1cc88d706f1a4 parent 0517587e5896cef1d5f99d3b24f5f2ca15d952ad author Greg Kroah-Hartman Thu, 22 Jun 2006 17:17:32 -0700 committer Greg Kroah-Hartman Thu, 22 Jun 2006 22:54:30 -0700 [PATCH] Driver core: fix locking issues with the devices that are attached to classes Doh, that was foolish... Signed-off-by: Greg Kroah-Hartman commit 0517587e5896cef1d5f99d3b24f5f2ca15d952ad tree 8f96898bc231018e899ae92c5e2542fe13a7e9d8 parent c71bd6944eb1458b7887af1783101f5a46140c40 author Greg Kroah-Hartman Thu, 22 Jun 2006 13:29:52 -0700 committer Greg Kroah-Hartman Thu, 22 Jun 2006 22:54:23 -0700 [PATCH] USB: get USB suspend to work again Yeah, it's a hack, but it is only temporary until Alan's patches reworking this area make it in. We really should not care what devices below us are doing, especially when we do not really know what type of devices they are. This patch relies on the fact that the endpoint devices do not have a driver assigned to us. Signed-off-by: Greg Kroah-Hartman commit 8542e5893c2b10b4f6c80149e7dc3fdd2dc38bc6 tree a02ec337d6d6e4b30cd0b4d8968116a32c59357c parent 6f3cafce0ed24372084b5648c9e8a6aacbaf9900 parent b44fb7a09e6bb7d77c1b4b402591f6f953c1e51c author Linus Torvalds Thu, 22 Jun 2006 22:47:06 -0700 committer Linus Torvalds Thu, 22 Jun 2006 22:47:06 -0700 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc * 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc: [ARM] 3565/1: AT91RM9200 MMC update [MMC] Convert all hosts except mmci to use data->blksz commit 6f3cafce0ed24372084b5648c9e8a6aacbaf9900 tree a20de49dbad477a608d1df3ce19f3eeb68417585 parent 0c97f524fc16004602f97ba19c36acdcc0fb9688 parent 02916526133aebc0b3b6c486d1b0af95221033bd author Linus Torvalds Thu, 22 Jun 2006 22:46:28 -0700 committer Linus Torvalds Thu, 22 Jun 2006 22:46:28 -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: (21 commits) [ARM] 3629/1: S3C24XX: fix missing bracket in regs-dsc.h [ARM] 3537/1: Rework DMA-bounce locking for finer granularity [ARM] 3601/1: i.MX/MX1 DMA error handling for signaled channels only [ARM] 3597/1: ixp4xx/nslu2: Board support for new LED subsystem [ARM] 3595/1: ixp4xx/nas100d: Board support for new LED subsystem [ARM] 3626/1: ARM EABI: fix syscall restarting [ARM] 3628/1: S3C24XX: add get_rate call to struct clk [ARM] 3627/1: S3C24XX: split s3c2410 clocks from core clocks [ARM] 3613/1: S3C2410: Add sysdev and sysclass [ARM] 3624/1: Report true modem control line states [ARM] 3620/2: ixp23xx: add uengine loader support [ARM] 3618/1: add defconfig for logicpd pxa270 card engine [ARM] 3617/1: ep93xx: fix slightly incorrect timer tick rate [ARM] 3616/1: fix timer handler wrap logic for a number of platforms [ARM] 3615/1: ixp23xx: use platform devices for physmap flash [ARM] 3614/1: ep93xx: use platform devices for physmap flash [ARM] 3621/1: fix compilation breakage for pnx4008 [ARM] 3623/1: pnx4008: move GPIO-related defines to gpio.h [ARM] 3622/1: pnx4008: remove clk_use/clk_unuse [ARM] Enable VFP to be built when non-VFP capable CPUs are selected ... commit 0c97f524fc16004602f97ba19c36acdcc0fb9688 tree c413a5d51dec3ddbe5f2e5cb0ea828976538168f parent c71bd6944eb1458b7887af1783101f5a46140c40 parent 4faf4e0e7d4e1935fbfc5043d3ebd8d51a3d898d author Linus Torvalds Thu, 22 Jun 2006 22:45:53 -0700 committer Linus Torvalds Thu, 22 Jun 2006 22:45:53 -0700 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial * 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial: [ARM] 3600/1: increase amba-pl010 UART_NR to 8 [ARM] 3571/1: netX: serial driver for Hilscher netX commit c71bd6944eb1458b7887af1783101f5a46140c40 tree 97a7f30a1fb5b3cde3d9f3108779e612960056da parent 065a3e17baa36d1d48eb7376138820035b44775e parent 4ec223d02f4d5f5a3129edc0e3d22550d6ac8a32 author Linus Torvalds Thu, 22 Jun 2006 22:40:00 -0700 committer Linus Torvalds Thu, 22 Jun 2006 22:40:00 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq * master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] Fix ondemand vs suspend deadlock [CPUFREQ] Fix powernow-k8 SMP kernel on UP hardware bug. [PATCH] redirect speedstep-centrino maintainer mail to cpufreq list [CPUFREQ] correct powernow-k8 fid/vid masks for extended parts [CPUFREQ] Clarify powernow-k8 cpu_family statements commit 065a3e17baa36d1d48eb7376138820035b44775e tree 556abb5dbeaad98fc5a66bd56f6a647dfbd22182 parent 45c091bb2d453ce4a8b06cf19872ec7a77fc4799 parent bfcbb00855db21dacd3c154ea13ec3fdd98e747b author Linus Torvalds Thu, 22 Jun 2006 22:15:09 -0700 committer Linus Torvalds Thu, 22 Jun 2006 22:15:09 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (33 commits) [PATCH] myri10ge - drop workaround pci_save_state() disabling MSI [PATCH] myri10ge - drop workaround for the missing AER ext cap on nVidia CK804 via-velocity: the link is not correctly detected when the device starts [PATCH] add b44 to maintainers [PATCH] WAN: ioremap() failure checks in drivers [PATCH] WAN: register_hdlc_device() doesn't need dev_alloc_name() [PATCH] skb_padto()-area fixes in 8390, wavelan [PATCH] make drivers/net/forcedeth.c:nv_update_pause() static [PATCH] network driver for Hilscher netx [PATCH] Dereference in tokenring/olympic.c [PATCH] Array overrun in drivers/net/wireless/wavelan.c [PATCH] Remove useless check in drivers/net/pcmcia/xirc2ps_cs.c [PATCH] 8139cp: add ethtool eeprom support [PATCH] 8139cp: fix eeprom read command length [PATCH] b44: update b44 Kconfig entry [PATCH] b44: update version to 1.01 [PATCH] b44: add wol for old nic [PATCH] b44: add parameter [PATCH] b44: add wol [PATCH] b44: fix manual speed/duplex/autoneg settings ... commit 45c091bb2d453ce4a8b06cf19872ec7a77fc4799 tree 06fb2e05518ebfba163f8424e028e7faf5672d66 parent d588fcbe5a7ba8bba2cebf7799ab2d573717a806 parent 2191fe3e39159e3375f4b7ec1420df149f154101 author Linus Torvalds Thu, 22 Jun 2006 22:11:30 -0700 committer Linus Torvalds Thu, 22 Jun 2006 22:11:30 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits) [POWERPC] re-enable OProfile for iSeries, using timer interrupt [POWERPC] support ibm,extended-*-frequency properties [POWERPC] Extra sanity check in EEH code [POWERPC] Dont look for class-code in pci children [POWERPC] Fix mdelay badness on shared processor partitions [POWERPC] disable floating point exceptions for init [POWERPC] Unify ppc syscall tables [POWERPC] mpic: add support for serial mode interrupts [POWERPC] pseries: Print PCI slot location code on failure [POWERPC] spufs: one more fix for 64k pages [POWERPC] spufs: fail spu_create with invalid flags [POWERPC] spufs: clear class2 interrupt status before wakeup [POWERPC] spufs: fix Makefile for "make clean" [POWERPC] spufs: remove stop_code from struct spu [POWERPC] spufs: fix spu irq affinity setting [POWERPC] spufs: further abstract priv1 register access [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts [POWERPC] spufs: dont try to access SPE channel 1 count [POWERPC] spufs: use kzalloc in create_spu [POWERPC] spufs: fix initial state of wbox file ... Manually resolved conflicts in: drivers/net/phy/Makefile include/asm-powerpc/spu.h commit 99ba9e093d058f6dff54f475136018e2e281d50f tree 8e69fbee21e413dc0f452cf3fb9bf3c383265c49 parent ba6a13083c1b720a47c05bee7bedbb6ef06c4611 author Brian King Mon, 12 Jun 2006 14:54:17 -0500 committer Jeff Garzik Thu, 22 Jun 2006 23:46:45 -0400 [PATCH] libata: Add ata_scsi_dev_disabled Separate out parts of ata_scsi_find_dev to be reused in future SAS/SATA patches. Acked-by: Jeff Garzik Signed-off-by: Brian King Signed-off-by: Jeff Garzik commit ba6a13083c1b720a47c05bee7bedbb6ef06c4611 tree 26f9d8d37145fac426744f96ecf006ec0a481e31 parent 47005f255ed126a4b48a1a2f63164fb1d83bcb0a author Jeff Garzik Thu, 22 Jun 2006 23:46:10 -0400 committer Jeff Garzik Thu, 22 Jun 2006 23:46:10 -0400 [libata] Add host lock to struct ata_port Prepare for changes required to support SATA devices attached to SAS HBAs. For these devices we don't want to use host_set at all, since libata will not be the owner of struct scsi_host. Signed-off-by: Brian King (with slight merge modifications made by...) Signed-off-by: Jeff Garzik commit 47005f255ed126a4b48a1a2f63164fb1d83bcb0a tree bac4a73716af3d9cdb201f1bd83d65952fa2c988 parent 3a778275626c0eb97674e92875efeba01189ce0e author Tejun Heo Mon, 19 Jun 2006 18:27:23 +0900 committer Jeff Garzik Thu, 22 Jun 2006 23:36:58 -0400 [PATCH] libata: implement per-dev EH action mask eh_info->dev_action[] Currently, the only per-dev EH action is REVALIDATE. EH used to exploit ehi->dev to do selective revalidation on a ATA bus. However, this is a bit hacky and makes it impossible to request selective revalidation from outside of EH or add another per-dev EH action. This patch adds per-dev EH action mask eh_info->dev_action[] and update EH to use this field for REVALIDATE. Note that per-dev actions can still be specified at port-level and it has the same effect of specifying the action for all devices on the port. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit bfcbb00855db21dacd3c154ea13ec3fdd98e747b tree 507cfad1eb90150516984d964580c19127233b3c parent 69eb887b0c2380791d33f7c07bfba88d7c5cef15 author Brice Goglin Thu, 22 Jun 2006 21:12:36 -0400 committer Jeff Garzik Thu, 22 Jun 2006 23:35:19 -0400 [PATCH] myri10ge - drop workaround pci_save_state() disabling MSI We don't need to restore the state right after saving it for later recovery since commit 99dc804d9bcc2c53f4c20c291bf4e185312a1a0c (PCI: disable msi mode in pci_disable_device) now prevents pci_save_state() from disabling MSI. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 69eb887b0c2380791d33f7c07bfba88d7c5cef15 tree c825bedddbc9fd6fd3094aff7d74af7e95a5b1d9 parent af57d238aa2107e1b45d8dacad6e50db938f0567 author Brice Goglin Thu, 22 Jun 2006 21:11:59 -0400 committer Jeff Garzik Thu, 22 Jun 2006 23:35:19 -0400 [PATCH] myri10ge - drop workaround for the missing AER ext cap on nVidia CK804 We don't need to hardcode the AER capability of the nVidia CK804 chipset anymore since commit cf34a8e07f02c76f3f1232eecb681301a3d7b10b (PCI: nVidia quirk to make AER PCI-E extended capability visible) now makes sure that this cap will be available to pci_find_ext_capability(). Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit af57d238aa2107e1b45d8dacad6e50db938f0567 tree c3ce4b9aa7a12e2b48a36fa01fef2190f13fc05c parent 39105890516b06319ffcf5ef0d0cea6c7f65bc96 parent 8a22dddb2a5b5834577afd9e25b5392218715611 author Jeff Garzik Thu, 22 Jun 2006 23:33:23 -0400 committer Jeff Garzik Thu, 22 Jun 2006 23:33:23 -0400 Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream commit 39105890516b06319ffcf5ef0d0cea6c7f65bc96 tree f336d6a252461b0a74c54d25c77bd1fc62bfa54b parent 4446065a2c9b65398ceb115f4d8c256eb1bb9647 author Gary Zambrano Thu, 22 Jun 2006 17:26:20 -0700 committer Jeff Garzik Thu, 22 Jun 2006 23:32:03 -0400 [PATCH] add b44 to maintainers Add b44 to the MAINTAINERS file. Signed-off-by: Gary Zambrano Signed-off-by: Jeff Garzik commit 4446065a2c9b65398ceb115f4d8c256eb1bb9647 tree cdaa04d42876632e0df95054d46851cac6648ce3 parent 4a31e348e3ecaf54c50240109ac4574b180f8840 author Krzysztof Halasa Thu, 22 Jun 2006 22:29:28 +0200 committer Jeff Garzik Thu, 22 Jun 2006 23:32:03 -0400 [PATCH] WAN: ioremap() failure checks in drivers Eric Sesterhenn found that pci200syn initialization lacks return statement in ioremap() error path (coverity bug id #195). It looks like more WAN drivers have problems with ioremap(). Signed-off-by: Krzysztof Halasa Signed-off-by: Jeff Garzik commit 4a31e348e3ecaf54c50240109ac4574b180f8840 tree 319978d90b95c7f1d4bf1fdfc552dc8850f330e7 parent aa95abefccc25efea5c8654bc3475e8161319b94 author Krzysztof Halasa Thu, 22 Jun 2006 22:20:19 +0200 committer Jeff Garzik Thu, 22 Jun 2006 23:32:03 -0400 [PATCH] WAN: register_hdlc_device() doesn't need dev_alloc_name() David Boggs noticed that register_hdlc_device() no longer needs to call dev_alloc_name() as it's called by register_netdev(). register_hdlc_device() is currently equivalent to register_netdev(). hdlc_setup() is now EXPORTed as per David's request. Signed-off-by: Krzysztof Halasa Signed-off-by: Jeff Garzik commit aa95abefccc25efea5c8654bc3475e8161319b94 tree cd2611a0998be1e68ce10d3a5cd6d7e4c6810a03 parent c7985051dec26dc5ae2562a975a0b37b70621f3f author Alan Cox Thu, 22 Jun 2006 14:25:34 +0100 committer Jeff Garzik Thu, 22 Jun 2006 23:32:02 -0400 [PATCH] skb_padto()-area fixes in 8390, wavelan Ar Iau, 2006-06-22 am 21:29 +1000, ysgrifennodd Herbert Xu: > Alan Cox wrote: > > > > The 8390 change (corrected version) also makes 8390.c faster so should > > be applied anyway, and the orinoco one fixes some code that isn't even > > needed and someone forgot to remove long ago. Otherwise the skb_padto > > Yeah I agree totally. However, I haven't actually seen the fixed 8390 > version being posted yet or at least not to netdev :) Ah the resounding clang of a subtle hint ;) Signed-off-by: Alan Cox - Return 8390.c to the old way of handling short packets (which is also faster) - Remove the skb_padto from orinoco. This got left in when the padding bad write patch was added and is actually not needed. This is fixing a merge error way back when. - Wavelan can also use the stack based buffer trick if you want Signed-off-by: Jeff Garzik commit c7985051dec26dc5ae2562a975a0b37b70621f3f tree 390de4b741a22c8a18e6ce6203ef25b709d9a8e4 parent 92aa674d721d089c440301ab95cb6be19c78727e author Adrian Bunk Thu, 22 Jun 2006 12:03:29 +0200 committer Jeff Garzik Thu, 22 Jun 2006 23:31:06 -0400 [PATCH] make drivers/net/forcedeth.c:nv_update_pause() static This patch makes the needlessly global nv_update_pause() static. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 92aa674d721d089c440301ab95cb6be19c78727e tree f5114973b0e5a975035664b48f44217802b4b6b1 parent 6d56ab936237b429366ade0d2a1540c7e41beb87 author Sascha Hauer Thu, 22 Jun 2006 07:11:13 +0200 committer Jeff Garzik Thu, 22 Jun 2006 23:28:05 -0400 [PATCH] network driver for Hilscher netx This is a patch for the Hilscher netx builtin ethernet ports. The netx board support was merged into 2.6.17-git2. The netx is a arm926 based SoC. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer -- drivers/net/Kconfig | 11 drivers/net/Makefile | 1 drivers/net/netx-eth.c | 516 ++++++++++++++++++++++++++++++++++++++++ include/asm-arm/arch-netx/eth.h | 27 ++ 4 files changed, 555 insertions(+) Signed-off-by: Jeff Garzik commit 3a778275626c0eb97674e92875efeba01189ce0e tree d0df8b559e2d95772ebd30a3cc70b86ae2703a9e parent 71f0737b2889b86f774a94afaf1342c2c0d61cb5 author Albert Lee Thu, 22 Jun 2006 13:00:25 +0800 committer Jeff Garzik Thu, 22 Jun 2006 23:26:24 -0400 [PATCH] libata-dev: move the CDB-intr DMA blacklisting Move the DMA blacklisting of the CDB-intr devices from ata_check_atapi_dma() to ata_dma_blacklisted(), where it makes more sense. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 6d56ab936237b429366ade0d2a1540c7e41beb87 tree 6e767fd02c7c43aa72d600bdb5057c14dd05d56f parent a192491ad58098f2c57d2d1efe721ea0634dc0aa author Eric Sesterhenn Wed, 21 Jun 2006 16:17:17 +0200 committer Jeff Garzik Thu, 22 Jun 2006 23:24:18 -0400 [PATCH] Dereference in tokenring/olympic.c hi, coverity found (bug id #225) that we might call free_netdev() with NULL argument, when alloc_trdev() fails. This patch changes the goto, so we dont call free_netdev() for dev == NULL. Signed-off-by: Eric Sesterhenn Signed-off-by: Jeff Garzik commit a192491ad58098f2c57d2d1efe721ea0634dc0aa tree 7a8ef6923e28dcec98f0a6d5bd2c3246cd01eacf parent da4f5ccf6040b998b64c60db8fa5f4ee03fdaf95 author Eric Sesterhenn Wed, 21 Jun 2006 16:40:24 +0200 committer Jeff Garzik Thu, 22 Jun 2006 23:24:18 -0400 [PATCH] Array overrun in drivers/net/wireless/wavelan.c hi, this is another array overrun spotted by coverity (#id 507) we should check the index against array size before using it. Not sure why the driver doesnt use ARRAY_SIZE instead of its own macro. Signed-off-by: Eric Sesterhenn Signed-off-by: Jeff Garzik commit 71f0737b2889b86f774a94afaf1342c2c0d61cb5 tree e983d3f4c3fccad0679aa8ae18a0c3ce91bfafe7 parent 8fa29b23d9e0ef976dc578aab98297d4f24f70da author Tejun Heo Wed, 21 Jun 2006 23:12:48 +0900 committer Jeff Garzik Thu, 22 Jun 2006 23:22:39 -0400 [PATCH] ahci: disable NCQ support on vt8251 vt8251 chokes on NCQ commands. Two different disks from different vendors are showing the same symptom and it seems that the windows driver from via doesn't support NCQ either. Disable NCQ support on this controller for the time being. Signed-off-by: Tejun Heo Cc: Aalderd Bouwman Cc: Bastiaan Jacques Signed-off-by: Jeff Garzik commit da4f5ccf6040b998b64c60db8fa5f4ee03fdaf95 tree f150dbaf402cc48baca720749135ff47987ff87e parent 722fdb33591bc7308a661913fb2f829128236b6f author Eric Sesterhenn Wed, 21 Jun 2006 16:10:48 +0200 committer Jeff Garzik Thu, 22 Jun 2006 23:22:17 -0400 [PATCH] Remove useless check in drivers/net/pcmcia/xirc2ps_cs.c hi, coverity choked at this check (id #223), assuming that skb might be NULL and used anyways later. Since start_hard_xmit() always gets called with a valid skb, the check is useless and this patch removes it. Signed-off-by: Eric Sesterhenn Signed-off-by: Jeff Garzik commit 722fdb33591bc7308a661913fb2f829128236b6f tree 6b8612e0f72f1ae26adb7d7f07a60e5f1a8bdf60 parent d73f1e3c3b0703e25728ce5bdda9806d6f2c576f author Philip Craig Wed, 21 Jun 2006 11:33:27 +1000 committer Jeff Garzik Thu, 22 Jun 2006 23:20:29 -0400 [PATCH] 8139cp: add ethtool eeprom support Implement the ethtool eeprom operations for the 8139cp driver. Tested on x86 and big-endian ARM. Signed-off-by: Philip Craig Signed-off-by: Jeff Garzik commit d73f1e3c3b0703e25728ce5bdda9806d6f2c576f tree 5bb928aa9d053bf14cc5a2a2eeb63e6ffa6160d6 parent fc13dcae24bfd877aeff07774c035b2b896e05ca author Philip Craig Wed, 21 Jun 2006 11:33:26 +1000 committer Jeff Garzik Thu, 22 Jun 2006 23:20:29 -0400 [PATCH] 8139cp: fix eeprom read command length The read command for the 93C46/93C56 EEPROMS should be 3 bits plus the address. This doesn't appear to affect the operation of the read command, but similar errors for write commands do cause failures. Signed-off-by: Philip Craig Signed-off-by: Jeff Garzik commit 8fa29b23d9e0ef976dc578aab98297d4f24f70da tree e39c58a310ae00079cb0652a3f7d202347303e6b parent c57c064994f1544a5ed2e9b319ebd0bc087ea540 author Jeff Garzik Thu, 22 Jun 2006 23:19:15 -0400 committer Jeff Garzik Thu, 22 Jun 2006 23:19:15 -0400 [libata] ahci: add JMicron PCI IDs Originally contributed by Justin @ JMicron. Signed-off-by: Jeff Garzik commit fc13dcae24bfd877aeff07774c035b2b896e05ca tree 0127b4e01a4c672520b9521c53b144ab1e24ca89 parent 4d1dabdb52ee49f24cf874b6af2cd2c9efd9444a author Gary Zambrano Tue, 20 Jun 2006 15:34:46 -0700 committer Jeff Garzik Thu, 22 Jun 2006 23:16:13 -0400 [PATCH] b44: update b44 Kconfig entry Deleted "EXPERIMENTAL" from b44 entry in Kconfig. Signed-off-by: Gary Zambrano Signed-off-by: Jeff Garzik commit 4d1dabdb52ee49f24cf874b6af2cd2c9efd9444a tree 1e5584a3d9fc9ed073380046438bfbf0d7e1c702 parent 725ad800b73a71fe91bfd8859f928852de688ea0 author Gary Zambrano Tue, 20 Jun 2006 15:34:40 -0700 committer Jeff Garzik Thu, 22 Jun 2006 23:16:13 -0400 [PATCH] b44: update version to 1.01 Update the driver version to 1.01 Signed-off-by: Gary Zambrano Signed-off-by: Jeff Garzik commit 725ad800b73a71fe91bfd8859f928852de688ea0 tree 1612e231baf1bd861c7a5724949a0b7b91966314 parent 00e8b3aa1cfd7577fd4019a24f7c3980506f83f3 author Gary Zambrano Tue, 20 Jun 2006 15:34:36 -0700 committer Jeff Garzik Thu, 22 Jun 2006 23:16:13 -0400 [PATCH] b44: add wol for old nic This patch adds wol support for the older 440x nics that use pattern matching. This patch is a redo thanks to feedback from Michael Chan and Francois Romieu. Signed-off-by: Gary Zambrano Signed-off-by: Jeff Garzik commit 00e8b3aa1cfd7577fd4019a24f7c3980506f83f3 tree bcdc179045db7ba908671ec864caf3cca74282ae parent 52cafd965507b7a7bb962486539f6d7422552692 author Gary Zambrano Tue, 20 Jun 2006 15:34:26 -0700 committer Jeff Garzik Thu, 22 Jun 2006 23:16:13 -0400 [PATCH] b44: add parameter This patch adds a parameter to init_hw() to not completely initialize the nic for wol. Signed-off-by: Gary Zambrano Signed-off-by: Jeff Garzik commit 52cafd965507b7a7bb962486539f6d7422552692 tree 629aa6883f073b1d28fad4340f3d4d3f5c124230 parent 47b9c3b1e6afa3c40e3ac1822cd13946567b5955 author Gary Zambrano Tue, 20 Jun 2006 15:34:23 -0700 committer Jeff Garzik Thu, 22 Jun 2006 23:16:13 -0400 [PATCH] b44: add wol Adds wol to the driver. This is a redo of a previous patch thanks to feedback from Francois Romieu. Signed-off-by Gary Zambrano Signed-off-by: Jeff Garzik commit 47b9c3b1e6afa3c40e3ac1822cd13946567b5955 tree 21316fb2f44240c9eb123367097b2e41a43a1ecc parent 00e5edcbfdb7030f6cbb8d5d89fdc2848133a182 author Gary Zambrano Tue, 20 Jun 2006 15:34:15 -0700 committer Jeff Garzik Thu, 22 Jun 2006 23:16:13 -0400 [PATCH] b44: fix manual speed/duplex/autoneg settings Fixes for speed/duplex/autoneg settings and driver settings info. This is a redo of a previous patch thanks to feedback from Jeff Garzik. Signed-off-by: Gary Zambrano Signed-off-by: Jeff Garzik commit c57c064994f1544a5ed2e9b319ebd0bc087ea540 tree 43a3756959c73eda9e48c1c7c4b728c94d68379f parent fe7fa31aa0749d7d247d21e1880f0c5aea15b158 author Jeff Garzik Thu, 22 Jun 2006 23:12:24 -0400 committer Jeff Garzik Thu, 22 Jun 2006 23:12:24 -0400 [libata] sata_nv: add PCI IDs Based on a patch contributed by Andrew Chew @ NVIDIA. Signed-off-by: Jeff Garzik commit fe7fa31aa0749d7d247d21e1880f0c5aea15b158 tree fe1bb95683d5032f4656a8e6276fab50533bf5e3 parent 71d530cd1b6d97094481002a04c77fea1c8e1c22 author Jeff Garzik Thu, 22 Jun 2006 23:05:36 -0400 committer Jeff Garzik Thu, 22 Jun 2006 23:05:36 -0400 [libata] ahci: Add NVIDIA PCI IDs. Based on a patch by Andrew Chew @ NVIDIA. Signed-off-by: Jeff Garzik commit 00e5edcbfdb7030f6cbb8d5d89fdc2848133a182 tree db1e8bc9e3ff9adbf78b7695bd566f9681567e98 parent 427d269f17fd02d192e9ae3bd93bdc07790fa02c author Andrew Victor Tue, 20 Jun 2006 12:19:13 +0200 committer Jeff Garzik Thu, 22 Jun 2006 22:56:21 -0400 [PATCH] AT91RM9200 Ethernet #4: Suspend/Resume Adds power-management (suspend/resume) support to the AT91RM9200 Ethernet driver. Patch from David Brownell. Signed-off-by: Andrew Victor Signed-off-by: Jeff Garzik commit 427d269f17fd02d192e9ae3bd93bdc07790fa02c tree 2bb5f446e7e134173a7b83a4940d147dd88a2c19 parent ca5585ed248dc01ce918002ee9a9c9c41ae4f7c0 author Andrew Victor Tue, 20 Jun 2006 12:10:57 +0200 committer Jeff Garzik Thu, 22 Jun 2006 22:56:21 -0400 [PATCH] AT91RM9200 Ethernet #3: Cleanup Moved global ether_clk variable into controller data structure. Patch from David Brownell. Davicom 9161 PHY was being incorrectly displayed as "9196". Patch from Brian Stafford. clk_get() doesn't return NULL on error, so the return value needs to be tested with IS_ERR(). Whitespace cleanup. Signed-off-by: Andrew Victor Signed-off-by: Jeff Garzik commit ca5585ed248dc01ce918002ee9a9c9c41ae4f7c0 tree 354844b9b92c9694625b805b7044ded9c9abe1c6 parent 775637df0caccc204628ebacca2b07f35c88b96b author Andrew Victor Tue, 20 Jun 2006 11:59:05 +0200 committer Jeff Garzik Thu, 22 Jun 2006 22:56:21 -0400 [PATCH] AT91RM9200 Ethernet #2: MII interface Adds support for the MII ioctls via generic_mii_ioctl(). Patch from Brian Stafford. Set the mii.phy_id to the detected PHY address, otherwise ethtool cannot access PHYs other than 0. Patch from Roman Kolesnikov. Signed-off-by: Andrew Victor Signed-off-by: Jeff Garzik commit 775637df0caccc204628ebacca2b07f35c88b96b tree 837b379c417d2bd39f92ede7036642c12f47b014 parent d955d90b90db4b3ac2a3e56d271f372c41fb00d6 author Andrew Victor Tue, 20 Jun 2006 11:50:23 +0200 committer Jeff Garzik Thu, 22 Jun 2006 22:56:21 -0400 [PATCH] AT91RM9200 Ethernet #1: Link poll For Ethernet PHYs that don't have an IRQ pin or boards that don't connect the IRQ pin to the processor, we enable a timer to poll the PHY's link state. Patch originally supplied by Eric Benard and Roman Kolesnikov. Signed-off-by: Andrew Victor Signed-off-by: Jeff Garzik commit d955d90b90db4b3ac2a3e56d271f372c41fb00d6 tree ef769c3b50bebc185785a0cff1bb1d20b779656b parent dbe1ab9514c231c9b062140a107d9dea0eabefcc author Ralf Baechle Sat, 17 Jun 2006 18:57:39 +0100 committer Jeff Garzik Thu, 22 Jun 2006 22:52:35 -0400 [PATCH] IP27: Really set PCI64_ATTR_VIRTUAL, not PCI64_ATTR_PREC. IOC3's homegrown DMA mapping functions that are used to optimize things a little on IP27 set the wrong bit. Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit dbe1ab9514c231c9b062140a107d9dea0eabefcc tree 0001c7143cf923fc704215f0a0e54221e9e5cbb9 parent 612eff0e3715a6faff5ba1b74873b99e036c59fe parent d588fcbe5a7ba8bba2cebf7799ab2d573717a806 author Jeff Garzik Thu, 22 Jun 2006 22:51:46 -0400 committer Jeff Garzik Thu, 22 Jun 2006 22:51:46 -0400 Merge branch 'master' into upstream commit 189acaaef81b1d71aedd0d28810de24160c2e781 tree 7360484f3e255557641053f170ab324572d4b855 parent 75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d author Steve French Fri, 23 Jun 2006 02:33:48 +0000 committer Steve French Fri, 23 Jun 2006 02:33:48 +0000 [CIFS] Enable sec flags on mount for cifs (part one) Signed-off-by: Steve French commit 71d530cd1b6d97094481002a04c77fea1c8e1c22 tree e786da7145d83c19a594adf76ed90d52c51058b1 parent d7a80dad2fe19a2b8c119c8e9cba605474a75a2b parent d588fcbe5a7ba8bba2cebf7799ab2d573717a806 author Jeff Garzik Thu, 22 Jun 2006 22:11:56 -0400 committer Jeff Garzik Thu, 22 Jun 2006 22:11:56 -0400 Merge branch 'master' into upstream Conflicts: drivers/scsi/libata-core.c drivers/scsi/libata-scsi.c include/linux/pci_ids.h commit 8a22dddb2a5b5834577afd9e25b5392218715611 tree 987fb5c1b8a6ce4d0437b675909e4505a09144d7 parent 612eff0e3715a6faff5ba1b74873b99e036c59fe author Francois Romieu Fri, 23 Jun 2006 00:47:06 +0200 committer Francois Romieu Fri, 23 Jun 2006 01:18:35 +0200 via-velocity: the link is not correctly detected when the device starts The patch fixes http://bugzilla.kernel.org/show_bug.cgi?id=6711 Signed-off-by: Roy Marples Signed-off-by: Francois Romieu commit d588fcbe5a7ba8bba2cebf7799ab2d573717a806 tree 2c82f5d26bd9f2e2f82711ef58f3c7a1b6a9a4df parent eaa8568901b3164197ce727c4c9b4067383e526c parent 4941b395b3c2635a8c16d88791a789fb6ac6be43 author Linus Torvalds Thu, 22 Jun 2006 15:08:56 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:08:56 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: (44 commits) [PATCH] I2C: I2C controllers go into right place on sysfs [PATCH] hwmon-vid: Add support for Intel Core and Conroe [PATCH] lm70: New hardware monitoring driver [PATCH] hwmon: Fix the Kconfig header [PATCH] i2c-i801: Merge setup function [PATCH] i2c-i801: Better pci subsystem integration [PATCH] i2c-i801: Cleanups [PATCH] i2c-i801: Remove PCI function check [PATCH] i2c-i801: Remove force_addr parameter [PATCH] i2c-i801: Fix block transaction poll loops [PATCH] scx200_acb: Documentation update [PATCH] scx200_acb: Mark scx200_acb_probe __init [PATCH] scx200_acb: Use PCI I/O resource when appropriate [PATCH] i2c: Mark block write buffers as const [PATCH] i2c-ocores: Minor cleanups [PATCH] abituguru: Fix fan detection [PATCH] abituguru: Review fixes [PATCH] abituguru: New hardware monitoring driver [PATCH] w83792d: Add missing data access locks [PATCH] w83792d: Fix setting the PWM value ... commit eaa8568901b3164197ce727c4c9b4067383e526c tree 6dc48f016cfff6e1e5ce9278be819e1b651027b0 parent 6c763eb9ead86c612492b59287b36c0dcf7d09b1 parent c6976a4eb3c9ead165de950899b45db0840b8e30 author Linus Torvalds Thu, 22 Jun 2006 15:08:34 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:08:34 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6: [PATCH] w1: warning fix [PATCH] w1: clean up W1_CON dependency. [PATCH] drivers/w1/w1.c: fix a compile error [PATCH] W1: fix dependencies of W1_SLAVE_DS2433_CRC [PATCH] W1: possible cleanups [PATCH] W1: cleanups [PATCH] w1 exports [PATCH] w1: Use mutexes instead of semaphores. [PATCH] w1: Make w1 connector notifications depend on connector. [PATCH] w1: netlink: Mark netlink group 1 as unused. [PATCH] w1: Move w1-connector definitions into linux/include/connector.h [PATCH] w1: Userspace communication protocol over connector. [PATCH] w1: Replace dscore and ds_w1_bridge with ds2490 driver. [PATCH] w1: Added default generic read/write operations. commit 6c763eb9ead86c612492b59287b36c0dcf7d09b1 tree 46497ff44bcf909517bffac70f0d6c7ad45ae1f0 parent dcc1a66a09420ccc5a22671bddc5a842f92d67e5 parent cf34a8e07f02c76f3f1232eecb681301a3d7b10b author Linus Torvalds Thu, 22 Jun 2006 15:07:59 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:07:59 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (27 commits) [PATCH] PCI: nVidia quirk to make AER PCI-E extended capability visible [PATCH] PCI: fix issues with extended conf space when MMCONFIG disabled because of e820 [PATCH] PCI: Bus Parity Status sysfs interface [PATCH] PCI: fix memory leak in MMCONFIG error path [PATCH] PCI: fix error with pci_get_device() call in the mpc85xx driver [PATCH] PCI: MSI-K8T-Neo2-Fir: run only where needed [PATCH] PCI: fix race with pci_walk_bus and pci_destroy_dev [PATCH] PCI: clean up pci documentation to be more specific [PATCH] PCI: remove unneeded msi code [PATCH] PCI: don't move ioapics below PCI bridge [PATCH] PCI: cleanup unused variable about msi driver [PATCH] PCI: disable msi mode in pci_disable_device [PATCH] PCI: Allow MSI to work on kexec kernel [PATCH] PCI: AMD 8131 MSI quirk called too late, bus_flags not inherited ? [PATCH] PCI: Move various PCI IDs to header file [PATCH] PCI Bus Parity Status-broken hardware attribute, EDAC foundation [PATCH] PCI: i386/x86_84: disable PCI resource decode on device disable [PATCH] PCI ACPI: Rename the functions to avoid multiple instances. [PATCH] PCI: don't enable device if already enabled [PATCH] PCI: Add a "enable" sysfs attribute to the pci devices to allow userspace (Xorg) to enable devices without doing foul direct access ... commit dcc1a66a09420ccc5a22671bddc5a842f92d67e5 tree 612610869ea027b80b721a0f205d217792b95f3d parent 4f3865fb57a04db7cca068fed1c15badc064a302 author Roman Zippel Thu, 22 Jun 2006 14:47:35 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:58 -0700 [PATCH] x86_64: use select for GART_IOMMU to enable AGP The AGP default doesn't work well with other selects, so use a select for GART_IOMMU as well. Remove a redundant default for SWIOTLB as well. Signed-off-by: Roman Zippel Signed-off-by: Andi Kleen Cc: Andi Kleen Cc: Dave Jones Cc: Dave Airlie Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f3865fb57a04db7cca068fed1c15badc064a302 tree 4c923c72b6ac9b633c87cc73b55a75c7cfd0f044 parent 4f1bcaf094ccc512c23e10104c05a6f8e5b7a9e4 author Richard Purdie Thu, 22 Jun 2006 14:47:34 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:58 -0700 [PATCH] zlib_inflate: Upgrade library code to a recent version Upgrade the zlib_inflate implementation in the kernel from a patched version 1.1.3/4 to a patched 1.2.3. The code in the kernel is about seven years old and I noticed that the external zlib library's inflate performance was significantly faster (~50%) than the code in the kernel on ARM (and faster again on x86_32). For comparison the newer deflate code is 20% slower on ARM and 50% slower on x86_32 but gives an approx 1% compression ratio improvement. I don't consider this to be an improvement for kernel use so have no plans to change the zlib_deflate code. Various changes have been made to the zlib code in the kernel, the most significant being the extra functions/flush option used by ppp_deflate. This update reimplements the features PPP needs to ensure it continues to work. This code has been tested on ARM under both JFFS2 (with zlib compression enabled) and ppp_deflate and on x86_32. JFFS2 sees an approx. 10% real world file read speed improvement. This patch also removes ZLIB_VERSION as it no longer has a correct value. We don't need version checks anyway as the kernel's module handling will take care of that for us. This removal is also more in keeping with the zlib author's wishes (http://www.zlib.net/zlib_faq.html#faq24) and I've added something to the zlib.h header to note its a modified version. Signed-off-by: Richard Purdie Acked-by: Joern Engel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f1bcaf094ccc512c23e10104c05a6f8e5b7a9e4 tree 883c6ece20a28f86eb73cd329bb9d4674b1e5480 parent d702ccb342e49f7591df5a87c3857c698183b0fa author Bjorn Helgaas Thu, 22 Jun 2006 14:47:32 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:58 -0700 [PATCH] vgacon: make VGA_MAP_MEM take size, remove extra use VGA_MAP_MEM translates to ioremap() on some architectures. It makes sense to do this to vga_vram_base, because we're going to access memory between vga_vram_base and vga_vram_end. But it doesn't really make sense to map starting at vga_vram_end, because we aren't going to access memory starting there. On ia64, which always has to be different, ioremapping vga_vram_end gives you something completely incompatible with ioremapped vga_vram_start, so vga_vram_size ends up being nonsense. As a bonus, we often know the size up front, so we can use ioremap() correctly, rather than giving it a zero size. Signed-off-by: Bjorn Helgaas Cc: "Antonino A. Daplas" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d702ccb342e49f7591df5a87c3857c698183b0fa tree 4bc01a35030827a238c0822d74995b37efa4d9f7 parent 0feae5c47aabdde59cbbec32d150e17102de37f0 author Andrew Morton Thu, 22 Jun 2006 14:47:31 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:57 -0700 [PATCH] prune_one_dentry() tweaks - Add description of d_lock handling to comments over prune_one_dentry(). - It has three callsites - uninline it, saving 200 bytes of text. Cc: Jan Blunck Cc: Kirill Korotaev Cc: Olaf Hering Cc: Balbir Singh Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0feae5c47aabdde59cbbec32d150e17102de37f0 tree 244f742d943a0516921180b840419fdc329075f0 parent de047c1bcd7f7bcfbdc29eb5b439fb332594da3f author NeilBrown Thu, 22 Jun 2006 14:47:28 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:57 -0700 [PATCH] Fix dcache race during umount The race is that the shrink_dcache_memory shrinker could get called while a filesystem is being unmounted, and could try to prune a dentry belonging to that filesystem. If it does, then it will call in to iput on the inode while the dentry is no longer able to be found by the umounting process. If iput takes a while, generic_shutdown_super could get all the way though shrink_dcache_parent and shrink_dcache_anon and invalidate_inodes without ever waiting on this particular inode. Eventually the superblock gets freed anyway and if the iput tried to touch it (which some filesystems certainly do), it will lose. The promised "Self-destruct in 5 seconds" doesn't lead to a nice day. The race is closed by holding s_umount while calling prune_one_dentry on someone else's dentry. As a down_read_trylock is used, shrink_dcache_memory will no longer try to prune the dentry of a filesystem that is being unmounted, and unmount will not be able to start until any such active prune_one_dentry completes. This requires that prune_dcache *knows* which filesystem (if any) it is doing the prune on behalf of so that it can be careful of other filesystems. shrink_dcache_memory isn't called it on behalf of any filesystem, and so is careful of everything. shrink_dcache_anon is now passed a super_block rather than the s_anon list out of the superblock, so it can get the s_anon list itself, and can pass the superblock down to prune_dcache. If prune_dcache finds a dentry that it cannot free, it leaves it where it is (at the tail of the list) and exits, on the assumption that some other thread will be removing that dentry soon. To try to make sure that some work gets done, a limited number of dnetries which are untouchable are skipped over while choosing the dentry to work on. I believe this race was first found by Kirill Korotaev. Cc: Jan Blunck Acked-by: Kirill Korotaev Cc: Olaf Hering Acked-by: Balbir Singh Signed-off-by: Neil Brown Signed-off-by: Balbir Singh Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de047c1bcd7f7bcfbdc29eb5b439fb332594da3f tree ff0d52044559971b8d68aaeb00fc7b6a876b3a3d parent c89681ed7d0e4a61d35bdc12c06c6733b718b2cb author Ravikiran G Thirumalai Thu, 22 Jun 2006 14:47:26 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:57 -0700 [PATCH] avoid tasklist_lock at getrusage for multithreaded case too Avoid taking tasklist_lock for at getrusage for the multithreaded case too. We don't need to take the tasklist lock for thread traversal of a process since Oleg's do-__unhash_process-under-siglock.patch and related work. Signed-off-by: Ravikiran Thirumalai Cc: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c89681ed7d0e4a61d35bdc12c06c6733b718b2cb tree 170d7c54d578480ba231dd690243aa21067ca253 parent 09d967c6f32b35eab15b45862ae16e4f06259d8e author Miklos Szeredi Thu, 22 Jun 2006 14:47:22 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:57 -0700 [PATCH] remove steal_locks() This patch removes the steal_locks() function. steal_locks() doesn't work correctly with any filesystem that does it's own lock management, including NFS, CIFS, etc. In addition it has weird semantics on local filesystems in case tasks sharing file-descriptor tables are doing POSIX locking operations in parallel to execve(). The steal_locks() function has an effect on applications doing: clone(CLONE_FILES) /* in child */ lock execve lock POSIX locks acquired before execve (by "child", "parent" or any further task sharing files_struct) will after the execve be owned exclusively by "child". According to Chris Wright some LSB/LTP kind of suite triggers without the stealing behavior, but there's no known real-world application that would also fail. Apps using NPTL are not affected, since all other threads are killed before execve. Apps using LinuxThreads are only affected if they - have multiple threads during exec (LinuxThreads doesn't kill other threads, the app may do it with pthread_kill_other_threads_np()) - rely on POSIX locks being inherited across exec Both conditions are documented, but not their interaction. Apps using clone() natively are affected if they - use clone(CLONE_FILES) - rely on POSIX locks being inherited across exec The above scenarios are unlikely, but possible. If the patch is vetoed, there's a plan B, that involves mostly keeping the weird stealing semantics, but changing the way lock ownership is handled so that network and local filesystems work consistently. That would add more complexity though, so this solution seems to be preferred by most people. Signed-off-by: Miklos Szeredi Cc: Trond Myklebust Cc: Matthew Wilcox Cc: Chris Wright Cc: Christoph Hellwig Cc: Steven French Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09d967c6f32b35eab15b45862ae16e4f06259d8e tree 9fca9dda390612041f857a33cb746fe1eb28b60a parent 0e5b3781591cc954037c08ef78edf7f1192d38c5 author OGAWA Hirofumi Thu, 22 Jun 2006 14:47:21 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:57 -0700 [PATCH] Fix a race condition between ->i_mapping and iput() This race became a cause of oops, and can reproduce by the following. while true; do dd if=/dev/zero of=/dev/.static/dev/hdg1 bs=512 count=1000 & sync done This race condition was between __sync_single_inode() and iput(). cpu0 (fs's inode) cpu1 (bdev's inode) ----------------- ------------------- close("/dev/hda2") [...] __sync_single_inode() /* copy the bdev's ->i_mapping */ mapping = inode->i_mapping; generic_forget_inode() bdev_clear_inode() /* restre the fs's ->i_mapping */ inode->i_mapping = &inode->i_data; /* bdev's inode was freed */ destroy_inode(inode); if (wait) { /* dereference a freed bdev's mapping->host */ filemap_fdatawait(mapping); /* Oops */ Since __sync_single_inode() is only taking a ref-count of fs's inode, the another process can be close() and freeing the bdev's inode while writing fs's inode. So, __sync_signle_inode() accesses the freed ->i_mapping, oops. This patch takes a ref-count on the bdev's inode for the fs's inode before setting a ->i_mapping, and the clear_inode() of the fs's inode does iput() on the bdev's inode. So if the fs's inode is still living, bdev's inode shouldn't be freed. Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e5b3781591cc954037c08ef78edf7f1192d38c5 tree 252bc504e76564f232bd889481212eb53d407049 parent bec0e85910b95c325a008ead7c3bbe047cc39672 author Brice Goglin Thu, 22 Jun 2006 14:47:20 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:56 -0700 [PATCH] PCI: Add PCI_CAP_ID_VNDR Add the vendor-specific extended capability PCI_CAP_ID_VNDR. It is required by the Myri-10G Ethernet driver. Signed-off-by: Brice Goglin Signed-off-by: Greg Kroah-Hartman Cc: Jeff Garzik Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bec0e85910b95c325a008ead7c3bbe047cc39672 tree 06628df44497bbcd17c7aadd2932f30d8170c8cb parent 6cc0719181a7aa8883855140541e7892250e66af author Andrew Morton Thu, 22 Jun 2006 14:47:19 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:56 -0700 [PATCH] myri10ge build fix Someone changed skb_linearize(). Cc: Brice Goglin Cc: "David S. Miller" Cc: Jeff Garzik Cc: Herbert Xu Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6cc0719181a7aa8883855140541e7892250e66af tree e5c740230abef71bb4d8367b68602fd294284e89 parent 04c567d9313e4927b9835361d8ac0318ce65af6b author Andrew Morton Thu, 22 Jun 2006 14:47:18 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:56 -0700 [PATCH] suspend_console() warning fix kernel/power/main.c: In function 'suspend_prepare': kernel/power/main.c:89: warning: implicit declaration of function 'suspend_console' kernel/power/main.c: In function 'suspend_finish': kernel/power/main.c:137: warning: implicit declaration of function 'resume_console' Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04c567d9313e4927b9835361d8ac0318ce65af6b tree d040ef59337342603f2cc30917493fb6a74a212a parent d720024e94de4e8b7f10ee83c532926f3ad5d708 author David Howells Thu, 22 Jun 2006 14:47:18 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:56 -0700 [PATCH] Keys: Fix race between two instantiators of a key Add a revocation notification method to the key type and calls it whilst the key's semaphore is still write-locked after setting the revocation flag. The patch then uses this to maintain a reference on the task_struct of the process that calls request_key() for as long as the authorisation key remains unrevoked. This fixes a potential race between two processes both of which have assumed the authority to instantiate a key (one may have forked the other for example). The problem is that there's no locking around the check for revocation of the auth key and the use of the task_struct it points to, nor does the auth key keep a reference on the task_struct. Access to the "context" pointer in the auth key must thenceforth be done with the auth key semaphore held. The revocation method is called with the target key semaphore held write-locked and the search of the context process's keyrings is done with the auth key semaphore read-locked. The check for the revocation state of the auth key just prior to searching it is done after the auth key is read-locked for the search. This ensures that the auth key can't be revoked between the check and the search. The revocation notification method is added so that the context task_struct can be released as soon as instantiation happens rather than waiting for the auth key to be destroyed, thus avoiding the unnecessary pinning of the requesting process. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d720024e94de4e8b7f10ee83c532926f3ad5d708 tree 8f21613c29a26bfbeb334cb0104b8b998b09fbdc parent f893afbe1262e27e91234506f72e17716190dd2f author Michael LeMay Thu, 22 Jun 2006 14:47:17 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:55 -0700 [PATCH] selinux: add hooks for key subsystem Introduce SELinux hooks to support the access key retention subsystem within the kernel. Incorporate new flask headers from a modified version of the SELinux reference policy, with support for the new security class representing retained keys. Extend the "key_alloc" security hook with a task parameter representing the intended ownership context for the key being allocated. Attach security information to root's default keyrings within the SELinux initialization routine. Has passed David's testsuite. Signed-off-by: Michael LeMay Signed-off-by: David Howells Signed-off-by: James Morris Acked-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f893afbe1262e27e91234506f72e17716190dd2f tree 4352204e9c53e278f7d494d2564f8ae78244feef parent 5d2170ad1092b2940138dc3ae4a944d7bf87ae9e author Anton Altaparmakov Thu, 22 Jun 2006 14:47:15 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:55 -0700 [PATCH] NTFS: Critical bug fix (affects MIPS and possibly others) Many thanks to Pauline Ng for the detailed bug report and analysis! Signed-off-by: Anton Altaparmakov Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d2170ad1092b2940138dc3ae4a944d7bf87ae9e tree aa06fc77266eff805b97e9f44fc35783f8f34c73 parent 7f98a44b9d09580036da7e7f8b33e66f411cf374 author Al Viro Thu, 22 Jun 2006 14:47:14 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:55 -0700 [PATCH] sparc build breakage rd_prompt et.al. depend on CONFIG_BLK_DEV_RAM, not CONFIG_BLK_INITRD; now that those are independent, setup.c blows with INITRD on and BLK_DEV_RAM off. Signed-off-by: Al Viro Cc: "David S. Miller" Cc: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f98a44b9d09580036da7e7f8b33e66f411cf374 tree d2200ab2fe158e696bcbde408cf4355f91f8d025 parent 0dad31d2da706ef114bc5c21123123be2f405d5b author Jeff Dike Thu, 22 Jun 2006 14:47:09 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:55 -0700 [PATCH] UML: fix wall_to_monotonic initialization Change a variable from unsigned to signed in order to get sign-extension when the thing is negated. Without this, uptime is horribly confused. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02916526133aebc0b3b6c486d1b0af95221033bd tree 7ff94b83c7affd3d254e4c225e972c457a76ebbc parent 823588c18689ddd49d4643eda7654302f18a275f author Ben Dooks Thu, 22 Jun 2006 22:57:54 +0100 committer Russell King Thu, 22 Jun 2006 22:57:54 +0100 [ARM] 3629/1: S3C24XX: fix missing bracket in regs-dsc.h Patch from Ben Dooks Fix missing bracket in include/asm-arm/arch-s3c2410/regs-dsc.h Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 823588c18689ddd49d4643eda7654302f18a275f tree 3cd555063265808fdf2b5c3375f27d32148bf822 parent fa3e686a34f4c33de31a128cc36def0b466bfe1a author Kevin Hilman Thu, 22 Jun 2006 22:27:14 +0100 committer Russell King Thu, 22 Jun 2006 22:27:14 +0100 [ARM] 3537/1: Rework DMA-bounce locking for finer granularity Patch from Kevin Hilman This time with IRQ versions of locks. Rework also enables compatability with realtime-preemption patch. With the current locking via interrupt disabling, under RT, potentially sleeping functions can be called with interrupts disabled. Signed-off-by: Kevin Hilman Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit fa3e686a34f4c33de31a128cc36def0b466bfe1a tree 7fb7bccf367a6d796fcf5751e5b3d901cbe91818 parent e22b04fb6b1689aee208b65966fa9fb19e098006 author Pavel Pisa Thu, 22 Jun 2006 22:21:03 +0100 committer Russell King Thu, 22 Jun 2006 22:21:03 +0100 [ARM] 3601/1: i.MX/MX1 DMA error handling for signaled channels only Patch from Pavel Pisa There has been bug, that dma_err_handler() touches even channels not signaling error condition. Problem noticed by Andrea Paterniani. Signed-off-by: Pavel Pisa Signed-off-by: Russell King commit e22b04fb6b1689aee208b65966fa9fb19e098006 tree 4b55d6133cfa7aa5e2e8f3d8909f8e2ed98c19d8 parent df6934b33c43a3ad517244935fe9c19715d9dc15 author Rod Whitby Thu, 22 Jun 2006 22:21:02 +0100 committer Russell King Thu, 22 Jun 2006 22:21:02 +0100 [ARM] 3597/1: ixp4xx/nslu2: Board support for new LED subsystem Patch from Rod Whitby This patch implements NEW_LEDS support for the Linksys NSLU2. The NSLU2 has four LED indicators, which are the only form of output for an unmodified device - there is no keyboard or display on an NSLU2. For an NSLU2 which has been modified to bring out the serial port console, it is important to register that device first separately, to enable debugging of other device support. Signed-off-by: John Bowler Signed-off-by: Rod Whitby Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit df6934b33c43a3ad517244935fe9c19715d9dc15 tree 6a8a6c66182e98466472aa4ab195e39ead6b1bb2 parent f606a6ff222dc7dceeb4d0e214ce4f55d9c6b0e6 author Rod Whitby Thu, 22 Jun 2006 22:21:01 +0100 committer Russell King Thu, 22 Jun 2006 22:21:01 +0100 [ARM] 3595/1: ixp4xx/nas100d: Board support for new LED subsystem Patch from Rod Whitby This patch implements NEW_LEDS support for the IOMega NAS100d. The NAS100d has three LED indicators, which are the only form of output for an unmodified device - there is no keyboard or display on an NAS100d. For an NAS100d which has been modified to bring out the serial port console, it is important to register that device first separately, to enable debugging of other device support. Signed-off-by: John Bowler Signed-off-by: Rod Whitby Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit f606a6ff222dc7dceeb4d0e214ce4f55d9c6b0e6 tree 6a44374b8085d5523743268f67bae7fd70e25a43 parent 92b7eb8ffc0741f1fd5fbd5458a466d608310442 author Nicolas Pitre Thu, 22 Jun 2006 22:18:45 +0100 committer Russell King Thu, 22 Jun 2006 22:18:45 +0100 [ARM] 3626/1: ARM EABI: fix syscall restarting Patch from Nicolas Pitre The RESTARTBLOCK case currently store some code on the stack to invoke sys_restart_syscall. However this is ABI dependent and there is a mismatch with the way __NR_restart_syscall gets defined when the kernel is compiled for EABI. There is also a long standing bug in the thumb case since with OABI the __NR_restart_syscall value includes __NR_SYSCALL_BASE which should not be the case for Thumb syscalls. Credits to Yauheni Kaliuta for finding the EABI bug. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 92b7eb8ffc0741f1fd5fbd5458a466d608310442 tree 55b34b892da1a64f62d7ae922c75fa903247e208 parent 99c13853ffa26dd6527995b3f47548e075f201fb author Ben Dooks Thu, 22 Jun 2006 22:18:21 +0100 committer Russell King Thu, 22 Jun 2006 22:18:21 +0100 [ARM] 3628/1: S3C24XX: add get_rate call to struct clk Patch from Ben Dooks Add a get_rate call to allow an given clock to over-ride the clk_get_rate() call. This provides support for clocks which rely on division of their parent to correctly report their frequency when the parent can also change. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 99c13853ffa26dd6527995b3f47548e075f201fb tree b007bb3e79739f7f442daa00f92a34b1348cd29b parent a341305e94982c66a2e94125a24b860605da9066 author Ben Dooks Thu, 22 Jun 2006 22:18:20 +0100 committer Russell King Thu, 22 Jun 2006 22:18:20 +0100 [ARM] 3627/1: S3C24XX: split s3c2410 clocks from core clocks Patch from Ben Dooks Split the s3c2410 specific clocks from the core clock code, as part of the work to support more of the Samsung line of SoCs. The patch does not use the sysdev mechanism as the clocks are needed for the timer init, which is very early in the kernel init sequence. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a341305e94982c66a2e94125a24b860605da9066 tree 762cf31353b711f9ec12482d9823fa71a6ae18b8 parent 005b5e4d0c7795d2ec298c34c96cbe2c1e1902b0 author Ben Dooks Thu, 22 Jun 2006 22:18:13 +0100 committer Russell King Thu, 22 Jun 2006 22:18:13 +0100 [ARM] 3613/1: S3C2410: Add sysdev and sysclass Patch from Ben Dooks The S3C2440 and S3C2442 both have their own sysdev and sysclass for differentiating them from the currently default S3C2410. Add a sysdev for the S3C2410 as part of the work to make the code be non-dependant on the S3C2410. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 0dad31d2da706ef114bc5c21123123be2f405d5b tree 83082c94a5c6fada0827cbaf98cc9d3cd44aca2c parent 607c0fbee7272be4d5455d6b29f6ffb092573eff author Jaroslav Kysela Thu, 22 Jun 2006 21:35:11 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:35:11 +0200 [ALSA] version 1.0.12rc1 commit 607c0fbee7272be4d5455d6b29f6ffb092573eff tree 1fbb30f4997ef7c50de8ec07590af31dcf3c1dd2 parent 5885492ab4fb18c155000d12f920754f7f35fbab author Jaroslav Kysela Thu, 22 Jun 2006 17:49:58 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:44 +0200 [ALSA] aoa driver - Kconfig - remove spaces for SND!=n Signed-off-by: Jaroslav Kysela commit 5885492ab4fb18c155000d12f920754f7f35fbab tree 7dbb41d41ebc7ec3f5240e2d44e5f17c20f0476a parent 45df379798b5c3b2ea937735ef04c58ce0f532a7 author Takashi Iwai Wed, 21 Jun 2006 19:19:25 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:43 +0200 [ALSA] hda-codec - Show EAPD and pin-detection capabilities in proc Show EAPD and pin-detection capabilities in proc files. They are often required to support the proper audio functionality. Signed-off-by: Takashi Iwai commit 45df379798b5c3b2ea937735ef04c58ce0f532a7 tree 3deab42967800920543f7d6d3dfdae2cdda595cd parent 555fdc2e9fb2071fdd10ff1d86b8d63265d80241 author Takashi Iwai Wed, 21 Jun 2006 16:37:54 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:42 +0200 [ALSA] Remove nested mutexes in seq_ports.c Removed nested mutexes in the removal routine of port connections. The port is guaranteed to be offline before calling it, so no mutex is needed. Signed-off-by: Takashi Iwai commit 555fdc2e9fb2071fdd10ff1d86b8d63265d80241 tree f29396055538d16fcaef1c728c1152ffeef00f0b parent 55c385ad5e1f3cda887cd6a8ad69a6d74b4b9125 author Takashi Iwai Wed, 21 Jun 2006 16:23:31 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:41 +0200 [ALSA] Remove ppc/toonie.c Remove obsoleted ppc/toonie.c. The function is replaced with new snd-aoa driver. Signed-off-by: Takashi Iwai commit 55c385ad5e1f3cda887cd6a8ad69a6d74b4b9125 tree a15a2e0134adae10e76eca5434be29a0115011a0 parent f3d9478b2ce468c3115b02ecae7e975990697f15 author Johannes Berg Wed, 21 Jun 2006 15:43:44 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:39 +0200 [ALSA] snd-powermac: no longer handle anything with a layout-id property This patch removes from snd-powermac the code that check for the layout-id and instead adds code that makes it refuse loading when a layout-id property is present, nothing that snd-aoa should be used. It also removes the 'toonie' codec from snd-powermac which was only ever used on the mac mini which has a layout-id property. Signed-off-by: Johannes Berg Signed-off-by: Takashi Iwai commit f3d9478b2ce468c3115b02ecae7e975990697f15 tree 8397671cbf251c54bf539016468164e08d0c45ee parent 41f0cd3a0c4c6547860cf3b1c2d7968008e6c071 author Johannes Berg Wed, 21 Jun 2006 15:42:43 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:38 +0200 [ALSA] snd-aoa: add snd-aoa This large patch adds all of snd-aoa. Consisting of many modules, it currently replaces snd-powermac for all layout-id based machines and handles many more (for example new powerbooks and powermacs with digital output that previously couldn't be used at all). It also has support for all layout-IDs that Apple has (judging from their Info.plist file) but not all are tested. The driver currently has 2 known regressions over snd-powermac: * it doesn't handle powermac 7,2 and 7,3 * it doesn't have a DRC control on snapper-based machines I will fix those during the 2.6.18 development cycle. Signed-off-by: Johannes Berg Signed-off-by: Takashi Iwai commit 41f0cd3a0c4c6547860cf3b1c2d7968008e6c071 tree e67dac0f4844d03fa243398696ce00fa09f7bf2c parent 6dac9a65f05600bc29316e3cf3365236efe69041 author Takashi Iwai Wed, 21 Jun 2006 12:14:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:34 +0200 [ALSA] hda-codec - Use 3stack model for ASUS P5RD2-VM / P5GPL-X SE Use 3stack model as default for ASUS P5RD2-VM and P5GPL-X SE boards with AD1986A codec (ALSA bug#2103). Signed-off-by: Takashi Iwai commit 6dac9a65f05600bc29316e3cf3365236efe69041 tree 992d3f9c3f9b8a778ab2647f034ecfa8efd3d08e parent c4a87ef4de9860d00460dce30776f7cc17e77459 author Daniel T Chen Wed, 21 Jun 2006 08:51:07 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:32 +0200 [ALSA] HDA - Lenovo 3000 N100-07684JU - enable laptop-eapd by default Justin Sunseri reports that sound is audible on his Lenovo 3000 N100-07684JU by passing 'model=laptop-eapd' to modprobe, so this patch adds the pci ids for his sound device to patch_analog.c . This commit closes LP#39517. Alexey Parshin also confirmed the fix at http://bugs.gentoo.org/137245 TODO: Mute onboard speakers when device is plugged into the headphone jack. Muting the 'External Amplifier' mixer element while a device is plugged into the headphone jack allows sound to be played only from the headphone jack. From: Daniel T Chen Signed-off-by: Daniel T Chen Signed-off-by: Daniel Drake Signed-off-by: Jaroslav Kysela commit c4a87ef4de9860d00460dce30776f7cc17e77459 tree 3cb5fc7db428e75e1c8545f890d76b11390465a2 parent 1561f09a2f91bc258a72225f919807c9e51c8290 author Ben Williamson Mon, 19 Jun 2006 17:20:09 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:31 +0200 [ALSA] USB midi: Remove duplicate CS_AUDIO_* #defines Removed the CS_AUDIO_* #defines, which were duplicates of the class-specific USB_DT_CS_* #defines in . Signed-off-by: Ben Williamson Signed-off-by: Takashi Iwai commit 1561f09a2f91bc258a72225f919807c9e51c8290 tree f045d98be38fd0a113b7f48c970ae66b26d26839 parent 1459c7849ea24fd71e4d2e678caa1cc3fef754e2 author Jaya Kumar Mon, 19 Jun 2006 15:06:14 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:30 +0200 [ALSA] AD1888 suspend/resume fix This patch adds a write to an undocumented register, 0x60 Extended Codec Register Page in the AD1888 codec. It is neccessary in order to make suspend/resume work with the AD1888. Signed-off-by: Jaya Kumar Signed-off-by: Takashi Iwai commit 1459c7849ea24fd71e4d2e678caa1cc3fef754e2 tree 9faaca96c655768056850706a82ac5bb4ffc1f80 parent 396f739e21f3b7ea9ece08bf0abf0a45693c3047 author Rodolfo Giometti Mon, 19 Jun 2006 15:04:54 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:29 +0200 [ALSA] Disable AC97 AUX and VIDEO controls for WM9705 touchscreen This patch by Rodolfo Giometti disables the AC97 AUX and VIDEO controls on the WM9705 when the touchscreen is selected as the AUX and VIDEO lines are shared with the touch controller. Changes:- o Added AC97_HAS_NO_AUX flag o Test for AC97_HAS_NO_AUX flag in snd_ac97_mixer_build() o Sets AC97_HAS_NO_VIDEO and AC97_HAS_NO_AUX in patch_wolfson05() when WM9705 touch driver is selected. Signed-off-by: Rodolfo Giometti Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai commit 396f739e21f3b7ea9ece08bf0abf0a45693c3047 tree 37c7c55a90858c49b9be9d311e457af938cbaf81 parent d4199f01750f3fa6a5b8bacdac9bd0051fee95ef author Karsten Wiese Mon, 19 Jun 2006 13:22:52 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:27 +0200 [ALSA] via82xx - Default to variable samplerate enabled for MSI K8T Neo2-FI Default to variable samplerate enabled for MSI K8T Neo2-FI No crackles here with 44100. Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai commit d4199f01750f3fa6a5b8bacdac9bd0051fee95ef tree 0230ed321fe62b22646c94b175ede789e7e3fcf0 parent 1781a9af1d95256ed45abac4b0b87f48f64b9b87 author Daniel T Chen Fri, 16 Jun 2006 16:21:54 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:26 +0200 [ALSA] Add hp_only quirk for pci id [161f:2032] to via82xx http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=eae2cc78de39502595f67b7fc1f821f5963bb8ae UpstreamStatus: Not merged Christian Bjalevik reports in LP#38546 that his sound chipset requires the 'hp_only' quirk to allow him to control sound volume correctly when headphones are inserted. This patch adds the appropriate pci id to the via82xx ALSA driver so that the quirk is applied automatically, thereby removing the need for users to modify /etc/modprobe.d/alsa-base (or to unload and reload snd-via82xx with ac97_quirk=hp_only). This patch closes LP#38546. Signed-off-by: Daniel T Chen Signed-off-by: Ben Collins Signed-off-by: Takashi Iwai commit 1781a9af1d95256ed45abac4b0b87f48f64b9b87 tree 793af6d1aab74b41c6db1b893d2e59a906d43fcb parent 40a4f7a014339712a9f81b5fad99558611e99ca1 author Daniel T Chen Fri, 16 Jun 2006 12:13:00 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:25 +0200 [ALSA] sound/pci/: Add hp_only quirk for Dell D800 laptops http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=9ad787cd9670c3f3b8f3db235e84baf00a2ea526 Anders Ostling comments in Malone #41015 that his Dell D800 laptop's volume control works correctly when the hp_only quirk is passed to modprobe. This commit adds his hardware's sub{vendor,device} ids to the quirk list for the intel8x0 driver. Signed-off-by: Daniel T Chen Signed-off-by: Ben Collins Signed-off-by: Takashi Iwai commit 40a4f7a014339712a9f81b5fad99558611e99ca1 tree 95fb440b2ea037f265ef5d9c384548f11df881b3 parent 63eb1e4bd2975f1d1102c1f44e4fd6fcd76f7792 author Jaya Kumar Tue, 13 Jun 2006 12:01:14 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:24 +0200 [ALSA] cs5535audio - trivial debug printk Following is a trivial patch to get more info for boards where the AC97_VENDOR_ID2 register (or others) time out. Signed-off-by: Jaya Kumar Signed-off-by: Takashi Iwai commit 63eb1e4bd2975f1d1102c1f44e4fd6fcd76f7792 tree 6768bcbdfba41b7e4a79f5faee5d4f117e076321 parent 6540dffa6ecfe0d99fb263548dcc4b35ccefe784 author Jesper Juhl Tue, 13 Jun 2006 11:58:12 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:22 +0200 [ALSA] fix potential NULL pointer deref in snd_sb8dsp_midi_interrupt() First testing if a pointer is NULL and if it is (or might be), proceeding with code that dereferences that same pointer is clearly a mistake. This happens in sound/isa/sb/sb8_midi.c::snd_sb8dsp_midi_interrupt() The patch below reworks the code so this unfortunate case doesn't happen. Also remove some blank comments. Found by the Coverity checker as bug #367 Patch is compile testted only due to lack of hardware. Signed-off-by: Jesper Juhl Signed-off-by: Takashi Iwai commit 6540dffa6ecfe0d99fb263548dcc4b35ccefe784 tree 45aab0273192703d269578bf35f3b9fed9ef9bcb parent 70c5acbdcc7bb1651bb166f9e4b2345759a9fb18 author Takashi Iwai Tue, 13 Jun 2006 11:57:22 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:21 +0200 [ALSA] hda-codec - Add SPDIF support to Thinkpad T/X/Z60 Added IEC958 (SPDIF) output support to Thinkpad T/X/Z60 with AD1981HD codec. The spdif jack is on docking station. Also, renamed 'IEC958 Playback Route' to 'IEC958 Playback Source' to avoid the mixer name confliction with IEC958 switch. Signed-off-by: Takashi Iwai commit 70c5acbdcc7bb1651bb166f9e4b2345759a9fb18 tree 534753139efe08d6abbf4140063a6b0a74f227e7 parent ecb594e66e740dc390a301768d89662777f1fde2 author Jaya Kumar Mon, 12 Jun 2006 10:08:02 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:20 +0200 [ALSA] ac97_codec - fix duplicate control creation in AC97 This patch conditions AC97 control creation by whether or not the codec is an AD18xx codec. This fixes the case where the default control would get created and then snd_ac97_mixer_build fails out when creation of ad18xx specific control would get attempted. This problem was found and debuged by Marcelo Tosatti. Signed-off-by: Jaya Kumar Signed-off-by: Jaroslav Kysela commit ecb594e66e740dc390a301768d89662777f1fde2 tree c5f2e55e3e0e2e9f9693e9e56ef9002b59b311c1 parent 58398895663f855aa32b440b164c426cfae4450c author Remy Bruno Mon, 12 Jun 2006 09:25:22 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:19 +0200 [ALSA] RME HDSP - fixed proc interface (missing {}) From: Remy Bruno Signed-off-by: Jaroslav Kysela commit 58398895663f855aa32b440b164c426cfae4450c tree 6102d88c3ba683f9c634c35e067114a83e5db627 parent 2e74eba3e2f000184ade92833c80e799af41c180 author James Courtier-Dutton Sat, 10 Jun 2006 09:16:49 +0100 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:18 +0200 [ALSA] snd-ca0106: Update playback to 24bit. Fix typo is comment. Signed-off-by: James Courtier-Dutton commit 2e74eba3e2f000184ade92833c80e799af41c180 tree a83010a86190b9bf57e28352898e32acb4679e33 parent 3f3488b84c261ab3cb64b9f0b9f40b61e33edb98 author Takashi Iwai Fri, 09 Jun 2006 15:28:07 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:17 +0200 [ALSA] Fix invalid __init in ALSA ISA drivers Replaced invalid __init with __devinit in snd-sbawe and snd-opl3sa2 drivers. Signed-off-by: Takashi Iwai commit 3f3488b84c261ab3cb64b9f0b9f40b61e33edb98 tree 77a233779dbbe27fc4bcbf43427f377751da31fa parent 3758d4e601552a3d9066913a31ccb8dc6a25ee69 author Randy Dunlap Thu, 08 Jun 2006 12:01:44 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:15 +0200 [ALSA] sound/vxpocket: fix printk warning Fix printk format warning: sound/pcmcia/vx/vxp_ops.c:205: warning: format '%x' expects type 'unsigned int', but argument 5 has type 'size_t' Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai commit 3758d4e601552a3d9066913a31ccb8dc6a25ee69 tree 715613a222b5d6abd47973a225191eecbcf11cc4 parent 688956f23bdbfb1c3551bfafc819f989b36bb8ae author Takashi Iwai Wed, 07 Jun 2006 18:12:31 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:14 +0200 [ALSA] Remove bogus check of mmap_count in snd_pcm_release() Removed a bogus check of mmap_count in snd_pcm_release(). This is no longer true for the shared streams. Signed-off-by: Takashi Iwai commit 688956f23bdbfb1c3551bfafc819f989b36bb8ae tree ae59fdf7662b5a27c66554cbfd2b67c49fc156da parent c5533bf36b4a6629dab0e08c4951247050928853 author Takashi Iwai Tue, 06 Jun 2006 15:44:34 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:13 +0200 [ALSA] Fix races in irq handler and ioremap Call ioremap before request_irq for avoiding possible races in the irq handler. Signed-off-by: Takashi Iwai Signed-off-by: Takashi Iwai commit c5533bf36b4a6629dab0e08c4951247050928853 tree 8ce30e7534a9ca7593ae5609c687fa6a7eb8cc58 parent f8e9f340da753c021c071f318f97ac9046c1316a author Clemens Ladisch Fri, 02 Jun 2006 09:15:44 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:12 +0200 [ALSA] virmidi: revert erroneous removal of zero initialization The last patch that tried to remove zero initializations of static variables accidentally removed a not-quite-zero initialization too. Signed-off-by: Clemens Ladisch commit f8e9f340da753c021c071f318f97ac9046c1316a tree fba37355bdd2abf2a3c4a651265348a764a8456d parent a43c4d4d7326c2894be9fd04519b109c438ee78b author Takashi Iwai Thu, 01 Jun 2006 21:08:53 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:11 +0200 [ALSA] hda-codec - Add model entry for HP nx6320 Added a model entry for HP nx6320 with AD1981HD codec. It wasn't covered by the generic HP entry because of a hardware bug (the SSID is reversed). Signed-off-by: Takashi Iwai commit a43c4d4d7326c2894be9fd04519b109c438ee78b tree 58fb7d478d5f9597b1e4d8cdb4a83aa4b937d00c parent 0a50d2b2951cb7ae12726814f9a198e1c699aa0b author Takashi Iwai Thu, 01 Jun 2006 17:16:41 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:09 +0200 [ALSA] ac97 - Add Thinkpad T41p to AD1981 jack-sense blacklist Added Thinkpad T41p to the blacklist to disable HP/line jack-sensing with AD1981B. The jack-sensing is just harmful on this laptop. Signed-off-by: Takashi Iwai commit 0a50d2b2951cb7ae12726814f9a198e1c699aa0b tree 38197874a92ead9bf652732d2dc03ecafe3bfdaf parent f079c25ab8a7d223875c5bac9b23b484e4a18f88 author Takashi Iwai Thu, 01 Jun 2006 14:47:29 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:08 +0200 [ALSA] Fix possible races in PCI driver removal Call free_irq() before releasing others to avoid races when shared irq is issued. Signed-off-by: Takashi Iwai commit f079c25ab8a7d223875c5bac9b23b484e4a18f88 tree de5d3fbad8b2f9f7ff8b66410ab7eb7a96e63167 parent 29463dfea754b8b360f638244f002c751aaad1b0 author Takashi Iwai Thu, 01 Jun 2006 11:42:14 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:07 +0200 [ALSA] hda-intel - Fix race in remove Call iounmap after free_irq to avoid invalid accesses in the shared irq. The patch is taken from https://bugzilla.novell.com/show_bug.cgi?id=167869 Signed-off-by: Takashi Iwai commit 29463dfea754b8b360f638244f002c751aaad1b0 tree b226ad43a18494c8847812e6ed6234100b745662 parent d20cad602fc3d92902dc3b4ed252359ab05eae0f author Clemens Ladisch Thu, 01 Jun 2006 08:33:48 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:06 +0200 [ALSA] bt87x: add Voodoo TV 200 whitelist entry This adds a whitelist entry for the digital audio input of the Voodoo TV 200. Signed-off-by: Clemens Ladisch commit d20cad602fc3d92902dc3b4ed252359ab05eae0f tree b2a2c5ffd6b94317ea26a7a349d44993d95d6dce parent f26eb78fcfb5b76fbe6d3e740b6fedda611f8395 author Eric Sesterhenn Wed, 31 May 2006 11:55:17 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:05 +0200 [ALSA] NULL pointer dereference in sound/synth/emux/soundfont.c this is about coverity id #100. It seems the if statement is negated, since the else branch calls remove_info() with sflist->currsf as a parameter where it gets dereferenced. Signed-off-by: Eric Sesterhenn Signed-off-by: Takashi Iwai commit f26eb78fcfb5b76fbe6d3e740b6fedda611f8395 tree 7ce241ac9e7b765d2c75e49a9f3f92078bbb5d63 parent cf78ee2ccc96d59e602188e0e6e3fe3522b6d3f6 author Takashi Iwai Mon, 29 May 2006 19:05:28 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:04 +0200 [ALSA] cmipci - Fix a typo in 'PC Speaker Playback Switch' control Fixed a typo in 'PC Speaker Playback Switch' control name. Signed-off-by: Takashi Iwai commit cf78ee2ccc96d59e602188e0e6e3fe3522b6d3f6 tree 027aff68ac7c21c27c86ba99b43a8f2b112f79e0 parent 766a6c36f3a0b12e1c55dddc1df6673db6b22bfb author Alan Horstmann Fri, 26 May 2006 17:19:34 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:02 +0200 [ALSA] ice1712 - Set mpu401 info flags from _card_info To permit use, in ice1712, of the mpu401 info flags recently added to mpu401_uart, adds info_flags in snd_ice1712_card_info so that additional flags can be set, if desired.  'MPU401_INFO_INTEGRATED' is always set with the ice1712.  The flags are passed on to snd_mpu401_uart_new(). _INFO_OUTPUT is set for DMX6fire mpu2. Signed-off-by: Alan Horstmann Signed-off-by: Takashi Iwai commit 766a6c36f3a0b12e1c55dddc1df6673db6b22bfb tree d9691f29148696d85d40e514f22fcc7cd841acad parent c51302710546f075e65b1e70487707e8324abf2f author Takashi Iwai Fri, 26 May 2006 14:58:29 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:01 +0200 [ALSA] hda-codec - Fix model for HP dc7600 Changed the assigned model for HP dc7600 with ALC260 codec to match better with the actual I/O assignment. Patch taken from ALSA bug#2157. Signed-off-by: Takashi Iwai commit c51302710546f075e65b1e70487707e8324abf2f tree 97a25d7fd3ead411ccb8b58bdc4bcb8b3c5fd5b4 parent d5a31b8b6e79145c832d530743ca80bf5f58a965 author Takashi Iwai Tue, 23 May 2006 15:46:10 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:00 +0200 [ALSA] ice1724 - Add functionality for Audiotrak Prodigy 7.1 LT This patch adds support for useable front audio channels, user controllable headphone channel and optical output. From: Anho Ki Signed-off-by: Matt Taylor Signed-off-by: Takashi Iwai commit d5a31b8b6e79145c832d530743ca80bf5f58a965 tree c3e421c6284a64e538162aa68bb15c6566d9f773 parent 721b8a297279276699900a662fa8299232ebc0e8 author Takashi Iwai Tue, 23 May 2006 13:30:59 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:59 +0200 [ALSA] au88x0 - Fix 64bit address of MPU401 MMIO port Fix 64bit address of MPU401 MMIO port on au88x0 chip. Signed-off-by: Takashi Iwai commit 721b8a297279276699900a662fa8299232ebc0e8 tree 26b007f788400ab9a1ba1775954a5050baa56824 parent 302e4c2f9e2b9f07c69649782330a61c60001ac4 author Alan Horstmann Tue, 23 May 2006 13:29:51 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:57 +0200 [ALSA] ice1712 - Disable AC97 for DMX6fire Consumer AC97 is not used by the Terratec DMX6fire, but eeprom bit indicates it is; change the stored value to disable failing consumer mode. Signed-off-by: Alan Horstmann Signed-off-by: Takashi Iwai commit 302e4c2f9e2b9f07c69649782330a61c60001ac4 tree 406d44e355f502ac5e7ee584a28d725c6e7c8a94 parent 140432fd2fbe68d59fe6fcddbcd4bcd0f84e951a author Takashi Iwai Tue, 23 May 2006 13:24:30 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:56 +0200 [ALSA] Change an arugment of snd_mpu401_uart_new() to bit flags Change the 5th argument of snd_mpu401_uart_new() to bit flags instead of a boolean. The argument takes bits that consist of MPU401_INFO_XXX flags. The callers that used the value 1 there are replaced with MPU401_INFO_INTEGRATED. Signed-off-by: Takashi Iwai commit 140432fd2fbe68d59fe6fcddbcd4bcd0f84e951a tree 3c2c1d1791f0bab08146bee76e73855a6ff2699d parent c00bd74a0dd69c4b39e4d95a20253e735616bdb9 author Takashi Iwai Mon, 22 May 2006 14:31:57 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:55 +0200 [ALSA] hdsp - Fix compilation with hdsp driver built in kernel Fixed the compilation with hdsp driver built in kernel. The traditional hwdep loader is used in this case. Signed-off-by: Takashi Iwai commit c00bd74a0dd69c4b39e4d95a20253e735616bdb9 tree a47815bc259c5bc0728e29d76da19a146605bd7f parent 77389b432344c811832962ca7f8181b8b3da3449 author Takashi Iwai Fri, 19 May 2006 19:22:34 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:53 +0200 [ALSA] Fix description of cs5535audio driver in ALSA-Configuration.txt Fix the description of cs5535audio driver in ALSA-Configuraiton.txt. Now it supports only single device. Signed-off-by: Takashi Iwai commit 77389b432344c811832962ca7f8181b8b3da3449 tree 2a48b7ef7e567b35ebb58692b1517acc785f5c22 parent 2851d963e0038c53d2175970daac4217abed7af2 author Jaya Kumar Fri, 19 May 2006 12:04:22 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:52 +0200 [ALSA] Single variables for cs5535audio As per Takashi's feedback, this is a cleanup to make cs5535audio be single device per system. The diff is against 2.6.17-rc4 with Takashi's patch adding the module_params for index, id and enable. Signed-off-by: Jaya Kumar Signed-off-by: Takashi Iwai commit 2851d963e0038c53d2175970daac4217abed7af2 tree f70c36bfe9beeeb8b63d8d576651889c478153ce parent f8c7579051763d6be275bf88a430ffb1c5234bad author Takashi Iwai Thu, 18 May 2006 14:48:26 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:51 +0200 [ALSA] mpu401_uart - Fix coding style and code clean up - fold lines and fix spaces to follow the standard style - added some comments - moved EXPORT_SYMBOL() near the definition - some code clean up Signed-off-by: Takashi Iwai commit f8c7579051763d6be275bf88a430ffb1c5234bad tree 9575641d80d4fd42656ff686cf74914269aaa2a2 parent c77a03551b3fd8ef6434153dfadff83ae404e526 author Takashi Iwai Thu, 18 May 2006 14:47:03 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:50 +0200 [ALSA] usbaudio - Fix a typo Fix a typo introduced by the last fix. Signed-off-by: Takashi Iwai commit c77a03551b3fd8ef6434153dfadff83ae404e526 tree 71d9ca72eb3b6c0898bc4420eaf6c498522db905 parent faf8d11743961c720c85be191f8a08c00e5c5d60 author Alan Horstmann Thu, 18 May 2006 14:24:30 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:49 +0200 [ALSA] Remove ENTER_UART from au88x0 init Remove an unnecessary ENTER_UART instruction during au88x0 init as it makes the first/subsequent midi open to fail. Signed-off-by: Alan Horstmann Signed-off-by: Takashi Iwai commit faf8d11743961c720c85be191f8a08c00e5c5d60 tree c769a20e29e8fa2f43c4f01e410ed502bf9ecdef parent 474167d646cb2147b9fcd7bacf5cdf8177ed43c4 author Clemens Ladisch Thu, 18 May 2006 09:35:15 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:47 +0200 [ALSA] usb-audio: add workaround for CSR Bluetooth Headphones (Saitek A-250) Some devices don't have the required class-specific endpoint descriptors. Instead of making this case an error, this patch makes the driver guess the endpoint attributes. Signed-off-by: Clemens Ladisch commit 474167d646cb2147b9fcd7bacf5cdf8177ed43c4 tree 8b2c6b202b6f419d6e4c9db6beedf679f47b467e parent 6581f4e74d8541dd7d579f64e94822622cbb1654 author Takashi Iwai Wed, 17 May 2006 17:17:43 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:46 +0200 [ALSA] hda-codec - Fix init verbs for ALC260 hp model Use the basic init verbs for ALC260 instead of hp init verbs since hp init verbs seem incomplete and not working on some machines. Signed-off-by: Takashi Iwai commit 6581f4e74d8541dd7d579f64e94822622cbb1654 tree fa7a0609c7a3e0460e052ab54a06a6fa935c64dc parent 0fbf405c583e6ee6d7227eb938a096d0998f7e78 author Takashi Iwai Wed, 17 May 2006 17:14:51 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:45 +0200 [ALSA] Remove zero-initialization of static variables Removed zero-initializations of static variables. A tiny optimization. Signed-off-by: Takashi Iwai commit 0fbf405c583e6ee6d7227eb938a096d0998f7e78 tree 796958578b3bf9c9f0e1da0faa201cfd09fa5a3c parent 9b87819b61060a3d32d5982f5ee998c22ab8ca27 author Takashi Iwai Wed, 17 May 2006 17:10:35 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:43 +0200 [ALSA] Fix pcm-draining of capture stream in PCM middle layer Fix the draining of PCM capture stream in the PCM middle layer. snd_pcm_drain() ignored capture streams, but it should change the state to SNDRV_PCM_DRAINING. Signed-off-by: Takashi Iwai commit 9b87819b61060a3d32d5982f5ee998c22ab8ca27 tree e7141b82856df6e64a06062da505beb6b807dac6 parent 778b6e1b2da260adf3d3254aaa35bffd1eb05b42 author Takashi Iwai Wed, 17 May 2006 11:26:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:42 +0200 [ALSA] Fix description of snd-hda-intel driver in document Fixed the description of snd-hda-intel driver in ALSA-Configuration.txt document. Signed-off-by: Takashi Iwai commit 778b6e1b2da260adf3d3254aaa35bffd1eb05b42 tree e1c55390dd5fc4b791dc9c0962f1c2f721333075 parent e2f872608af7f3c00beaa61ff6037e3cc5a66cf1 author Felix Kuehling Wed, 17 May 2006 11:22:21 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:41 +0200 [ALSA] hda - Add support for the ATI RS600 HDMI audio device Add support for the ATI RS600 HDMI audio device. It has a one-stream pure digital stereo codec that isn't handled by the generic codec support. Signed-off-by: Felix Kuehling Signed-off-by: Takashi Iwai commit e2f872608af7f3c00beaa61ff6037e3cc5a66cf1 tree c14cb26532ea165169f33f19f2bcc20c6472dd97 parent 13769e3f21d6e9c59999c9bf6908278b878d05c5 author Andreas Mohr Wed, 17 May 2006 11:04:19 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:40 +0200 [ALSA] azt3328.c: use kernel coding style Scope braces were not done the One True Kernel Way. Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit 13769e3f21d6e9c59999c9bf6908278b878d05c5 tree 255c4fb239afbd2f6d6f1d4ccb824c81e3d52f82 parent ca54bde3634360afecd0dada9c59399bbe88bd32 author Andreas Mohr Wed, 17 May 2006 11:03:16 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:39 +0200 [ALSA] azt3328.c: add 3D sound mixer switch/rename controls - add 3D sound pre-3D/post-3D switch, as seen in standard AC-97 - rename controls to shorter and more accurate strings Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit ca54bde3634360afecd0dada9c59399bbe88bd32 tree 217d8c5f617da88191552433be734831edb6e6ed parent 746df94898554b3d8e91d855e934852e626c701c author Andreas Mohr Wed, 17 May 2006 11:02:24 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:38 +0200 [ALSA] azt3328.c: add suspend/resume support - add suspend/resume handlers - fix problem (private_data members not set) Playing a file while suspending will resume correctly with this patch, so I assume the hardware to get fully correctly reinitialized with this patch. Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit 746df94898554b3d8e91d855e934852e626c701c tree dc312e426d52804d98080af18f12f5b14010d2e5 parent 0defb2672d7cde8d048eec35c183da7b88adbd9e author Takashi Iwai Mon, 15 May 2006 19:49:05 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:37 +0200 [ALSA] Fix rwlock around snd_iprintf() in sound core Fixed rwlock around snd_iprintf() in sound core part. Replaced with mutex. Also, make mutex and flags static variables with addition of snd_card_locked() function (just for sound.c). Signed-off-by: Takashi Iwai commit 0defb2672d7cde8d048eec35c183da7b88adbd9e tree b74310bf01b6b9c117db3b89c7cc655e6fa3701b parent ed7cbe3e4175e5fe9386793fbffee786840d7e9c author Takashi Iwai Thu, 11 May 2006 18:12:23 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:35 +0200 [ALSA] hda-codec - Fix handling of capture controls on ALC882 3/6-stack models Fixed the handling of capture controls on ALC882 3/6-stack models. Now the driver checks the availability of NID 07h. Signed-off-by: Takashi Iwai commit ed7cbe3e4175e5fe9386793fbffee786840d7e9c tree 1dbae20b435a1c90e421a807e78d3c2a314cf205 parent 3206b9ca9fba8dc8d6ddd371a3ff455c67ad137f author Takashi Iwai Thu, 11 May 2006 11:30:10 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:34 +0200 [ALSA] Remove obsolete description from ALSA-Configuration.txt Remove obsolete descriptions about the dependency on CONFIG_ISA for vxpocket and pdaudiocf drivers. Signed-off-by: Takashi Iwai commit 3206b9ca9fba8dc8d6ddd371a3ff455c67ad137f tree f93c8d055685b9562873eb7ade3ed7be8e6895ba parent 2ce7fb579f842f76a0216618c105bffd334d9233 author Takashi Iwai Wed, 10 May 2006 16:33:11 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:33 +0200 [ALSA] hda-codec - Add support for Sony Vaio VGN-S3HP Added the missing support for Sony Vaio VGN-S3HP with ALC260 codec. The patch taken from ALSA bug#2101. Signed-off-by: Takashi Iwai commit 2ce7fb579f842f76a0216618c105bffd334d9233 tree e84026ba0f087b4fdad4edd10d7db5c940b28bf0 parent 62fe78e90dc25b269362034487dc450cd8453e8c author Takashi Iwai Wed, 10 May 2006 16:24:42 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:32 +0200 [ALSA] rme96 - Fix OSS full-duplex Fixed a bug in rme96 driver that the full-duplex on OSS emulation doesn't work due to the invalid period size parameter. Signed-off-by: Takashi Iwai commit 62fe78e90dc25b269362034487dc450cd8453e8c tree eebf3a6431a50c179ffd5d019666bddad4f1cb3e parent 4d1a70dad0e1c44dc0725de6de25aceead48599e author Sam Revitch Wed, 10 May 2006 15:09:17 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:31 +0200 [ALSA] hda-codec - Add support for Apple Mac Mini (early 2006) Add support for some audio quirks of the Apple Mac Mini (early 2006) Signed-off-by: Sam Revitch Signed-off-by: Takashi Iwai commit 4d1a70dad0e1c44dc0725de6de25aceead48599e tree ad34123decaef69bf00e66463911ef20bdb14c25 parent cab5c4c97a98e46359faa52e86787c1f0ccd773c author Raimonds Cicans Fri, 05 May 2006 09:49:53 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:30 +0200 [ALSA] add support for SB Live! 24-Bit External remote control This patch rewrites the remote control code to use a table for the peculiarities of the various SB models, and adds support for a third model. Signed-off-by: Raimonds Cicans Signed-off-by: Clemens Ladisch commit cab5c4c97a98e46359faa52e86787c1f0ccd773c tree 8de8992098044914809cc6ef2d9accdffc90095a parent a7306336e818fe83f08a476c91ae2616e7fb209f author Takashi Iwai Thu, 04 May 2006 14:36:08 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:29 +0200 [ALSA] cmipci - Disable integrated mpu401 as default Enable the support of mpu401 PCI port only when mpu_port=1 module option is given, i.e. disabled as default. It turned out that the check of integrated midi port isn't perfect and caused hang-ups on some boards. Signed-off-by: Takashi Iwai commit a7306336e818fe83f08a476c91ae2616e7fb209f tree 6c207d342785854d8592f4a9523847ee6d0b94c0 parent 520290e43f9880da34e542185838816c6d79a340 author Takashi Iwai Thu, 04 May 2006 11:58:43 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:28 +0200 [ALSA] Fix a typo in writing-an-alsa-driver document Fixed a typo in writing-an-alsa-driver document. Signed-off-by: Takashi Iwai commit 520290e43f9880da34e542185838816c6d79a340 tree bf98333a95a459ea41dbe05b5d56785061ae3525 parent a59524faf3a2050e14a1c9038eb006ce96025394 author Alan Horstmann Wed, 03 May 2006 17:07:29 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:26 +0200 [ALSA] au88x0 - Init before create components Change the order in vortex_probe to set the card details before creating the components, meaning for example that card->shortname is available when registering the midi port. I have also added extra to card->shortname, and a line to overwrite the midi name following snd_mpu401_uart_new. Signed-off-by: Alan Horstmann Signed-off-by: Takashi Iwai commit a59524faf3a2050e14a1c9038eb006ce96025394 tree e4af56b4c6a0a5521bfe04cafb871bdc80b5c8e9 parent a9393d70e564e4afe0333b1e26dda48af8b9305e author Matt Porter Wed, 03 May 2006 14:08:33 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:25 +0200 [ALSA] hda: add sigmatel 9227/9228/9229 ids Adds support for the 9227/9228/9229 sigmatel hda codecs. Signed-off-by: Matt Porter Signed-off-by: Takashi Iwai commit a9393d70e564e4afe0333b1e26dda48af8b9305e tree 0a90f3bd33cf4548ca4b91a930e6b67e6e5704b2 parent 1dbfd8c56bd7366d86e58b3e510a75de93e1978b author Takashi Iwai Wed, 03 May 2006 11:59:03 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:24 +0200 [ALSA] hda-codec - Fix mute switch on VAIO laptops with STAC7661 Fixed the master mute switch on VAIO laptops with STAC7661 codec chip. Signed-off-by: Takashi Iwai commit 1dbfd8c56bd7366d86e58b3e510a75de93e1978b tree 613d0c04d4994925107cf23aa222848d4c6b5ebf parent eed656493a459bbc0fdf687fa8f43f87946d8d3a author Takashi Iwai Tue, 02 May 2006 18:31:31 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:23 +0200 [ALSA] cs5535audio - Add missing module_param*() and MODULE_PARM_DESC() Added missing module_param*() and MODULE_PARM_DESC() for cs5535audio driver. Signed-off-by: Takashi Iwai commit eed656493a459bbc0fdf687fa8f43f87946d8d3a tree acdfe0117c3139dfadd0b2fcb786f5822c416ac2 parent 886da8677d2e4e942fc8984b22bfb8da45e810ec author Takashi Iwai Tue, 02 May 2006 18:22:06 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:22 +0200 [ALSA] Add a workaround for ASUS A6KM Added a workaround for ASUS A6KM board that requires EAPD rather than SPDIF-in. Signed-off-by: Takashi Iwai commit 886da8677d2e4e942fc8984b22bfb8da45e810ec tree cf5da4e27559e406d1b65a19e68ebba56c05751b parent a7b928ac5fcd8e1b5c7c69926d8845b1d0500af3 author Takashi Iwai Tue, 02 May 2006 18:17:57 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:21 +0200 [ALSA] hda-codec - Add support for LG S1 laptop Added the model entry for LG S1 laptop. Signed-off-by: Takashi Iwai commit a7b928ac5fcd8e1b5c7c69926d8845b1d0500af3 tree 8157f37993802f1defa42f2126aca29fda4dd44c parent 450047a78f3c35a905576e121abfbee2ccd45993 author Clemens Ladisch Tue, 02 May 2006 16:22:12 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:20 +0200 [ALSA] rawmidi: add get_port_info callback for sequencer information flags Add a get_port_info callback to the snd_rawmidi_global_ops structure to allow the USB MIDI driver to supply information flags for the sequencer ports created by seq_midi. Signed-off-by: Clemens Ladisch commit 450047a78f3c35a905576e121abfbee2ccd45993 tree 7788c29141fc1dac2c0cb5f2b4799b7c9231c361 parent c97f3dd85490e51ba48782dd0c063cdade352c0d author Clemens Ladisch Tue, 02 May 2006 16:08:41 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:18 +0200 [ALSA] add more sequencer port type information bits Add four new information flags SNDRV_SEQ_PORT_TYPE_HARDWARE, _SOFTWARE, _SYNTHESIZER, _PORT for sequencer ports. This makes it easier for apps like Rosegarden to make policy decisions based on the port type. Signed-off-by: Clemens Ladisch commit c97f3dd85490e51ba48782dd0c063cdade352c0d tree ee2dee73cf5daaabc8acebc2c78f056465d284e4 parent f4a747f155fe375231196ec3d26fcb6e3675d82f author Clemens Ladisch Tue, 02 May 2006 15:50:05 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:17 +0200 [ALSA] fix port type bits Fix the port information about non-MIDI messages that had wrong values for some OPL3 and EmuX ports. Signed-off-by: Clemens Ladisch commit f4a747f155fe375231196ec3d26fcb6e3675d82f tree 1092a52d4df60019270408f01bcafe25870fa020 parent 170a34605c14a90df5f4a78e0b4ca643be6ef8ba author Clemens Ladisch Tue, 02 May 2006 15:33:25 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:16 +0200 [ALSA] fix a wrong lock fix a typo in the info locking code Signed-off-by: Clemens Ladisch commit 170a34605c14a90df5f4a78e0b4ca643be6ef8ba tree b605cca90122ed94b5ea2b01cadebc0d0a2ca629 parent 9c323fcbc51493f79f9700cb20830d0857c72d99 author Takashi Iwai Fri, 28 Apr 2006 15:29:15 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:15 +0200 [ALSA] Fix compile warning in timer.c Fix a compile warning in timer.c due to unused variables. Signed-off-by: Takashi Iwai commit 9c323fcbc51493f79f9700cb20830d0857c72d99 tree 17e17046c0642f918b9516de8d9517914cabd0ad parent 0df63e44c3e315ec0fe427ae62558231864108bd author Takashi Iwai Fri, 28 Apr 2006 15:13:41 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:14 +0200 [ALSA] Fix mmap_count with O_APPEND opened streams Move mmap_count to snd_pcm_substream instead of runtime struct so that multiplly opened substreams via O_APPEND can be handled correctly. Signed-off-by: Takashi Iwai commit 0df63e44c3e315ec0fe427ae62558231864108bd tree 3cff6f5d5fdb7ad047a61c591d891e3ca1bc669e parent f001c3acf64b8ca18fe40af592629abb261b321e author Takashi Iwai Fri, 28 Apr 2006 15:13:41 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:13 +0200 [ALSA] Add O_APPEND flag support to PCM Added O_APPEND flag support to PCM to enable shared substreams among multiple processes. This mechanism is used by dmix and dsnoop plugins. Signed-off-by: Takashi Iwai commit f001c3acf64b8ca18fe40af592629abb261b321e tree 20eeb99fe71d2128e6dcd5cfcb16d73b6315aa81 parent d689e34b524b69c111db0b7c844d71c8e1a53b15 author Takashi Iwai Fri, 28 Apr 2006 15:13:41 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:11 +0200 [ALSA] Insert might_sleep() in snd_iprintf() Inserted might_sleep() in snd_iprintf() for sanity check. Signed-off-by: Takashi Iwai commit d689e34b524b69c111db0b7c844d71c8e1a53b15 tree a37916ba70fd8d37d14bf546a656722fb4ed79ab parent bf850204a71a97eb5a6afaf27263bb667f9cab0a author Takashi Iwai Fri, 28 Apr 2006 15:13:41 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:10 +0200 [ALSA] Remove spinlocks around proc prints Don't lock during showing proc read. snd_iprintf() might sleep. Signed-off-by: Takashi Iwai commit bf850204a71a97eb5a6afaf27263bb667f9cab0a tree 2d917d9886a3488f1524699374d546d8bf6af88e parent 7e4eeec8a30fa9e00cac67a37ca9ddf6cbdb79c4 author Takashi Iwai Fri, 28 Apr 2006 15:13:41 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:09 +0200 [ALSA] Remove unneeded read/write_size fields in proc text ops Remove unneeded read/write_size fields in proc text ops. snd_info_set_text_ops() is fixed, too. Signed-off-by: Takashi Iwai commit 7e4eeec8a30fa9e00cac67a37ca9ddf6cbdb79c4 tree 73e296c11c87e399b32aa9b7714575180bf8b39a parent 2f4ca8e5c7cf6a6f7935483d8ee4aa8b039bdd7d author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:07 +0200 [ALSA] Make buffer size of proc text interface variable Make the read/write buffer size of proc text interface variable. Signed-off-by: Takashi Iwai commit 2f4ca8e5c7cf6a6f7935483d8ee4aa8b039bdd7d tree be79b48cd1d562a17379f0b602034ecacd358446 parent e88e8ae639a4908b903d9406c54e99a729b01a28 author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:06 +0200 [ALSA] Clean up ugly hacks in pcm_lib.c Clean up ugly hacks for sync with alsa-lib code in pcm_lib.c. Also, optimize snd_pcm_hw_params_choose() with a loop. Signed-off-by: Takashi Iwai commit e88e8ae639a4908b903d9406c54e99a729b01a28 tree ff49ba0d2370c3259b055986ebca6487994cf6e2 parent e5e8a1d4618595ea406336da3cdbd0c6eb6f260d author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:05 +0200 [ALSA] Move OSS-specific hw_params helper to snd-pcm-oss module Move EXPORT_SYMBOL()s to places adjacent to functions/variables. Also move OSS-specific hw_params helper functions to pcm_oss.c. Signed-off-by: Takashi Iwai commit e5e8a1d4618595ea406336da3cdbd0c6eb6f260d tree 11d27311e920b03c710b6a1305fa6ffae2cd8abe parent 57c65c116e1c03c54ac7c4bf38f2b4086d2c1a17 author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:03 +0200 [ALSA] hda-codec - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit 57c65c116e1c03c54ac7c4bf38f2b4086d2c1a17 tree 61e636abe458e85207ea6c4d2e1e052f8015dabc parent fa325eb3afc3cdaf7fba6ee3eaf05b243f5614a3 author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:02 +0200 [ALSA] i2c - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit fa325eb3afc3cdaf7fba6ee3eaf05b243f5614a3 tree f962e3a98b87bac02d7d7d567329a0fef215836b parent 95ff17564b6db34cad0cd67678fb79174e77531e author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:01 +0200 [ALSA] vx - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit 95ff17564b6db34cad0cd67678fb79174e77531e tree e1ac40bfc703e6a32c62407081e313f1b14d2d46 parent cbef55f3d8e4e7efef4703c82302a0021d781483 author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:00 +0200 [ALSA] emux - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit cbef55f3d8e4e7efef4703c82302a0021d781483 tree 071d499c332187b622ce834a316ef6e89562f3e4 parent 2dd31deeeb238a4f40c9fc9e219dc210fcbf8765 author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:59 +0200 [ALSA] trident - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit 2dd31deeeb238a4f40c9fc9e219dc210fcbf8765 tree 19156b05b4e8a6624a1d9a87cc2236db435b90b4 parent 4181e5fe4b27b0a049402a359a4a5d8b80308528 author Takashi Iwai Fri, 28 Apr 2006 15:13:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:58 +0200 [ALSA] emu10k1 - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit 4181e5fe4b27b0a049402a359a4a5d8b80308528 tree 33c17ab9c81e54edbf9fc6e4dbdbe8dead9bfc41 parent ac19e19b3664feda8040fb9fb7885183a9eb7a80 author Takashi Iwai Fri, 28 Apr 2006 15:13:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:56 +0200 [ALSA] opl4 - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit ac19e19b3664feda8040fb9fb7885183a9eb7a80 tree 4ce2320f85f42c5aeae15dc97c3457a62d0d17ef parent 7b09679c431ba91551a90203f7e7dadbb4c26d1b author Takashi Iwai Fri, 28 Apr 2006 15:13:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:55 +0200 [ALSA] opl3 - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit 7b09679c431ba91551a90203f7e7dadbb4c26d1b tree 9e919199a28caeb8d40ca63384c06917457ea8b0 parent 91715ed934fb645948ff17b6c20c6f7fd7688a70 author Takashi Iwai Fri, 28 Apr 2006 15:13:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:54 +0200 [ALSA] ac97 - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit 91715ed934fb645948ff17b6c20c6f7fd7688a70 tree 74a32f914cdcb8fae864ab1b6fd64bef9ddcffdb parent c0d3fb39e9511c6fad17d059a3a50d1be33add24 author Takashi Iwai Fri, 28 Apr 2006 15:13:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:53 +0200 [ALSA] Clean up EXPORT_SYMBOL()s in snd-seq module Move EXPORT_SYMBOL()s to places adjacent to functions/variables. Signed-off-by: Takashi Iwai commit c0d3fb39e9511c6fad17d059a3a50d1be33add24 tree aa4c22034dcd035d919002f1c146153fe828e3a6 parent 9bb22e215c28204faee73dd7ac0ad98c075d6f7b author Takashi Iwai Fri, 28 Apr 2006 15:13:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:52 +0200 [ALSA] Clean up EXPORT_SYMBOL()s in snd module Move EXPORT_SYMBOL()s to places adjacent to functions/variables. Signed-off-by: Takashi Iwai commit 9bb22e215c28204faee73dd7ac0ad98c075d6f7b tree aa1492c0cac206b80b5932bbb1247ea8db0771b4 parent 9ac25594e68a4b61516e7c1140d8c0f7ef449e20 author Takashi Iwai Fri, 28 Apr 2006 15:13:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:51 +0200 [ALSA] Clean up ugly hacks in pcm_params.h Clean up ugly hacks for sync with alsa-lib in pcm_params.h. Signed-off-by: Takashi Iwai commit 9ac25594e68a4b61516e7c1140d8c0f7ef449e20 tree 628040fb065b882191a6ff5ed7aba42ef04b99d6 parent 5e1b1518a53fc62d9f39a13819c849336c6d8dd4 author Jaya Kumar Fri, 28 Apr 2006 14:34:49 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:49 +0200 [ALSA] PM support for cs5535audio Appended is my patch adding PM support to the cs5535audio driver. I also added the ac97 quirk but it's not yet confirmed which boards need to be in the quirk list. The patch also includes some Kconfig and misc cleanup. Signed-off-by: Jaya Kumar Signed-off-by: Takashi Iwai commit 5e1b1518a53fc62d9f39a13819c849336c6d8dd4 tree 88dd70e37014986800144d1fd6705d07c8b8f94c parent 3bef229e4f13790402b1387ea8147906f217a766 author Kenneth Crudup Fri, 28 Apr 2006 13:03:48 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:48 +0200 [ALSA] hda-codec - Add support for Sony Vaio VGN-A790 laptop Added the model entry for Sony Vaio VGN-A790 laptop with ALC260 codec. From: Kenneth Crudup Signed-off-by: Takashi Iwai commit 3bef229e4f13790402b1387ea8147906f217a766 tree 27d4bac19a6b64c14886954b2da552321e7c08f0 parent 78fc030bdbbeebdea436f2b02a616d67e5f9bd9b author Alan Horstmann Wed, 26 Apr 2006 18:13:59 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:47 +0200 [ALSA] ice1712 - Provides specified midi port names instead of defaults Patch provides for the ice1712 card driver to overwrite the midi port name string given by default in mpu401_uart, with one specified in snd_ice1712_card_info. Signed-off-by: Alan Horstmann Signed-off-by: Takashi Iwai commit 78fc030bdbbeebdea436f2b02a616d67e5f9bd9b tree 1c2264a565bc9f71a2cfdfffafe8cce38082c47c parent 887709be9063d233eb5abef25aafcd94615b03f9 author Alan Horstmann Fri, 21 Apr 2006 08:39:20 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:46 +0200 [ALSA] Change seq_midi.c so client name is card, rather than port, specific Change snd_seq_midisynth_register_port() in seq_midi.c so that if a new client is created, the client name string is based on card->shortname not (port-specific) info->name. Signed-off-by: Alan Horstmann Signed-off-by: Clemens Ladisch commit 887709be9063d233eb5abef25aafcd94615b03f9 tree 4f14da2d0d5f492ac61f736eab18818b4a806ee8 parent 01686c5fce4682350849f9f2c262fcaf67ec73c3 author Takashi Iwai Tue, 18 Apr 2006 13:27:31 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:45 +0200 [ALSA] hda-codec - Fix a typo Fixed a typo of 'pci_subsystem' in the last changeset. Signed-off-by: Takashi Iwai commit 01686c5fce4682350849f9f2c262fcaf67ec73c3 tree baa73c310d68bbc12b3f212326ab3fd5003bb5e6 parent 7152447df98b3981d621224be947a2c8d77aed06 author Takashi Iwai Tue, 18 Apr 2006 12:54:11 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:44 +0200 [ALSA] hda-codec - Add Thinkpad X60/T60/Z60 support Added the support for Thinkpad X60/T60/Z60 laptops with AD1981HD codec. Signed-off-by: Takashi Iwai commit 7152447df98b3981d621224be947a2c8d77aed06 tree 33419b17c13ee13c757c2d2fff9a09d47cc01af6 parent 79ca4f3f625e14212310f953b096e2e45110ac6b author Rene Herman Thu, 13 Apr 2006 12:58:06 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:42 +0200 [ALSA] unregister platform device again if probe was unsuccessful This second one unregisters the platform device again when the probe is unsuccesful for sound/drivers, sound/arm/sa11xx-uda1341.c and sound/ppc/powermac.c. This gets them all. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai commit 79ca4f3f625e14212310f953b096e2e45110ac6b tree 04087def5cdfe7771b0369310cbdfcd4198c9811 parent d7f6f1157f73dffe0a6afd12b90557e484b7fb35 author Takashi Iwai Wed, 12 Apr 2006 12:54:55 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:41 +0200 [ALSA] vxpocket - Fix a typo Fix a typo of return value from vxpocket_config(). Signed-off-by: Takashi Iwai commit d7f6f1157f73dffe0a6afd12b90557e484b7fb35 tree 16aa60bf3e602afea7ed52c219aa7c440a5b2b55 parent be0b7b0113300c324034e94a12244c4ac3f4b354 author James Courtier-Dutton Tue, 11 Apr 2006 21:47:27 +0100 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:40 +0200 [ALSA] AC97: Correct Mic Boost label. Signed-off-by: James Courtier-Dutton commit be0b7b0113300c324034e94a12244c4ac3f4b354 tree 95409a8755e9e8e8055da964383d7f35401cfd17 parent 3969f6178b86613fd443e70d11b8848451552bdd author James Courtier-Dutton Sun, 09 Apr 2006 20:48:44 +0100 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:39 +0200 [ALSA] ca0106: Fixes MSI K8N's SB Live 24 bit, no sound from line-in. Fixed bug#1331 Signed-off-by: James Courtier-Dutton commit 3969f6178b86613fd443e70d11b8848451552bdd tree 4e7c2c81b5dbeff5b48313d0d5fc2ef5b1bda5c8 parent 21fdddea8e4cc54341d389916d0c17db8c1ca452 author James Courtier-Dutton Sun, 09 Apr 2006 17:44:13 +0100 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:38 +0200 [ALSA] Add p17v.h file. Signed-off-by: James Courtier-Dutton commit 21fdddea8e4cc54341d389916d0c17db8c1ca452 tree 9ab8e7c8e92cfc747d71907a7c9ebaa2151fcd41 parent 6129daaa0d2b84c0e376b6b17b3d3740c4d1d1ca author James Courtier-Dutton Sun, 09 Apr 2006 17:36:39 +0100 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:37 +0200 [ALSA] emu10k1: Add support for Audigy4 (not Pro) Signed-off-by: James Courtier-Dutton commit 6129daaa0d2b84c0e376b6b17b3d3740c4d1d1ca tree 8a043f22709ffa613f44a4bc1d3aeed256f488cf parent 52ab3f3dc711eeccbfbcc5d4f5c5d9b9ff59650f author James Courtier-Dutton Sun, 09 Apr 2006 13:01:34 +0100 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:35 +0200 [ALSA] ca0106: Add analog capture controls. Signed-off-by: James Courtier-Dutton commit c6976a4eb3c9ead165de950899b45db0840b8e30 tree 093fdb13bdef4bbd5f9b23e6f02e98ddede68ed3 parent 30841711c88dc2d9ce31bfa3fa5479aa823804cf author Andrew Morton Sun, 14 May 2006 21:43:50 -0700 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:51 -0700 [PATCH] w1: warning fix drivers/w1/w1.c:423: warning: long long unsigned int format, __u64 arg (arg 8) u64 is not, never has been and never will be "unsigned long long"! While we're there, fix up some code layout - it looks awful in an 80-col display. Cc: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 30841711c88dc2d9ce31bfa3fa5479aa823804cf tree f06a08530d844e17925179a0703dda6fc334e5d9 parent 6a873403d387c34c4466cc81649acc8acd66874d author Evgeniy Polyakov Thu, 27 Apr 2006 19:40:27 +0400 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:51 -0700 [PATCH] w1: clean up W1_CON dependency. If w1 is not enabled, w1_con should not appear in configuration, even if no logic is turned on without w1. W1_CON should depend on W1 also. Signed-off-by: Randy Dunlap Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 6a873403d387c34c4466cc81649acc8acd66874d tree 1b449b00ef736ede8e07481909d2e333c126a01b parent f621e1c78134f7cea0d2cf2c2822c917bedec516 author Adrian Bunk Thu, 27 Apr 2006 02:29:18 -0700 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:51 -0700 [PATCH] drivers/w1/w1.c: fix a compile error From: Adrian Bunk drivers/w1/w1.c:197: error: static declaration of 'w1_bus_type' follows non-static declaration drivers/w1/w1.h:217: error: previous declaration of 'w1_bus_type' was here Signed-off-by: Adrian Bunk Cc: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit f621e1c78134f7cea0d2cf2c2822c917bedec516 tree 4b9b30d7d708aa778a5fb0e0e7c8fe230073386f parent 70d484bff43013e9b08f5d970b1c5941e9d98e16 author Jean-Luc Leger Tue, 18 Apr 2006 21:18:20 -0700 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:51 -0700 [PATCH] W1: fix dependencies of W1_SLAVE_DS2433_CRC From: Jean-Luc Leger Default values for boolean and tristate options can only be 'y', 'm' or 'n'. This patch fixes dependencies of W1_SLAVE_DS2433_CRC. Signed-off-by: Jean-Luc Leger Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 70d484bff43013e9b08f5d970b1c5941e9d98e16 tree 1d5fdc87b7cdfe45b4ae745aef0310c256bd50f7 parent 2c5bfdac33607a618d8cf1532ef235ca9eccd49e author Evgeniy Polyakov Mon, 24 Apr 2006 10:46:14 +0400 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] W1: possible cleanups This patch contains the following possible cleanups: - the following file did't #include the header with the prototypes for it's global functions: - w1_int.c - #if 0 the following unused global function: - w1_family.c: w1_family_get() - make the following needlessly global functions static: - w1_family.c: __w1_family_put() - w1_io.c: w1_delay() - w1_io.c: w1_touch_bit() - w1_io.c: w1_read_8() - remove the following unused EXPORT_SYMBOL's: - w1_family.c: w1_family_put - w1_family.c: w1_family_registered Signed-off-by: Adrian Bunk Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 2c5bfdac33607a618d8cf1532ef235ca9eccd49e tree 77786a135938d368db3d386ab864fc9d8d50c153 parent 339f07236b481371ffb4993cf309dd1f1b3382ab author Evgeniy Polyakov Tue, 04 Apr 2006 20:35:22 +0400 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] W1: cleanups Nice cleanup spotted by Adrian Bunk, which was lost due to moving to the completely new functionality. Shame-shame-shame on me. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 339f07236b481371ffb4993cf309dd1f1b3382ab tree aaa6fe54ce812ca9fcf7752664acb74d846b77fe parent abd52a13206e02537ca1dc08fc5438c7d27bdbf1 author Andrew Morton Mon, 03 Apr 2006 22:51:17 -0700 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1 exports From: Andrew Morton WARNING: "w1_read_block" [drivers/w1/slaves/w1_therm.ko] undefined! WARNING: "w1_write_8" [drivers/w1/slaves/w1_therm.ko] undefined! WARNING: "w1_reset_select_slave" [drivers/w1/slaves/w1_therm.ko] undefined! WARNING: "w1_reset_bus" [drivers/w1/slaves/w1_ds2433.ko] undefined! WARNING: "w1_write_8" [drivers/w1/slaves/w1_ds2433.ko] undefined! WARNING: "w1_read_block" [drivers/w1/slaves/w1_ds2433.ko] undefined! WARNING: "w1_write_block" [drivers/w1/slaves/w1_ds2433.ko] undefined! WARNING: "w1_reset_select_slave" [drivers/w1/slaves/w1_ds2433.ko] undefined! Cc: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit abd52a13206e02537ca1dc08fc5438c7d27bdbf1 tree efe0ff89898aad10600d392ac727dcea9e7af322 parent 46e07f6e5eb0e465e086b8f485f4238bd453e3e9 author Evgeniy Polyakov Mon, 03 Apr 2006 12:04:27 +0400 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1: Use mutexes instead of semaphores. Use mutexes instead of semaphores. Patch tested on x86_64 and i386 with test bus master driver. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 46e07f6e5eb0e465e086b8f485f4238bd453e3e9 tree 3ec2810e889f2938ba6811e8c717c1cde2e69eea parent bb5427b5466782ba0bbf56a4ed752e08b65a5d08 author Evgeniy Polyakov Mon, 03 Apr 2006 12:01:12 +0400 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1: Make w1 connector notifications depend on connector. Make w1 connector notifications depend on connector. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit bb5427b5466782ba0bbf56a4ed752e08b65a5d08 tree e59a0c4c6fa7ede28cfc245d320dda467831ddf7 parent b6043fcab4b2b06b9fcde4c783ab253cdc2c1129 author Evgeniy Polyakov Thu, 23 Mar 2006 19:11:58 +0300 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1: netlink: Mark netlink group 1 as unused. netlink_w1 was moved to connector. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit b6043fcab4b2b06b9fcde4c783ab253cdc2c1129 tree fd89df381e6d0beabf41f11be5fdc2b7bfe941d6 parent 12003375acd879e498c6c511faf27531296f9640 author Evgeniy Polyakov Thu, 23 Mar 2006 19:11:58 +0300 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1: Move w1-connector definitions into linux/include/connector.h Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 12003375acd879e498c6c511faf27531296f9640 tree f69001169d28c6e56e1a12e04420683620e31d79 parent 81f6075ebcf3b0800321b7d81e4845d6ad9566d8 author Evgeniy Polyakov Thu, 23 Mar 2006 19:11:58 +0300 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1: Userspace communication protocol over connector. There are three types of messages between w1 core and userspace: 1. Events. They are generated each time new master or slave device found either due to automatic or requested search. 2. Userspace commands. Includes read/write and search/alarm search comamnds. 3. Replies to userspace commands. From: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 81f6075ebcf3b0800321b7d81e4845d6ad9566d8 tree 48eb8a7a5f96813882402a211b8db9d91d2e7af5 parent f522d2396138e68bcb9cc5650aa368a81d7f7ff0 author Evgeniy Polyakov Thu, 23 Mar 2006 19:11:58 +0300 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1: Replace dscore and ds_w1_bridge with ds2490 driver. commit f522d2396138e68bcb9cc5650aa368a81d7f7ff0 tree 3446d411b996b19094856c5729725e0e43ff4b0e parent 52ab3f3dc711eeccbfbcc5d4f5c5d9b9ff59650f author Evgeniy Polyakov Thu, 23 Mar 2006 19:11:58 +0300 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1: Added default generic read/write operations. Special file in each w1 slave device's directory called "rw" is created each time new slave and no appropriate w1 family is registered. "rw" file supports read and write operations, which allows to perform almost any kind of operations. Each logical operation is a transaction in nature, which can contain several (two or one) low-level operations. Let's see how one can read EEPROM context: 1. one must write control buffer, i.e. buffer containing command byte and two byte address. At this step bus is reset and appropriate device is selected using either W1_SKIP_ROM or W1_MATCH_ROM command. Then provided control buffer is being written to the wire. 2. reading. This will issue reading eeprom response. It is possible that between 1. and 2. w1 master thread will reset bus for searching and slave device will be even removed, but in this case 0xff will be read, since no device was selected. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 4941b395b3c2635a8c16d88791a789fb6ac6be43 tree 82c06cf9135c65a6d4c48240b87df8ceb73ffa48 parent 6af586dc58820d052aa538abef4d4d15c2a9e33e author David Brownell Tue, 13 Jun 2006 09:47:27 -0700 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:36 -0700 [PATCH] I2C: I2C controllers go into right place on sysfs I2C creates some sysfs nodes in the wrong places: not as children of parent controllers, but as their peers (!). This puts them into the right place always, instead of just when the adapter is on the platform bus. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 6af586dc58820d052aa538abef4d4d15c2a9e33e tree 8ff2ba7d6fd130259e099df3771694c5961bf924 parent e1a8e913f97e36cc5a23a24a8b4717e84998f13c author Rudolf Marek Mon, 12 Jun 2006 22:00:53 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:36 -0700 [PATCH] hwmon-vid: Add support for Intel Core and Conroe This patch adds support for two new VID codes, supporting Intel mobile Core processors and new Conroe based platforms. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit e1a8e913f97e36cc5a23a24a8b4717e84998f13c tree 3ee23138ab7acba7a8ceb8f38f14eecac055141e parent 060b2f5584bf3bbb0268c83c24d5a506780fb702 author Kaiwan N Billimoria Mon, 12 Jun 2006 22:00:05 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] lm70: New hardware monitoring driver This driver implements support for the National Semiconductor LM70 temperature sensor. The LM70 temperature sensor chip supports a single temperature sensor. It communicates with a host processor (or microcontroller) via an SPI/Microwire Bus interface. Communication with the LM70 is simple: when the temperature is to be sensed, the driver accesses the LM70 using SPI communication: 16 SCLK cycles comprise the MOSI/MISO loop. At the end of the transfer, the 11-bit 2's complement digital temperature (sent via the SIO line), is available in the driver for interpretation. This driver makes use of the kernel's in-core SPI support. Signed-off-by: Kaiwan N Billimoria Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 060b2f5584bf3bbb0268c83c24d5a506780fb702 tree 32d2ea5f9325a24f1e733065bd46ed7d25695f43 parent 02dd7ae2892e5ceff111d032769c78d3377df970 author Jean Delvare Mon, 12 Jun 2006 21:55:28 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] hwmon: Fix the Kconfig header Hardware monitoring chips don't have to be on the I2C bus. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 02dd7ae2892e5ceff111d032769c78d3377df970 tree 965487234823f6d4895512d575d3f6a198182a37 parent 6dcc19dfbc84b2ea5428711b7a47146b5b1788bb author Jean Delvare Mon, 12 Jun 2006 21:53:41 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] i2c-i801: Merge setup function i2c-i801: Merge setup function Merge i801_setup into i801_probe, as it doesn't make much sense to have them split. This lets us handle errors better. Christopher Hellwig had been suggesting this back in March 2003 when the driver was merged. Also drop two useless debug messages (revision and base address can be obtained from lspci, procfs or sysfs.) Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 6dcc19dfbc84b2ea5428711b7a47146b5b1788bb tree f4f9edfc5c66a7ef586e941172c47f2482aa4508 parent 455f332323a17446fb66ea7b2f65f2751f1a3f06 author Jean Delvare Mon, 12 Jun 2006 21:53:02 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] i2c-i801: Better pci subsystem integration i2c-i801: Better pci subsystem integration Integrate the i2c-i801 driver better with the pci subsystem, by calling pci_{enable,disable}_device and requesting the I/O region by BAR rather than direct configuration space access. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 455f332323a17446fb66ea7b2f65f2751f1a3f06 tree e5e8011731dd00b41bd1dbf035bc9595afa1f114 parent 520e64d5c081c76b77b4ee87d241cd3e40edc43a author Jean Delvare Mon, 12 Jun 2006 21:52:02 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] i2c-i801: Cleanups i2c-i801: Cleanups Various cleanups to the i2c-i801 driver: * Fix documentation file and self file name references. * i801_setup can be marked __devinit. * Drop useless error local variable and label in i801_setup. * Avoid a double PCI configuration register write in some cases. * Use symbolic names for SMBHSTCFG bits. * Transmit the error code returned by i801_setup instead of forcing it to an arbitrary value. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 520e64d5c081c76b77b4ee87d241cd3e40edc43a tree 7ff6d4868a5be78b10e7a84927c18fc3c42cc538 parent d8db8f98562c1e358e42503bb920f75f15a5c6d2 author Jean Delvare Mon, 12 Jun 2006 21:51:20 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] i2c-i801: Remove PCI function check i2c-i801: Remove PCI function check Remove the PCI function number check when probing devices. This check is redundant, each function has a separate PCI device ID, so checking for that ID is sufficient. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit d8db8f98562c1e358e42503bb920f75f15a5c6d2 tree 389e113cfd07cef7e8c213a49d517bfe206aba79 parent 397e2f66a23469e2b8a13b764cb2d9ff2444ad5a author Jean Delvare Mon, 12 Jun 2006 21:50:11 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] i2c-i801: Remove force_addr parameter i2c-i801: Remove force_addr parameter Remove the force_addr module parameter. It doesn't appear to ever have been needed, and PCI resources shouldn't be arbitrarily changed anyway. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 397e2f66a23469e2b8a13b764cb2d9ff2444ad5a tree 188283532b9ae804752b30cf8d5ac5c8739a53e2 parent 62aaa288ab0425b058fd337c5135a32e8c1aeace author Jean Delvare Mon, 12 Jun 2006 21:49:36 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] i2c-i801: Fix block transaction poll loops i2c-i801: Fix block transaction poll loops Two of the three poll loops have the poll and sleep swapped, causing an extra sleep to occur after the polled condition is fulfilled. In practice, this doubles the amount of sleep time for every block transaction. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 62aaa288ab0425b058fd337c5135a32e8c1aeace tree b189c6a1f203042910a602dd0f7d2aa96b57e544 parent 9917392608c6d8b8952bce9f7b5867b1e9149235 author Jean Delvare Mon, 12 Jun 2006 21:48:08 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] scx200_acb: Documentation update Documentation update for the scx200_acb driver. Hopefully this will help future users. References: [lm-sensors] Support of i2c-nscacb (April, May 2005) http://lists.lm-sensors.org/pipermail/lm-sensors/2005-April/011756.html http://lists.lm-sensors.org/pipermail/lm-sensors/2005-May/012043.html [lm-sensors] making a geode i2c slave driver (April 2006) http://lists.lm-sensors.org/pipermail/lm-sensors/2006-April/015998.html Kernel bug #6445 http://bugzilla.kernel.org/show_bug.cgi?id=6445 Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 9917392608c6d8b8952bce9f7b5867b1e9149235 tree 8a9947478ca98bba567ac55cb633a8165e095f28 parent 80cd3a8769c66203d55cdf635390bdcebd742091 author Jean Delvare Mon, 12 Jun 2006 21:46:04 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] scx200_acb: Mark scx200_acb_probe __init In i2c bus driver scx200_acb, function scx200_acb_probe can be tagged __init. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 80cd3a8769c66203d55cdf635390bdcebd742091 tree de8b6e47ffb2651dd75ddce036dee9b5732199fa parent 46f5ed753fac512f73069bd07455555b41a8a06e author Jordan Crouse Mon, 12 Jun 2006 21:44:28 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] scx200_acb: Use PCI I/O resource when appropriate On the CS5535 and CS5536, the I/O resource is allocated through PCI, so use that instead of using the MSR backdoor. Signed-off-by: Jordan Crouse Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 46f5ed753fac512f73069bd07455555b41a8a06e tree fd36fabe80349967a71efa373e2ad42c12b1af3b parent 1ded969fb97fba33e7310ef95f0b3e3123d4d92a author Krzysztof Halasa Mon, 12 Jun 2006 21:42:20 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] i2c: Mark block write buffers as const The attached patch marks i2c_smbus_write_block_data() and i2c_smbus_write_i2c_block_data() buffers as const. Signed-off-by: Krzysztof Halasa Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 1ded969fb97fba33e7310ef95f0b3e3123d4d92a tree 660ed1ca5eee779d8e03aae97324d318b2a1fa45 parent b7c066044f4355d9fbe1ac45e03303b78d21e8d4 author Peter Korsgaard Mon, 12 Jun 2006 21:40:53 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] i2c-ocores: Minor cleanups Minor cleanup to the i2c-ocores driver. Peter Korsgaard will maintain the i2c-ocores driver. Signed-off-by: Peter Korsgaard Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit b7c066044f4355d9fbe1ac45e03303b78d21e8d4 tree 4bcd5f967fcb44994eea388df23900f90fe94f0e parent a2392e0b907b9633c31be14ee75bb39fce348b01 author Hans de Goede Sun, 04 Jun 2006 20:24:11 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] abituguru: Fix fan detection One of my testers had a problem where the driver only saw 2 of the 4 fan sensors his uGuru has, this fixes this. -accept 0x40 (bit 6) being high as a valid fan sensor setting for all fans not just fan 1, I have a feeling this bit indicates whether or not a fan is actually connected . Signed-off-by: Hans de Goede Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit a2392e0b907b9633c31be14ee75bb39fce348b01 tree 7e393e1c53b7f26c87d871fd9eb401b0f4369d7d parent f2b84bbcebfdbe4855bab532909eef6621999f9f author Hans de Goede Sun, 04 Jun 2006 20:23:01 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] abituguru: Review fixes Fixes to the Abit uGuru driver as requested in review by Jean Delvare: - exactly calculate the sysfs_names array length using macro - use snprintf when generating names to double check that the sysfs_names array does not overflow. - use ARRAY_SIZE and / or defines to determine number of loops in for loops instead of using hardcoded values. - In abituguru_probe(), refactor the error path leaving a single call to kfree Signed-off-by: Hans de Goede Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit f2b84bbcebfdbe4855bab532909eef6621999f9f tree 9e0112af923b56af771708505b69e792c4bc9f2f parent bed730821b74be4c7d135098842219473f7c8f2c author Hans de Goede Sun, 04 Jun 2006 20:22:24 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] abituguru: New hardware monitoring driver New hardware monitoring driver for the Abit uGuru Signed-off-by: Hans de Goede Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit bed730821b74be4c7d135098842219473f7c8f2c tree 8cc046bc9b7415c5036322de29d754dd5bc97be5 parent 53e2761bb2e4ed58913c266ad13e8c10692aec1e author Yuan Mu Sun, 04 Jun 2006 20:18:45 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] w83792d: Add missing data access locks Add missing data lock in w83792d driver to avoid unexpected data change. Signed-off-by: Yuan Mu Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 53e2761bb2e4ed58913c266ad13e8c10692aec1e tree 163840e48c2a50f4a86f2a584cd9a697c065075a parent 3dc26c600cbae8e8e7566136148aef5667e8342b author Yuan Mu Sun, 04 Jun 2006 20:18:05 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] w83792d: Fix setting the PWM value W83792D use pwm register low 4 bits to store PWM/DC value, bit 7 is used to store fan PWM/DC mode. The store_pwm function did not convert the pwm input correctly, so it may change the fan mode when new value is set. This fix the problem. Change the "index" value of pwm*_mode and pwm* SENSOR_ATTR to simplify code. Signed-off-by: Yuan Mu Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 3dc26c600cbae8e8e7566136148aef5667e8342b tree 829ce9884acbf5eed5f85d6d07f73511e606c2be parent 0a704681f37f8cd84fa10312728a39e9fcf2c2c5 author Jean Delvare Sun, 04 Jun 2006 20:13:01 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] hwmon: Drop some maintainers entries I no more wish to be listed as the maintainer for the smsc47m1 and w83l785ts drivers. I have no test device, and people will fallback to me as the general hardware monitoring maintainer anyway. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 0a704681f37f8cd84fa10312728a39e9fcf2c2c5 tree 167dd8974c1a8f17c661b64ef3455343dad3a6b2 parent 740e06a89fb905ee1979c57442c544afe51ed21c author Jean Delvare Sun, 04 Jun 2006 20:10:55 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] hwmon: Fix a typo in the hdaps driver Fix a typo in the hdaps driver. Signed-off-by: Jean Delvare Acked-by: Robert Love Signed-off-by: Greg Kroah-Hartman commit 740e06a89fb905ee1979c57442c544afe51ed21c tree ad50727bef11b0423afa8910555283ffd158a63c parent 057bc350992fa2ac31fcd2ff80add269bdf32a80 author Jean Delvare Mon, 05 Jun 2006 20:31:20 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] hwmon: Sysfs interface documentation update, 2 of 2, take 2 Reword and complete certain parts of the hwmon sysfs-interface documentation file. Hopefully this will make things clearer for new driver authors. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 057bc350992fa2ac31fcd2ff80add269bdf32a80 tree e07c0d21c7f8f1df8dace43004bdd2c5aa0682de parent 18f98b1e3147afdb51e545cc6ff2b016c7d088a7 author Rudolf Marek Sun, 04 Jun 2006 20:03:39 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] hwmon: Sysfs interface documentation update, 1 of 2 This patch cleans up hwmon sysfs documentation file, plus introduces the description of DC/PWM selection for fan speed control. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 18f98b1e3147afdb51e545cc6ff2b016c7d088a7 tree 5f974b01a7efadabe037ace19a0f33037d36a4b7 parent aee62305345863430a937af289b9bd080a100dac author Peter Korsgaard Sun, 04 Jun 2006 20:01:08 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] i2c: New bus driver for the OpenCores I2C controller The following patch adds support for the OpenCores I2C controller IP core (See http://www.opencores.org/projects.cgi/web/i2c/overview). Signed-off-by: Peter Korsgaard Signed-off-by: Andrew Morton Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit aee62305345863430a937af289b9bd080a100dac tree 7e145ccf7052fd298ed94b75e7f9e85a64999a53 parent 177d165d7c2ec424007d6241a93d0cb83d953c51 author Jean Delvare Sun, 04 Jun 2006 19:59:57 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] i2c: Suggest N for rare devices in Kconfig Improve the Kconfig help text of the follwing i2c drivers: * busses/i2c-pca-isa.c * chips/pcf8574.c * chips/pcf8591.c These are hard to detect and building them into the kernel results in long delays at boot. March 2006, thread "I2C_PCA_ISA causes boot delays" http://marc.theaimsgroup.com/?l=linux-kernel&m=114360399415744&w=2 April 2006, thread "i2c-related 1-minute hang during bootup" http://marc.theaimsgroup.com/?l=linux-kernel&m=114640992330721&w=2 Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 177d165d7c2ec424007d6241a93d0cb83d953c51 tree 9ebddfb4b97fae069b99d1162334a95729bf4015 parent 0d0001dd956d4ae2c8739c2877fa660eec68ed5f author Rudolf Marek Tue, 25 Apr 2006 14:24:46 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] HWMON: Trim VID values to correct number of bits Following patch trims the VID value to correct number of bits for each VRM. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 0d0001dd956d4ae2c8739c2877fa660eec68ed5f tree 5990ffaa2bdd946bf3b46d26107f4c76f2d67080 parent 114cc0c0c1e98f0b8e205f91ae7b2471e0ad5325 author Jean Delvare Tue, 25 Apr 2006 14:23:01 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] HWMON: Improve the help text for CONFIG_HWMON Improve the help text for CONFIG_HWMON to let the users know how they pick the right hardware monitoring driver(s) for their system. Also fix a couple typos in the related documentation file and improve some parts a bit. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 114cc0c0c1e98f0b8e205f91ae7b2471e0ad5325 tree 5231dfed0b817dca786b82ec9c1c8ac49fbc365d parent 9873964d6eb24bd0205394f9b791de9eddbcb855 author Jean Delvare Tue, 25 Apr 2006 14:22:14 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] HWMON: lm83: Documentation update One more motherboard confirmed to have an LM83 temperature sensor chip. Thanks to Steven Hardy for reporting. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 9873964d6eb24bd0205394f9b791de9eddbcb855 tree b0e4a6f72f31e4a1215d2ae1e79a16d6e753f617 parent 4f507ea1560805b16cf4a4359e304ae0db0c2dcb author Charles Spirakis Tue, 25 Apr 2006 14:21:03 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] HWMON: w83791d: New hardware monitoring driver for the Winbond W83791D Add support for the w83791d sensor chip. The w83791d hardware is somewhere between the w83781d and the w83792d and this driver code is derived from the code that supports those chips. Signed-off-by: Charles Spirakis Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 4f507ea1560805b16cf4a4359e304ae0db0c2dcb tree 3b94e81b46f2c42461e2aaa734783ca94940efd4 parent 5c7ae65899a4c5b05b6277f856018d1eeeb98907 author Jean Delvare Tue, 25 Apr 2006 14:20:11 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] HWMON: hdaps: Update the list of supported systems Update the list of systems supported by the hdaps driver: * Add the "ThinkPad Z60m" entry, reported by Arkadiusz Miskiewicz. * Add the "ThinkPad H" entry, reported by Frank Gevaerts for some ThinkPad R52 models (1846AQG). * Drop the "ThinkPad X41 Tablet" entry, which looks redundant to me. And a comment update for good measure. Signed-off-by: Jean Delvare Cc: Arkadiusz Miskiewicz Cc: Frank Gevaerts Signed-off-by: Greg Kroah-Hartman commit 5c7ae65899a4c5b05b6277f856018d1eeeb98907 tree e59ee9f28b3e07bdb0a0716c058cfde0fd867ee1 parent f9ba6c04ef1dcf16f7179b7883e9751baaac218e author Jean Delvare Tue, 25 Apr 2006 14:18:16 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] I2C: i2c-nforce2: Add support for the nForce4 MCP51 and MCP55 Add support for the new nForce4 MCP51 (also known as nForce 410 or 430) and nForce4 MCP55 to the i2c-nforce2 driver. Some code changes were required because the base I/O address registers have changed in these versions. Standard BARs are now being used, while the original nForce2 chips used non-standard ones. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit f9ba6c04ef1dcf16f7179b7883e9751baaac218e tree 0d66c8aab1ea1c0343744925e53f7e9111daaff0 parent 7aadb8f943f6f8fb48962099cfba05ad0518b0ac author Jean Delvare Tue, 25 Apr 2006 13:37:25 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] I2C: i2c-piix4: Document the IBM problem more clearly Properly document on which systems the i2c-piix4 SMBus driver will refuse to load. Hopefully this will make it clearer for users, which were often wondering why their destop or server systems were detected as laptops. Closes bug #6429. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 7aadb8f943f6f8fb48962099cfba05ad0518b0ac tree 7c9143af3cf47a8c5a907a32dc90b671b416ab6d parent 54aaa1ca1022d95d854315743241bb6bf59f531f author Jean Delvare Tue, 25 Apr 2006 13:29:26 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] I2C: i2c-piix4: Fix typo in documentation Fix i2c-piix4 documentation typo. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 54aaa1ca1022d95d854315743241bb6bf59f531f tree af43ffb4efb559b823b6ce6db30df3667ecfe194 parent 5e9f4f2e5a02bb6908278a819952aa31fffefaa2 author Rudolf Marek Tue, 25 Apr 2006 13:06:41 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] I2C: i2c-piix4: Remove the fix_hstcfg parameter This patch removes the fix_hstcfg option from the driver and related SMBus Interrupt Select register magic because now we know what are valid values for this register. This patch updates the documentation and adds new IRQ mode check so we are sure not to miss any new "unusual" value. The PCI quirk for users of fix_hstcfg was not developed because the chipset lacks of subsystem ID registers and DMI is stated "To be filled". Impact to existing systems is minimal because the problem showed up on motherboards like 10 years back. On the other hand users of newer Serverworks and HT1000 systems won't be misleaded by the message suggesting to try the fix_hstcfg any more. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 5e9f4f2e5a02bb6908278a819952aa31fffefaa2 tree 6f000080ee15597f9523de0e6d31b192bdb0aaec parent e931b8d8a428f87e6ea488d2fd80007bb66b3ea8 author Mark A. Greer Tue, 25 Apr 2006 13:04:54 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] I2C: m41t00: Add support for the ST M41T81 and M41T85 This patch adds support for the ST m41t81 and m41t85 i2c rtc chips to the existing m41t00 driver. Since there is no way to reliably determine what type of rtc chip is in use, the chip type is passed in via platform_data. The i2c address and square wave frequency are passed in via platform_data as well. To accommodate the use of platform_data, a new header file include/linux/m41t00.h has been added. The m41t81 and m41t85 chips halt the updating of their time registers while they are being accessed. They resume when a stop condition exists on the i2c bus or when non-time related regs are accessed. To make the best use of that facility and to make more efficient use of the i2c bus, this patch replaces multiple i2c_smbus_xxx calls with a single i2c_transfer call. Signed-off-by: Mark A. Greer Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit e931b8d8a428f87e6ea488d2fd80007bb66b3ea8 tree 709992bdc7dee30f2eefd4b8481b09cb7dc4b670 parent 02e0c5d5c2e00374b6808a42f8eea4ea9baaa216 author Mark A. Greer Fri, 31 Mar 2006 23:06:46 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] i2c: cleanup m41t00 This patch does some cleanup to the m41t00 i2c/rtc driver including: - use BCD2BIN/BIN2BCD instead of BCD_TO_BIN/BIN_TO_BCD - use strlcpy instead of strncpy - some whitespace cleanup Signed-off-by: Mark A. Greer Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 02e0c5d5c2e00374b6808a42f8eea4ea9baaa216 tree 13ab61631d66e9fe83d8abd47e774e90c90239e1 parent 400b48ecd95a7fac6b126042d37b7efe0202b582 author Rudolf Marek Thu, 23 Mar 2006 16:48:09 +0100 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] i2c-piix4: Add ATI IXP200/300/400 support This patch adds the ATI IXP southbridges support to i2c-piix4, as it turned out those chips are compatible with it. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 400b48ecd95a7fac6b126042d37b7efe0202b582 tree f0fe5c22b7f2198a952ec75b476ac7a33c515248 parent 568825c8ed3c902981ce908ed5693abb3c9ddf59 author Jean Delvare Thu, 23 Mar 2006 16:46:47 +0100 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] hwmon: Add sysfs interface for individual alarm files Extend the sysfs interface of hardware monitoring chips, by adding individual alarm and beep files. Contrary to the old aggregated "alarms" and "beeps" files, individual files constitute a standard way to access the status information, making it finally possible to implement a chip-independant hardware monitoring chip access library (once all drivers have been added this new interface, that is.) If future drivers need more individual files, the interface will be extended as needed at the same time these drivers are merged into the kernel tree. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 568825c8ed3c902981ce908ed5693abb3c9ddf59 tree 29d37359823ea8439f5b51bf9632d31440a9f559 parent 59ac83677f72ea2cc25b5426e7df9589aa7a5384 author Jean Delvare Thu, 23 Mar 2006 16:40:23 +0100 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] f71805f: Resource needs not be global The F71805F I/O resource structure needs not be a global variable, as the platform core allocs its own copy of it anyway. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 59ac83677f72ea2cc25b5426e7df9589aa7a5384 tree a15039b9744a87832af8efa048cc9d229440aa97 parent a4589dbb4e2dc758d1aadb8b5d7e5a598ccb0341 author Hartmut Rick Thu, 23 Mar 2006 16:37:23 +0100 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] smsc47m192: New hwmon driver for SMSC LPC47M192/997 New driver (smsc47m192) which supports voltage and temperature measurement features of SMSC LPC47M192 and LPC47M997 chips. Signed-off-by: Hartmut Rick Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit a4589dbb4e2dc758d1aadb8b5d7e5a598ccb0341 tree 48f9807a0e1c237afbfd1661a203eea5b4236fba parent cf0676fe42c8e14c4c7ed5895e2fe5d17f779b43 author Jean Delvare Thu, 23 Mar 2006 16:30:29 +0100 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] w83627ehf: Add alarms support Add alarms support for the W83627EHF/EHG hardware monitoring chip. This is based on an earlier patch from Rudolf Marek. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit cf0676fe42c8e14c4c7ed5895e2fe5d17f779b43 tree ff201260e2a0979471c60ca440e6eedbe87ee27f parent 43cb7ebee2f478d3f987ad773d4e6b07fc23c631 author Rudolf Marek Thu, 23 Mar 2006 16:25:22 +0100 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:31 -0700 [PATCH] w83627ehf: Add voltage inputs support Add the voltage measuring support to W83627EHF. The code is based on the patch provided by Yuan Mu from Winbond. Signed-off-by: Yuan Mu Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 43cb7ebee2f478d3f987ad773d4e6b07fc23c631 tree f862838ccb28af35ba9e1951a26ba9fb4b99b0e3 parent 52ab3f3dc711eeccbfbcc5d4f5c5d9b9ff59650f author Jordan Crouse Thu, 23 Mar 2006 16:19:49 +0100 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:31 -0700 [PATCH] lm83: Add LM82 support Add LM82 temperature sensor support (similar to the LM83, but less featureful). Signed-off-by: Jordan Crouse Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 005b5e4d0c7795d2ec298c34c96cbe2c1e1902b0 tree cb2efd2684f74cfaa5f354f34acb77a13ee01811 parent 8b76a68c6caafef5a91cdc80958aecaca76a8896 author Uli Luckas Thu, 22 Jun 2006 16:49:54 +0100 committer Russell King Thu, 22 Jun 2006 16:49:54 +0100 [ARM] 3624/1: Report true modem control line states Patch from Uli Luckas This patch removes the fake return from serial_pxa_get_mctrl. Signed-off-by: Uli Luckas I just can't remember why this return was there. Being in the first column clearly indicates it was meant to be removed. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 3f1244a2f8d3892f991b662cea49b2a0b4e0c115 tree e47aa472b5487d9d1ef8d8177d953d2b128d3ee5 parent 6461f64ab51e6929680df064b2682004a1548290 author Or Gerlitz Thu, 11 May 2006 10:03:30 +0300 committer Roland Dreier Thu, 22 Jun 2006 07:51:14 -0700 IB/iser: iSER Kconfig and Makefile Kconfig and Makefile for iSER. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 6461f64ab51e6929680df064b2682004a1548290 tree 52922f1830a6f6ed7fe546db9230a507f91974a7 parent 1cfa0a75dbef1d5bf687aacafabb023288f6b36a author Or Gerlitz Thu, 11 May 2006 10:03:08 +0300 committer Roland Dreier Thu, 22 Jun 2006 07:51:12 -0700 IB/iser: iSER handling of memory for RDMA This file contains the processing carried over an SG list associated with a SCSI command such that it can be registered with the IB verbs. The registration produces a network virtual address (VA) and a remote access key (RKEY or STAG in iSER spec notation) which are used by the target for its RDMA operation. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 1cfa0a75dbef1d5bf687aacafabb023288f6b36a tree 8296842d0f7afb479e1437330d54bd31a0272c95 parent e85b24b5e7de9f507c6253183d089370f37618c5 author Or Gerlitz Thu, 11 May 2006 10:02:46 +0300 committer Roland Dreier Thu, 22 Jun 2006 07:51:11 -0700 IB/iser: iSER RDMA CM (CMA) and IB verbs interaction This file contains the low level interaction with the RDMA CM and the IB verbs, where iSER is consumer of both. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit e85b24b5e7de9f507c6253183d089370f37618c5 tree ba56462012733f1a99f95e6a3dc5123abb24407f parent 65e7ae7bfc71219f13162b3bbad44e6471cd67f9 author Or Gerlitz Thu, 11 May 2006 10:02:19 +0300 committer Roland Dreier Thu, 22 Jun 2006 07:51:09 -0700 IB/iser: iSER initiator iSCSI PDU and TX/RX This file contains the iSER initiator processing of iSCSI PDUs - controls, commands and data-outs along with processing of TX and RX completions. It interacts with the lower level iser code doing the memory registration and and the cma and verbs calls. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 65e7ae7bfc71219f13162b3bbad44e6471cd67f9 tree 90bb6c39fe78b3ef4ff0949ce7b4fc369523acd7 parent 49cd5382f629bde2aee9f817cefb271106dc47ee author Or Gerlitz Thu, 11 May 2006 10:00:44 +0300 committer Roland Dreier Thu, 22 Jun 2006 07:51:07 -0700 IB/iser: iSCSI iSER transport provider high level code This file contains the code that registeres with the iscsi transport manager and with the SCSI Mid Layer, where much of the provided functions to iSCSI and SCSI are implemented in libiscsi. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 49cd5382f629bde2aee9f817cefb271106dc47ee tree 5643cf0424612640475499dbaa77562001f92663 parent 9b8efc0242777353d5d62bfaa7766ebf0b5598b4 author Or Gerlitz Thu, 11 May 2006 10:00:21 +0300 committer Roland Dreier Thu, 22 Jun 2006 07:51:05 -0700 IB/iser: iSCSI iSER transport provider header file iSER (iSCSI Extensions for RDMA) transport provider driver for the iSCSI initiator, whose other parts (under drivers/scsi) are scsi_transport_iscsi - the transport management module, iscsi_tcp - the TCP transport provider module and libiscsi - a kernel library (module) implementing functionality needed by both TCP and iSER transports. iSER is both a provider of the iSCSI transport api and a SCSI low level driver. This file contains internal data structures and non static service functions. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 9b8efc0242777353d5d62bfaa7766ebf0b5598b4 tree e4379663486936078e2631bc4204bb51d37b1ead parent 183208284e3ab3816189fc0e23faf29675ce6c9f author Roland Dreier Thu, 22 Jun 2006 07:47:27 -0700 committer Roland Dreier Thu, 22 Jun 2006 07:47:27 -0700 IB/uverbs: Remove unnecessary list_del()s In ib_uverbs_cleanup_ucontext(), when iterating through the lists of objects, there's no reason to do list_del() to remove the objects, since both the objects and the lists that contain them are about to be freed anyway. Since list_del() is a moderately big inline function, getting rid of this extra work saves quite a bit of .text: add/remove: 0/0 grow/shrink: 1/2 up/down: 3/-217 (-214) function old new delta ib_uverbs_comp_handler 225 228 +3 ib_uverbs_async_handler 256 255 -1 ib_uverbs_close 905 689 -216 Signed-off-by: Roland Dreier commit 183208284e3ab3816189fc0e23faf29675ce6c9f tree 4a99c2275740be90a73e6a43aa04f8c75028a5ab parent 52ab3f3dc711eeccbfbcc5d4f5c5d9b9ff59650f author Krishna Kumar Thu, 22 Jun 2006 07:47:27 -0700 committer Roland Dreier Thu, 22 Jun 2006 07:47:27 -0700 IB/uverbs: Don't free wr list when it's known to be empty In ib_uverbs_post_send(), move the "out:" label after the loop that frees the list of work requests, since the only place that jumps there is before any work requests could possibly be added to the list. This removes a compile warning: "is_ud might be used uninitialized in this function". Signed-off-by: Krishna Kumar Signed-off-by: Roland Dreier commit 17ffc7ba6d7ea68b8d5f55a5ca1b87163e69720d tree a7b8595492f38425a971d8e212ce367fb0bebb4a parent 1794c13002918c2216e2e11913eb299d071a5731 author Artem B. Bityutskiy Thu, 22 Jun 2006 18:15:48 +0400 committer Artem B. Bityutskiy Thu, 22 Jun 2006 18:15:48 +0400 [MTD] Initialize 'writesize' Signed-off-by: Artem B. Bityutskiy commit 1bca9f2e5bd7f92fe4b34753e57bf4f47d3a2f01 tree b7ce0292398d4d5a1cfea0ee01034071251351bc parent 4d1a099828fb3ed52ff666fceb6a7d562d9048b8 author Jean Delvare Thu, 22 Jun 2006 14:24:31 +0100 committer David Woodhouse Thu, 22 Jun 2006 14:24:31 +0100 Remove and from userspace export Do not export the following i2c header files to user space: * i2c-id.h: These IDs are internal to the kernel and user space does not need them. * i2c-algo-ite.h: The driver is broken and planned for removal, so let's not export it for now. The extra ioctl defined here can be standardized and moved to i2c-core/i2c-dev if really needed. Signed-off-by: Jean Delvare Signed-off-by: David Woodhouse commit 1794c13002918c2216e2e11913eb299d071a5731 tree 106c26e69079190f7189f1d4b79f4061f61f63cd parent 99974c62b6acd4093b6f485132067089c39f967c author Thomas Gleixner Thu, 22 Jun 2006 13:06:43 +0200 committer Thomas Gleixner Thu, 22 Jun 2006 13:06:43 +0200 [MTD] NAND: ndfc fix address offset thinko The rework of the command handling in the nand driver led to wrong address setting in the command control function. Use the correct address again. Signed-off-by: Thomas Gleixner commit 8b76a68c6caafef5a91cdc80958aecaca76a8896 tree f22a684595267ee6b087381a00a543f46482c8a1 parent 744da2cb598639767ddcc90ca855771bc524fe76 author Lennert Buytenhek Thu, 22 Jun 2006 10:30:56 +0100 committer Russell King Thu, 22 Jun 2006 10:30:56 +0100 [ARM] 3620/2: ixp23xx: add uengine loader support Patch from Lennert Buytenhek This patch allows the ixp2000 uengine loader that is already in the tree to also be used on the ixp23xx. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 744da2cb598639767ddcc90ca855771bc524fe76 tree f84303b5b6ef0f239f0112b22b61bc167c84fe0d parent a059e33ce67cec5e990fdec43f242d3b06c60d1a author Lennert Buytenhek Thu, 22 Jun 2006 10:30:55 +0100 committer Russell King Thu, 22 Jun 2006 10:30:55 +0100 [ARM] 3618/1: add defconfig for logicpd pxa270 card engine Patch from Lennert Buytenhek As it's slightly nontrivial to make it possible to build a single kernel image for both the mainstone and the logicpd pxa270 card engine, add a separate defconfig for the logicpd pxa270 card engine for now. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit a059e33ce67cec5e990fdec43f242d3b06c60d1a tree 6ce83ae735281ab2e6ee891b2e06e965cd65c3be parent f869afab8f36c5f8561557f74b4b9846719092da author Lennert Buytenhek Thu, 22 Jun 2006 10:30:54 +0100 committer Russell King Thu, 22 Jun 2006 10:30:54 +0100 [ARM] 3617/1: ep93xx: fix slightly incorrect timer tick rate Patch from Lennert Buytenhek The tick rate of timers 1-3 isn't exactly 508 kHz as some parts of the relevant documentation claim, but more like 508.469 kHz (14.7456 MHz divided by 29.) Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit f869afab8f36c5f8561557f74b4b9846719092da tree 6a23d7981a3b06b9cd40ad99c1543d22f6a1d528 parent 84b61f6d3ad8a5761e61d83076588f64a289a574 author Lennert Buytenhek Thu, 22 Jun 2006 10:30:53 +0100 committer Russell King Thu, 22 Jun 2006 10:30:53 +0100 [ARM] 3616/1: fix timer handler wrap logic for a number of platforms Patch from Lennert Buytenhek A couple of platforms aren't using the right comparison type in their timer interrupt handlers (as we're comparing two wrapping timestamps, we need a bmi/bpl-type comparison, not an unsigned comparison) -- this patch fixes them up. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 84b61f6d3ad8a5761e61d83076588f64a289a574 tree 1a36155da857eedbd9834abc5d12f94cff6b9614 parent 0967b5f0790cff737c86e9797cbbbdf420eb00f3 author Lennert Buytenhek Thu, 22 Jun 2006 10:30:52 +0100 committer Russell King Thu, 22 Jun 2006 10:30:52 +0100 [ARM] 3615/1: ixp23xx: use platform devices for physmap flash Patch from Lennert Buytenhek Now that the physmap platform device rewrite is in, make the ixp23xx boards use platform devices for physmap flash. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 0967b5f0790cff737c86e9797cbbbdf420eb00f3 tree 9b9234f6fc133ad75c2a40779a89e87b99e8f1d3 parent ae2a120ce50e9dc8092f9bd4d76d8c8150a12c48 author Lennert Buytenhek Thu, 22 Jun 2006 10:30:51 +0100 committer Russell King Thu, 22 Jun 2006 10:30:51 +0100 [ARM] 3614/1: ep93xx: use platform devices for physmap flash Patch from Lennert Buytenhek Now that the physmap platform device rewrite is in, make the ep93xx boards use platform devices for physmap flash. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit ae2a120ce50e9dc8092f9bd4d76d8c8150a12c48 tree 10fd1a5d5cade798d95e28f8ce311a07d75be0b4 parent b741483d7d8d86d215daf2a1f77bc3d3770746a6 author Vitaly Wool Thu, 22 Jun 2006 10:27:15 +0100 committer Russell King Thu, 22 Jun 2006 10:27:15 +0100 [ARM] 3621/1: fix compilation breakage for pnx4008 Patch from Vitaly Wool pnx4008_defconfig fails to build: include/asm/hardware/debug-8250.S: Assembler messages: include/asm/hardware/debug-8250.S:12: Error: Macro with this name was already defined. This is due to senduart macro erroneously defined in include/asm-arm/arch-pnx4008/debug-macro.S. This patch removes it from that file. Signed-off-by: Vitaly Wool Signed-off-by: Russell King commit b741483d7d8d86d215daf2a1f77bc3d3770746a6 tree 436e643627f06cdc8bc1765ece01673c5e52e899 parent e9931b5da6247c18cbf4db8e9e924c980758f41a author Vitaly Wool Thu, 22 Jun 2006 10:26:21 +0100 committer Russell King Thu, 22 Jun 2006 10:26:21 +0100 [ARM] 3623/1: pnx4008: move GPIO-related defines to gpio.h Patch from Vitaly Wool This patch moves GPIO-related defines and static inline funcs from include/asm-arm/arch-pnx4008/pm.h to include/asm-arm/arch-pnx4008/gpio.h. Also, some more GPIO-related defines are added to include/asm-arm/arch-pnx4008/gpio.h as they are needed for the USB host driver (coming soon...) Signed-off-by: Vitaly Wool Signed-off-by: Russell King commit e9931b5da6247c18cbf4db8e9e924c980758f41a tree c82648c1bc484a738c695bf88831083777534ccf parent 1a6be26d5b1a86f66ef60e5b73bae64d50873724 author Vitaly Wool Thu, 22 Jun 2006 10:26:20 +0100 committer Russell King Thu, 22 Jun 2006 10:26:20 +0100 [ARM] 3622/1: pnx4008: remove clk_use/clk_unuse Patch from Vitaly Wool clk_use/clk_unuse functions are no longer needed, so removing those from arch/arm/mach-pnx4008/clock.c. Also, the order of functions is rearranged a bit, to avoid forward declarations. Signed-off-by: Vitaly Wool Signed-off-by: Russell King commit 1a6be26d5b1a86f66ef60e5b73bae64d50873724 tree c56cc8ed28d9d9dc062043a0a7862e1692908770 parent d6551e884cf66de072b81f8b6d23259462c40baf author Russell King Wed, 21 Jun 2006 13:51:41 +0100 committer Russell King Thu, 22 Jun 2006 10:24:24 +0100 [ARM] Enable VFP to be built when non-VFP capable CPUs are selected Since we pass flags to the compiler to control code generation based on the least capable selected CPU, if we want to include VFP support, we must tweak the assembler flags to allow the VFP instructions. Moreover, we must not use the mrrc/mcrr versions since these will not be recognised by the assembler. We do not convert all instructions to the VFP-equivalent (yet) since binutils appears to barf on "fmrx rn, fpinst" and doesn't provide any other way (other than using the mrc equivalent) to encode this instruction - which is rather a problem when you have a VFP implementation which requires these instructions. Signed-off-by: Russell King commit d6551e884cf66de072b81f8b6d23259462c40baf tree fd8af193bd045e4b16ce911d392d7ffd109d7284 parent 52ab3f3dc711eeccbfbcc5d4f5c5d9b9ff59650f author Russell King Wed, 21 Jun 2006 13:31:52 +0100 committer Russell King Thu, 22 Jun 2006 10:24:18 +0100 [ARM] Add thread_notify infrastructure Some machine classes need to allow VFP support to be built into the kernel, but still allow the kernel to run even though VFP isn't present. Unfortunately, the kernel hard-codes VFP instructions into the thread switch, which prevents this being run-time selectable. Solve this by introducing a notifier which things such as VFP can hook into to be informed of events which affect the VFP subsystem (eg, creation and destruction of threads, switches between threads.) Signed-off-by: Russell King commit 52ab3f3dc711eeccbfbcc5d4f5c5d9b9ff59650f tree f6fa8468885835152f131e3abc094da369d15669 parent 43104f1da88f5335e9a45695df92a735ad550dda parent 98174e46974323e4941c72e46345f7277755e146 author Linus Torvalds Wed, 21 Jun 2006 18:10:19 -0700 committer Linus Torvalds Wed, 21 Jun 2006 18:10:19 -0700 Merge git://oss.sgi.com:8090/xfs-2.6 * git://oss.sgi.com:8090/xfs-2.6: (43 commits) [XFS] Remove files from the build that are now unused. [XFS] Fix a Makefile issue related to exports.o handling. [XFS] Remove version 1 directory code. Never functioned on Linux, just [XFS] Map EFSCORRUPTED to an actual error code, not just a made up one [XFS] Kill direct access to ->count in valusema(); all we ever use it for [XFS] Remove unneeded conditional code on NFS export interface related [XFS] Remove an incorrect use of unlikely() on a relatively likely code [XFS] Push some common code out of write path into core XFS code for [XFS] Remove unnecessary local from open_exec dmapi path. [XFS] Minor XFS documentation updates. [XFS] Fix broken const use inside local suffix_strtoul routine. [XFS] Fix nused counter. It's currently getting set to -1 rather than [XFS] Fix mismerge of the fs_writable cleanup patch causing a freeze/thaw [XFS] Fix up debug code so that bulkstat wont generate thousands of [XFS] Remove unused parameter from di2xflags routine. [XFS] Cleanup a missed porting conversion, and freezing. [XFS] Resolve a namespace collision on remaining vtypes for FreeBSD [XFS] Resolve a namespace collision on vnode/vnodeops for FreeBSD porters. [XFS] Resolve a namespace collision on vfs/vfsops for FreeBSD porters. [XFS] statvfs component of directory/project quota support, code ... commit 4ec223d02f4d5f5a3129edc0e3d22550d6ac8a32 tree 753cec643fa59ccda64a95fa5436956e481c1137 parent 9ed059e1551bf36092215b965838502ac21f42e4 author Venkatesh Pallipadi Wed, 21 Jun 2006 15:18:34 -0700 committer Dave Jones Wed, 21 Jun 2006 18:30:26 -0400 [CPUFREQ] Fix ondemand vs suspend deadlock Rootcaused the bug to a deadlock in cpufreq and ondemand. Due to non-existent ordering between cpu_hotplug lock and dbs_mutex. Basically a race condition between cpu_down() and do_dbs_timer(). cpu_down() flow: * cpu_down() call for CPU 1 * Takes hot plug lock * Calls pre down notifier * cpufreq notifier handler calls cpufreq_driver_target() which takes cpu_hotplug lock again. OK as cpu_hotplug lock is recursive in same process context * CPU 1 goes down * Calls post down notifier * cpufreq notifier handler calls ondemand event stop which takes dbs_mutex So, cpu_hotplug lock is taken before dbs_mutex in this flow. do_dbs_timer is triggerred by a periodic timer event. It first takes dbs_mutex and then takes cpu_hotplug lock in cpufreq_driver_target(). Note the reverse order here compared to above. So, if this timer event happens at right moment during cpu_down, system will deadlok. Attached patch fixes the issue for both ondemand and conservative. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 43104f1da88f5335e9a45695df92a735ad550dda tree 465c6e7a3bcc68cebf4b29f32c3574454cf98323 parent bd00949647ddcea47ce4ea8bb2cfcfc98ebf9f2a author Greg Kroah-Hartman Tue, 20 Jun 2006 15:14:07 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:19 -0700 [PATCH] USB: only make /sys/class/usb show up when there is something in it Now /sys/class/usb is dynamically created when we have something to put in it, and removed when all devices go away. Just trying to cut down on the clutter in sysfs... Signed-off-by: Greg Kroah-Hartman commit bd00949647ddcea47ce4ea8bb2cfcfc98ebf9f2a tree 89086a5b63caf798086efbe7d3bb1094c8fa4d38 parent c182274ffe1277f4e7c564719a696a37cacf74ea author Greg Kroah-Hartman Tue, 20 Jun 2006 13:09:50 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:19 -0700 [PATCH] USB: convert usb class devices to real devices Signed-off-by: Greg Kroah-Hartman commit c182274ffe1277f4e7c564719a696a37cacf74ea tree 0e9df4d75ff12dcefad3058b3509b2f2b09202bc parent 9bde7497e0b54178c317fac47a18be7f948dd471 author Greg Kroah-Hartman Mon, 19 Jun 2006 23:59:31 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:19 -0700 [PATCH] USB: move usb_device_class class devices to be real devices This moves the usb class devices that control the usbfs nodes to show up in the proper place in the larger device tree. No userspace changes is needed, this is compatible due to the symlinks generated by the driver core. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 9bde7497e0b54178c317fac47a18be7f948dd471 tree 395a1c86801a1ba1bd04a007ffac3c5a73d9f27d parent 36679ea59846d8f34a48f71ca1a37671ca0ad3c5 author Greg Kroah-Hartman Wed, 14 Jun 2006 12:14:34 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:19 -0700 [PATCH] USB: make endpoints real struct devices This will allow for us to give endpoints a major/minor to create a "usbfs2-like" way to access endpoints directly from userspace in an easier manner than the current usbfs provides us. Signed-off-by: Greg Kroah-Hartman commit 36679ea59846d8f34a48f71ca1a37671ca0ad3c5 tree 3483f57f83dc5af39c773246255c85954ff4b67f parent 84412f6291b50690febd81899e46f0f0ef7a13e0 author Greg Kroah-Hartman Wed, 14 Jun 2006 12:14:34 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:19 -0700 [PATCH] USB: make usb_create_ep_files take a struct device Instead of a kobject, will make things easier in the future (don't know what I was thinking when I did this originally...) Signed-off-by: Greg Kroah-Hartman commit 84412f6291b50690febd81899e46f0f0ef7a13e0 tree d13850f546c4d3a7a8ff561982145325336e4167 parent ae0dadcf0f912cbab2ac84caa437454620bf71b2 author Greg Kroah-Hartman Wed, 14 Jun 2006 12:14:34 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] USB: move the endpoint specific sysfs code to it's own file This makes it easier to modify in the future without touching anything else. Signed-off-by: Greg Kroah-Hartman commit ae0dadcf0f912cbab2ac84caa437454620bf71b2 tree 8ad54ef4ddb8615256ee71196cbfca912e647a5c parent 325a4af60dc945bf2da9cbcdbabb276e312b297c author David Brownell Tue, 13 Jun 2006 10:04:34 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] USB: move to Move to and remove some redundant includes. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 325a4af60dc945bf2da9cbcdbabb276e312b297c tree 05a6eeaf6c820485a011b3bcd40070c38b753abd parent a8c28f2389942bab376e39351d27525499630248 author David Brownell Tue, 13 Jun 2006 09:59:32 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] USB: move hardware-specific to This moves header files for controller-specific platform data from to to start reducing some clutter. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit a8c28f2389942bab376e39351d27525499630248 tree a1e8aaa3eefbf2730a06e7ca16084d8ad7c94d90 parent 7e27f18c8a37ffb95f677e4e9c3cca818a3e9eb1 author David Brownell Tue, 13 Jun 2006 09:57:47 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] USB: move to This moves to to reduce some of the clutter of usb header files. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 7e27f18c8a37ffb95f677e4e9c3cca818a3e9eb1 tree 24bbec7b9e3bd8e2642471e9ee9bd1e45c992e71 parent d5681fe8110e1169902df37a8fd8bd01c2b7810e author David Brownell Tue, 13 Jun 2006 09:54:40 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] USB: whitespace removal from usb/gadget/ether This removes extraneous whitespace from the Ethernet/RNDIS gadget driver. It's all space-at-EOL, spaces-before-tabs, or tabs-then-spaces. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit d5681fe8110e1169902df37a8fd8bd01c2b7810e tree 028dd32c3b35ff0bb8398361abeb1eb0512d337b parent db54a53d26322e978e66482208afabaab9cd0752 author Alan Stern Tue, 13 Jun 2006 09:59:32 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] USB: unusual_devs entry for Nokia N80 Here is a patch (as720) adding an unusual_devs entry for the Nokia N80 mobile phone. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit db54a53d26322e978e66482208afabaab9cd0752 tree 389920f93a45647fec5f90eb27e75213c27934f9 parent 043ea18b2e145c4c9cb3c30757a65fe0f1678a35 author Luiz Fernando N. Capitulino Mon, 12 Jun 2006 22:46:20 -0300 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] usbserial: Fixes wrong return values. Some usbserial functions returns -EINVAL if the port doesn't exist or if it's not opened. However, the right error code for such situations is -ENODEV. Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman commit 043ea18b2e145c4c9cb3c30757a65fe0f1678a35 tree 8d5faa202172a6b13bb4ebd4682ff822454b7963 parent 44df45a09c7c20bbd641b1c30b6406d54ba7e2c8 author Milan Svoboda Mon, 29 May 2006 03:34:00 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] usb gadget: update pxa2xx_udc.c driver to fully support IXP4xx platform This patch adds IXP465 into the list of known devices and adds IXP425 and IXP465 to the list of devices that have cfr. This is not described in the hardware documentation, but without it driver won't work. Workaround (#if 1) that seemed to get rid of lost status irqs is disabled for IXP4XX as it caused freezes during testing of control messages. No lost irqs are visible on IXP4XX. Driver survived tests running over night without any visible problems. Signed-off-by: Milan Svoboda Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 44df45a09c7c20bbd641b1c30b6406d54ba7e2c8 tree c0693d486a8b73eb64c6f281d8fd8718084c2db8 parent 7c0642c196beb41b7770571b8a61151bdd418bbe author Milan Svoboda Mon, 29 May 2006 03:34:00 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] usb gadget: fix compile errors This patch fixes compile errors when pxa2xx_udc is to be compiled for ixp4xx platform. Signed-off-by: Milan Svoboda Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 7c0642c196beb41b7770571b8a61151bdd418bbe tree 7f117d31ede4743f56d936fef1921ab814c81fe4 parent ca094f1186ef50ef8983325072cdc4f051830f13 author Milan Svoboda Mon, 29 May 2006 03:34:00 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] usb gadget: allow drivers support speeds higher than full speed This patch removes limitation which prevents use of drivers that support speeds different that full speed. Signed-off-by: Milan Svoboda Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit ca094f1186ef50ef8983325072cdc4f051830f13 tree 1613108cc900cda8d209b48a86d9d1bf66d174ad parent 943e1b4d60dc7acfabe2ebad31189bcb3b853688 author Franck Bui-Huu Wed, 14 Jun 2006 10:47:18 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB: gadget-serial: do not save/restore IRQ flags in gs_close() As pointed out by David Brownell, we know that IRQs are never blocked when calling gs_close function. So the save/restore IRQ flags are pointless. Signed-off-by: Franck Bui-Huu Signed-off-by: Greg Kroah-Hartman commit 943e1b4d60dc7acfabe2ebad31189bcb3b853688 tree 3a8de95902d0f8699d0c2dd1759a1841960d1720 parent b059c81af7a1759a911cfc20ce8a4bf47c435830 author Franck Bui-Huu Wed, 14 Jun 2006 10:29:21 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB: gadget-serial: fix a deadlock when closing the serial device When closing the device, the driver acquires/release twice the port lock before/after waiting for the data to be completely sent. Therefore it will dead lock. This patch fixes it and also uses the generic scheduler services for waiting for an event. Signed-off-by: Franck Bui-Huu Signed-off-by: Greg Kroah-Hartman commit b059c81af7a1759a911cfc20ce8a4bf47c435830 tree 397568ad8fe0ebfd2ee504919f7ae8f12657703f parent 4186c29ca199063facdda49851b4c863699687b1 author Frank Gevaerts Wed, 14 Jun 2006 15:52:05 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB Serial: clean tty fields on failed device open If either the driver's open() method or try_module_get() fails, we need to set 'tty->driver_data' and 'port->tty' to NULL in serial_open(), otherwise we'll get an OOPS in usb_device_disconnect() when the device is disconnected. Signed-off-by: Frank Gevaerts Acked-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman commit 4186c29ca199063facdda49851b4c863699687b1 tree 4288ce26277af8097faa38df90cd99b7cbeb7503 parent 4255e6f6d98ad092c27fa2b83ac314cbe8a0c56f author Matt Reimer Wed, 07 Jun 2006 11:46:13 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB: trivial DEBUG message correction in gadget ether driver Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4255e6f6d98ad092c27fa2b83ac314cbe8a0c56f tree 564734c2b0112880b7b826af1c8e441e3e65f89e parent d9ac2cfc3aaf3bc37da4192d3edfa11d2ad2e96f author Oliver Bock Sat, 10 Jun 2006 00:42:19 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB: new driver for Cypress CY7C63xxx mirco controllers This is a new driver for the Cypress CY7C63xxx mirco controller series. It currently supports the pre-programmed CYC63001A-PC by AK Modul-Bus GmbH. It's based on a kernel 2.4 driver (cyport) by Marcus Maul which I ported to kernel 2.6 using sysfs. I intend to support more controllers of this family (and more features) as soon as I get hold of the required IDs etc. Please see the source code's header for more information. Signed-off-by: Oliver Bock Signed-off-by: Greg Kroah-Hartman commit d9ac2cfc3aaf3bc37da4192d3edfa11d2ad2e96f tree 71afab7732f7acb26cb3637122a417a28741b17a parent 12e72feab5d9a23107f245b0f241a2484cbb5a4e author Pete Zaitcev Mon, 12 Jun 2006 20:09:39 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB: update usbmon.txt Fix up the documentation. Apparently, I left unedited copy-paste results in examples. Also, Alan helped me to improve the most confusing parts. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 12e72feab5d9a23107f245b0f241a2484cbb5a4e tree 0a7325d03fddd768118e42e25cf7a8214b99a560 parent 5b1c674d223eef6c6494be8be91e9e3a3054817e author Pete Zaitcev Fri, 09 Jun 2006 22:03:32 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB: implement error event in usbmon Implement the "error" event in usbmon. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 5b1c674d223eef6c6494be8be91e9e3a3054817e tree 4f7cbbc36d90ec00cd9f958b62cbfc87f550f34f parent 4bc203d997c0dc1eada4cc9681372c2f7a456c46 author Pete Zaitcev Fri, 09 Jun 2006 20:10:10 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB: update usbmon, fix glued lines This update contains one bug fix: some lines can come out truncated, because of the safety cutoff. This happened because I forgot to update the size when status packets began to be printed. The rest is: - Comments updates - Allow snooping with pkmap on x86_64, which is cache-coherent - Enlarge event buffers (certainly we can have a couple of pages) - Add event counter First touch upon usbmon for 2.6.18. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 4bc203d997c0dc1eada4cc9681372c2f7a456c46 tree 9bbe49aeed4efb64b72559bff9c49e128371c37c parent 34ab86e140e9810d6c5162971b6dcf01fcc0f11c author Pete Zaitcev Tue, 06 Jun 2006 18:18:33 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] USB: io_edgeport touch-up Al Borchers suggested to do this in his review of my previous patch. I guess that I skipped this initially because of my visceral dislike of sizeof(data). But in this case it seems well localized. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 34ab86e140e9810d6c5162971b6dcf01fcc0f11c tree faf2836c04eef8670f010431e509366dab7181a2 parent c5e3b741a3fec6077a480aa65ded29d79ded8898 author Timothy Sipples Fri, 16 Jun 2006 20:42:59 +0900 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] airprime.c: add Kyocera Wireless KPC650/Passport support Adds vendor & product IDs to drivers/usb/serial/airprime.c for Kyocera Wireless KPC650/Passport EV-DO/1xRTT PC Cards. Signed-off-by: Timothy Sipples Signed-off-by: Greg Kroah-Hartman commit c5e3b741a3fec6077a480aa65ded29d79ded8898 tree 13d5bf2fe7d2cc14500bafbb2c804da2ed23b102 parent e323de46e83b6df2f330651907ac823f8d53308a author Alan Stern Mon, 05 Jun 2006 12:28:57 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] UHCI: Improve FSBR-off timing This patch (as707) improves the FSBR operation in uhci-hcd by turning it off more quickly when it isn't needed. FSBR puts a noticeable load on a computer's PCI bus, so it should be disabled as soon as possible when it isn't in use. The patch leaves it running for only 10 ms after the last URB stops using it, on the theory that this should be long enough for a driver to submit another URB if it wants keep FSBR going. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit e323de46e83b6df2f330651907ac823f8d53308a tree c899168e635f967fe46acaf4873c6b29dbf7f406 parent be3cbc5f87d4b1fbd714644b6824ce4eb229f372 author Alan Stern Mon, 05 Jun 2006 12:21:30 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] UHCI: remove hc_inaccessible flag This patch (as706) removes the private hc_inaccessible flag from uhci-hcd. It's not needed because it conveys exactly the same information as the generic HCD_FLAG_HW_ACCESSIBLE bit. In its place goes a new flag recording whether the controller is dead. The new code allows a complete device reset to resurrect a dead controller (although usbcore doesn't yet implement such a facility). Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit be3cbc5f87d4b1fbd714644b6824ce4eb229f372 tree cea9e1dd8bc67ae65cb25dd7d46235234da7730f parent ae671813affd947d2f21ff8e3cd329e466ee85b2 author David Brownell Mon, 05 Jun 2006 12:16:39 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] UHCI: various updates This patch (as705) contains a small set of updates for uhci-hcd written mostly by Dave Brownell: * Root hub suspend messages come out labeled as root hub messages; PCI messages should only come out when the pci device suspends. * Rename the reset() method to better match its init() role * Behave more like the other HCDs by returning -ESHUTDOWN for root-hub suspend/resume errors. * When an URB fails, associate the message with the usb device not the host controller (it still hides endpoint and direction) From: David Brownell Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit ae671813affd947d2f21ff8e3cd329e466ee85b2 tree 161aa0691de2a02977d99d3507aba3724b7da132 parent 5c218e3b86510f9685bfae5b0d2d7cc8468056c1 author Alan Stern Tue, 06 Jun 2006 15:19:17 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] usb-storage: unusual_devs entry for Nikon DSC D70s This patch (as704) adds an unusual_devs entry for the Nikon DSC D70s, which uses a different Product ID from the D70. It also moves the entry for the DSC E2000 up in the list, to preserve the numerical ordering. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 5c218e3b86510f9685bfae5b0d2d7cc8468056c1 tree 5456256e4aa726f8c704e84ce12db49abe4f8a4f parent dfbaa7d8a4056436b6a170625d64986ebb648486 author Rene Rebe Sun, 04 Jun 2006 11:39:09 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] USB: Add Apple MacBook product IDs to usbhid This adds the Apple MacBook product IDs for the Fn translation to the usbhid. Signed-off-by: Rene Rebe Signed-off-by: Greg Kroah-Hartman commit dfbaa7d8a4056436b6a170625d64986ebb648486 tree 61713fd79502bc395a7e13798e90e7ddba9f92aa parent bfd5df3c0cf65bdf10a3a00baff036cb096140f6 author Ralf Baechle Sat, 03 Jun 2006 23:58:55 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] USB: EHCI on non-Au1200 build fix Including ehci-au1xxx.c on a non-Au1200 Alchemy only to have it throw an error is stupid. From: Ralf Baechle Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit bfd5df3c0cf65bdf10a3a00baff036cb096140f6 tree 3b7835253e0b1f03bc42e323fe3988ee407c0e11 parent 14f76cc7ab75b1c9db036dcd6b247e0dcc8952be author Chris Lund Sat, 03 Jun 2006 13:58:19 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] USB: free allocated memory on io_edgeport startup memory failure While an Edgeport is allocating individual port structures, if kmalloc returns NULL, the serial structure is freed and -ENOMEM, but the ports allocated before the failure are not freed. This patch addresses that condition. Signed-off-by: Christopher Lund Signed-off-by: Greg Kroah-Hartman commit 14f76cc7ab75b1c9db036dcd6b247e0dcc8952be tree 21452b3fa8d83300a1604d16e1c8ed1a559d352a parent 786dc1d3d7333f269e17d742886eac2188a2d9cc author Matthias Urlichs Fri, 02 Jun 2006 11:48:56 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] USB: new devices for the Option driver This patch extends the "option" driver with a few more devices, some of which are actually connected to USB the "right" way -- as opposed to doing it via PCMCIA and OHCI. Signed-Off-By: Matthias Urlichs Signed-off-by: Greg Kroah-Hartman commit 786dc1d3d7333f269e17d742886eac2188a2d9cc tree c2c3f14b485fd2fd9bf41ba2a7dada7486ee4c49 parent 6ad07129a8ed2e13dcd7e6313c201c32bcf7cc32 author Philippe Retornaz Thu, 01 Jun 2006 20:48:46 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] usb: drivers/usb/core/devio.c dereferences a userspace pointer See http://bugzilla.kernel.org/show_bug.cgi?id=6617. This function dereference a __user pointer. Signed-off-by: Philippe Retornaz Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 6ad07129a8ed2e13dcd7e6313c201c32bcf7cc32 tree 55a1e1a2bdb6bfc5e93f169e22be98598dfbf8c7 parent df9a1f482d1252045210f50048911e2efba61e62 author Alan Stern Thu, 01 Jun 2006 13:59:16 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] usbcore: recovery from Set-Configuration failure This patch (as703) improves the error handling when a Set-Configuration request fails. The old interfaces are all unregistered before the request is sent, and if the request fails then we don't know what config the device is using. So it makes no sense to leave actconfig pointing to the old configuration with its invalid interfaces. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit df9a1f482d1252045210f50048911e2efba61e62 tree a2a581e278e9ef6ede4b58ef73d3388510f06064 parent 47104b0dd32cec467574822b0dc3517b3de3f0ad author Alan Stern Thu, 01 Jun 2006 13:55:28 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] usbhid: use usb_reset_composite_device This patch (as702) makes usbhid use the new usb_reset_composite_device API. Now HID interfaces can coexist with other interfaces on the same device, and a reset can safely be requested by any of the drivers. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 47104b0dd32cec467574822b0dc3517b3de3f0ad tree 7cc1a012b3351275249c15fbdfc608a1774762b4 parent 7de18d8bf4b470752e799e219b38b6dff4b49993 author Alan Stern Thu, 01 Jun 2006 13:52:56 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] usb-storage: use usb_reset_composite_device This patch (as701) modifies usb-storage to take advantage of the new usb_reset_composite_device() API. Now we will be able to safely request port resets even if other drivers are bound to a mass-storage device. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 7de18d8bf4b470752e799e219b38b6dff4b49993 tree bb48636199b616fa578a93917295dcb99c8f7886 parent 79efa097e75018a2918155f343f0e08e61ee8a8c author Alan Stern Thu, 01 Jun 2006 13:37:24 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] USB hub: use usb_reset_composite_device This patch (as700) modifies the hub driver to take advantage of the new usb_reset_composite_device API. The existing code had special-case calls stuck into usb_reset_device, just before and after the reset. With the new version there's no need for special-case stuff; it all happens naturally in the form of pre_reset and post_reset notifications. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 79efa097e75018a2918155f343f0e08e61ee8a8c tree 336237ca96191aeb9cac6ed8706bc479545f3108 parent efcaa20525fde82bbb4fb8cd9e9016f6fabc6509 author Alan Stern Thu, 01 Jun 2006 13:33:42 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] usbcore: port reset for composite devices This patch (as699) adds usb_reset_composite_device(), a routine for sending a USB port reset to a device with multiple interfaces owned by different drivers. Drivers are notified about impending and completed resets through two new methods in the usb_driver structure. The patch modifieds the usbfs ioctl code to make it use the new routine instead of usb_reset_device(). Follow-up patches will modify the hub, usb-storage, and usbhid drivers so they can utilize this new API. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit efcaa20525fde82bbb4fb8cd9e9016f6fabc6509 tree bdceb58add9793206e4af8a147fe5fccb9bad74d parent d5ce1379be9c79d4bcf201c20c5cc87bb2bc973c author David Brownell Tue, 30 May 2006 20:49:29 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] USB: cdc_ether: recognize olympus r1000 (fix regression) Earlier work splitting the "usbnet" driver out into a core plus driver modules was missing a blacklist entry for the Olympus R-1000; it must not use the CDC Ethernet driver, only the "zaurus" support works with it. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit d5ce1379be9c79d4bcf201c20c5cc87bb2bc973c tree 35920fe3fd457b4a472dfa999b76393637d2d544 parent b10cee9d035db54d0bf5a9f9fa622dcfc3f740c6 author Eric Sesterhenn Thu, 01 Jun 2006 20:48:45 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] USB: negative index in drivers/usb/host/isp116x-hcd.c From: Eric Sesterhenn This fixes coverity Bug #390. With the following code ret = ep->branch = balance(isp116x, ep->period, ep->load); if (ret < 0) goto fail; the problem is that ret and balance are of the type int, and ep->branch is u16. so the int balance() returns gets reduced to u16 and then converted to an int again, which removes the sign. Maybe the following little c program can explain it better: commit b10cee9d035db54d0bf5a9f9fa622dcfc3f740c6 tree 22300f8dbab5fea58cbc43082fb2702415599613 parent 09fd6bc8b453c9215e81911cbb6882556aa03639 author Jeremy Fitzhardinge Wed, 31 May 2006 11:21:52 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] USB: Add Sierra Wireless MC5720 ID to airprime.c Recognize the Sierra Wireless MC5720. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit 09fd6bc8b453c9215e81911cbb6882556aa03639 tree 8ad0daea7395d01200bbad239ec033d780486612 parent 069e8a65cd7970b15672825541be59218d9a8a0f author Stuart MacDonald Wed, 31 May 2006 13:28:40 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] USB: Whiteheat: fix firmware spurious errors Attached patch fixes spurious errors during firmware load. Signed-off-by: Stuart MacDonald Signed-off-by: Greg Kroah-Hartman commit 069e8a65cd7970b15672825541be59218d9a8a0f tree fb71ec51c74b469a83be696c9133c1438e6c05e9 parent eb79b4fda4654eaa7e6421ad41b0a75c7b4f0608 author akpm@osdl.org Fri, 26 May 2006 13:17:09 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] Driver for Apple Cinema Display This is a driver to control the brightness of an Apple Cinema Display over USB. It updates the local brightness value if the user presses a button on the display. Signed-off-by: Michael Hanselmann Cc: Oliver Neukum Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit eb79b4fda4654eaa7e6421ad41b0a75c7b4f0608 tree fcc7812adc7c98f79d09e78947b9bc36f93a97e8 parent 633a7ecf89587879161179ac4f5a03722626866f author Ian Abbott Tue, 30 May 2006 12:36:30 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] USB: ftdi_sio: add support for Yost Engineering ServoCenter3.1 This patch adds support for Yost Engineering Inc's ServoCenter 3.1 USB product to the ftdi_sio driver's device ID table. The PID was supplied by Aaron Prose of Yost Engineering on the ftdi-usb-sio-devel list. The PID 0xE050 matches the Windows INF files for this device. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 633a7ecf89587879161179ac4f5a03722626866f tree ecbc0930e6644ce0b3719e19c656d3ddd7d8f55f parent 3f8f4a18f4f76a67fe5b80da1d3a3940e41a14a8 author Alan Stern Tue, 30 May 2006 10:21:14 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] usbhid: Remove unneeded blacklist entries Now that usbhid automatically applies HID_QUIRK_NOGET to keyboards and mice, we no longer need the blacklist entries that were present for no other purpose. This patch (as698) removes them. Signed-off-by: Alan Stern Acked-by: Vojtech Pavlik Signed-off-by: Greg Kroah-Hartman commit 3f8f4a18f4f76a67fe5b80da1d3a3940e41a14a8 tree 14f7408ac859d47187f03256c145238320c3b525 parent 1fbe75e12f0dd567c86533e13ba2605f3ecad2e1 author Giridhar Pemmasani Tue, 30 May 2006 10:12:30 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] usbcore: Fix broken RNDIS config selection RNDIS devices don't get configured owing to a typo in choose_configuration(). This patch from Giridhar Pemmasani fixes the typo. From: Giridhar Pemmasani Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 1fbe75e12f0dd567c86533e13ba2605f3ecad2e1 tree 2fc8008f06fd96869dd591dcb08fc7536775212c parent 955a260829b5848fa90721678bab003234c93356 author Daniel Drake Fri, 26 May 2006 21:36:28 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] USB: print message when device is rejected due to insufficient power 2.6.16 introduces USB power budgeting in the Linux kernel, and since then, a fair number of users have observed that some of their devices no longer work in unpowered hubs (this is not a bug, the devices claim that they need more than 100mA). The very least we can do is print an informational message to the kernel log when this happens, otherwise it is not at all clear why the device was not accepted. Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman commit 955a260829b5848fa90721678bab003234c93356 tree 279bf00d4d028b2787cc59b111ec7aa9580e37fe parent b5600339cd37472455d99b39963f3106411070b6 author David Brownell Fri, 26 May 2006 10:17:03 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] USB: more pegasus log spamming removed Remove more log spamming from pegasus: stop talking to the device once we see ENODEV reported. It may take a while before khubd notifies us. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit b5600339cd37472455d99b39963f3106411070b6 tree ed370175216754f26d2b9c98db105114f428533d parent 688e9fb1bbdd4e5a51b5030b7f9b1c811fd5e5e3 author Pete Zaitcev Thu, 25 May 2006 20:08:50 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] ub: random cleanups Remove some silly messages and cast in stone "temporary" messages which we keep around. Also, I am hesitant to remove the initialization retries without having the hardware to test (anyone who was at KS04 has a spare?) Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 688e9fb1bbdd4e5a51b5030b7f9b1c811fd5e5e3 tree 302c191611e780f3e897d353b134f1fe3c9394bc parent 2f8ad9a1b91bc6856860a2fea8b07e0c82c0ad0a author Pete Zaitcev Thu, 25 May 2006 20:04:54 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] ub: atomic add_disk I am taling about this: "if (disk->flags & GENHD_FL_UP) del_gendisk(disk);" If del_gendisk() undoes add_disk() like viro just said, why is it conditional? huh? add_disk() sets the damn flag So, I should not need to check ever so the above is "if I've called add_disk(), call gendisk()" which might be what you want, of course but usually you know if you'd done add_disk() on that puppy anyway In ub, nobody upstream should ever see half-constructed disks before they were passed to add_disk. To that end, only add the struct lun to the list on the path of no return. With that fix in place, we do not need to test GENHD_FL_UP. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 2f8ad9a1b91bc6856860a2fea8b07e0c82c0ad0a tree 8ee7eba6bfd0c955dfcd455e32e305466f53f829 parent ba47f66bd9fc451e9ce88f291e057b2f4910d01c author Pete Zaitcev Wed, 24 May 2006 11:04:04 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] USB: rmmod pl2303 after -28 Wait for the scheduled work to finish before freeing memory, prevent oops. http://bugzilla.kernel.org/show_bug.cgi?id=6596 Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit ba47f66bd9fc451e9ce88f291e057b2f4910d01c tree a05a5c8b59d8f15b50d84b8cb3d2810e72d9223b parent 3428cc43d23f125dcb31c981aa91535dd3c4cb0d author Dan Streetman Wed, 24 May 2006 09:39:16 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] improved TT scheduling for EHCI This updates the EHCI driver by adding an improved scheduler for the transaction translators, found in USB 2.0 hubs and used for low and full speed devices. - adds periodic_tt_usecs() and some helper functions, which does the same thing that "periodic_usecs" does, except on the other side of the TT, i.e. it calculates the low/fullspeed bandwidth usage instead of highspeed. - adds a tt_available() function which is the new implementation of what tt_no_collision() does ... while tt_no_collision() ensures that each TT handles only 1 periodic transfer at a time (a very pessimistic approach) this version instead tracks bandwidth and allows each TT to handle as many transfers as will fit on each TT's downstream bus (closer to best-case). The new scheduler is selected by a config option, marked as EXPERIMENTAL so it can be tested (and more broadly reviewed) for a while until it seems safe to remove the original scheduler. Signed-off-by: Dan Streetman Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 3428cc43d23f125dcb31c981aa91535dd3c4cb0d tree 6217a74b7bb3d475a88ab7437d7fcdaa64fab53c parent 80b47853b19114dd53e83e15bf1db3e183a66824 author Franck Bui-Huu Wed, 24 May 2006 16:57:28 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] usb-storage: get rid of the timer during URB submission This patch uses completion timeout instead of a timer to implement a timeout when submitting an URB. It also put the task in interruptible state instead of an uninterruptible one while waiting for the completion. Signed-off-by: Franck Bui-Huu Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 80b47853b19114dd53e83e15bf1db3e183a66824 tree 7b18b9ac43a8c158a6a544915be647e13c6d125e parent 6f065f70c0c1bfb0b8212438cee21e68aa155887 author Pete Zaitcev Mon, 22 May 2006 22:05:17 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] USB: Syntax cleanup for pl2303 (trailing backslash) Remove the silly trailing backslash. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 6f065f70c0c1bfb0b8212438cee21e68aa155887 tree 0b41372a44c6aae94152b5ff0dd1eb987640a6fb parent cf2c7481d2ff7f0c266de873b2fe93883e9782f9 author Pete Zaitcev Mon, 22 May 2006 22:02:32 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] USB: Improve Kconfig comment for mct_u232 Add a couple of supported devices into the help message. It's a long story... I promised this comment changed to a user long ago, so I'd like to have that promise kept. In reality though, nobody is likely to read this anyway. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit cf2c7481d2ff7f0c266de873b2fe93883e9782f9 tree 35dba35b3969f431feb0dfe5732c3825aa077a22 parent ad93375a30334cd97a61f7076d242e1cfdb66abc author Pete Zaitcev Mon, 22 May 2006 21:58:49 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] USB serial: encapsulate schedule_work, remove double-calling I'm going to throw schedule_work away, it's retarded. But for starters, let's have it encapsulated. Also, generic and whiteheat were both calling usb_serial_port_softint and scheduled work. Only one was necessary. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit ad93375a30334cd97a61f7076d242e1cfdb66abc tree 96f6c49d01c18389939c73d1e5f31516f26f3942 parent 9da2150f59e885d88b9eabe0a677f0fa4962f7b4 author Pete Zaitcev Mon, 22 May 2006 21:49:44 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] usb: io_edgeport, cleanup to unicode handling Clean up the unicode handling in io_edgeport. Make get_string size-limited. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 9da2150f59e885d88b9eabe0a677f0fa4962f7b4 tree 74913a5f9712fa8e2e37fc9796b54c7971899c3a parent 0ae4ea8092e1277cfca07cade7eaba5f594076c1 author Alan Stern Mon, 22 May 2006 16:47:13 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] usbtest: report errors in iso tests This patch (as693b) makes the usbtest driver report errors in the isochronous bulk transfer tests instead of always returning 0. As an arbitrary cutoff, an error is returned if more than 10% of the packet transfers fail. It also stops a test immediately upon receiving an URB submission error. For a test harness, it's especially important to report when errors occur! Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 0ae4ea8092e1277cfca07cade7eaba5f594076c1 tree 79c822a07fe4e79587460d723e32a29d70b6dab1 parent 83196b52053068f0240371ad2efd9d6ad685bbeb author Alan Stern Mon, 22 May 2006 12:27:38 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] gadgetfs: fix memory leaks This patch (as692) fixes a few memory leaks in some unimportant error pathways of the gadgetfs driver. Signed-off-by: Alan Stern Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 83196b52053068f0240371ad2efd9d6ad685bbeb tree 61ce5b727519780633f1cc4cfaaebc7087a1f8d2 parent 212a4b4ed1ea9a969f3f967b3e3a8075ad1cb4de author Alan Stern Mon, 22 May 2006 12:26:31 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] gadgetfs: fix AIO interface bugs This patch (as691) fixes a few errors in the AIO interface for the gadgetfs driver. Now requests will complete properly instead of hanging. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 212a4b4ed1ea9a969f3f967b3e3a8075ad1cb4de tree 113adcb02cc4bc78baa327cdd2b6260885e64daa parent 782a7a632e4b0581ade665e3d89ee97c8db0f441 author Vitja Makarov Wed, 31 May 2006 00:40:06 +0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] USB: new cp2101 device By the way I have to ask you to add new (vid,pid) pair to cp2101 driver. This device is argussoft's avr in-system programmer AS3M, http://atmel.argussoft.ru/hard.htm it's based on cp2101 chip and works pretty well with the linux driver. It could be used with argussoft's `asisp1109.exe' (http://atmel.argussoft.ru/download/software/as-tools.soft/asisp.zip) tool run under wine. Signed-off-by: Vitja Makarov Signed-off-by: Greg Kroah-Hartman commit 782a7a632e4b0581ade665e3d89ee97c8db0f441 tree 3d2e829e4581ff2be519429d8ed81d2fc2305333 parent caa2a1226741e023a103e091a7f6dce7c42e82ee author Greg Kroah-Hartman Fri, 19 May 2006 13:20:20 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] USB: add usb_interrupt_msg() function for api completeness. Really just a wrapper around usb_bulk_msg() but now it's documented much better. Signed-off-by: Greg Kroah-Hartman commit caa2a1226741e023a103e091a7f6dce7c42e82ee tree 95a9552242797efd04bd752ab5f07963d837805a parent c8155cc5d839838f8425dbea568fc537337176a7 author Franck Bui-Huu Mon, 15 May 2006 19:23:53 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] Fix a deadlock in usbtest ctrl_complete functions acquires ctx->lock and tries to unlink all queued urbs in case of errors through usb_unlink_urb func. In its turn usb_unlink_urb calls, through the hcd driver, usb_hcd_giveback_urb which calls ctrl_complete again. At this time, ctx->lock is already taken by the same function. Signed-off-by: Franck Bui-Huu Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit c8155cc5d839838f8425dbea568fc537337176a7 tree fc50ffe774fa59a1a3d18e8543bb7e04d1e80726 parent caf3827a65af476c71eaeb79636869a4ab128d48 author Alan Stern Fri, 19 May 2006 16:52:35 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] UHCI: remove ISO TDs as they are used This patch (as690) does the same thing for ISO TDs as as680 did for non-ISO TDs: free them as they are used rather than all at once when an URB is complete. At the same time it fixes a minor buglet (I'm not aware of it ever affecting anyone): An ISO TD should be retired when its frame is over, regardless of whether or not the hardware has marked it inactive. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit caf3827a65af476c71eaeb79636869a4ab128d48 tree 78ef5d5ec466e59d9ac626faf34fb1031ba4fd8e parent 10b8e47d6b32bfba22874354c62770cb4e42aa6c author Alan Stern Fri, 19 May 2006 16:44:55 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] UHCI: store the period in the queue header This patch (as689) stores the period for periodic transfers (interrupt and ISO) in the queue header. This is necessary for proper bandwidth tracking (not yet implemented). It also makes the scheduling of ISO transfers a bit more rigorous, with checks for out-of-bounds frame numbers. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 10b8e47d6b32bfba22874354c62770cb4e42aa6c tree 5477d441bd4e01c4e3a4a9c2ef7b4e677b49d157 parent c433472658b4df11bd3590a59be79194a1ff43ae author Alan Stern Fri, 19 May 2006 16:39:52 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] UHCI: fix race in ISO dequeuing This patch (as688) fixes a small race in uhci-hcd. Because ISO queues aren't controlled by queue headers, they can't be unlinked. Only individual URBs can. So whenever multiple ISO URBs are dequeued, it's necessary to make sure the hardware is done with each one. We can't assume that dequeuing the first URB will suffice to unlink the entire queue. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c433472658b4df11bd3590a59be79194a1ff43ae tree 32d48a155360c8e877be3956c9964d2d4c19a236 parent 3612242e527eb47ee4756b5350f8bdf791aa5ede author Alan Stern Fri, 19 May 2006 16:34:57 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] UHCI: use integer-sized frame numbers This patch (as687) changes uhci-hcd to keep track of frame numbers as full-sized integers rather than 11-bit values. This makes them a lot easier to handle and makes it possible to schedule beyond a 2-second window, should anyone ever want to do so. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 3612242e527eb47ee4756b5350f8bdf791aa5ede tree 581c5088ce1cff693615ce06cac6ba5410d5aca9 parent e016683d595aacde78b9385aabd0b98c8915d885 author Micah Dowty Fri, 19 May 2006 11:26:24 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] USB: Allow high-bandwidth isochronous packets via usbfs This patch increases an arbitrary limit on the size of individual isochronous packets submitted via usbfs. The limit is still arbitrary, but it's now large enough to support the maximum packet size used by high-bandwidth isochronous transfers. Signed-off-by: Micah Dowty Signed-off-by: Greg Kroah-Hartman commit e016683d595aacde78b9385aabd0b98c8915d885 tree 72253a7751eb8568e65b306e3939ca0885f6fac0 parent b9827e4b29edb4af1481b75efdf9ea2d8a7ffc96 author Micah Dowty Fri, 19 May 2006 11:20:11 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] USB: Remove 4088-byte limit on usbfs control URBs This patch removes the artificial 4088-byte limit that usbfs currently places on Control transfers. The USB spec does not specify a strict limit on the size of an entire control transfer. It does, however, state that the data stage "follows the same protocol rules as bulk transfers." (USB 2, 8.5.3) The level of support for large control transfers in real host controllers varies, but it's important to support at least 4K transfers. Windows enforces a maximum control transfer size of 4K, so there exists some hardware that requires a full 4096 byte data stage. Without this patch, we fall short of that by 8 bytes on architectures with a 4K page size, and it becomes impossible to support such hardware with a user-space driver. Since any limit placed on control transfers by usbfs would be arbitrary, this patch replaces the PAGE_SIZE limit with the same arbitrary limit used by bulk transfers. Signed-off-by: Micah Dowty Signed-off-by: Greg Kroah-Hartman commit b9827e4b29edb4af1481b75efdf9ea2d8a7ffc96 tree fd8aabed6f397cd7ce968211bccdaa1993f5c4d6 parent b761d9d867bcc29e8de3e62d1d72b27e75078ca6 author David Brownell Tue, 16 May 2006 17:33:14 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] USB: correct the USB info in Documentation/power/swsusp.txt The swsusp.txt documentation harshes confusingly on USB, and this patch addresses the issue. It's harsh because it blames USB for some issues that are generic to all drivers -- especially those supporting removable media -- and it's confusing since it says that USB has the issue with "suspend" not just swsusp ... while in reality, USB doesn't have the issue when real system suspend states are used. Signed-off-by: David Brownell Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit b761d9d867bcc29e8de3e62d1d72b27e75078ca6 tree 40b8f2e530bd9bbece14007a3d887bbe12e8afde parent 84afddd7ac58adad00cb0e50d0af25fcf825668b author Alan Stern Fri, 12 May 2006 11:41:59 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] UHCI: Work around old Intel bug Some old Intel UHCI controllers have a bug that has shown up in a few systems (the PIIX3 "Neptune" chip set). Until now there has not been any simple way to work around the bug, but the lastest changes in uhci-hcd have made it easy. This patch (as684) adds the work-around. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 84afddd7ac58adad00cb0e50d0af25fcf825668b tree b528f0169ae61309ea4a0020bd53504f8faa827e parent 04538a255ac8b404c20cbf15867c9829254c470f author Alan Stern Fri, 12 May 2006 11:35:45 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] UHCI: Reimplement FSBR This patch (as683) re-implements Full-Speed Bandwidth Reclamation (FSBR) properly. It keeps track of which endpoint queues have advanced, and when none have advanced for a sufficiently long time, FSBR is turned off. The next TD on each of the non-moving queues is modified to generate an interrupt on completion, so that FSBR can be re-enabled as soon as the hardware starts to make some progress. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 04538a255ac8b404c20cbf15867c9829254c470f tree 8b8a9bf63e9b1b804e2bf732e32db2827f422867 parent a0b458b64b2a3a4cb806dd5cd889bbf6c7e9d686 author Alan Stern Fri, 12 May 2006 11:29:04 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] UHCI: Eliminate the TD-removal list This patch (as682) gets rid of the TD-removal list in uhci-hcd. It is no longer needed because now TDs are not freed until we know the hardware isn't using them. It also simplifies the code for adding and removing TDs to/from URBs. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a0b458b64b2a3a4cb806dd5cd889bbf6c7e9d686 tree 88a5d6e48140f4534e6b9e02352bf4b16cb5ef42 parent 59e29ed91cff90b27d393c7a3d3ac9c3fcaea7dd author Alan Stern Fri, 12 May 2006 11:23:19 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] UHCI: Move code for cleaning up unlinked URBs This patch (as681) moves some code for cleaning up after unlinked URBs out of the general completion pathway into the unlinking pathway. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 59e29ed91cff90b27d393c7a3d3ac9c3fcaea7dd tree 5003afaca5960954fe25a2fe6401f43fef48f8bb parent b1869000a60b0c72022811f24110a52d3e300b1e author Alan Stern Fri, 12 May 2006 11:19:19 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] UHCI: Remove non-iso TDs as they are used This patch (as680) frees non-isochronous TDs as they are used, rather than all at once when an URB is complete. Although not a terribly important change in itself, it opens the door to a later enhancement that will reduce storage requirements by allocating only a limited number of TDs at any time for each endpoint queue. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit b1869000a60b0c72022811f24110a52d3e300b1e tree b44930e177a344e63fb7e8b60466a38ae4877b2b parent 0f28b55db543001d360e4319bfc3f2c4e28ba05f author Alan Stern Fri, 12 May 2006 11:14:25 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] UHCI: Common result routine for Control/Bulk/Interrupt This patch (as679) combines the result routine for Control URBs with the routine for Bulk/Interrupt URBs. Along the way I eliminated the debugging printouts for Control transfers unless the debugging level is set higher than 1. I also eliminated a long-unused (#ifdef'ed-out) section that works around some buggy old APC BackUPS devices. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 0f28b55db543001d360e4319bfc3f2c4e28ba05f tree ba4f93841ee399c6eba67c3920f4e10e74850258 parent a82e49b8aeb9f8dafdf6cf2e617c8b95bf056257 author Alan Stern Mon, 15 May 2006 14:49:04 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] usbhid: automatically set HID_QUIRK_NOGET for keyboards and mice It seems to be relatively common for USB keyboards and mice to dislike being polled for reports. Since there's no need to poll a keyboard or a mouse, this patch (as685) automatically sets the HID_QUIRK_NOGET flag for devices that advertise themselves as either sort of device with boot protocol support. This won't cure all the problems since some devices don't support the boot protocol, but it's simple and easy and it should fix quite a few problems. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a82e49b8aeb9f8dafdf6cf2e617c8b95bf056257 tree c264d2e4193d76a68468c42ee36cb33affe018fa parent 2775562ad2af2fc131ef7987166db6e42217528f author Bart Massey Mon, 08 May 2006 14:40:13 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB HID/HIDBP, INPUT DRIVERS: fix various usb/input/hid-input.c bugs that make Apple Mighty Mouse work poorly Transposed lines of code in drivers/usb/input/hid-input.c causes the capability bits for a new HID device to be set before quirks are applied at configuration time. When an HID event is then sent up to the input layer, it may then be discarded as irrelevant because the wrong capability bit is set. Further, the quirks for the Apple Mighty Mouse are not quite right: the horizontal scrolling needs its axis reversed, and the left and center buttons are transposed. Also, the mouse is labeled in the kernel with its earlier name (I think) of Apple PowerMouse. Steps to reproduce problem: Plug in an Apple Mighty Mouse. Note that horizontal scrolling doesn't work at all, and in fact doesn't generate any input events on /dev/input/eventN. Note also that pushing the middle button performs the right button action, and vice versa. Once you have the horizontal scrolling working, note that it is backward WRT both to vertical scrolling and to common sense. This patch maybe should be broken up, as it does address two problems. The transposed code in hidinput_configure_usage() probably creates bugs beyond just the Mighty Mouse. The rest of the patch renames POWERMOUSE to MIGHTYMOUSE everywhere (which I *believe* is correct), fixes the MIGHTYMOUSE quirk to swap the center and right mouse buttons, and adds a new quirk HID_QUIRK_INVERT_HWHEEL also assigned to the MIGHTYMOUSE with code in hidinput_hid_event() to implement it. Signed-off-by: Bart Massey Signed-off-by: Greg Kroah-Hartman commit 2775562ad2af2fc131ef7987166db6e42217528f tree 87c0ba46d8daa8d4b9af6f54b34b21b52c3fa57e parent 4de7d2c231a8624a47417977be0768c5b5257c4f author Alan Stern Fri, 05 May 2006 16:32:02 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB: UHCI: fix obscure bug in enqueue() This patch (as676) fixes a small bug in uhci-hcd's enqueue routine. When an URB is unlinked or gets an error and the completion handler queues another URB for the same endpoint, the queue shouldn't be allowed to start up again until the handler returns. Not even if the new URB is the only one on its queue. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 4de7d2c231a8624a47417977be0768c5b5257c4f tree 3dba388c3c8e0673a5884c900f2b04339dc4708e parent 2d61bde7a0e630e1906e6478b6b2a7aeaaa8f8da author Alan Stern Fri, 05 May 2006 16:26:58 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB: UHCI: store the endpoint type in the QH structure This patch (as675) simplifies uhci-hcd slightly by storing each endpoint's type in the corresponding Queue Header structure. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 2d61bde7a0e630e1906e6478b6b2a7aeaaa8f8da tree b52f1ed6ea51a5503ef859e2ae3d4eaa16ee4b05 parent b383539e04c413e040d998aedcc120c49aa670da author Alan Stern Fri, 05 May 2006 16:23:42 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB: net2280: add a shutdown routine The net2280 board has an annoying habit of surviving soft reboots with interrupts enabled. This patch (as674) adds a shutdown routine to the driver so that the board can be put in a quiescent state. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit b383539e04c413e040d998aedcc120c49aa670da tree e926b4f73ec6929aa3b8a794e88ecc43d863e957 parent f9347c52347f24244c550871eab8ecb0fb5704d6 author Daniel Drake Tue, 09 May 2006 01:45:27 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB: usb-storage alauda: Fix transport info mismerge Unfortunately it looks like the transport entry for this subdriver was merged into the protocol section, making this driver unusable :( Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman commit f9347c52347f24244c550871eab8ecb0fb5704d6 tree f6060ca35c9ad6eb6804e529de6186632bb5c160 parent bdcfd9e349eff9398a1d85eaa517294f493bb3c8 author Daniel Drake Mon, 08 May 2006 23:43:02 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB shuttle_usbat: hardcode flash detection for now After some further testing with my flash device I realised that our current probe doesn't always work (e.g. when no media is inserted). Now that Peter Chubb's patch has simplified the detection of 99% of the HP CD writers out there, we have a much smaller range of hardware to work with on the shared device ID, so it should be possible to try some of the previous probe options again: we just need to find another tester with a USBAT2-based HP CD writer. This patch hardcodes the flash detection until someone comes along with one of these obscure CD drives. Note that these devices are extremely rare, so even if we can't ever find a decent probe method, at least we will be supporting almost all of the USBAT-based hardware out there. Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman commit bdcfd9e349eff9398a1d85eaa517294f493bb3c8 tree 62a8804e6ff6559a0de1f09021c9f8cccaf11cf5 parent 141804d401631f0384feabfa5fc3e2ce1321c0f0 author Peter Chubb Tue, 02 May 2006 18:29:34 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB: shuttle_usbat: Hardcode detection of HP CDRW devices Use USB vendor and product IDs to determine whether the attached device is a CDROM or a Flash device. Daniel Drake says that the *same* vendor and product IDs for non-HP vendor ID could be either flash or cdrom, so try to probe for them. Signed-off-by: Peter Chubb Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman commit 141804d401631f0384feabfa5fc3e2ce1321c0f0 tree 196342c81d2e9de937575d7851525a3e5b2f210e parent 69165c29bb4db9bafead7c6574c73ce245965f3a author Peter Chubb Tue, 02 May 2006 18:30:12 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB: shuttle_usbat: Fix handling of scatter-gather buffers I've worked out what's going wrong. The scsi layer is now much more likely to pass down scatterlists instead of plain buffers. So you have to make sure that they're handled correctly. In one of the changes along the way, usbat_write_block and friends stopped obeying the srb->use_sg flag. Anyway, with the appended patch, and the one I'm putting in the next email, it all seems to work for the HP cd4e. Of course, someone's going to have to test it with the flash drives as well.... This patch teaches the usbat_{read,write}_block functions to obey the use_sg flag in the scsi-request. Signed-off-by: Peter Chubb Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman commit 69165c29bb4db9bafead7c6574c73ce245965f3a tree 64e39463bb48cb1a40393640222e4ef69a2b308b parent a01c4ef1cc9622fcce5c10ddb8e9e7f76206959e author Sean Young Tue, 02 May 2006 11:44:43 +0000 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB Phidget InterfaceKit: make inputs pollable and new device support Make inputs pollable using sysfs_notify and add support for the Phidget InterfaceKit 0/16/16. Various cleanups. Signed-off-by: Sean Young Signed-off-by: Daniel Saakes Signed-off-by: Greg Kroah-Hartman commit a01c4ef1cc9622fcce5c10ddb8e9e7f76206959e tree d818051ca720f30307f70c99055583ed3e697d61 parent fcf4830a525d37b9bd3ba60430b5729b8621062d author Duncan Sands Fri, 28 Apr 2006 18:58:57 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USBATM: remove no-longer needed #include We #include only because needed it, but didn't #include it itself. But that's been fixed now. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit fcf4830a525d37b9bd3ba60430b5729b8621062d tree f074a52b10ea331915c9b3cbb5469cfe6a50a2ee parent 41fea55e0382b7d59d694d8055b39aa69c793b1f author Duncan Sands Fri, 28 Apr 2006 18:53:45 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USBATM: remove pointless inline Remove pointless inline. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 41fea55e0382b7d59d694d8055b39aa69c793b1f tree 634dce47441863b0270f66de25a0995bb767b8dd parent 4489a5712b086621a6c3f669057d2996245cd3fb author Pete Zaitcev Fri, 28 Apr 2006 20:45:49 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB: clean out an unnecessary NULL check from ub Remove the check for NULL which makes no sense. Suggested by Al. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 4489a5712b086621a6c3f669057d2996245cd3fb tree f79eb7f00a4d95eb7505b2f29283b2ce927feac4 parent 9effa978f1d51f6d0426ebabcf6cb32336bb3153 author Alan Stern Thu, 27 Apr 2006 15:54:22 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB: usbcore: always turn on hub port power Some hubs claim not to support port-power switching, and right now the hub driver believes them and does not enable power to their ports. However it turns out that even though they don't actually switch power, they do ignore all events on a port until told to turn on the power! This problem has been reported by several users. This revised patch (as672b) makes the hub driver always try to turn on port power to all hubs, regardless of what the hub descriptor says. It also adds a comment explaining the need for this. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 9effa978f1d51f6d0426ebabcf6cb32336bb3153 tree 9f30639c3bda03d031fc75f5b6404abbf19f17cb parent 73e487fdb75f8abf230968dbf73a3dc3b16808d3 author Nicolas Boichat Wed, 19 Apr 2006 23:36:40 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB: MacBook Pro touchpad support Add support for MacBook touchpad in appletouch driver. Thanks to Alex Harper for the informations. Use u16 instead of int16_t in atp_is_geyser* functions. Acked-by: Johannes Berg Acked-by: Stelian Pop Signed-off-by: Nicolas Boichat Signed-off-by: Greg Kroah-Hartman commit 73e487fdb75f8abf230968dbf73a3dc3b16808d3 tree 3e40b1888ec5529b2f3e9a2dfa5d5e6b47947b48 parent ca85485c1f482e6625f36aceb85eaaeff4b22d79 author Guennadi Liakhovetski Tue, 25 Apr 2006 07:46:17 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB console: fix disconnection issues Prevent sending further output to a USB-serial console after the dongle is disconnected, take care not to leak kref. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Greg Kroah-Hartman commit ca85485c1f482e6625f36aceb85eaaeff4b22d79 tree 8baa96756703e12b9033b8618bd0cdbfc2a1143b parent 57845bd104233cb75b9ab3624f7ea7662298bc27 author Paul Fulghum Thu, 13 Apr 2006 22:28:17 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB: console: prevent ENODEV on node Prevent ENODEV on a /dev/ttyUSBx, used as a USB-serial console. From: Paul Fulghum Signed-off-by: Guennadi Liakhovetski Signed-off-by: Greg Kroah-Hartman commit 57845bd104233cb75b9ab3624f7ea7662298bc27 tree 73ac01088881aa217b07c79a781b7c4412ea85e4 parent c10746dbb39d41e5fc27badfebe61448210c426d author Guennadi Liakhovetski Thu, 13 Apr 2006 22:27:12 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB: console: fix oops Prevent NULL dereference when used as a USB-serial console. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Greg Kroah-Hartman commit c10746dbb39d41e5fc27badfebe61448210c426d tree 8e1b47bb64433e8f7f282bdcebc38f0368323775 parent 01cced250722d22d99c2342979490f93ca886521 author Paul Fulghum Thu, 13 Apr 2006 22:26:35 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB: console: fix cr/lf issues Append Carriage-Returns after Line-Feeds, analogous to the serial driver. From: Paul Fulghum Signed-off-by: Guennadi Liakhovetski Signed-off-by: Greg Kroah-Hartman commit 01cced250722d22d99c2342979490f93ca886521 tree b29b395305836a0f3690a69173e1df2a2f0ecf4f parent df47e5330b0f5decb0a5736e9a81fff49d46d151 author Kumar Gala Tue, 11 Apr 2006 10:07:16 -0500 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB: allow multiple types of EHCI controllers to be built as modules In some systems we may have both a platform EHCI controller and PCI EHCI controller. Previously we couldn't build the EHCI support as a module due to conflicting module_init() calls in the code. Signed-off-by: Kumar Gala Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit df47e5330b0f5decb0a5736e9a81fff49d46d151 tree fcf5fe254235517ecb77fe652f5ed2e04fa02554 parent 2682d27c5884550857cd96231db5b22b3acced53 author Adrian Bunk Sat, 15 Apr 2006 11:17:27 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:08 -0700 [PATCH] USB: sisusbvga: possible cleanups This patch contains the following possible cleanups: - make needlessly global functions static - function and struct declarations belong into header files - make SiS_VCLKData const - #if 0 the following unused global functions: - sisusb.c: sisusb_writew() - sisusb.c: sisusb_readw() - sisusb_init.c: SiSUSB_GetModeID() Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 2682d27c5884550857cd96231db5b22b3acced53 tree 94b19f6a04993352d8ce3f189366d9cd4969fb58 parent 7327413c745c2f8e8d4b92f76759821263b095c1 author Arjan van de Ven Tue, 28 Mar 2006 01:00:21 -0800 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:08 -0700 [PATCH] USB: convert the semaphores in the sisusb driver to mutexes From: Arjan van de Ven Convert the semaphores-used-as-mutex to mutexes in the sisusb video driver; this required manual checking due to the "return as locked" stuff in this driver, but the ->lock semaphore is still used as mutex in the end. Signed-off-by: Arjan van de Ven Cc: Thomas Winischhofer Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 7327413c745c2f8e8d4b92f76759821263b095c1 tree 193e4ffb890a98757ca319fd90d9ec7b8920efe1 parent f44f725f7d635e8b9786eef13f836dc1a2851495 author Eduard Warkentin Thu, 18 May 2006 01:13:17 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:08 -0700 [PATCH] USB: added support for ASIX 88178 chipset USB Gigabit Ethernet adaptor Add support for detection and dworking with a ASIX 88178 based USB-Gigabit adaptor. With the patch, it is detected and handled correctly by the asix module. Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit f44f725f7d635e8b9786eef13f836dc1a2851495 tree b9059a88ce6123ee093422b3ba47174534555ddb parent 86478944eba887f149e151bacc023ae4b2d23ea6 author David Brownell Fri, 12 May 2006 19:24:34 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:08 -0700 [PATCH] USB: usbnet, zaurus mtu fixup This includes an MTU fixup which could affect larger packets with newer Zaurii, described as http://bugzilla.kernel.org/show_bug.cgi?id=6286; plus minor whitespace cleanup. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 86478944eba887f149e151bacc023ae4b2d23ea6 tree 21c9871c1524c75cc702e0fbaa7700e82a9f744f parent 5cd330f4f30eb154e7af9210bed42dfcd447997f author Oliver Neukum Sat, 13 May 2006 22:50:47 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:08 -0700 [PATCH] USB: cdc-acm: add a new special case for modems with buggy firmware this fixes the "duplicated text" bug. There's a modem that cannot cope with large transfers and more than one urb in flight. This patch adds a special case to the driver. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 5cd330f4f30eb154e7af9210bed42dfcd447997f tree 5b480f10d1f4a3abb4fc338ae521b5c24d6fca20 parent c32ba30f76eb18b3d4449072fe9c345a9574796b author Henk Vergonet Mon, 15 May 2006 12:34:43 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:08 -0700 [PATCH] USB: add YEALINK phones to the HID_QUIRK_IGNORE blacklist Keys on Yealink based phones will not function properly when using the generic HID driver. This patch prevents the generic HID code from grabbing the device before the regular yealink driver can get a grip on it. Signed-off-by: Henk Vergonet Signed-off-by: Vojtech Pavlik Signed-off-by: Greg Kroah-Hartman commit c32ba30f76eb18b3d4449072fe9c345a9574796b tree 33e589aa7da775a4a67aeec4b72d9f721013b7d4 parent a5117ba7da37deb09df5eb802dace229b3fb1e9f author Paul Serice Wed, 07 Jun 2006 10:23:38 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:08 -0700 [PATCH] USB: EHCI works again on NVidia controllers with >2GB RAM From: Paul Serice The workaround in commit f7201c3dcd7799f2aa3d6ec427b194225360ecee broke. The work around requires memory for DMA transfers for some NVidia EHCI controllers to be below 2GB, but recent changes have caused some DMA memory to be allocated before the DMA mask is set. Signed-off-by: Paul Serice Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 1323523f505606cfd24af6122369afddefc3b09d tree a3238a27220dd91ec0918478683e59e48605865f parent 9ba89334552b96e2127dcafb1c46ce255ecf2667 parent 32e62c636a728cb39c0b3bd191286f2ca65d4028 author Tony Luck Wed, 21 Jun 2006 14:50:10 -0700 committer Tony Luck Wed, 21 Jun 2006 14:50:10 -0700 Pull rework-memory-attribute-aliasing into release branch commit 9ba89334552b96e2127dcafb1c46ce255ecf2667 tree 9e94efa48696b0796720a9f9f042da51a6fa7fc8 parent f640f94ec4f39e8a4d91d58354d3e09b28769edf author Ian Wienand Wed, 21 Jun 2006 10:33:04 +1000 committer Tony Luck Wed, 21 Jun 2006 14:48:34 -0700 [IA64] SKI Simulator boot Sorry I didn't notice earlier, but that BUG_ON triggers for me on the simulator. AFAICS the mask for itv is set in cpu_init(), which comes after sal_init(). Consequently on the simulator the itv still has its start value of zero. I've probably missed something, but I wonder why at this stage of the boot you even need to save and restore the itv? Signed-Off-By: Ian Wienand Signed-off-by: Tony Luck commit f640f94ec4f39e8a4d91d58354d3e09b28769edf tree 005abff2ede1284c7220f01c5f066cbb2d24ff8b parent d270acbc24f0ce451c773c214ac0e92e95396b2f author Mike Habeck Mon, 19 Jun 2006 15:38:10 -0500 committer Tony Luck Wed, 21 Jun 2006 14:47:06 -0700 [IA64-SGI] fix SGI Altix tioce_bus_fixup() bug The following patch fixes a bug in the SGI Altix tioce_bus_fixup() code. ce_dre_comp_err_addr needs to be zero'd out not ~0ULL. As a result completion errors weren't being captured. Signed-off-by: Mike Habeck Signed-off-by: Tony Luck commit d270acbc24f0ce451c773c214ac0e92e95396b2f tree 46fb1417fd85a4fe477afe391975bc3bc3dec1ab parent b7bb575c3fa3694811a072109f4e9c2f4705d8f5 author Keith Owens Fri, 07 Apr 2006 18:08:11 +1000 committer Tony Luck Wed, 21 Jun 2006 14:44:26 -0700 [IA64] Sanitize assembler code for ia64_sal_os_state struct ia64_sal_os_state has three semi-independent sections. The code in mca_asm.S assumes that these three sections are contiguous, which makes it very awkward to add new data to this structure. Remove the assumption that the sections are contiguous. Define a macro to shorten references to offsets in ia64_sal_os_state. This patch does not change the way that the code behaves. It just makes it easier to update the code in future and to add fields to ia64_sal_os_state when debugging the MCA/INIT handlers. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit b7bb575c3fa3694811a072109f4e9c2f4705d8f5 tree 7d3c8bc2ba07af4e551f6d847f358090fb39d51d parent ea95972f18481089e73368f9e62f6d70087bf4de author Kenji Kaneshige Fri, 28 Apr 2006 11:50:43 +0900 committer Tony Luck Wed, 21 Jun 2006 14:42:24 -0700 [IA64] Make PCI Express support selectable When I tried to use PCI Express Hotplug driver on my ia64 box, I noticed that "PCI Express support" is not even selectable on ia64. This patch makes PCI Express support selectable. Signed-off-by: Kenji Kaneshige Signed-off-by: Tony Luck commit ea95972f18481089e73368f9e62f6d70087bf4de tree 7ea2a8c039eff1dfb638d97732bfc27b0e1cd26c parent 65884734902c8f0b4d83293985678ab83b24ef72 author Russ Anderson Wed, 10 May 2006 11:09:01 -0500 committer Tony Luck Wed, 21 Jun 2006 14:39:41 -0700 [IA64-SGI] Remove SN SAL error handling feature bit that is no longer needed Due to improvements in linux & SAL MCA handling, the SAL_ERR_FEAT_MCA_SLV_TO_OS_INIT_SLV error handling features bit is no longer needed. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit 4092e256ca35e62b431ebad4e0c42c6360acee08 tree c74cfb2d1b72fecb75be031e177c3477f65a1c58 parent b3818ed446fc41db41b5a38d934ac2b69fd2e0aa author Dave Jones Wed, 21 Jun 2006 17:36:24 -0400 committer Dave Jones Wed, 21 Jun 2006 17:36:24 -0400 [AGPGART] Fix pci_register_driver checking in amd64-agp pci_register_driver() never returns a positive number. Signed-off-by: Dave Jones commit 65884734902c8f0b4d83293985678ab83b24ef72 tree 7e522d52daf95368d59cbd2699b8e96b6b3de222 parent a1d7057727bc9e20a0a417812f538fe6b8a02c03 author David Mosberger-Tang Wed, 24 May 2006 22:16:03 -0600 committer Tony Luck Wed, 21 Jun 2006 14:35:28 -0700 [IA64] make efi_stub.S fit in 80 cols Just a trivial cleanup patch Signed-off-by: Tony Luck commit 9ed059e1551bf36092215b965838502ac21f42e4 tree 083f7ffc708a4b0c9a2ebb6519478edf1ea3a825 parent 491b07c98f2ac75f1a4370af76ae2403a4c579f5 author Randy Dunlap Tue, 20 Jun 2006 22:32:56 -0700 committer Dave Jones Wed, 21 Jun 2006 17:34:25 -0400 [CPUFREQ] Fix powernow-k8 SMP kernel on UP hardware bug. Fix powernow-k8 doesn't load bug. Reference: https://launchpad.net/distros/ubuntu/+source/linux-source-2.6.15/+bug/35145 Signed-off-by: Ben Collins Signed-off-by: Dave Jones commit 491b07c98f2ac75f1a4370af76ae2403a4c579f5 tree b9c6bcbae16069aa9341448caef1723ecb328e82 parent 6cad647da228486f36a9794137ad459e39b02590 author Jeremy Fitzhardinge Wed, 21 Jun 2006 13:15:48 -0700 committer Dave Jones Wed, 21 Jun 2006 17:34:25 -0400 [PATCH] redirect speedstep-centrino maintainer mail to cpufreq list I haven't really maintained this driver for a while, and I'm not keeping up with the latest in Intel power management. I get a steady stream of mail which I don't really do anything useful with; the cpufreq list seems like a better destination, unless someone wants to get the mail directly. Also clean up a couple of ancient comments which don't really apply anymore (as far as I know, nobody has ever damaged a CPU with this driver). Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Dave Jones commit a1d7057727bc9e20a0a417812f538fe6b8a02c03 tree bd3627eb3ea4b916dd1de521c341b92e3444f4dd parent 5eb1d63f5fc8455269c2756223b3cf3779fd2f7a author Jack Steiner Wed, 31 May 2006 08:58:08 -0500 committer Tony Luck Wed, 21 Jun 2006 14:33:56 -0700 [IA64-SGI] SN topology fix for large systems There is an SN bug in sn_hwperf.c that affects systems with 1024n or 1024p. The bug manifests itself 2 ways: IO interrupts are not always targeted to the nearest node, and 2) the "cat /proc/sgi_sn/sn_topology" commands fails with "cannot allocate memory". The code is using the wrong macros for validating node numbers. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 5eb1d63f5fc8455269c2756223b3cf3779fd2f7a tree 169d7791754f75b970d0b7e8d3c921a8cf59919b parent 120b286d3c94a4e59fdb8069d42e8d49ea468ffd author Alex Williamson Tue, 06 Jun 2006 10:36:27 -0600 committer Tony Luck Wed, 21 Jun 2006 14:32:25 -0700 [IA64] sanity check reserved region usage One more trivial, stand-alone patch from the Xen/ia64 review. Sanity check usage of the reserved region numbers. Signed-off-by: Alex Williamson Signed-off-by: Tony Luck commit 120b286d3c94a4e59fdb8069d42e8d49ea468ffd tree c103f6926a08cb50c4586efd4db2a330a3381c40 parent 28e4b224955cbe30275b2a7842e729023a4f4b03 author Alex Williamson Tue, 06 Jun 2006 10:23:34 -0600 committer Tony Luck Wed, 21 Jun 2006 14:31:07 -0700 [IA64] add vmlinuz target This is a trivial stand-alone patch out of the Xen/ia64 patches. Add a vmlinuz build target to be more compatible with x86-ish targets. Signed-off-by: Alex Williamson Signed-off-by: Tony Luck commit a5117ba7da37deb09df5eb802dace229b3fb1e9f tree eec1e160cbc11a4a1dae107ed27d92c991f5fcf6 parent 3e95637a48820ff8bedb33e6439def96ccff1de5 author Rene Herman Tue, 06 Jun 2006 23:54:02 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] Driver model: add ISA bus During the recent "isa drivers using platform devices" discussion it was pointed out that (ALSA) ISA drivers ran into the problem of not having the option to fail driver load (device registration rather) upon not finding their hardware due to a probe() error not being passed up through the driver model. In the course of that, I suggested a seperate ISA bus might be best; Russell King agreed and suggested this bus could use the .match() method for the actual device discovery. The attached does this. For this old non (generically) discoverable ISA hardware only the driver itself can do discovery so as a difference with the platform_bus, this isa_bus also distributes match() up to the driver. As another difference: these devices only exist in the driver model due to the driver creating them because it might want to drive them, meaning that all device creation has been made internal as well. The usage model this provides is nice, and has been acked from the ALSA side by Takashi Iwai and Jaroslav Kysela. The ALSA driver module_init's now (for oldisa-only drivers) become: static int __init alsa_card_foo_init(void) { return isa_register_driver(&snd_foo_isa_driver, SNDRV_CARDS); } static void __exit alsa_card_foo_exit(void) { isa_unregister_driver(&snd_foo_isa_driver); } Quite like the other bus models therefore. This removes a lot of duplicated init code from the ALSA ISA drivers. The passed in isa_driver struct is the regular driver struct embedding a struct device_driver, the normal probe/remove/shutdown/suspend/resume callbacks, and as indicated that .match callback. The "SNDRV_CARDS" you see being passed in is a "unsigned int ndev" parameter, indicating how many devices to create and call our methods with. The platform_driver callbacks are called with a platform_device param; the isa_driver callbacks are being called with a "struct device *dev, unsigned int id" pair directly -- with the device creation completely internal to the bus it's much cleaner to not leak isa_dev's by passing them in at all. The id is the only thing we ever want other then the struct device * anyways, and it makes for nicer code in the callbacks as well. With this additional .match() callback ISA drivers have all options. If ALSA would want to keep the old non-load behaviour, it could stick all of the old .probe in .match, which would only keep them registered after everything was found to be present and accounted for. If it wanted the behaviour of always loading as it inadvertently did for a bit after the changeover to platform devices, it could just not provide a .match() and do everything in .probe() as before. If it, as Takashi Iwai already suggested earlier as a way of following the model from saner buses more closely, wants to load when a later bind could conceivably succeed, it could use .match() for the prerequisites (such as checking the user wants the card enabled and that port/irq/dma values have been passed in) and .probe() for everything else. This is the nicest model. To the code... This exports only two functions; isa_{,un}register_driver(). isa_register_driver() register's the struct device_driver, and then loops over the passed in ndev creating devices and registering them. This causes the bus match method to be called for them, which is: int isa_bus_match(struct device *dev, struct device_driver *driver) { struct isa_driver *isa_driver = to_isa_driver(driver); if (dev->platform_data == isa_driver) { if (!isa_driver->match || isa_driver->match(dev, to_isa_dev(dev)->id)) return 1; dev->platform_data = NULL; } return 0; } The first thing this does is check if this device is in fact one of this driver's devices by seeing if the device's platform_data pointer is set to this driver. Platform devices compare strings, but we don't need to do that with everything being internal, so isa_register_driver() abuses dev->platform_data as a isa_driver pointer which we can then check here. I believe platform_data is available for this, but if rather not, moving the isa_driver pointer to the private struct isa_dev is ofcourse fine as well. Then, if the the driver did not provide a .match, it matches. If it did, the driver match() method is called to determine a match. If it did _not_ match, dev->platform_data is reset to indicate this to isa_register_driver which can then unregister the device again. If during all this, there's any error, or no devices matched at all everything is backed out again and the error, or -ENODEV, is returned. isa_unregister_driver() just unregisters the matched devices and the driver itself. More global points/questions... - I'm introducing include/linux/isa.h. It was available but is ofcourse a somewhat generic name. Moving more isa stuff over to it in time is ofcourse fine, so can I have it please? :) - I'm using device_initcall() and added the isa.o (dependent on CONFIG_ISA) after the base driver model things in the Makefile. Will this do, or I really need to stick it in drivers/base/init.c, inside #ifdef CONFIG_ISA? It's working fine. Lastly -- I also looked, a bit, into integrating with PnP. "Old ISA" could be another pnp_protocol, but this does not seem to be a good match, largely due to the same reason platform_devices weren't -- the devices do not have a life of their own outside the driver, meaning the pnp_protocol {get,set}_resources callbacks would need to callback into driver -- which again means you first need to _have_ that driver. Even if there's clean way around that, you only end up inventing fake but valid-form PnP IDs and generally catering to the PnP layer without any practical advantages over this very simple isa_bus. The thing I also suggested earlier about the user echoing values into /sys to set up the hardware from userspace first is... well, cute, but a horrible idea from a user standpoint. Comments ofcourse appreciated. Hope it's okay. As said, the usage model is nice at least. Signed-off-by: Rene Herman commit 3e95637a48820ff8bedb33e6439def96ccff1de5 tree 69930bc984892d68574e3623a0cbd88928fa6d06 parent e9a7d305faec364ba973d6c22c9b1e802ef79204 author Alan Stern Fri, 16 Jun 2006 17:10:48 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] Driver Core: Make dev_info and friends print the bus name if there is no driver This patch (as721) makes dev_info and related macros print the device's bus name if the device doesn't have a driver, instead of printing just a blank. If the device isn't on a bus either... well, then it does leave a blank space. But it will be easier for someone else to change if they want. Cc: Matthew Wilcox Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit e9a7d305faec364ba973d6c22c9b1e802ef79204 tree 1bd38fb8f39d4895734885fd7b6f52c14222e481 parent b9d9c82b4d081feb464f62dfc786c8621d09ecd2 author Greg Kroah-Hartman Tue, 20 Jun 2006 13:59:20 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] Driver core: add proper symlinks for devices We need to create the "compatible" symlinks that class_devices used to create when they were in the class directories so that userspace does not know anything changed at all. Yeah, we have a lot of symlinks now, but we should be able to get rid of them in a year or two... (wishful thinking...) Signed-off-by: Greg Kroah-Hartman commit b9d9c82b4d081feb464f62dfc786c8621d09ecd2 tree 511d15b4d7aaba80a2c0fe49622a3224ca386122 parent 23681e479129854305da1da32f7f1eaf635ef22c author Kay Sievers Thu, 15 Jun 2006 15:31:56 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] Driver core: add generic "subsystem" link to all devices Like the SUBSYTEM= key we find in the environment of the uevent, this creates a generic "subsystem" link in sysfs for every device. Userspace usually doesn't care at all if its a "class" or a "bus" device. This provides an unified way to determine the subsytem of a device, regardless of the way the driver core has created it. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 23681e479129854305da1da32f7f1eaf635ef22c tree 5677e3d851e8d65feeb64c9852e4dbb60e75ff41 parent aa49b9136e3d44cc264811d77eef4ded88456717 author Greg Kroah-Hartman Wed, 14 Jun 2006 12:14:34 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] Driver core: allow struct device to have a dev_t This is the first step in moving class_device to being replaced by struct device. It allows struct device to export a dev_t and makes it easy to dynamically create and destroy struct device as long as they are associated with a specific class. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit aa49b9136e3d44cc264811d77eef4ded88456717 tree 9f84c71790724ba53384a651ca523b35382c054c parent cad1e55d4d19a49c2b82b74562a6e4e555b05f38 author Greg Kroah-Hartman Tue, 20 Jun 2006 13:59:20 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] Driver core: change make_class_name() to take kobjects This is needed for a future patch for the device code to create the proper symlinks for devices that are "class devices". Signed-off-by: Greg Kroah-Hartman commit cad1e55d4d19a49c2b82b74562a6e4e555b05f38 tree 8782a20ecc3086277ec9e1f0d97b0e32d058a512 parent fd869db6eb1ea0ffe251e53a113dbf259400f4f6 author Laura Garcia Tue, 23 May 2006 23:22:38 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] firmware_class: s/semaphores/mutexes Hi, this patch converts semaphores to mutexes for Randy's firmware_class. Signed-off-by: Laura Garcia Liebana Signed-off-by: Greg Kroah-Hartman commit fd869db6eb1ea0ffe251e53a113dbf259400f4f6 tree bce8f3d2316c3e257dfe5f6e5fa024abffa0c03d parent 1e724845034eb898c97dc6636207f0a231af9432 author David Brownell Tue, 16 May 2006 17:03:25 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] Driver core: PM_DEBUG device suspend() messages become informative This makes the driver model PM suspend debug messages more useful, by (a) explaining what event is being sent, since not all suspend() requests mean the same thing; (b) reporting when a PM_EVENT_SUSPEND call is allowing the device to issue wakeup events. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 1e724845034eb898c97dc6636207f0a231af9432 tree 1c99a56d22c10fe995ebc5c5a088233adeee677d parent 4039483fd3065920f035eed39ec59085421c0a4f author David Brownell Tue, 16 May 2006 17:00:08 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] remove duplication from Documentation/power/devices.txt Remove a chunk of duplicated documentation text. Signed-off-by: Greg Kroah-Hartman commit 4039483fd3065920f035eed39ec59085421c0a4f tree fc89410a8cd031c3f71a7319987fa6fc9b09336c parent e391553222211e07dfbe2f01c413b4e6d0ae32aa author Michael Holzheu Tue, 09 May 2006 12:53:49 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:48 -0700 [PATCH] Driver Core: Add /sys/hypervisor when needed To have a home for all hypervisors, this patch creates /sys/hypervisor. A new config option SYS_HYPERVISOR is introduced, which should to be set by architecture dependent hypervisors (e.g. s390 or Xen). Acked-by: Martin Schwidefsky Signed-off-by: Michael Holzheu Signed-off-by: Greg Kroah-Hartman commit e391553222211e07dfbe2f01c413b4e6d0ae32aa tree 4240a4023c5434de449a9f73e07a9d1ff0d68c84 parent 670dd90d81f60ef429cbba54ad235e9207f4d444 author Russell King Sat, 06 May 2006 08:15:26 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:48 -0700 [PATCH] Driver Core: Fix platform_device_add to use device_add platform_device_add() should be using device_add() rather than device_register() - any platform device passed to platform_device_add() should have already been initialised, either by platform_device_alloc() or platform_device_register(). Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 670dd90d81f60ef429cbba54ad235e9207f4d444 tree 817c62329690f69cb32439d00c25023dfe977402 parent 1740757e8f94c6899705eb6f5434de9404992778 author Shaohua Li Mon, 08 May 2006 13:45:57 +0800 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:48 -0700 [PATCH] Driver Core: Allow sysdev_class have attributes allow sysdev_class adding attribute. Next patch will use the new API to add an attribute under /sys/device/system/cpu/. Signed-off-by: Shaohua Li Signed-off-by: Greg Kroah-Hartman commit 1740757e8f94c6899705eb6f5434de9404992778 tree 012bf37dae6c7705a50f88bbdd8d28d975a5dc46 parent a0245f7ad5214cb00131d7cd176446e067c913dc author Greg Kroah-Hartman Tue, 02 May 2006 16:59:59 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:48 -0700 [PATCH] Driver Core: remove unused exports Cc: Arjan van de Ven Signed-off-by: Greg Kroah-Hartman commit a0245f7ad5214cb00131d7cd176446e067c913dc tree 78f138afefa3114cb587561e464ddc6a8b6a7805 parent 05967118a6c354eaa5950429c70ad4c8daca94bf author David Brownell Mon, 29 May 2006 10:37:33 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:48 -0700 [PATCH] platform_bus learns about modalias This patch adds modalias support to platform devices, for simpler hotplug/coldplug driven driver setup. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 05967118a6c354eaa5950429c70ad4c8daca94bf tree 000b297e0c8b673915389743587ef1a7218b8655 parent b7fe4a60f3a5a428832bf5dd9388e80f0d02fc2e author David Brownell Mon, 01 May 2006 13:58:33 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:48 -0700 [PATCH] Driver Core: CONFIG_DEBUG_PM covers drivers/base/power too The drivers/base/power PM debug messages should appear when either PM or driver model debug are enabled. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit b7fe4a60f3a5a428832bf5dd9388e80f0d02fc2e tree e378263252c78af899e8db3f98a0e2cc6486a265 parent 3dda4e373c7474cfe280f4270b70c1563f92a2a7 author Stephen Hemminger Wed, 26 Apr 2006 09:53:14 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:48 -0700 [PATCH] Driver core: class_device_add needs error checks class_device_add needs to check the return value of all the setup it does. It doesn't handle out of memory well. This is not complete, probably more needs to be done. Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman commit 3dda4e373c7474cfe280f4270b70c1563f92a2a7 tree b38e2c22056859de773ef8e47b059f53a52d0215 parent 1cdcb6b43fda7424b7435dac8f80b2b5d8a48899 author Hansjoerg Lipp Sat, 22 Apr 2006 18:43:00 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:47 -0700 [PATCH] i4l gigaset: move sysfs entry to tty class device Using the class device pointer returned by tty_register_device() with part 1 of the patch, attach the Gigaset drivers' "cidmode" sysfs entry to its tty class device, where it can be found more easily by users who do not know nor care which USB port the device is attached to. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Signed-off-by: Greg Kroah-Hartman commit 1cdcb6b43fda7424b7435dac8f80b2b5d8a48899 tree 3090342c60b9b8f0f8144f67962d3cb3ce2a9207 parent 53877d06d53a412d901bb323f080296c363d8b51 author Hansjoerg Lipp Sat, 22 Apr 2006 18:36:53 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:47 -0700 [PATCH] TTY: return class device pointer from tty_register_device() Let tty_register_device() return a pointer to the class device it creates. This allows registrants to add their own sysfs files under the class device node. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Signed-off-by: Greg Kroah-Hartman commit 53877d06d53a412d901bb323f080296c363d8b51 tree ceffbd4dd9342e1742bf59165880888f7f961f33 parent 27c0ff868f2ad3c9732ce45abbb8dd7e1723931f author Kay Sievers Tue, 04 Apr 2006 20:42:26 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:47 -0700 [PATCH] Driver core: bus device event delay split bus_add_device() and send device uevents after sysfs population Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 27c0ff868f2ad3c9732ce45abbb8dd7e1723931f tree bfb9a16843377d12a1d051d04cc8c7791eaceb6e parent c18f6365fdbaf30611a8822afcd7097865dcaa32 author Greg Kroah-Hartman Thu, 27 Apr 2006 15:46:39 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:47 -0700 [PATCH] CCISS: add device symlink to the block cciss block devices in sysfs Signed-off-by: Greg Kroah-Hartman commit c18f6365fdbaf30611a8822afcd7097865dcaa32 tree fb136fffab80d3022edcc4fc17b3da789eb7b838 parent 183bd5b3da82b80920c30c4772222df8027fc364 author Greg Kroah-Hartman Thu, 27 Apr 2006 14:10:12 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:47 -0700 [PATCH] Add kernel<->userspace ABI stability documentation Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 183bd5b3da82b80920c30c4772222df8027fc364 tree 9af7f9210a044b0604d09338cd0920fbab82e3a9 parent 789e7dc8ee6cfb7928208b077d0799d81196e9bb author Greg Kroah-Hartman Thu, 18 May 2006 10:39:21 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:47 -0700 [PATCH] kobject: make people pay attention to kobject_add errors These really need to be fixed, shout it out to the world. Signed-off-by: Greg Kroah-Hartman commit cf34a8e07f02c76f3f1232eecb681301a3d7b10b tree 9148713707b7b5f50bfeceeaefb78d87474a106b parent ead2bfeb7f739d2ad6e09dc1343f0da51feb7f51 author Brice Goglin Tue, 13 Jun 2006 14:35:42 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:01 -0700 [PATCH] PCI: nVidia quirk to make AER PCI-E extended capability visible The nVidia CK804 PCI-E chipset supports the AER extended capability but sometimes fails to link it (with some BIOS or after a warm reboot). It makes the AER cap invisible to pci_find_ext_capability(). The patch adds a quirk to set the missing bit that controls the linking of the capability. By the way, it removes the corresponding code in the myri10ge driver. Signed-off-by: Brice Goglin Signed-off-by: Loic Prylli Signed-off-by: Greg Kroah-Hartman commit ead2bfeb7f739d2ad6e09dc1343f0da51feb7f51 tree 08a716dbc0c5f1db461a2f1d5773ce08bcbf7654 parent bdee9d98d281d84718eaff6bf0dd2b6ad418b36f author Chuck Ebbert <76306.1226@compuserve.com> Thu, 15 Jun 2006 04:41:52 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:01 -0700 [PATCH] PCI: fix issues with extended conf space when MMCONFIG disabled because of e820 On 15 Jun 2006 03:45:10 +0200, Andi Kleen wrote: > Anyways I would say that if the BIOS can't get MCFG right then > it's likely not been validated on that board and shouldn't be used. According to Petr Vandrovec: ... "What is important (and checked) is address of MMCONFIG reported by MCFG table... Unfortunately code does not bother with printing that address :-( "Another problem is that code has hardcoded that MMCONFIG area is 256MB large. Unfortunately for the code PCI specification allows any power of two between 2MB and 256MB if vendor knows that such amount of busses (from 2 to 128) will be sufficient for system. With notebook it is quite possible that not full 8 bits are implemented for MMCONFIG bus number." So here is a patch. Unfortunately my system still fails the test because it doesn't reserve any part of the MMCONFIG area, but this may fix others. Booted on x86_64, only compiled on i386. x86_64 still remaps the max area (256MB) even though only 2MB is checked... but 2.6.16 had no check at all so it is still better. PCI: reduce size of x86 MMCONFIG reserved area check 1. Print the address of the MMCONFIG area when the test for that area being reserved fails. 2. Only check if the first 2MB is reserved, as that is the minimum. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Acked-by: Arjan van de Ven Signed-off-by: Greg Kroah-Hartman commit bdee9d98d281d84718eaff6bf0dd2b6ad418b36f tree b7122ecf946d3922f1462c512e2f0599fb505184 parent acc7c2e0b73a46122ec370bf8a3aa9f19065d331 author Doug Thompson Wed, 14 Jun 2006 16:59:48 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:01 -0700 [PATCH] PCI: Bus Parity Status sysfs interface From: Doug Thompson This patch adds the 'broken_parity_status' sysfs attribute file to a PCI device. Reading this attribute a userland program can determine if PCI device provides false positives (value of 1) in its generation of PCI Parity status, or not (value of 0). As PCI devices are found to be 'bad' in this regard, userland programs can also set the appropriate value (root access only) of a faulty device. This per device information will be used in the EDAC PCI Parity scanner code in a future patch once this interface becomes available. Signed-off-by: Doug Thompson Signed-off-by: Greg Kroah-Hartman commit acc7c2e0b73a46122ec370bf8a3aa9f19065d331 tree 6e37db90a6e73aa2095d00e66314b3c3dec7e072 parent 4d15a1779dfdf7e7a111022697d3a43da1745d31 author Konrad Rzeszutek Thu, 15 Jun 2006 12:08:30 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:01 -0700 [PATCH] PCI: fix memory leak in MMCONFIG error path This a bit late (yours patch was posted about a year ago), but a co-worker of spotted part of the code that looks like a memory leak. Looking at the code it seems that pci_mmcfg_config should be free-ed if MMCONFIG is above 4GB. From: Konrad Rzeszutek Signed-off-by: Greg Kroah-Hartman commit 4d15a1779dfdf7e7a111022697d3a43da1745d31 tree 883b86d569d70b52b4e4fc0170fb8efaa42b6260 parent bd91fde952b0aa80c820857241ff1923537d2bde author Greg Kroah-Hartman Tue, 06 Jun 2006 16:58:25 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:01 -0700 [PATCH] PCI: fix error with pci_get_device() call in the mpc85xx driver Signed-off-by: Greg Kroah-Hartman commit bd91fde952b0aa80c820857241ff1923537d2bde tree 5fe1d5703f430894bcf13635f95423c7560d30a6 parent d71374dafbba7ec3f67371d3b7e9f6310a588808 author Chris Wedgwood Mon, 05 Jun 2006 00:13:21 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:01 -0700 [PATCH] PCI: MSI-K8T-Neo2-Fir: run only where needed Be more selective when running the MSI-K8T-Neo2Fir soundcard PCI quirk so as not to run this on hardware where it's probably not needed. Signed-off-by: Chris Wedgwood Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit d71374dafbba7ec3f67371d3b7e9f6310a588808 tree 116dcd65fde3701d10fea954cdbd5bb063182b2c parent 733a7fe12248072e1bca729c88a26298666f1956 author Zhang Yanmin Fri, 02 Jun 2006 12:35:43 +0800 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:01 -0700 [PATCH] PCI: fix race with pci_walk_bus and pci_destroy_dev pci_walk_bus has a race with pci_destroy_dev. When cb is called in pci_walk_bus, pci_destroy_dev might unlink the dev pointed by next. Later on in the next loop, pointer next becomes NULL and cause kernel panic. Below patch against 2.6.17-rc4 fixes it by changing pci_bus_lock (spin_lock) to pci_bus_sem (rw_semaphore). Signed-off-by: Zhang Yanmin Signed-off-by: Greg Kroah-Hartman commit 733a7fe12248072e1bca729c88a26298666f1956 tree 059c803091394a3a61a6c4537a4eaa3f5426fa5f parent f7e6600d762bf7c04b48c8d9bd0ab26d04a8d11f author Grant Grundler Thu, 01 Jun 2006 11:15:59 -0600 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: clean up pci documentation to be more specific On Thu, Jun 01, 2006 at 02:46:11AM -0700, Rajesh Shah wrote: > This patch assumes that pci_request_region() will always be called > after pci_enable_device() and pci_release_region() will always > be called before pci_disable_device(). We cannot make this > assumption,since it's perfectly legal to disable a device > first and then release it's regions. So, I think that patch > needs to change. Patch below clarifies comments in Documentation/pci.txt. Signed-off-by: Grant Grundler Signed-off-by: Greg Kroah-Hartman commit f7e6600d762bf7c04b48c8d9bd0ab26d04a8d11f tree 8e72e80936bf30be991fa8e023f7dd47837085fe parent c0da3ba0a29d70c95ed39366a1c9b849f3439fbe author Grant Grundler Wed, 31 May 2006 23:35:47 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: remove unneeded msi code The code is really not needed. Roland Dreier/Greg KH removed the release_mem_region() calls that were the only consumers of phys_addr: http://www.ussg.iu.edu/hypermail/linux/kernel/0503.0/1540.html patch below deletes the "dead" code. Signed-off-by: Grant Grundler Signed-off-by: Greg Kroah-Hartman commit c0da3ba0a29d70c95ed39366a1c9b849f3439fbe tree e8d31f5137a8f5bc5337e139c0778f8ba6b4b4f4 parent b209a6ee49099b7500abf024f7b6b9648b5a3eac author Kimball Murray Wed, 31 May 2006 14:20:04 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: don't move ioapics below PCI bridge A recent Stratus x86_64 platform uses a system ioapic that is a PCI device located below a PCI bridge. Other platforms like this may exist. This patch fixes a problem wherein the kernel's PCI setup code moves the ioapic to an address other than that assigned by the BIOS. It simply adds another exclusion (which already includes classless devices and host bridges) to the function pbus_assign_resources_sorted so that it will not move the ioapic. If the ioapic is moved, the fixmap mapping to it is broken, so the OS should leave it alone. From: Kimball Murray Signed-off-by: Greg Kroah-Hartman commit b209a6ee49099b7500abf024f7b6b9648b5a3eac tree 6e6c614ae010aa92e9ded5e55c3a913f3c6c9dd3 parent 99dc804d9bcc2c53f4c20c291bf4e185312a1a0c author bibo,mao Wed, 31 May 2006 18:17:33 +0800 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: cleanup unused variable about msi driver In IA64 platform, msi driver does not use irq_vector variable, and in x86 platform LAST_DEVICE_VECTOR should one before FIRST_SYSTEM_VECTOR, this patch modify this. Signed-off-by: bibo, mao Signed-off-by: Greg Kroah-Hartman commit 99dc804d9bcc2c53f4c20c291bf4e185312a1a0c tree 4798f39176d0f8fe06de446d74cf94ba48423aa9 parent 020d502488bebdbc1b2c2828d996f04e563f082a author Shaohua Li Fri, 26 May 2006 10:58:27 +0800 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: disable msi mode in pci_disable_device Brice said the pci_save_msi_state breaks his driver in his special usage (not in suspend/resume), as pci_save_msi_state will disable msi mode. In his usage, pci_save_state will be called at runtime, and later (after the device operates for some time and has an error) pci_restore_state will be called. In another hand, suspend/resume needs disable msi mode, as device should stop working completely. This patch try to workaround this issue. Drivers are expected call pci_disable_device in suspend time after pci_save_state. Signed-off-by: Shaohua Li Signed-off-by: Greg Kroah-Hartman commit 020d502488bebdbc1b2c2828d996f04e563f082a tree 101cf0138612137dc08844dff137f927ed0a3b8b parent 1edab4a164b229807853682f7ff7858c11dd3481 author Rajesh Shah Tue, 23 May 2006 10:14:36 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: Allow MSI to work on kexec kernel We recently ran into a problem where the e1000 device failed to work properly on the kexec kernel. MSI was enabled for the device in the main kernel when it crashed. The e1000 driver tried to enable MSI on the kexec kernel, but the code bailed early when it found that MSI was already enabled in the hardware, even though the software state was not properly set up in the kexec'd kernel. This patch fixes the problem by moving the early return to after making sure that the software state is properly initialized. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman commit 1edab4a164b229807853682f7ff7858c11dd3481 tree b2b65bb914850270f5e22f9b4c49ef371c0f20b6 parent 74d0a988d3aa359b6b8a8536c8cb92cce02ca5d5 author Brice Goglin Tue, 23 May 2006 03:05:27 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: AMD 8131 MSI quirk called too late, bus_flags not inherited ? The PCI_BUS_FLAGS_NO_MSI bus flags does not appear do be inherited correctly from the amd8131 MSI quirk to its parent busses. It makes devices behind a bridge behind amd8131 try to enable MSI while the amd8131 does not support it. We fix this by looking at flags of all parent busses in pci_enable_msi() and pci_enable_msix(). By the way, also add the missing dev->no_msi check in pci_enable_msix() Signed-off-by: Brice Goglin Signed-off-by: Greg Kroah-Hartman commit 74d0a988d3aa359b6b8a8536c8cb92cce02ca5d5 tree 7c5cad6b97a589ce70e1cf662ddc8b578c2bcf98 parent bd8481e1646d7649fa101ee57a5139b9da3c2436 author Brent Casavant Wed, 10 May 2006 01:49:14 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: Move various PCI IDs to header file Move various QLogic, Vitesse, and Intel storage controller PCI IDs to the main header file. Signed-off-by: Brent Casavant Acked-by: Jes Sorensen Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit bd8481e1646d7649fa101ee57a5139b9da3c2436 tree 6b64dfebc5c7eb36a3487f51373347341f36cac2 parent 53e4d30dd666d7f83598957ee4a415eefb47c9a6 author Doug Thompson Mon, 08 May 2006 17:06:09 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI Bus Parity Status-broken hardware attribute, EDAC foundation Currently, the EDAC (error detection and correction) modules that are in the kernel contain some features that need to be moved. After some good feedback on the PCI Parity detection code and interface (http://www.ussg.iu.edu/hypermail/linux/kernel/0603.1/0897.html) this patch ADDs an new attribute to the pci_dev structure: Namely the 'broken_parity_status' bit. When set this indicates that the respective hardware generates false positives of Parity errors. The EDAC "blacklist" solution was inferior and will be removed in a future patch. Also in this patch is a PCI quirk.c entry for an Infiniband PCI-X card which generates false positive parity errors. I am requesting comments on this AND on the possibility of a exposing this 'broken_parity_status' bit to userland via the PCI device sysfs directory for devices. This access would allow for enabling of this feature on new devices and for old devices that have their drivers updated. (SLES 9 SP3 did this on an ATI motherboard video device). There is a need to update such a PCI attribute between kernel releases. This patch just adds a storage place for the attribute and a quirk entry for a known bad PCI device. PCI Parity reaper/harvestor operations are in EDAC itself and will be refactored to use this PCI attribute instead of its own mechanisms (which are currently disabled) in the future. Signed-off-by: Doug Thompson Signed-off-by: Greg Kroah-Hartman commit 53e4d30dd666d7f83598957ee4a415eefb47c9a6 tree 3fb71e7d79e6290ea7758ae45d297912a4407ae9 parent 9c273b95808c270149e9be9e172e4ef19f5d5c98 author Rajesh Shah Wed, 03 May 2006 15:27:47 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: i386/x86_84: disable PCI resource decode on device disable When a PCI device is disabled via pci_disable_device(), it's still left decoding its BAR resource ranges even though its driver will have likely released those regions (and may even have unloaded). pci_enable_device() already explicitly enables BAR resource decode for the device being enabled. This patch disables resource decode for the PCI device being disabled, making it symmetric with the enable call. I saw this while doing something else, not because of a problem report. Still, seems to be the correct thing to do. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman commit 9c273b95808c270149e9be9e172e4ef19f5d5c98 tree 68bbd28b17e3f0d947d0d9ea61d08202c22a896d parent a1e022b3aeacf633a6c8e8f0eb04d9c9e44b4fcd author Muthu Kumar Fri, 28 Apr 2006 00:42:21 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI ACPI: Rename the functions to avoid multiple instances. There were two instances of pci_acpi_init(), one in drivers/pci/pci-acpi.c and another in arch/i386/pci/acpi.c. Rename the one in pci-acpi.c and make it consistent with other names in the same file. Signed-off-by: Muthukumar R Signed-off-by: Greg Kroah-Hartman commit a1e022b3aeacf633a6c8e8f0eb04d9c9e44b4fcd tree 55f95cedf7056a762caec8c61715bb0422c95f02 parent 9f125d30487cea72542a84b4835c037163c7f3d5 author Kristen Accardi Fri, 28 Apr 2006 11:37:38 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: don't enable device if already enabled If a device is already enabled, don't bother reenabling it. Signed-off-by: Kristen Carlson Accardi Acked-By: Arjan van de Ven Signed-off-by: Greg Kroah-Hartman commit 9f125d30487cea72542a84b4835c037163c7f3d5 tree 268a4592aaf2e6a43c82571dde4aae2cd2938100 parent 75acfecaa031c0e1bc412cee4fe58ba49ff3406c author Arjan van de Ven Sat, 29 Apr 2006 10:59:08 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: Add a "enable" sysfs attribute to the pci devices to allow userspace (Xorg) to enable devices without doing foul direct access This patch adds an "enable" sysfs attribute to each PCI device. When read it shows the "enabled-ness" of the device, but you can write a "0" into it to disable a device, and a "1" to enable it. This later is needed for X and other cases where userspace wants to enable the BARs on a device (typical example: to run the video bios on a secundary head). Right now X does all this "by hand" via bitbanging, that's just evil. This allows X to no longer do that but to just let the kernel do this. Signed-off-by: Arjan van de Ven CC: Peter Jones Acked-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit 75acfecaa031c0e1bc412cee4fe58ba49ff3406c tree 39f784dcc17a093e80463163867ec0e554942453 parent ea28502d5d0fc624777a8a6b4d6865d282055b05 author Kumar Gala Mon, 01 May 2006 10:43:46 -0500 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: Add pci_assign_resource_fixed -- allow fixed address assignments PCI: Add pci_assign_resource_fixed -- allow fixed address assignments On some embedded systems the PCI address for hotplug devices are not only known a priori but are required to be at a given PCI address for other master in the system to be able to access. An example of such a system would be an FPGA which is setup from user space after the system has booted. The FPGA may be access by DSPs in the system and those DSPs expect the FPGA at a fixed PCI address. Added pci_assign_resource_fixed() as a way to allow assignment of the PCI devices's BARs at fixed PCI addresses. Signed-off-by: Kumar Gala Signed-off-by: Greg Kroah-Hartman commit ea28502d5d0fc624777a8a6b4d6865d282055b05 tree 561045b0bca2e2493bf41628dd965a8cb958f900 parent 17d6dc8ff098cc8c57941c82f7702804302b1ea1 author Bjorn Helgaas Fri, 09 Jun 2006 11:28:29 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: fix to pci ignore pre-set 64-bit bars on 32-bit platforms When we detect a 64-bit pre-set address in a BAR on a 32-bit platform, we disable it and treat it as if it had been unset, thus allowing the general address assignment code to assign a new address to it when the device is enabled. This can happen either if the firmware assigns 64-bit addresses; additionally, some cards have been found "in the wild" which do not come out of reset with all the BAR registers set to zero. Unfortunately, the patch that implemented this tested the low part of the address instead of the high part of the address. This patch fixes that. Signed-off-by: Bjorn Helgaas Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit 17d6dc8ff098cc8c57941c82f7702804302b1ea1 tree 866b2243517d1dae26f1fff0986ed08f96e63baa parent 83821d3f558dc651e555d62182ed0c95651f41a6 author H. Peter Anvin Tue, 18 Apr 2006 17:19:52 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: Ignore pre-set 64-bit BARs on 32-bit platforms [pci] Ignore pre-set 64-bit BARs on 32-bit platforms Currently, Linux always rejects a device which has a pre-set 64-bit address on a 32-bit platform. On systems which do not do PCI initialization in firmware, this causes some devices which don't correctly power up with all BARs zero to fail. This patch makes the kernel automatically zero out such an address (thus treating it as if it had not been set at all, meaning it will assign an address if necessary). I have done this only for devices, not bridges. It seems potentially hazardous to do for bridges. Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit 83821d3f558dc651e555d62182ed0c95651f41a6 tree 60f3ae42e9b729a5061b8e4e2dce522b03e54810 parent 10083072bfabc40bc47306e512c158c57cf55c2e author Mark Maule Fri, 14 Apr 2006 16:03:54 -0500 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: altix: msi support MSI callouts for altix. Involves a fair amount of code reorg in sn irq.c code as well as adding some extensions to the altix PCI provider abstaction. Signed-off-by: Mark Maule Signed-off-by: Greg Kroah-Hartman commit 10083072bfabc40bc47306e512c158c57cf55c2e tree 2c7c3f08ae779594026e67a7a36915c2f97d73b9 parent fd58e55fcf5568e51da2ed54d7acd049c3fdb184 author Mark Maule Fri, 14 Apr 2006 16:03:49 -0500 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: per-platform IA64_{FIRST,LAST}_DEVICE_VECTOR definitions Abstract IA64_FIRST_DEVICE_VECTOR/IA64_LAST_DEVICE_VECTOR since SN platforms use a subset of the IA64 range. Implement this by making the above macros global variables which the platform can override in it setup code. Also add a reserve_irq_vector() routine used by SN to mark a vector's as in-use when that weren't allocated through assign_irq_vector(). Signed-off-by: Mark Maule Signed-off-by: Greg Kroah-Hartman commit fd58e55fcf5568e51da2ed54d7acd049c3fdb184 tree 2cf41864d66b8db39f637549d4652c7664256155 parent c34b4c734482dda750deb6089521f7c891b48736 author Mark Maule Mon, 10 Apr 2006 21:17:48 -0500 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:58 -0700 [PATCH] PCI: msi abstractions and support for altix Abstract portions of the MSI core for platforms that do not use standard APIC interrupt controllers. This is implemented through a new arch-specific msi setup routine, and a set of msi ops which can be set on a per platform basis. Signed-off-by: Mark Maule Signed-off-by: Greg Kroah-Hartman commit c34b4c734482dda750deb6089521f7c891b48736 tree 97ccfb8fcaeb5e9fb2b025794e5e72e9ba102b38 parent 789e7dc8ee6cfb7928208b077d0799d81196e9bb author Brice Goglin Tue, 09 May 2006 10:52:09 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:58 -0700 [PATCH] PCI: Add PCI_CAP_ID_VNDR Add the vendor-specific extended capability PCI_CAP_ID_VNDR. It will be used by the Myri-10G Ethernet driver (will be submitted soon). Signed-off-by: Brice Goglin Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 789e7dc8ee6cfb7928208b077d0799d81196e9bb tree cfaa3da3f3f919379d673819db9a27de355695dd parent 28e4b224955cbe30275b2a7842e729023a4f4b03 parent 9c64f9774805ba5d5ad4129899bdd822f61874e9 author Linus Torvalds Wed, 21 Jun 2006 11:23:13 -0700 committer Linus Torvalds Wed, 21 Jun 2006 11:23:13 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (30 commits) [PATCH] PCI Hotplug: Fix recovery path from errors during pcie_init() [PATCH] PCI Hotplug: fake NULL pointer dereferences in IBM Hot Plug Controller Driver [PATCH] shpchp: Cleanup improper info messages [PATCH] shpchp: Remove Unused hpc_evelnt_lock [PATCH] shpchp: Cleanup interrupt polling timer [PATCH] shpchp: Cleanup SHPC commands [PATCH] shpchp: Cleanup interrupt handler [PATCH] shpchp: Remove unnecessary hpc_ctlr_handle check [PATCH] pciehp: Implement get_address callback [PATCH] pciehp: Add missing pci_dev_put [PATCH] pciehp: Replace pci_find_slot() with pci_get_slot() [PATCH] SGI Hotplug: Incorrect power status [PATCH] shpchp: Create shpchpd at controller probe time [PATCH] shpchp: Mask Global SERR and Intr at controller release time [PATCH] SHPC: Fix SHPC Contoller SERR-INT Register bits access [PATCH] SHPC: Fix SHPC Logical Slot Register bits access [PATCH] SHPC: Cleanup SHPC Logical Slot Register bits access [PATCH] SHPC: Cleanup SHPC Logical Slot Register access [PATCH] SHPC: Cleanup SHPC register access [PATCH] pciehp: Fix programming hotplug parameters ... commit 28e4b224955cbe30275b2a7842e729023a4f4b03 tree ab4d28fecc06070fc2a2742f4b4550b29de44912 parent 22ae813b85df7c0b0fc7c8d6f336d6a9f566ff97 parent 67d59dfdeb21df2c16dcd478b66177e91178ecd0 author Linus Torvalds Wed, 21 Jun 2006 11:18:25 -0700 committer Linus Torvalds Wed, 21 Jun 2006 11:18:25 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (85 commits) [SCSI] 53c700: remove reliance on deprecated cmnd fields [SCSI] hptiop: don't use cmnd->bufflen [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver [SCSI] aacraid: small misc. cleanups [SCSI] aacraid: Update supported product information [SCSI] aacraid: Fix return code interpretation [SCSI] scsi_transport_sas: fix panic in sas_free_rphy [SCSI] remove RQ_SCSI_* flags [SCSI] remove scsi_request infrastructure [SCSI] mptfusion: change driver revision to 3.03.10 [SCSI] mptfc: abort of board reset leaves port dead requiring reboot [SCSI] mptfc: fix fibre channel infinite request/response loop [SCSI] mptfc: set fibre channel fw target missing timers to one second [SCSI] mptfusion: move fc event/reset handling to mptfc [SCSI] spi transport: don't allow dt to be set on SE or HVD buses [SCSI] aic7xxx: expose the bus setting to sysfs [SCSI] scsi: remove Documentation/scsi/cpqfc.txt [SCSI] drivers/scsi: Use ARRAY_SIZE macro [SCSI] Remove last page_address from dc395x.c [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver ... Fixed up conflicts in drivers/message/fusion/mptbase.c manually (due to the sparc interrupt cleanups) commit b3818ed446fc41db41b5a38d934ac2b69fd2e0aa tree 924fc28a9f2a9f1f333c95aaf65f75e349ddbbee parent c5f2f261e7a47e4c72723cdcbe99e1bd771a81ea author Dave Jones Wed, 21 Jun 2006 13:10:26 -0400 committer Dave Jones Wed, 21 Jun 2006 13:10:26 -0400 [AGPGART] Compile fix for ati-agp Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit 99974c62b6acd4093b6f485132067089c39f967c tree ac6f0125e576129735fbda03732104fd61f1c617 parent 0d420f9d6111b3a2fb7d5dd0180456eed469055d author Ben Dooks Wed, 21 Jun 2006 15:43:05 +0100 committer Thomas Gleixner Wed, 21 Jun 2006 18:56:34 +0200 [MTD] NAND: S3C2410 convert prinks to dev_*()s Convert the use of printk() to the correct dev_info/dev_err functions Signed-off-by: Ben Dooks Signed-off-by: Thomas Gleixner commit 0d420f9d6111b3a2fb7d5dd0180456eed469055d tree 22f543748d8ffbda4f0787a07f809844f0d5896c parent 22ae813b85df7c0b0fc7c8d6f336d6a9f566ff97 author Savin Zlobec Wed, 21 Jun 2006 11:51:20 +0200 committer David Woodhouse Wed, 21 Jun 2006 13:11:56 +0100 [MTD] NAND: Missing fixups The oob fixups broke a return value and missed one patch from the Mailing List. Signed-off-by: Savin Zlobec Signed-off-by: Thomas Gleixner commit 2191fe3e39159e3375f4b7ec1420df149f154101 tree cb196889a369cd8f1d0c0f7b936f61dc91a63f57 parent 0bb474a48e5d1ceb8e4005c7664b548c9834a784 author Kelly Daly Wed, 21 Jun 2006 13:52:55 +1000 committer Paul Mackerras Wed, 21 Jun 2006 15:01:33 +1000 [POWERPC] re-enable OProfile for iSeries, using timer interrupt This patch removes the changes from an earlier patch that disables oProfile for iSeries within the oProfile KConfig (submitted Feb 23, 2006). Checks within the arch init for iSeries, still allowing profiling for timer interrupts (using firmware_has_feature). Signed-off-by: Kelly Daly Acked-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 0bb474a48e5d1ceb8e4005c7664b548c9834a784 tree 8ad98249b5fc854b0db2f02f7a4db5e4a9d56586 parent ccba051c373e342de240ba00d542dac67ae0eb7e author Anton Blanchard Tue, 20 Jun 2006 18:47:26 +1000 committer Paul Mackerras Wed, 21 Jun 2006 15:01:33 +1000 [POWERPC] support ibm,extended-*-frequency properties Support the ibm,extended-*-frequency properties found in recent POWER5 firmware: cpus/PowerPC,POWER5@0/clock-frequency 59aa5880 (1504336000) cpus/PowerPC,POWER5@0/ibm,extended-clock-frequency 00000000 59aa5880 cpus/PowerPC,POWER5@0/timebase-frequency 0b354b10 (188042000) cpus/PowerPC,POWER5@0/ibm,extended-timebase-frequency 00000000 0b354b10 Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit ccba051c373e342de240ba00d542dac67ae0eb7e tree 7ee4bcffa4b500e916a3abc3a036954e73233bf1 parent d3c58fb177dc957af5cdac5ad1638d713fdb8765 author Nathan Lynch Tue, 20 Jun 2006 18:01:58 +1000 committer Paul Mackerras Wed, 21 Jun 2006 15:01:33 +1000 [POWERPC] Extra sanity check in EEH code Don't dereference a device node that isn't there. A "shouldn't happen" case, but someone ran into it with a possibly misconfigured device tree. Signed-off-by: Nathan Lynch Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit d3c58fb177dc957af5cdac5ad1638d713fdb8765 tree e21ecac987f87343ab00763e616c242d56875744 parent 1e92a550e80fef01ebcc0bcd0896109cdb986c72 author Anton Blanchard Tue, 20 Jun 2006 18:00:30 +1000 committer Paul Mackerras Wed, 21 Jun 2006 15:01:33 +1000 [POWERPC] Dont look for class-code in pci children Looking for class-code in PCI children breaks with direct slots. Lets just count all children. Signed-off-by: Anton Blanchard Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 1e92a550e80fef01ebcc0bcd0896109cdb986c72 tree 6cdb7bc6c6ad51644f9b899b2604d26fe7cd540b parent ddf5f75a16b3e7460ffee881795aa168dffcd0cf author Anton Blanchard Thu, 15 Jun 2006 14:11:22 +1000 committer Paul Mackerras Wed, 21 Jun 2006 15:01:33 +1000 [POWERPC] Fix mdelay badness on shared processor partitions On partitioned PPC64 systems where a partition is given 1/10 of a processor, we have seen mdelay() delaying for 10 times longer than it should. The reason is that the generic mdelay(n) does n delays of 1 millisecond each. However, with 1/10 of a processor, we only get a one-millisecond timeslice every 10ms. Thus each 1 millisecond delay loop ends up taking 10ms elapsed time. The solution is just to use the PPC64 udelay function, which uses the timebase to ensure that the delay is based on elapsed time rather than how much processing time the partition has been given. (Yes, the generic mdelay uses the PPC64 udelay, but the problem is that the start time gets reset every millisecond, and each time it gets reset we lose another 9ms.) Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras Acked-by: Andrew Morton commit ddf5f75a16b3e7460ffee881795aa168dffcd0cf tree 28149044321f1f7e39a957b3eed3cc6537229536 parent 72abd54035a3d71fd8f02596e659257e8bba16ca author Arnd Bergmann Tue, 20 Jun 2006 02:30:33 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:33 +1000 [POWERPC] disable floating point exceptions for init Floating point exceptions should not be enabled by default, as this setting impacts the performance on some CPUs, in particular the Cell BE. Since the bits are inherited from parent processes, the place to change the default is the thread struct used for init. glibc sets this up correctly per thread in its fesetenv function, so user space should not be impacted by this setting. None of the other common libc implementations (uClibc, dietlibc, newlib, klibc) has support for fp exceptions, so they are unlikely to be hit by this either. There is a small risk that somebody wrote their own application that manually sets the fpscr bits instead of calling fesetenv, without changing the MSR bits as well. Those programs will break with this change. It probably makes sense to change glibc in the future to be more clever about FE bits, so that when running on a CPU where this is expensive, it disables exceptions ASAP, while it keeps them enabled on CPUs where running with exceptions on is cheaper than changing the state often. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 72abd54035a3d71fd8f02596e659257e8bba16ca tree 006ddd84ad8d7290bbadccd15633be0d36737c25 parent 868ea0c9256b658b14603e1ad7361b81b92ccacd author Andreas Schwab Mon, 19 Jun 2006 22:45:04 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:32 +1000 [POWERPC] Unify ppc syscall tables Avoid duplication of the syscall table for the cell platform. Based on an idea from David Woodhouse. Signed-off-by: Andreas Schwab Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 868ea0c9256b658b14603e1ad7361b81b92ccacd tree 6d080ba156f8098277329f26f1d4e3a73cae2093 parent 0aa8d15b01881ccaab5f2fb31eef33ced97ccb5f author Mark A. Greer Tue, 20 Jun 2006 14:15:36 -0700 committer Paul Mackerras Wed, 21 Jun 2006 15:01:32 +1000 [POWERPC] mpic: add support for serial mode interrupts On Tue, Jun 20, 2006 at 02:01:26PM +1000, Benjamin Herrenschmidt wrote: > On Mon, 2006-06-19 at 13:08 -0700, Mark A. Greer wrote: > > MPC10x-style interrupt controllers have a serial mode that allows > > several interrupts to be clocked in through one INT signal. > > > > This patch adds the software support for that mode. > > You hard code the clock ratio... why not add a separate call to be > called after mpic_init, > something like mpic_set_serial_int(int mpic, int enable, int > clock_ratio) ? How's this? -- MPC10x-style interrupt controllers have a serial mode that allows several interrupts to be clocked in through one INT signal. This patch adds the software support for that mode. Signed-off-by: Mark A. Greer -- arch/powerpc/sysdev/mpic.c | 20 ++++++++++++++++++++ include/asm-powerpc/mpic.h | 10 ++++++++++ 2 files changed, 30 insertions(+) -- Signed-off-by: Paul Mackerras commit 0aa8d15b01881ccaab5f2fb31eef33ced97ccb5f tree 398d2b5c20d56073ade09e2e3bc1032bf6130324 parent 379507181a1e330d4f5b0fabe61cd43eccf09763 author Linas Vepstas Mon, 19 Jun 2006 15:07:40 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:32 +1000 [POWERPC] pseries: Print PCI slot location code on failure The PCI error recovery code will printk diagnostic info when a PCI error event occurs. Change the messages to include the slot location code, which is how most sysadmins will know the device. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 379507181a1e330d4f5b0fabe61cd43eccf09763 tree dc986704087a40854a9f8a386d125627b20dee14 parent c983294872ebccd4aacf1b8dd694ac2170feadc3 author arnd@arndb.de Mon, 19 Jun 2006 20:33:35 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:32 +1000 [POWERPC] spufs: one more fix for 64k pages The SPU context save/restore code is currently built for a 4k page size and we provide a _shipped version of it since most people don't have the spu toolchain that is needed to rebuild that code. This patch hardcodes the data structures to a 64k page alignment, which also guarantees 4k alignment but unfortunately wastes 60k of memory per SPU context that is created in the running system. We will follow up on this with another patch to reduce that overhead or maybe redo the context save/restore logic to do this part entirely different, but for now it should make experimental systems work with either page size. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit c983294872ebccd4aacf1b8dd694ac2170feadc3 tree 529c3bc88a9ff10536ffdbf0936c3af2f193bac6 parent ba723fe2b2facc8d45b53701fec39aa429596759 author arnd@arndb.de Mon, 19 Jun 2006 20:33:34 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:32 +1000 [POWERPC] spufs: fail spu_create with invalid flags At this time, all flags are invalid. Since we are planning to actually add valid flags in the future, we better check if any were passed by the user. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit ba723fe2b2facc8d45b53701fec39aa429596759 tree 637c2ed713cbfa712d4306f98a43656379e1c5ba parent 6e18b27bd0911d4d2495c6fdeeac0c047d915300 author Masato Noguchi Mon, 19 Jun 2006 20:33:33 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:32 +1000 [POWERPC] spufs: clear class2 interrupt status before wakeup SPU interrupt status must be cleared before handle it. Otherwise, kernel may drop some interrupt packet. Currently, class2 interrupt treated like: 1) call callback to wake up waiting process 2) mask raised mailbox interrupt 3) clear interrupt status I changed like: 1) mask raised mailbox interrupt 2) clear interrupt status 3) call callback to wake up waiting process Clearing status before masking will make spurious interrupt. Thus, it is necessary to hold by steps I described above, I think. Signed-off-by: Masato Noguchi Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 6e18b27bd0911d4d2495c6fdeeac0c047d915300 tree a25ddde6b31ca7872d95710e4cd425cbd27e5f2b parent 2eabbbd33ec39f690005aa186c57476598edc6b3 author Masato Noguchi Mon, 19 Jun 2006 20:33:32 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:31 +1000 [POWERPC] spufs: fix Makefile for "make clean" added spu_{save,restore}_dump.h to target of 'make clean' Signed-off-by: Masato Noguchi Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 2eabbbd33ec39f690005aa186c57476598edc6b3 tree abee6e62227111cfd961c7cf3bf692519837c380 parent a91942ae7ebd518006dcbeb2a1d7b147253c080e author Masato Noguchi Mon, 19 Jun 2006 20:33:31 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:31 +1000 [POWERPC] spufs: remove stop_code from struct spu This patch remove 'stop_code' -- discarded member of struct spu. It is written at initialize and interrupt, but never read in current implementation. Signed-off-by: Masato Noguchi Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit a91942ae7ebd518006dcbeb2a1d7b147253c080e tree 74a923f4847495b509089d92010c42c0cb123f4a parent 540270d82db943855538cea5d0c790e7e669dda0 author Geoff Levand Mon, 19 Jun 2006 20:33:30 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:31 +1000 [POWERPC] spufs: fix spu irq affinity setting This changes the hypervisor abstraction of setting cpu affinity to a higher level to avoid platform dependent interrupt controller routines. I replaced spu_priv1_ops:spu_int_route_set() with a new routine spu_priv1_ops:spu_cpu_affinity_set(). As a by-product, this change eliminated what looked like an existing bug in the set affinity code where spu_int_route_set() mistakenly called int_stat_get(). Signed-off-by: Geoff Levand Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 540270d82db943855538cea5d0c790e7e669dda0 tree e13b8194d8781b2f5d3bf6566a8d96ecc943f8f3 parent c01ea72a3b8abb7baa4291a1876b82599867035a author Geoff Levand Mon, 19 Jun 2006 20:33:29 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:31 +1000 [POWERPC] spufs: further abstract priv1 register access To support muti-platform binaries the spu hypervisor accessor routines must have runtime binding. I removed the existing statically linked routines in spu.h and spu_priv1_mmio.c and created new accessor routines in spu_priv1.h that operate indirectly through an ops struct spu_priv1_ops. spu_priv1_mmio.c contains the instance of the accessor routines for running on raw hardware. Signed-off-by: Geoff Levand Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit c01ea72a3b8abb7baa4291a1876b82599867035a tree 0ba10d699df09db0b35d5aaea4a654a5d0b216d7 parent e46a0237fda640f02bc4cb3d9702b6ee91bfd6e4 author Geoff Levand Mon, 19 Jun 2006 20:33:28 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:31 +1000 [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts Creates new config variables PPC_CELL_NATIVE and PPC_IBM_CELL_BLADE. The existing CONFIG_PPC_CELL is now used to denote the generic Cell processor support. PPC_CELL = make descends into platforms/cell PPC_CELL_NATIVE = add bare metal support PPC_IBM_CELL_BLADE = add blade device drivers, etc. Also renames spu_priv1.c to spu_priv1_mmio.c. Signed-off-by: Geoff Levand Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit e46a0237fda640f02bc4cb3d9702b6ee91bfd6e4 tree b61fd03a0eeb727da423cd6cfe5c20a666caa08c parent ecec21770d87a5035cfd210cfdb22e1935b0c4a6 author arnd@arndb.de Mon, 19 Jun 2006 20:33:27 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:31 +1000 [POWERPC] spufs: dont try to access SPE channel 1 count The save/restore sequence for SPE contexts currently attempts to save and restore the channel count for SPE channel 1 (the SPU_WriteEventMask channel. But the CBE architecture (section 9.11.2) clearly states that this channel does not have an associated count. Hardware simply ignores the attempt to write this count, but the simulator generates a warning message. WARNING: 279721590: SPE7: Attempt to write channel count for CH 1 with no associated count is ignored. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit ecec21770d87a5035cfd210cfdb22e1935b0c4a6 tree 889884e4dd6ca476686197846a90f8bd551a3521 parent 970f1baae78ff99b7536464214d4c78dde4551e2 author Jeremy Kerr Mon, 19 Jun 2006 20:33:26 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:30 +1000 [POWERPC] spufs: use kzalloc in create_spu Clean up create_spu() a little by using kzalloc instead of kmalloc + assignments. Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 970f1baae78ff99b7536464214d4c78dde4551e2 tree cc4ac218ea913c0aa36e4df3f80c9874604c55e1 parent 7b1a701480fb17b7f78b95b257bfc90a4f949d04 author arnd@arndb.de Mon, 19 Jun 2006 20:33:25 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:30 +1000 [POWERPC] spufs: fix initial state of wbox file The wbox channel count of an spu is now initialized to four for the saved context. This makes it possible to write to the mailbox right away without waiting for the SPE to become scheduled first. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 7b1a701480fb17b7f78b95b257bfc90a4f949d04 tree 658ea67f2b96a174b90a3de52e2251a4471c2dc4 parent 724bd80e8102ac137868b23fad2b06af65f8e168 author arnd@arndb.de Mon, 19 Jun 2006 20:33:24 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:30 +1000 [POWERPC] spufs: add a phys-id attribute to each SPU context For performance analysis, it is often interesting to know which physical SPE a thread is currently running on, and, more importantly, if it is running at all. This patch adds a simple attribute to each SPU directory with that information. The attribute is read-only and called 'phys-id'. It contains an ascii string with the number of the physical SPU (e.g. "0x5"), or alternatively the string "0xffffffff" (32 bit -1) when it is not running at all at the time that the file is read. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 724bd80e8102ac137868b23fad2b06af65f8e168 tree 768d32aa894a06abec676e26088b44072ce817bf parent 0309f02d8e1b68811e513bdd06015672d0696af5 author arnd@arndb.de Mon, 19 Jun 2006 20:33:23 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:30 +1000 [POWERPC] spufs: set up correct SLB entries for 64k pages spufs currently knows only 4k pages and 16M hugetlb pages. Make it use the regular methods for deciding on the SLB bits. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 0309f02d8e1b68811e513bdd06015672d0696af5 tree 81e73d666fecdf50264f86a6eda98073cb9f0494 parent d9379c4bcee7046182edf45eeab349334421416e author Michael Ellerman Mon, 19 Jun 2006 20:33:22 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:30 +1000 [POWERPC] spufs: fix deadlock in spu_create error path spufs_rmdir tries to acquire the spufs root i_mutex, which is already held by spufs_create_thread. This was tracked as Bug #H9512. Signed-off-by: Michael Ellerman Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit d9379c4bcee7046182edf45eeab349334421416e tree da337ebe3f683b5717a591175376e4426f908072 parent 91edfa49b97f0b0fafac5c8d5f171fc183782ce6 author arnd@arndb.de Mon, 19 Jun 2006 20:33:21 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:30 +1000 [POWERPC] spufs: restore mapping of mssync register A recent change to the way that the mfc file gets mapped made it impossible to map the SPE Multi-Source Synchronization register into user space, but that may be needed by some applications. This restores the missing functionality. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 91edfa49b97f0b0fafac5c8d5f171fc183782ce6 tree 64737a0eb2e3594fcd1c619f5a04810aa5be5a8b parent 1d64093f6627a7eef1ed0fe005463f0a5ea25a5f author arnd@arndb.de Mon, 19 Jun 2006 20:33:20 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:30 +1000 [POWERPC] cell: always build spu base into the kernel The spu_base module is rather deeply intermixed with the core kernel, so it makes sense to have that built-in. This will let us extend the base in the future without having to export more core symbols just for it. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 1d64093f6627a7eef1ed0fe005463f0a5ea25a5f tree faa57ae7e34dd45b843161c233a59a15fe6ddaf1 parent 0f0f90c304b42d8ce7fc5958de894bdcff3a0ca1 author Jeremy Kerr Mon, 19 Jun 2006 20:33:19 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:29 +1000 [POWERPC] cell: register SPUs as sysdevs SPUs are registered as system devices, exposing attributes through sysfs. Since the sysdev includes a kref, we can remove the one in struct spu (it isn't used at the moment anyway). Currently only the interrupt source and numa node attributes are added. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 0f0f90c304b42d8ce7fc5958de894bdcff3a0ca1 tree 2cc6131da89ac3d38f211d22c2ba7886e6d150cb parent b40feec8efbe609a3a38bca1f18d3ba4d590563a author arnd@arndb.de Mon, 19 Jun 2006 20:33:18 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:29 +1000 [POWERPC] cell: update defconfig Enable some of the most requested features in defconfig and refresh with the latest powerpc.git Kconfig files. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit b40feec8efbe609a3a38bca1f18d3ba4d590563a tree 6c2163a85a1c26250f1fd66692fbdb745b126681 parent acf7d76827a577059636e949079021e6af6dd702 author arnd@arndb.de Mon, 19 Jun 2006 20:33:17 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:29 +1000 [POWERPC] cell: fix interrupt priority handling Checking the priority field to test for irq validity is completely bogus and breaks with future external interrupt controllers. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit acf7d76827a577059636e949079021e6af6dd702 tree 283e94488c79e75dd3df9a376e1e8a27a69e26ec parent ef82a306b46dbedaecbb154b24d05dfab937df35 author Benjamin Herrenschmidt Mon, 19 Jun 2006 20:33:16 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:29 +1000 [POWERPC] cell: add RAS support This is a first version of support for the Cell BE "Reliability, Availability and Serviceability" features. It doesn't yet handle some of the RAS interrupts (the ones described in iic_is/iic_irr), I'm still working on a proper way to expose these. They are essentially a cascaded controller by themselves (sic !) though I may just handle them locally to the iic driver. I need also to sync with David Erb on the way he hooked in the performance monitor interrupt. So that's all for 2.6.17 and I'll do more work on that with my rework of the powerpc interrupt layer that I'm hacking on at the moment. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit ef82a306b46dbedaecbb154b24d05dfab937df35 tree 04636c51f544b46b5562fe153538ad4638bcdc3f parent 2097c7f04af7fb962ab8676ed8083f350ed885f7 author Jon Loeliger Sat, 17 Jun 2006 17:52:55 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:29 +1000 [POWERPC] Add Vitesse 8244 PHY for MPC8641 HPCN platform. Signed-off-by: Kriston Carson Signed-off-by: Xianghua Xiao Signed-off-by: Jon Loeliger Acked-by: Jeff Garzik Signed-off-by: Paul Mackerras commit 2097c7f04af7fb962ab8676ed8083f350ed885f7 tree 9114ad228b7ad71ac349d4c499059da2a4a3c806 parent 6b543404058a5ffdca8c48e95e0b8a69bb4bdba9 author Jon Loeliger Sat, 17 Jun 2006 17:52:54 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:29 +1000 [POWERPC] Document I2C_MPC option for 86xx too. The same I2C driver found on 85xx, etc., can be used for 86xx too. Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 6b543404058a5ffdca8c48e95e0b8a69bb4bdba9 tree 0bde02196ca8de01df257679ddfc6ae66404472b parent b809b3e86f39651475b30ceb1caf535071534d4d author Jon Loeliger Sat, 17 Jun 2006 17:52:51 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:28 +1000 [POWERPC] Add 8641 Register space and IRQ definitions. Signed-off-by: Jeff Brown Signed-off-by: Xianghua Xiao Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit b809b3e86f39651475b30ceb1caf535071534d4d tree 712cc40ccca8871df5c113142880e73a9828dcc9 parent 4ca4b6274c30d53d22014fb6974efe2b3e52cfdc author Jon Loeliger Sat, 17 Jun 2006 17:52:48 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:28 +1000 [POWERPC] Add mpc8641hpcn PCI/PCI-Express platform files. Signed-off-by: Xianghua Xiao Signed-off-by: Wei Zhang Signed-off-by: Haiying Wang Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 4ca4b6274c30d53d22014fb6974efe2b3e52cfdc tree f02451f8c52a056829e4bbe681f2cf3c3f4f2bf4 parent ee0339f205d60375c5ce1653c0dc318c6ec72668 author Jon Loeliger Sat, 17 Jun 2006 17:52:45 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:28 +1000 [POWERPC] Add the MPC8641 HPCN platform files. Signed-off-by: Xianghua Xiao Signed-off-by: Haiying Wang Signed-off-by: Wei Zhang Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit ee0339f205d60375c5ce1653c0dc318c6ec72668 tree 8c4e46f6645224d88b26fed0a8c5ff031f233952 parent 9674ed38d8e4a9ce15c61b4306ef803cad0e1dc0 author Jon Loeliger Sat, 17 Jun 2006 17:52:44 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:28 +1000 [POWERPC] Add starting of secondary 86xx CPUs. Clear the high BATS during load_up_mmu if FTR_HAS_HIGH_BATS. Allow just a bit more time for secondary CPUs to phone home. Signed-off-by: Wei Zhang Signed-off-by: Haiying Wang Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 9674ed38d8e4a9ce15c61b4306ef803cad0e1dc0 tree 62311e5a6ed874f4c6b87e6e4bb12af6fb0ec4fb parent 96abe9358becb543c21121699c711897374bcbdf author Jon Loeliger Sat, 17 Jun 2006 17:52:40 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:28 +1000 [POWERPC] Add 8641 CPU table entry. Signed-off-by: Wei Zhang Signed-off-by: Xianghua Xiao Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 96abe9358becb543c21121699c711897374bcbdf tree 1f1aeb1730f31a9d99ee7d58f6627002f7bc0a77 parent c9b484b5c1201321f40b04870e8b417033b6fe76 author Jon Loeliger Sat, 17 Jun 2006 17:52:37 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:28 +1000 [POWERPC] Add mpc8641_hpcn_defconfig config file. Signed-off-by: Jon Loeliger Signed-off-by: Haiying Wang Signed-off-by: Paul Mackerras commit c9b484b5c1201321f40b04870e8b417033b6fe76 tree cddf9f91d9d8b5e42e6cc74865ed6596a78df391 parent 8a30088794ff426cd3e21557db8f3d2687ac6695 author Jon Loeliger Sat, 17 Jun 2006 17:52:35 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:27 +1000 [POWERPC] Add the mpc8641 hpcn Kconfig and Makefiles. Signed-off-by: Xianghua Xiao Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 8a30088794ff426cd3e21557db8f3d2687ac6695 tree c6265fec921408ba689ef6c0e59236c88149c52c parent 2198c070498850c16d65c09bc587e3f5042126ef author Jon Loeliger Sat, 17 Jun 2006 17:51:09 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:27 +1000 [POWERPC] Prevent duplicate lmb reservations for Device Tree blob. Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 2198c070498850c16d65c09bc587e3f5042126ef tree 4bc2cb0f7defd3f8e941195ce6de13d4d25ab2b0 parent 7932f0b82ff1db35a5ed8d5825d51cafe15fa6db author Jon Loeliger Sat, 17 Jun 2006 17:49:42 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:27 +1000 [POWERPC] Guard L3CR references with CPU_FTR_L3CR. Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 7932f0b82ff1db35a5ed8d5825d51cafe15fa6db tree dea2b59f7a485a858187d57f61334da9330e6d25 parent 2ba73b1d6fa62ddaa235c3c5fdf6095cae6ba748 author John Rose Thu, 15 Jun 2006 17:32:15 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:27 +1000 [POWERPC] RTAS delay, fix module build breaks Export both news RTAS delay functions, and change the scanlog module to use the new delay functions. Signed-off-by: John Rose Signed-off-by: Paul Mackerras commit 22ae813b85df7c0b0fc7c8d6f336d6a9f566ff97 tree 0c7d3ecf772be41facaffdda60b037d1e31c8e98 parent 34641a58a227e498adf471ab016bd054cc399d7e author Brice Goglin Tue, 20 Jun 2006 20:03:02 -0700 committer Linus Torvalds Tue, 20 Jun 2006 20:24:58 -0700 [PATCH] add __iowrite64_copy Introduce __iowrite64_copy. It will be used by the Myri-10G Ethernet driver to post requests to the NIC. This driver will be submitted soon. __iowrite64_copy copies to I/O memory in units of 64 bits when possible (on 64 bit architectures). It reverts to __iowrite32_copy on 32 bit architectures. Signed-off-by: Brice Goglin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34641a58a227e498adf471ab016bd054cc399d7e tree da1e0af965d06d0c6e13c546ac01f6a54a904d86 parent 2eec0e0842ef747027eb9181d5f50d7157184d57 parent 7136b8073f0123918e3e50269ae021bbb09e1a81 author Linus Torvalds Tue, 20 Jun 2006 20:01:16 -0700 committer Linus Torvalds Tue, 20 Jun 2006 20:01:16 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/linux1394-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/linux1394-2.6: (28 commits) eth1394: replace __constant_htons by htons ieee1394: adjust code formatting in highlevel.c ieee1394: hl_irqs_lock is taken in hardware interrupt context ieee1394_core: switch to kthread API ieee1394: sbp2: Kconfig fix ieee1394: add preprocessor constant for invalid csr address sbp2: fix deregistration of status fifo address space [PATCH] eth1394: endian fixes Fix broken suspend/resume in ohci1394 sbp2: use __attribute__((packed)) for on-the-wire structures sbp2: provide helptext for CONFIG_IEEE1394_SBP2_PHYS_DMA and mark it experimental Update feature removal of obsolete raw1394 ISO requests. sbp2: fix S800 transfers if phys_dma is off sbp2: remove ohci1394 specific constant ohci1394: make phys_dma parameter read-only ohci1394: set address range properties ieee1394: extend lowlevel API for address range properties sbp2: log number of supported concurrent logins sbp2: remove manipulation of inquiry response ieee1394: save RAM by using a single tlabel for broadcast transactions ... commit 2eec0e0842ef747027eb9181d5f50d7157184d57 tree 57756b7d0420833c5e46bd0635ac278d24888b84 parent 6b41fd1785f4effe2f3bd40da864415812f5b8c9 author Cedric Le Goater Mon, 19 Jun 2006 21:10:44 -0700 committer Linus Torvalds Tue, 20 Jun 2006 19:55:53 -0700 [PATCH] s390: add __raw_writeq required by __iowrite64_copy It also adds all the related quad routines. Signed-off-by: Cedric Le Goater Acked-by: Heiko Carstens Cc: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b41fd1785f4effe2f3bd40da864415812f5b8c9 tree 465b955a8055639828ef64bc963ddead4e44d3c8 parent 58dfd9c16e88b9d790e7df8f2c5b03b7887db54c author Linus Torvalds Tue, 20 Jun 2006 19:44:03 -0700 committer Linus Torvalds Tue, 20 Jun 2006 19:44:03 -0700 Fix up CFQ scheduler for recent rbtree node shrinkage The color is now in the low bits of the parent pointer, and initializing it to 0 happens as part of the whole memset above, so just remove the unnecessary RB_CLEAR_COLOR. Signed-off-by: Linus Torvalds commit 58dfd9c16e88b9d790e7df8f2c5b03b7887db54c tree c2df549913133d9885a182b926c76fa34a79f78d parent 050335db2a777ffaa859d77beb05fffe9e8c5ae9 author Herbert Xu Wed, 21 Jun 2006 10:53:54 +1000 committer Linus Torvalds Tue, 20 Jun 2006 17:57:28 -0700 [FORCEDETH] Fix xmit_lock/netif_tx_lock after merge There has been an update to the forcedeth driver that added a few new uses of xmit_lock which is no longer meant to be used directly. This patch replaces them with netif_tx_lock_bh. Signed-off-by: Herbert Xu Signed-off-by: Linus Torvalds commit 050335db2a777ffaa859d77beb05fffe9e8c5ae9 tree 6f1fb3e3477de613b4adac8c46bd6e86301ed8ae parent a4cfae13cef6a700a04b13ba1d819c0641b1b26f parent 905f14672e6d0552bfde954d5f7adb5f2c7a7960 author Linus Torvalds Tue, 20 Jun 2006 17:52:36 -0700 committer Linus Torvalds Tue, 20 Jun 2006 17:52:36 -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: (42 commits) [ARM] Fix tosa build error [ARM] 3610/1: Make reboot work on Versatile [ARM] 3609/1: S3C24XX: defconfig update for s3c2410_defconfig [ARM] 3591/1: Anubis: IDE device definitions [ARM] Include asm/hardware.h not asm/arch/hardware.h [ARM] 3594/1: Poodle: Add touchscreen support + other updates [ARM] 3564/1: sharpsl_pm: Abstract some machine specific parameters [ARM] 3561/1: Poodle: Correct the MMC/SD power control [ARM] 3593/1: Add reboot and shutdown handlers for Zaurus handhelds [ARM] 3599/1: AT91RM9200 remove global variables [ARM] 3607/1: AT91RM9200 misc fixes [ARM] 3605/1: AT91RM9200 Power Management [ARM] 3604/1: AT91RM9200 New boards [ARM] 3603/1: AT91RM9200 remove old files [ARM] 3592/1: AT91RM9200 Serial driver update [ARM] 3590/1: AT91RM9200 Platform devices support [ARM] 3589/1: AT91RM9200 DK/EK board update [ARM] 3588/1: AT91RM9200 CSB337/637 board update [ARM] 3587/1: AT91RM9200 hardware headers [ARM] 3586/1: AT91RM9200 header update ... commit 70ac4385a13f78bc478f26d317511893741b05bd tree dafc7f3018295fc4ee00339889e4f35d5b9d7743 parent d59bf96cdde5b874a57bfd1425faa45da915d0b7 parent 077e98945db7e54a9865b5f29a1f02f531eca414 author Trond Myklebust Tue, 20 Jun 2006 20:46:21 -0400 committer Trond Myklebust Tue, 20 Jun 2006 20:46:21 -0400 Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ Conflicts: include/linux/nfs_fs.h Fixed up conflict with kernel header updates. commit a4cfae13cef6a700a04b13ba1d819c0641b1b26f tree 91aa4f8be6df4494276d1a064d9f8f2b994aa367 parent be883da7594b0a2a02074e683673ae0e522566a4 parent ff7512e1a2a3504649d3716a757f43807b6d26ef author Linus Torvalds Tue, 20 Jun 2006 17:39:53 -0700 committer Linus Torvalds Tue, 20 Jun 2006 17:39:53 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [ATM]: fix broken uses of NIPQUAD in net/atm [SCTP]: sctp_unpack_cookie() fix [SCTP]: Fix unintentional change to SCTP_ASSERT when !SCTP_DEBUG [NET]: Prevent multiple qdisc runs [CONNECTOR]: Initialize subsystem earlier. [NETFILTER]: xt_sctp: fix endless loop caused by 0 chunk length commit be883da7594b0a2a02074e683673ae0e522566a4 tree b62f2a8a069fb4d389935c0b2de9bc78798f50c2 parent 077e98945db7e54a9865b5f29a1f02f531eca414 parent 4c5eb38af2131d867842cdd09fa83a3ed77bfd26 author Linus Torvalds Tue, 20 Jun 2006 17:39:28 -0700 committer Linus Torvalds Tue, 20 Jun 2006 17:39:28 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Update defconfig. [SPARC64]: Don't double-export synchronize_irq. [SPARC64]: Move over to GENERIC_HARDIRQS. [SPARC64]: Virtualize IRQ numbers. [SPARC64]: Kill ino_bucket->pil [SPARC]: Kill __irq_itoa(). [SPARC64]: bp->pil can never be zero [SPARC64]: Send all device interrupts via one PIL. [SPARC]: Fix iommu_flush_iotlb end address [SPARC]: Mark smp init functions as cpuinit [SPARC]: Add missing rw can_lock macros [SPARC]: Setup cpu_possible_map [SPARC]: Add topology_init() commit 077e98945db7e54a9865b5f29a1f02f531eca414 tree bb24d180075a2d5ac35bd0d893bdc867405bee03 parent d9eaec9e295a84a80b663996d0489fcff3a1dca9 parent 92af11cdec410f5de4e8d702d24e1672ce26a1f6 author Linus Torvalds Tue, 20 Jun 2006 15:38:12 -0700 committer Linus Torvalds Tue, 20 Jun 2006 15:38:12 -0700 Merge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird * 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird: [PATCH] missing readb/readw in rio [PATCH] copy_to_user() from iomem is a bad thing [PATCH] forgotten swap of copyout() arguments [PATCH] handling rio MEMDUMP [PATCH] fix rio_copy_to_card() for OLDPCI case [PATCH] uses of ->Copy() in rioroute are bogus [PATCH] bogus order of copy_from_user() arguments [PATCH] rio ->Copy() expects the sourse as first argument [PATCH] trivial annotations in rio commit d9eaec9e295a84a80b663996d0489fcff3a1dca9 tree 85cfc09bb5f0eb42d3be7dfbddaad31353307796 parent cee4cca740d209bcb4b9857baa2253d5ba4e3fbe parent 41757106b9ca7867dafb2404d618f947b4786fd7 author Linus Torvalds Tue, 20 Jun 2006 15:37:56 -0700 committer Linus Torvalds Tue, 20 Jun 2006 15:37:56 -0700 Merge branch 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current * 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: (25 commits) [PATCH] make set_loginuid obey audit_enabled [PATCH] log more info for directory entry change events [PATCH] fix AUDIT_FILTER_PREPEND handling [PATCH] validate rule fields' types [PATCH] audit: path-based rules [PATCH] Audit of POSIX Message Queue Syscalls v.2 [PATCH] fix se_sen audit filter [PATCH] deprecate AUDIT_POSSBILE [PATCH] inline more audit helpers [PATCH] proc_loginuid_write() uses simple_strtoul() on non-terminated array [PATCH] update of IPC audit record cleanup [PATCH] minor audit updates [PATCH] fix audit_krule_to_{rule,data} return values [PATCH] add filtering by ppid [PATCH] log ppid [PATCH] collect sid of those who send signals to auditd [PATCH] execve argument logging [PATCH] fix deadlocks in AUDIT_LIST/AUDIT_LIST_RULES [PATCH] audit_panic() is audit-internal [PATCH] inotify (5/5): update kernel documentation ... Manual fixup of conflict in unclude/linux/inotify.h commit 905f14672e6d0552bfde954d5f7adb5f2c7a7960 tree 0793fd04f21f18990fbb3ae9fb6a7cbb51c59c26 parent 4af6fee18822d012a15b4c9b8992e1f2793dfe0b author Russell King Tue, 20 Jun 2006 23:27:37 +0100 committer Russell King Tue, 20 Jun 2006 23:27:37 +0100 [ARM] Fix tosa build error tosa.c references mdelay(), but was missing linux/delay.h Signed-off-by: Russell King commit cee4cca740d209bcb4b9857baa2253d5ba4e3fbe tree 88a23004393ea4a32cad79839479c8e653e401d6 parent 2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6 parent 9348f0de2d2b541b4ba64fb1f4efee9710a3d731 author Linus Torvalds Tue, 20 Jun 2006 15:10:08 -0700 committer Linus Torvalds Tue, 20 Jun 2006 15:10:08 -0700 Merge git://git.infradead.org/hdrcleanup-2.6 * git://git.infradead.org/hdrcleanup-2.6: (63 commits) [S390] __FD_foo definitions. Switch to __s32 types in joystick.h instead of C99 types for consistency. Add to headers included for userspace in Move inclusion of out of user scope in asm-x86_64/mtrr.h Remove struct fddi_statistics from user view in Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390 Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) Include and use __uXX types in Use __uXX types in , include too Remove private struct dx_hash_info from public view in Include and use __uXX types in Use __uXX types in for struct divert_blk et al. Use __u32 for elf_addr_t in , not u32. It's user-visible. Remove PPP_FCS from user view in , remove __P mess entirely Use __uXX types in user-visible structures in Don't use 'u32' in user-visible struct ip_conntrack_old_tuple. Use __uXX types for S390 DASD volume label definitions which are user-visible S390 BIODASDREADCMB ioctl should use __u64 not u64 type. Remove unneeded inclusion of from Fix private integer types used in V4L2 ioctls. ... Manually resolve conflict in include/linux/mtd/physmap.h commit 2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6 tree e7be2cf442626316b6b6fb212960fe1f77ff2725 parent be967b7e2f7747a5ebf2a07ee627d9338491e784 parent 2f3243aebd8df4d9eecaeca04bbff6c7dbfb2142 author Linus Torvalds Tue, 20 Jun 2006 14:51:22 -0700 committer Linus Torvalds Tue, 20 Jun 2006 14:51:22 -0700 Merge git://git.infradead.org/~dwmw2/rbtree-2.6 * git://git.infradead.org/~dwmw2/rbtree-2.6: [RBTREE] Switch rb_colour() et al to en_US spelling of 'color' for consistency Update UML kernel/physmem.c to use rb_parent() accessor macro [RBTREE] Update hrtimers to use rb_parent() accessor macro. [RBTREE] Add explicit alignment to sizeof(long) for struct rb_node. [RBTREE] Merge colour and parent fields of struct rb_node. [RBTREE] Remove dead code in rb_erase() [RBTREE] Update JFFS2 to use rb_parent() accessor macro. [RBTREE] Update eventpoll.c to use rb_parent() accessor macro. [RBTREE] Update key.c to use rb_parent() accessor macro. [RBTREE] Update ext3 to use rb_parent() accessor macro. [RBTREE] Change rbtree off-tree marking in I/O schedulers. [RBTREE] Add accessor macros for colour and parent fields of rb_node commit be967b7e2f7747a5ebf2a07ee627d9338491e784 tree f42b82601209a52b8ee478e36d8b21543ab03060 parent eef11427edcb821b63920219f89379fab84198b9 parent 7bc3312bef4d6f220812500c0de7868fb7625a41 author Linus Torvalds Tue, 20 Jun 2006 14:50:31 -0700 committer Linus Torvalds Tue, 20 Jun 2006 14:50:31 -0700 Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: (199 commits) [MTD] NAND: Fix breakage all over the place [PATCH] NAND: fix remaining OOB length calculation [MTD] NAND Fixup NDFC merge brokeness [MTD NAND] S3C2410 driver cleanup [MTD NAND] s3c24x0 board: Fix clock handling, ensure proper initialisation. [JFFS2] Check CRC32 on dirent and data nodes each time they're read [JFFS2] When retiring nextblock, allocate a node_ref for the wasted space [JFFS2] Mark XATTR support as experimental, for now [JFFS2] Don't trust node headers before the CRC is checked. [MTD] Restore MTD_ROM and MTD_RAM types [MTD] assume mtd->writesize is 1 for NOR flashes [MTD NAND] Fix s3c2410 NAND driver so it at least _looks_ like it compiles [MTD] Prepare physmap for 64-bit-resources [JFFS2] Fix more breakage caused by janitorial meddling. [JFFS2] Remove stray __exit from jffs2_compressors_exit() [MTD] Allow alternate JFFS2 mount variant for root filesystem. [MTD] Disconnect struct mtd_info from ABI [MTD] replace MTD_RAM with MTD_GENERIC_TYPE [MTD] replace MTD_ROM with MTD_GENERIC_TYPE [MTD] remove a forgotten MTD_XIP ... commit eef11427edcb821b63920219f89379fab84198b9 tree 6a2863d3b2794958e30742bfb073a38e475989ae parent c9ab09710ecb071031b0a04f3f9d7e686c0a75e0 parent 14228a49913850493c7f9eb4501438c32da353f7 author Linus Torvalds Tue, 20 Jun 2006 14:49:45 -0700 committer Linus Torvalds Tue, 20 Jun 2006 14:49:45 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-serial * master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] PARPORT_SERIAL should depend on SERIAL_8250_PCI commit c9ab09710ecb071031b0a04f3f9d7e686c0a75e0 tree 4c270fb2390392d44426ab7551f0fa0215e1def4 parent ff9144530e9cfe8923e00172e3f8ff83c3b8ff8b parent 12223dabc617a4babfba4e17feb1ed88e8cfeb8f author Linus Torvalds Tue, 20 Jun 2006 14:49:29 -0700 committer Linus Torvalds Tue, 20 Jun 2006 14:49:29 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-mmc * master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] Add (MMC) to entry in MAINTAINERS file [MMC] sdhci truncated pointer fix commit ff9144530e9cfe8923e00172e3f8ff83c3b8ff8b tree c64a9528dde590b9f3174125ad361f46ee30bba8 parent 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f parent 96ce2385dd2817da549910001a69ac0a2762a1b9 author Linus Torvalds Tue, 20 Jun 2006 14:49:00 -0700 committer Linus Torvalds Tue, 20 Jun 2006 14:49:00 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits) [ARM] 3559/1: S3C2442: core and serial port [ARM] 3557/1: S3C24XX: centralise and cleanup uart registration [ARM] 3558/1: SMDK24XX: LED platform devices [ARM] 3534/1: add spi support to lubbock platform [ARM] 3554/1: ARM: Fix dyntick locking [ARM] 3553/1: S3C24XX: earlier print of cpu idcode info [ARM] 3552/1: S3C24XX: Move VA of GPIO for low-level debug [ARM] 3551/1: S3C24XX: PM code failes to compile with CONFIG_DCACHE_WRITETHROUGH [ARM] 3550/1: OSIRIS: fix serial port map for 1:1 [ARM] 3548/1: Fix the ARMv6 CPU id in compressed/head.S [ARM] 3335/1: Old-abi Thumb sys_syscall broken [ARM] 3467/1: [3/3] Support for Philips PNX4008 platform: defconfig [ARM] 3466/1: [2/3] Support for Philips PNX4008 platform: chip support [ARM] 3465/1: [1/3] Support for Philips PNX4008 platform: headers [ARM] 3407/1: lpd7x: documetation update [ARM] 3406/1: lpd7x: compilation fix for smc91x [ARM] 3405/1: lpd7a40x: CPLD ssp driver [ARM] 3404/1: lpd7a40x: AMBA CLCD support [ARM] 3403/1: lpd7a40x: updated default configurations [ARM] 3402/1: lpd7a40x: serial driver bug fix ... commit 75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d tree c2f02ee30609d0d69308b4ca80d68d02a5f85552 parent 0fd1ffe0633b4b039b343b753598e6df435e034d parent 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f author Steve French Tue, 20 Jun 2006 20:36:38 +0000 committer Steve French Tue, 20 Jun 2006 20:36:38 +0000 Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit 4af6fee18822d012a15b4c9b8992e1f2793dfe0b tree 99223edd72ba52b0bc1ba87717e525b07d79d24b parent 098a4cb7c0c9bdd86e9d99f607e9f31206a914eb author Deepak Saxena Tue, 20 Jun 2006 21:30:44 +0100 committer Russell King Tue, 20 Jun 2006 21:30:44 +0100 [ARM] 3610/1: Make reboot work on Versatile Patch from Deepak Saxena This patch makes soft reboot work on the Versatile board. Thanks to Catalin Marinas @ ARM for pointing out the proper way to do this. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 098a4cb7c0c9bdd86e9d99f607e9f31206a914eb tree fe96c6b220bdf09f691c0d82865572e1e1b2a456 parent ea75ee9ab8835ece099589c729574aa8aa94c0a6 parent ec57b709c3dc2e8b7643c51fc4c3fdae42b29be2 author Russell King Tue, 20 Jun 2006 20:57:34 +0100 committer Russell King Tue, 20 Jun 2006 20:57:34 +0100 Merge S3Cxxxx branch commit 7bc3312bef4d6f220812500c0de7868fb7625a41 tree 9ad49e850cdfe9868a19a37681bbf4d403e47ed3 parent 7e4178f90eec862affc97469118d5008bd1b5bda author Thomas Gleixner Tue, 20 Jun 2006 20:05:05 +0200 committer David Woodhouse Tue, 20 Jun 2006 20:31:24 +0100 [MTD] NAND: Fix breakage all over the place Following problems are addressed: - wrong status caused early break out of nand_wait() - removed the bogus status check in nand_wait() which is a relict of the abandoned support for interrupted erase. - status check moved to the correct place in read_oob - oob support for syndrom based ecc with strange layouts - use given offset in the AUTOOOB based oob operations Partially based on a patch from Vitaly Vool Thanks to Savin Zlobec for tracking down the status problem. Signed-off-by: Thomas Gleixner commit 7e4178f90eec862affc97469118d5008bd1b5bda tree b8b88499e53f5f306754aa26e879e3915e4e7e2c parent b6d5ee00e397b20dc88f7ffaa6f7651b71996a5c author Vitaly Wool Wed, 07 Jun 2006 09:34:37 +0400 committer David Woodhouse Tue, 20 Jun 2006 20:31:23 +0100 [PATCH] NAND: fix remaining OOB length calculation In nand_read_page_syndrome/nand_write_page_syndrome the calculation of the remaining oob length which is not used by the prepad/ecc/postpad areas is wrong. Signed-off-by: Vitaly Wool Signed-off-by: Thomas Gleixner commit b6d5ee00e397b20dc88f7ffaa6f7651b71996a5c tree 3b6f5c72fe60de068051189fd1d74962c2a147e7 parent ad3b5fb772e6a824f1ac341eb8e392eca6fc524f author Thomas Gleixner Fri, 16 Jun 2006 18:10:09 +0200 committer David Woodhouse Tue, 20 Jun 2006 20:31:23 +0100 [MTD] NAND Fixup NDFC merge brokeness Remove the remains of a broken merge. Signed-off-by: Thomas Gleixner commit ea75ee9ab8835ece099589c729574aa8aa94c0a6 tree e9b57958efda53f15dbb17dcb05bbba129d78e26 parent 3a8182bd886ab4197c9021645fac7a6f2bdc47ec author Russell King Tue, 20 Jun 2006 19:53:16 +0100 committer Russell King Tue, 20 Jun 2006 19:53:16 +0100 [ARM] Include asm/hardware.h not asm/arch/hardware.h Signed-off-by: Russell King commit 3a8182bd886ab4197c9021645fac7a6f2bdc47ec tree 1fdea3919dc2b4bfe2c1e61b81f7e06d6b2f4168 parent 695a9d236a6fd5a60557a02eff612880c37fe731 parent faed568413e89f87cd60aa8b292cc4b9996bae42 author Russell King Tue, 20 Jun 2006 19:49:07 +0100 committer Russell King Tue, 20 Jun 2006 19:49:07 +0100 Merge Zaurus branch commit 695a9d236a6fd5a60557a02eff612880c37fe731 tree 0ca809031f5f7139568914fe73ab5e244532aaf8 parent c322e24b40b83bbdfa7c269bc0105e76a39e627f parent 55c20c0af7fe7d5d09af4addfafcfe3bdc500f5d author Russell King Tue, 20 Jun 2006 19:48:18 +0100 committer Russell King Tue, 20 Jun 2006 19:48:18 +0100 Merge AT91 branch commit 55c20c0af7fe7d5d09af4addfafcfe3bdc500f5d tree 756496430a378be4be870928251c5aec43325634 parent 5c3fddced9f62f4b175ce400bb96b23f47626e50 author Andrew Victor Tue, 20 Jun 2006 19:31:39 +0100 committer Russell King Tue, 20 Jun 2006 19:31:39 +0100 [ARM] 3599/1: AT91RM9200 remove global variables Patch from Andrew Victor This patch removes some now unnecessary global variables - at91_master_clock, at91_serial_map, at91_console_port. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit ec57b709c3dc2e8b7643c51fc4c3fdae42b29be2 tree 2a1ca5ebfdd86f1d007883df0d17b49cc48bfe75 parent bf1c56a3aaa67ac74bc74e631ecc2a2673597cae author Ben Dooks Tue, 20 Jun 2006 19:31:06 +0100 committer Russell King Tue, 20 Jun 2006 19:31:06 +0100 [ARM] 3609/1: S3C24XX: defconfig update for s3c2410_defconfig Patch from Ben Dooks Update s3c2410_defconfig to latest kernel with the latest patches Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 5c3fddced9f62f4b175ce400bb96b23f47626e50 tree 52bad626b8b5111eb727f4a5fcc586f60c88c426 parent 907d6deb625cd7ff5fea3ef4b20dfb6c1c19c3ee author Andrew Victor Tue, 20 Jun 2006 19:30:20 +0100 committer Russell King Tue, 20 Jun 2006 19:30:20 +0100 [ARM] 3607/1: AT91RM9200 misc fixes Patch from Andrew Victor This final patch includes some general fixes. 1. Link in pm.o if CONFIG_PM is enabled. [Should have been included in patch 3605/1]. 2. Use __raw_readl()/__raw_writel() when accessing System Peripheral registers. 3. Removed some unnecessary includes Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 907d6deb625cd7ff5fea3ef4b20dfb6c1c19c3ee tree e89da97418b5b4fa51212bc14a558bcf0c3f900b parent 6902f523a328bba5af036699b1352389c0746526 author Andrew Victor Tue, 20 Jun 2006 19:30:19 +0100 committer Russell King Tue, 20 Jun 2006 19:30:19 +0100 [ARM] 3605/1: AT91RM9200 Power Management Patch from Andrew Victor This patch adds the core Power Management support for the AT91RM9200 processor. It will support suspend-to-RAM and standby modes. The suspend-to-RAM functionality is not 100% complete. The code that needs to be execute from the internal SRAM to restore the system is outstanding. For now we just fall through to Standby mode. The AT91-specific at91_suspend_entering_slow_clock() function will eventually be replaced by clk_must_disable() once that functionality is added to mainline clock API. Patch from David Brownell. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 6902f523a328bba5af036699b1352389c0746526 tree 7e55b5f1effd8f75b5675ba3c15285720b60cd37 parent d6bdbb8ef3e4a9cafc747e1444b4908f9f2f548d author Andrew Victor Tue, 20 Jun 2006 19:30:18 +0100 committer Russell King Tue, 20 Jun 2006 19:30:18 +0100 [ARM] 3604/1: AT91RM9200 New boards Patch from Andrew Victor This patch adds support for an additional 4 AT91RM9200-based boards: 1. Conitec ARM&EVA [MACH_CARMEVA] (http://www.conitec.net/english/linuxboard.htm) 2. KwikByte KB920x [MACH_KB9200] (http://kwikbyte.com/KB9202_description_new.htm) 3. Embest ATEB9200 [MACH_ATEB9200] (http://www.embedinfo.com/english/product/ATEB9200.asp) 4. Sperry-Sun KAFA board [MACH_KAFA] (unknown) Signed-off-by: Andrew Victor Signed-off-by: Russell King commit d6bdbb8ef3e4a9cafc747e1444b4908f9f2f548d tree 04945fd4a850b68b8c110ed4a5b5c2aa4a1a64c1 parent afefc4158f3c8529e4bb99c1dc119fd792bac220 author Andrew Victor Tue, 20 Jun 2006 19:27:34 +0100 committer Russell King Tue, 20 Jun 2006 19:27:34 +0100 [ARM] 3603/1: AT91RM9200 remove old files Patch from Andrew Victor This patch removes the now unnecessary include/asm-arm/arch-at91rm9200/pio.h file. The pin configuration is now handled in the platform-device setup code (arch/arm/mach-at91rm9200/devices.c). Signed-off-by: Andrew Victor Signed-off-by: Russell King commit c322e24b40b83bbdfa7c269bc0105e76a39e627f tree b4f559deb3cc249280380807bdf8dc5ec8220159 parent e6fea6a5e30efef56dee2b8455fde0811922055b author Liam Girdwood Tue, 20 Jun 2006 19:26:42 +0100 committer Russell King Tue, 20 Jun 2006 19:26:42 +0100 [ARM] 3606/1: PXA27x SSP Register definitions Patch from Liam Girdwood This patch adds some new PXA27x SSP port registers and also fixes the SSP slots per frame macro Changes:- o SSCR0_SlotPerFrm fixed o Added SSP port TSA, RSA, TSS and ACD registers Signed-off-by: Liam Girdwood Signed-off-by: Russell King commit e6fea6a5e30efef56dee2b8455fde0811922055b tree 10018ebe35f826ae722aae9e196280516a56ff8b parent 5af29e56c221d709bdbd5fccaf190e21f290a30e author Lennert Buytenhek Tue, 20 Jun 2006 19:26:41 +0100 committer Russell King Tue, 20 Jun 2006 19:26:41 +0100 [ARM] 3602/1: ixp23xx: fix two typos Patch from Lennert Buytenhek Fix two typos in include/asm-arm/arch-ixp23xx. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 4faf4e0e7d4e1935fbfc5043d3ebd8d51a3d898d tree 2260b6dcdeef40ceea39ef1c2f31fd3f9dc53a33 parent f8441e13449638e9fc3c160c35ada3b6f1f8d9c0 author Lennert Buytenhek Tue, 20 Jun 2006 19:24:07 +0100 committer Russell King Tue, 20 Jun 2006 19:24:07 +0100 [ARM] 3600/1: increase amba-pl010 UART_NR to 8 Patch from Lennert Buytenhek The cirrus ep93xx has 3 pl010 UARTs, while amba-pl010.c only allows for 2 by default. A while ago, I think we agreed on changing the 2 to 8, but I don't see this in 2.6.17 yet. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit dfc7bd9c385a888851a2d009ba272099549f98cc tree 93f84b1421a67760bb2f3ba8e3964897aff1b8e4 parent 58b519f3e5e491d5a3e320dc525f58ac439bdde4 author Andrew Victor Sun, 21 May 2006 15:32:59 +0200 committer Wim Van Sebroeck Tue, 20 Jun 2006 19:15:52 +0200 [WATCHDOG] convert AT91RM9200 watchdog to platform driver Converted to a platform driver. Added suspend/resume support - the watchdog is disabled during the sleep states. Original patch from David Brownell. Signed-off-by: Andrew Victor Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit 58b519f3e5e491d5a3e320dc525f58ac439bdde4 tree efff3a0bd308effbbedce1a50fbb40d71e5b5d96 parent e05b59fe7927bc648ac3af3d59dc64a7ee6b22e2 author Wim Van Sebroeck Sun, 21 May 2006 12:48:44 +0200 committer Wim Van Sebroeck Tue, 20 Jun 2006 19:00:30 +0200 [WATCHDOG] add WDIOC_GETTIMELEFT ioctl Some watchdog drivers have the ability to report the remaining time before the system will reboot. With the WDIOC_GETTIMELEFT ioctl you can now read the time left before the watchdog would reboot your system. The following drivers support this new IOCTL: i8xx_tco.c, pcwd_pci.c and pcwd_usb.c . Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit e05b59fe7927bc648ac3af3d59dc64a7ee6b22e2 tree 845497dc08f3d506edfc3af2956f43e3f6d70472 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Corey Minyard Wed, 19 Apr 2006 22:40:53 +0200 committer Wim Van Sebroeck Tue, 20 Jun 2006 18:50:42 +0200 [WATCHDOG] Pre-Timeout flags Some watchdog timers support the concept of a "pretimeout" which occurs some time before the real timeout. The pretimeout can be delivered via an interrupt or NMI and can be used to panic the system when it occurs (so you get useful information instead of a blind reboot). Signed-off-by: Corey Minyard Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton commit d59bf96cdde5b874a57bfd1425faa45da915d0b7 tree 351a40b72514d620e5bebea2de38c26f23277ffc parent 28df955a2ad484d602314b30183ea8496a9aa34a parent 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f author Trond Myklebust Tue, 20 Jun 2006 08:59:45 -0400 committer Trond Myklebust Tue, 20 Jun 2006 08:59:45 -0400 Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ commit ff7512e1a2a3504649d3716a757f43807b6d26ef tree bda8de186c3990142701d9b97cf2f7d18f01b2a1 parent 8ca84481b69513f7bf341c7dd9897023a04d7d1d author Al Viro Tue, 20 Jun 2006 03:27:27 -0700 committer David S. Miller Tue, 20 Jun 2006 03:27:27 -0700 [ATM]: fix broken uses of NIPQUAD in net/atm NIPQUAD expects an l-value of type __be32, _NOT_ a pointer to __be32. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 8ca84481b69513f7bf341c7dd9897023a04d7d1d tree d6c930de1d67d19a01967e18e8d116421cbe4eda parent 65fd28f743be6e3e3fd8eefa9a517656636fee42 author Al Viro Tue, 20 Jun 2006 03:26:14 -0700 committer David S. Miller Tue, 20 Jun 2006 03:26:14 -0700 [SCTP]: sctp_unpack_cookie() fix sizeof(pointer) != sizeof(array)... Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 41757106b9ca7867dafb2404d618f947b4786fd7 tree 6feff3fade7d842e58d535eef4f397ebfb8ae19e parent 9c937dcc71021f2dbf78f904f03d962dd9bcc130 author Steve Grubb Mon, 12 Jun 2006 07:48:28 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:29 -0400 [PATCH] make set_loginuid obey audit_enabled Hi, I was doing some testing and noticed that when the audit system was disabled, I was still getting messages about the loginuid being set. The following patch makes audit_set_loginuid look at in_syscall to determine if it should create an audit event. The loginuid will continue to be set as long as there is a context. Signed-off-by: Steve Grubb Signed-off-by: Al Viro commit 9c937dcc71021f2dbf78f904f03d962dd9bcc130 tree 6ab53c1cf1235515307d521cecc4f76afa34e137 parent 6a2bceec0ea7fdc47aef9a3f2f771c201eaabe5d author Amy Griffis Thu, 08 Jun 2006 23:19:31 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:28 -0400 [PATCH] log more info for directory entry change events When an audit event involves changes to a directory entry, include a PATH record for the directory itself. A few other notable changes: - fixed audit_inode_child() hooks in fsnotify_move() - removed unused flags arg from audit_inode() - added audit log routines for logging a portion of a string Here's some sample output. before patch: type=SYSCALL msg=audit(1149821605.320:26): arch=40000003 syscall=39 success=yes exit=0 a0=bf8d3c7c a1=1ff a2=804e1b8 a3=bf8d3c7c items=1 ppid=739 pid=800 auid=0 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=ttyS0 comm="mkdir" exe="/bin/mkdir" subj=root:system_r:unconfined_t:s0-s0:c0.c255 type=CWD msg=audit(1149821605.320:26): cwd="/root" type=PATH msg=audit(1149821605.320:26): item=0 name="foo" parent=164068 inode=164010 dev=03:00 mode=040755 ouid=0 ogid=0 rdev=00:00 obj=root:object_r:user_home_t:s0 after patch: type=SYSCALL msg=audit(1149822032.332:24): arch=40000003 syscall=39 success=yes exit=0 a0=bfdd9c7c a1=1ff a2=804e1b8 a3=bfdd9c7c items=2 ppid=714 pid=777 auid=0 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=ttyS0 comm="mkdir" exe="/bin/mkdir" subj=root:system_r:unconfined_t:s0-s0:c0.c255 type=CWD msg=audit(1149822032.332:24): cwd="/root" type=PATH msg=audit(1149822032.332:24): item=0 name="/root" inode=164068 dev=03:00 mode=040750 ouid=0 ogid=0 rdev=00:00 obj=root:object_r:user_home_dir_t:s0 type=PATH msg=audit(1149822032.332:24): item=1 name="foo" inode=164010 dev=03:00 mode=040755 ouid=0 ogid=0 rdev=00:00 obj=root:object_r:user_home_t:s0 Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit 6a2bceec0ea7fdc47aef9a3f2f771c201eaabe5d tree 9496dcc64e7cf94f4e87f01957ef41ed18b13e40 parent 0a73dccc4fd472e65887eae6fbf4afc030541709 author Amy Griffis Fri, 02 Jun 2006 13:16:01 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:28 -0400 [PATCH] fix AUDIT_FILTER_PREPEND handling Clear AUDIT_FILTER_PREPEND flag after adding rule to list. This fixes three problems when a rule is added with the -A syntax: - auditctl displays filter list as "(null)" - the rule cannot be removed using -d - a duplicate rule can be added with -a Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit 0a73dccc4fd472e65887eae6fbf4afc030541709 tree e9578332e31d0e88c681ac710acf2b196293ba8e parent f368c07d7214a7c41dfceb76c8db473b850f0229 author Al Viro Mon, 05 Jun 2006 08:15:59 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:27 -0400 [PATCH] validate rule fields' types Signed-off-by: Al Viro commit f368c07d7214a7c41dfceb76c8db473b850f0229 tree e3f1e2d1a6ffbe61bf99ece51b906654728db4c9 parent 20ca73bc792be9625af184cbec36e1372611d1c3 author Amy Griffis Fri, 07 Apr 2006 16:55:56 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:27 -0400 [PATCH] audit: path-based rules In this implementation, audit registers inotify watches on the parent directories of paths specified in audit rules. When audit's inotify event handler is called, it updates any affected rules based on the filesystem event. If the parent directory is renamed, removed, or its filesystem is unmounted, audit removes all rules referencing that inotify watch. To keep things simple, this implementation limits location-based auditing to the directory entries in an existing directory. Given a path-based rule for /foo/bar/passwd, the following table applies: passwd modified -- audit event logged passwd replaced -- audit event logged, rules list updated bar renamed -- rule removed foo renamed -- untracked, meaning that the rule now applies to the new location Audit users typically want to have many rules referencing filesystem objects, which can significantly impact filtering performance. This patch also adds an inode-number-based rule hash to mitigate this situation. The patch is relative to the audit git tree: http://kernel.org/git/?p=linux/kernel/git/viro/audit-current.git;a=summary and uses the inotify kernel API: http://lkml.org/lkml/2006/6/1/145 Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit 20ca73bc792be9625af184cbec36e1372611d1c3 tree 98a1232ad3c9baa14676b2b48fab79a3df4a20b0 parent 8ba8e0fbe6321961f6ba04e2fd7215b37d935c83 author George C. Wilson Wed, 24 May 2006 16:09:55 -0500 committer Al Viro Tue, 20 Jun 2006 05:25:26 -0400 [PATCH] Audit of POSIX Message Queue Syscalls v.2 This patch adds audit support to POSIX message queues. It applies cleanly to the lspp.b15 branch of Al Viro's git tree. There are new auxiliary data structures, and collection and emission routines in kernel/auditsc.c. New hooks in ipc/mqueue.c collect arguments from the syscalls. I tested the patch by building the examples from the POSIX MQ library tarball. Build them -lrt, not against the old MQ library in the tarball. Here's the URL: http://www.geocities.com/wronski12/posix_ipc/libmqueue-4.41.tar.gz Do auditctl -a exit,always -S for mq_open, mq_timedsend, mq_timedreceive, mq_notify, mq_getsetattr. mq_unlink has no new hooks. Please see the corresponding userspace patch to get correct output from auditd for the new record types. [fixes folded] Signed-off-by: George Wilson Signed-off-by: Al Viro commit 8ba8e0fbe6321961f6ba04e2fd7215b37d935c83 tree 040b02209b21a06fc0c45cafce599773c905ef75 parent 014149cce19c5acb19014e57a5b739b7f64e6fbf author Darrel Goeddel Wed, 24 May 2006 09:38:25 -0500 committer Al Viro Tue, 20 Jun 2006 05:25:26 -0400 [PATCH] fix se_sen audit filter Fix a broken comparison that causes the process clearance to be checked for both se_clr and se_sen audit filters. Signed-off-by: Darrel Goeddel Signed-off-by: Al Viro commit 014149cce19c5acb19014e57a5b739b7f64e6fbf tree eb92d3e25264e1ff89bffcedaca88c44ff7efae2 parent d8945bb51a2bb6623cfa36b9ff63594f46d513aa author Al Viro Tue, 23 May 2006 01:36:13 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:25 -0400 [PATCH] deprecate AUDIT_POSSBILE Signed-off-by: Al Viro commit d8945bb51a2bb6623cfa36b9ff63594f46d513aa tree b369c9b853e90790a04baa70ee66a2ef9e15fd18 parent e0182909297da8d38a5d473ae7bee3d0324632a1 author Al Viro Thu, 18 May 2006 16:01:30 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:25 -0400 [PATCH] inline more audit helpers pull checks for ->audit_context into inlined wrappers Signed-off-by: Al Viro commit e0182909297da8d38a5d473ae7bee3d0324632a1 tree 0c5c06bac1d626ba66aba1142f439b0f34c75282 parent ac03221a4fdda9bfdabf99bcd129847f20fc1d80 author Al Viro Thu, 18 May 2006 08:28:02 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:24 -0400 [PATCH] proc_loginuid_write() uses simple_strtoul() on non-terminated array Signed-off-by: Al Viro commit ac03221a4fdda9bfdabf99bcd129847f20fc1d80 tree 9b65ede238b03007bfe5e25f46efca68ec0994e0 parent 5d136a010de3bc16fe595987feb9ef8868f064c2 author Linda Knippers Tue, 16 May 2006 22:03:48 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:24 -0400 [PATCH] update of IPC audit record cleanup The following patch addresses most of the issues with the IPC_SET_PERM records as described in: https://www.redhat.com/archives/linux-audit/2006-May/msg00010.html and addresses the comments I received on the record field names. To summarize, I made the following changes: 1. Changed sys_msgctl() and semctl_down() so that an IPC_SET_PERM record is emitted in the failure case as well as the success case. This matches the behavior in sys_shmctl(). I could simplify the code in sys_msgctl() and semctl_down() slightly but it would mean that in some error cases we could get an IPC_SET_PERM record without an IPC record and that seemed odd. 2. No change to the IPC record type, given no feedback on the backward compatibility question. 3. Removed the qbytes field from the IPC record. It wasn't being set and when audit_ipc_obj() is called from ipcperms(), the information isn't available. If we want the information in the IPC record, more extensive changes will be necessary. Since it only applies to message queues and it isn't really permission related, it doesn't seem worth it. 4. Removed the obj field from the IPC_SET_PERM record. This means that the kern_ipc_perm argument is no longer needed. 5. Removed the spaces and renamed the IPC_SET_PERM field names. Replaced iuid and igid fields with ouid and ogid in the IPC record. I tested this with the lspp.22 kernel on an x86_64 box. I believe it applies cleanly on the latest kernel. -- ljk Signed-off-by: Linda Knippers Signed-off-by: Al Viro commit 5d136a010de3bc16fe595987feb9ef8868f064c2 tree ce0dbf3d5da61bc9b69fa557f0f578cd980f3147 parent 0a3b483e83edb6aa6d3c49db70eeb6f1cd9f6c6b author Serge E. Hallyn Thu, 27 Apr 2006 16:45:14 -0500 committer Al Viro Tue, 20 Jun 2006 05:25:23 -0400 [PATCH] minor audit updates Just a few minor proposed updates. Only the last one will actually affect behavior. The rest are just misleading code. Several AUDIT_SET functions return 'old' value, but only return value <0 is checked for. So just return 0. propagate audit_set_rate_limit and audit_set_backlog_limit error values In audit_buffer_free, the audit_freelist_count was being incremented even when we discard the return buffer, so audit_freelist_count can end up wrong. This could cause the actual freelist to shrink over time, eventually threatening to degrate audit performance. Signed-off-by: Serge E. Hallyn Signed-off-by: Al Viro commit 0a3b483e83edb6aa6d3c49db70eeb6f1cd9f6c6b tree d8714c7953e2eb5f1e12243fe8098127b4e7cada parent 3c66251e573219a0532a5a07381b2f60a412d9eb author Amy Griffis Tue, 02 May 2006 15:06:01 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:23 -0400 [PATCH] fix audit_krule_to_{rule,data} return values Don't return -ENOMEM when callers of these functions are checking for a NULL return. Bug noticed by Serge Hallyn. Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit 3c66251e573219a0532a5a07381b2f60a412d9eb tree b047b25d28ae1abe6bb81daba886e44e0a82094f parent f46038ff7d23ae092d61b366332c05aab8227b48 author Al Viro Sat, 06 May 2006 08:26:27 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:22 -0400 [PATCH] add filtering by ppid Signed-off-by: Al Viro commit f46038ff7d23ae092d61b366332c05aab8227b48 tree b1615e261d90cd6f83065b3d8350a6b2cd7176a2 parent e1396065e0489f98b35021b97907ab4edbfb24e1 author Al Viro Sat, 06 May 2006 08:22:52 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:22 -0400 [PATCH] log ppid Signed-off-by: Al Viro commit e1396065e0489f98b35021b97907ab4edbfb24e1 tree a276ea0a2ece9132d435adf1a1f82d0ada1ae938 parent 473ae30bc7b1dda5c5791c773f95e9424ddfead9 author Al Viro Thu, 25 May 2006 10:19:47 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:21 -0400 [PATCH] collect sid of those who send signals to auditd Signed-off-by: Al Viro commit 473ae30bc7b1dda5c5791c773f95e9424ddfead9 tree 541f6f20b9131fcfb650ca491e291d3c6b148a1b parent 9044e6bca5a4a575d3c068dfccb5651a2d6a13bc author Al Viro Wed, 26 Apr 2006 14:04:08 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:21 -0400 [PATCH] execve argument logging Signed-off-by: Al Viro commit 9044e6bca5a4a575d3c068dfccb5651a2d6a13bc tree e0fa2beb83c3ef4e52cc6c6b28ce3173656f4276 parent bc0f3b8ebba611291fdaa2864dbffd2d29336c64 author Al Viro Mon, 22 May 2006 01:09:24 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:20 -0400 [PATCH] fix deadlocks in AUDIT_LIST/AUDIT_LIST_RULES We should not send a pile of replies while holding audit_netlink_mutex since we hold the same mutex when we receive commands. As the result, we can get blocked while sending and sit there holding the mutex while auditctl is unable to send the next command and get around to receiving what we'd sent. Solution: create skb and put them into a queue instead of sending; once we are done, send what we've got on the list. The former can be done synchronously while we are handling AUDIT_LIST or AUDIT_LIST_RULES; we are holding audit_netlink_mutex at that point. The latter is done asynchronously and without messing with audit_netlink_mutex. Signed-off-by: Al Viro commit bc0f3b8ebba611291fdaa2864dbffd2d29336c64 tree 08418bb535747731348609b5ca2ddbbd8fa0f510 parent 0edce197db00094d04c7fb147903add814c9db67 author Al Viro Mon, 22 May 2006 01:36:34 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:20 -0400 [PATCH] audit_panic() is audit-internal ... no need to provide a stub; note that extern is already gone from include/linux/audit.h Signed-off-by: Al Viro commit 0edce197db00094d04c7fb147903add814c9db67 tree a8de0b2b6c5d57f1c6f2ba407a2e0c5f96486e42 parent 3ca10067f7f4bfa62a1b0edc84f590261fa02d75 author Amy Griffis Thu, 01 Jun 2006 13:11:07 -0700 committer Al Viro Tue, 20 Jun 2006 05:25:19 -0400 [PATCH] inotify (5/5): update kernel documentation Update kernel documentation to include a description of the inotify kernel API. Signed-off-by: Amy Griffis Acked-by: Robert Love Acked-by: John McCutchan Signed-off-by: Al Viro commit 3ca10067f7f4bfa62a1b0edc84f590261fa02d75 tree 456e1b555cd4af838bd4e833aa7589ab2bab6766 parent a9dc971d3fdb857a2bcd6d53238125a2cd31d5f4 author Amy Griffis Thu, 01 Jun 2006 13:11:05 -0700 committer Al Viro Tue, 20 Jun 2006 05:25:19 -0400 [PATCH] inotify (4/5): allow watch removal from event handler Allow callers to remove watches from their event handler via inotify_remove_watch_locked(). This functionality can be used to achieve IN_ONESHOT-like functionality for a subset of events in the mask. Signed-off-by: Amy Griffis Acked-by: Robert Love Acked-by: John McCutchan Signed-off-by: Al Viro commit a9dc971d3fdb857a2bcd6d53238125a2cd31d5f4 tree 02e8816f583b5ca40da5789ab9e8d7de9b3ed598 parent 7c29772288b7026504cfe75bfd90d40fbd1574bf author Amy Griffis Thu, 01 Jun 2006 13:11:03 -0700 committer Al Viro Tue, 20 Jun 2006 05:25:18 -0400 [PATCH] inotify (3/5): add interfaces to kernel API Add inotify_init_watch() so caller can use inotify_watch refcounts before calling inotify_add_watch(). Add inotify_find_watch() to find an existing watch for an (ih,inode) pair. This is similar to inotify_find_update_watch(), but does not update the watch's mask if one is found. Add inotify_rm_watch() to remove a watch via the watch pointer instead of the watch descriptor. Signed-off-by: Amy Griffis Acked-by: Robert Love Acked-by: John McCutchan Signed-off-by: Al Viro commit 7c29772288b7026504cfe75bfd90d40fbd1574bf tree dfc0cfef97c4c5fdbd87bbd9abdbf44bcd21c906 parent 2d9048e201bfb67ba21f05e647b1286b8a4a5667 author Amy Griffis Thu, 01 Jun 2006 13:11:01 -0700 committer Al Viro Tue, 20 Jun 2006 05:25:18 -0400 [PATCH] inotify (2/5): add name's inode to event handler When an inotify event includes a dentry name, also include the inode associated with that name. Signed-off-by: Amy Griffis Acked-by: Robert Love Acked-by: John McCutchan Signed-off-by: Al Viro commit 2d9048e201bfb67ba21f05e647b1286b8a4a5667 tree 1df2ca6780d403f3209cf445f8b0b27f45098434 parent 90204e0b7b51e9f2a6905adca12dc331128602c7 author Amy Griffis Thu, 01 Jun 2006 13:10:59 -0700 committer Al Viro Tue, 20 Jun 2006 05:25:17 -0400 [PATCH] inotify (1/5): split kernel API from userspace support The following series of patches introduces a kernel API for inotify, making it possible for kernel modules to benefit from inotify's mechanism for watching inodes. With these patches, inotify will maintain for each caller a list of watches (via an embedded struct inotify_watch), where each inotify_watch is associated with a corresponding struct inode. The caller registers an event handler and specifies for which filesystem events their event handler should be called per inotify_watch. Signed-off-by: Amy Griffis Acked-by: Robert Love Acked-by: John McCutchan Signed-off-by: Al Viro commit 90204e0b7b51e9f2a6905adca12dc331128602c7 tree fc5279d3cb343c3b3ec4bc2c3d825e5e01c8ff9a parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Al Viro Thu, 01 Jun 2006 21:39:38 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:17 -0400 [PATCH] remove config.h from inotify.h Signed-off-by: Al Viro commit d7a80dad2fe19a2b8c119c8e9cba605474a75a2b tree b32a32f95bc40f7fa4dbc1f127213aaa75e96ca9 parent 40ef1d8d48e364dce689342adfdc475aa53f4808 author Tejun Heo Fri, 16 Jun 2006 15:00:18 +0900 committer Jeff Garzik Tue, 20 Jun 2006 05:12:15 -0400 [PATCH] libata: convert several bmdma-style controllers to new EH, take #3 Convert sata_sis, svw, uli and vsc drivers to new EH. All the drivers used to specify ATA_FLAG_SATA_RESET to tell libata to use SATA hardreset instead of SRST. This patch makes all the converted drivers use the standard bmdma error handler which uses both SRST and SATA hardreset. All the controllers should be able to perform SRST but still needs verification. If some of the controllers can't do SRST, it will be very easy to spot as it will show up during boot probing. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 40ef1d8d48e364dce689342adfdc475aa53f4808 tree 56c54e99479c471a614b87de6eeeb15193453053 parent c5fa46e175ccd02803031ea071060cdb01521736 author Tejun Heo Fri, 16 Jun 2006 15:13:53 +0900 committer Jeff Garzik Tue, 20 Jun 2006 05:12:15 -0400 [PATCH] sata_via: convert to new EH, take #3 Convert sata_via to new EH. vt6420 used ATA_FLAG_SRST while vt6421 used ATA_FLAG_SATA_RESET. This difference seems to be an accident rather than intended. This patch makes both flavors use ata_bmdma_error_handler() which makes use of both SRST and SATA hardreset. This behavior change is intended and if it breaks anything, it should be very easy to spot. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c5fa46e175ccd02803031ea071060cdb01521736 tree 5e6f49d86a2dcd069c45bfd434efd6d6fa311bea parent 5a44efff4f8fe8139c0c4166ad5aae5f2fa5bced author Jeff Garzik Tue, 20 Jun 2006 05:08:44 -0400 committer Jeff Garzik Tue, 20 Jun 2006 05:08:44 -0400 [libata] sata_nv: s/spin_lock_irqsave/spin_lock/ in irq handler We don't need to use the heavier spin lock in the irq handler. It's quite possible we can do this in nv_generic_interrupt() as well, but I didn't take the time to pursue that train of thought. Signed-off-by: Jeff Garzik commit 5a44efff4f8fe8139c0c4166ad5aae5f2fa5bced tree fe424beaa46ad3d59b28ef79b1da4a1f748e2ac8 parent 39f8758259868a01ecad29b4379661dd3f21881f author Tejun Heo Sat, 17 Jun 2006 15:49:56 +0900 committer Jeff Garzik Tue, 20 Jun 2006 04:59:22 -0400 [PATCH] sata_nv: add hotplug support Add hotplug support. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 39f8758259868a01ecad29b4379661dd3f21881f tree 12c9583bc5ed11d2c7c4b95b796251d30c465c16 parent ada364e884eb7e60ee96e84cbce07b3c90234c9d author Tejun Heo Sat, 17 Jun 2006 15:49:56 +0900 committer Jeff Garzik Tue, 20 Jun 2006 04:59:22 -0400 [PATCH] sata_nv: convert to new EH Convert to new EH. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ada364e884eb7e60ee96e84cbce07b3c90234c9d tree 4826b8e6638084e3d248457f5a7319820ccb9b29 parent 27e4b2745443cef67220da9a4f5f71b1c5f72442 author Tejun Heo Sat, 17 Jun 2006 15:49:56 +0900 committer Jeff Garzik Tue, 20 Jun 2006 04:59:22 -0400 [PATCH] sata_nv: better irq handlers nf2/3 and ck804 have irq status register. Implement better irq handler for those flavors of nv. This patch makes different flavors of nv controllers use different irq handlers by using separate port_info for each flavor. This change also makes following EH and hotplug updates easier to integrate. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 27e4b2745443cef67220da9a4f5f71b1c5f72442 tree 473afba54188a535a6ab3e4bfe36f7a9ed2a62ba parent e6faf082cd75d6dcdcf89258ddf40c6855df87a1 author Tejun Heo Sat, 17 Jun 2006 15:49:55 +0900 committer Jeff Garzik Tue, 20 Jun 2006 04:59:22 -0400 [PATCH] sata_nv: simplify constants Simplify interrupt constants and make NFORCE3 equal to NFORCE2. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e6faf082cd75d6dcdcf89258ddf40c6855df87a1 tree f0a74b0233a8524de32a21ae2c12300803f14c00 parent 638ebcc81f40b160f5e8b161e690e9b1b9503c1e author Tejun Heo Sat, 17 Jun 2006 15:49:55 +0900 committer Jeff Garzik Tue, 20 Jun 2006 04:59:21 -0400 [PATCH] sata_nv: kill struct nv_host_desc and nv_host nv_host_desc and nv_host are used to discern different generations of nv controllers. Kill those. New EH/hotplug implementation will use standard port_info/ata_port_operations for that. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 638ebcc81f40b160f5e8b161e690e9b1b9503c1e tree fc902a4de9705818efb2f93b286fed31d076e6f0 parent ea6e1e94f2cb9ae54bd1428e1ef3e84a749ceed8 author Tejun Heo Sat, 17 Jun 2006 15:49:55 +0900 committer Jeff Garzik Tue, 20 Jun 2006 04:59:21 -0400 [PATCH] sata_nv: kill not-working hotplug code sata_nv contained hotplug code which is mainly for demonstrating how hotplug event is handled. This patch kills the demo code in prepration for real hotplug implementation. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 612eff0e3715a6faff5ba1b74873b99e036c59fe tree 647f0ddec94d0fb4aaf74fa55bcad75946030f8a parent 4b2d9cf00962d0a0e697f887f3ecaa155cbde555 author Brian Haley Thu, 15 Jun 2006 14:36:36 -0400 committer Jeff Garzik Tue, 20 Jun 2006 04:50:36 -0400 [PATCH] s2io: netpoll support This adds netpoll support for things like netconsole/kgdboe to the s2io 10GbE driver. Signed-off-by: Brian Haley Signed-off-by: Jeff Garzik commit 4b2d9cf00962d0a0e697f887f3ecaa155cbde555 tree 3a64ad0825e82c3df0b4d84c412c647c19e34afb parent 4c1234ff24dd8dc2d9020d6315d91a71339be114 parent 89c318ed3985da1271e00ad586f2dce8a6e75656 author Jeff Garzik Tue, 20 Jun 2006 04:46:02 -0400 committer Jeff Garzik Tue, 20 Jun 2006 04:46:02 -0400 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream commit 4c1234ff24dd8dc2d9020d6315d91a71339be114 tree 9d20c648648bb7544b48e2853667475d03273afd parent 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f parent 1668b19f75cb949f930814a23b74201ad6f76a53 author Jeff Garzik Tue, 20 Jun 2006 04:43:43 -0400 committer Jeff Garzik Tue, 20 Jun 2006 04:43:43 -0400 Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream commit 4c5eb38af2131d867842cdd09fa83a3ed77bfd26 tree bc46864eb3ac479bb4ea1cb454dd077dea759a81 parent c8bfcd95def89cb69a04c58e1de7995d696c8760 author David S. Miller Tue, 20 Jun 2006 01:27:08 -0700 committer David S. Miller Tue, 20 Jun 2006 01:27:08 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit c8bfcd95def89cb69a04c58e1de7995d696c8760 tree 48e19f24d0218d1ed92c3b58696b29ab1ae574be parent e18e2a00efc8352c131eb8d5a460149fb5776f1c author David S. Miller Tue, 20 Jun 2006 01:23:56 -0700 committer David S. Miller Tue, 20 Jun 2006 01:23:56 -0700 [SPARC64]: Don't double-export synchronize_irq. It is done by the generic IRQ layer now. Signed-off-by: David S. Miller commit e18e2a00efc8352c131eb8d5a460149fb5776f1c tree bee6e965d77f4289c37300714d7976c3e19f2994 parent 8047e247c899f80c33a23ad7e9e250224f0d26a5 author David S. Miller Tue, 20 Jun 2006 01:23:32 -0700 committer David S. Miller Tue, 20 Jun 2006 01:23:32 -0700 [SPARC64]: Move over to GENERIC_HARDIRQS. This is the long overdue conversion of sparc64 over to the generic IRQ layer. The kernel image is slightly larger, but the BSS is ~60K smaller due to the reduced size of struct ino_bucket. A lot of IRQ implementation details, including ino_bucket, were moved out of asm-sparc64/irq.h and are now private to arch/sparc64/kernel/irq.c, and most of the code in irq.c totally disappeared. One thing that's different at the moment is IRQ distribution, we do it at enable_irq() time. If the cpu mask is ALL then we round-robin using a global rotating cpu counter, else we pick the first cpu in the mask to support single cpu targetting. This is similar to what powerpc's XICS IRQ support code does. This works fine on my UP SB1000, and the SMP build goes fine and runs on that machine, but lots of testing on different setups is needed. Signed-off-by: David S. Miller commit 8047e247c899f80c33a23ad7e9e250224f0d26a5 tree 253a7ba3c902730928214df5c2b5630d7875cc11 parent 37cdcd9e82108f9b899f1631f66ade2e45738a6e author David S. Miller Tue, 20 Jun 2006 01:22:35 -0700 committer David S. Miller Tue, 20 Jun 2006 01:22:35 -0700 [SPARC64]: Virtualize IRQ numbers. Inspired by PowerPC XICS interrupt support code. All IRQs are virtualized in order to keep NR_IRQS from needing to be too large. Interrupts on sparc64 are arbitrary 11-bit values, but we don't need to define NR_IRQS to 2048 if we virtualize the IRQs. As PCI and SBUS controller drivers build device IRQs, we divy out virtual IRQ numbers incrementally starting at 1. Zero is a special virtual IRQ used for the timer interrupt. So device drivers all see virtual IRQs, and all the normal interfaces such as request_irq(), enable_irq(), etc. translate that into a real IRQ number in order to configure the IRQ. At this point knowledge of the struct ino_bucket is almost entirely contained within arch/sparc64/kernel/irq.c There are a few small bits in the PCI controller drivers that need to be swept away before we can remove ino_bucket's definition out of asm-sparc64/irq.h and privately into kernel/irq.c Signed-off-by: David S. Miller commit 37cdcd9e82108f9b899f1631f66ade2e45738a6e tree 452b4a106d767947664b99797640194c7483047e parent c6387a48cf5958e43c201fc27a158c328927531a author David S. Miller Tue, 20 Jun 2006 01:21:57 -0700 committer David S. Miller Tue, 20 Jun 2006 01:21:57 -0700 [SPARC64]: Kill ino_bucket->pil And reuse that struct member for virt_irq, which will be used in future changesets for the implementation of mapping between real and virtual IRQ numbers. This nicely kills off a ton of SBUS and PCI controller PIL assignment code which is no longer necessary. Signed-off-by: David S. Miller commit c6387a48cf5958e43c201fc27a158c328927531a tree a6c24951d6c86ac47bd3f0ba198adbfffd03291b parent 6a76267f0e52d920e6bb6da75541e6116d7304da author David S. Miller Tue, 20 Jun 2006 01:21:29 -0700 committer David S. Miller Tue, 20 Jun 2006 01:21:29 -0700 [SPARC]: Kill __irq_itoa(). This ugly hack was long overdue to die. It was a way to print out Sparc interrupts in a more freindly format, since IRQ numbers were arbitrary opaque 32-bit integers which vectored into PIL levels. These 32-bit integers were not necessarily in the 0-->NR_IRQS range, but the PILs they vectored to were. The idea now is that we will increase NR_IRQS a little bit and use a virtual<-->real IRQ number mapping scheme similar to PowerPC. That makes this IRQ printing hack irrelevant, and furthermore only a handful of drivers actually used __irq_itoa() making it even less useful. Signed-off-by: David S. Miller commit 6a76267f0e52d920e6bb6da75541e6116d7304da tree 82b40f6c49fad8746f534d047b309c628d4f708c parent fd0504c3217d6d1bc8f33f53fb536299cae8feda author David S. Miller Tue, 20 Jun 2006 01:20:30 -0700 committer David S. Miller Tue, 20 Jun 2006 01:20:30 -0700 [SPARC64]: bp->pil can never be zero Only pil0_dummy_bucket had a pil of zero and we just killed that off, so we can delete all special case code that used bp->pil==0 as a way to identify a dummy bucket. Signed-off-by: David S. Miller commit fd0504c3217d6d1bc8f33f53fb536299cae8feda tree 4379f5376358d1f54fc183f458614f289ed6d326 parent 3185d4d2873a46ca1620d784013f285522091aa0 author David S. Miller Tue, 20 Jun 2006 01:20:00 -0700 committer David S. Miller Tue, 20 Jun 2006 01:20:00 -0700 [SPARC64]: Send all device interrupts via one PIL. This is the first in a series of cleanups that will hopefully allow a seamless attempt at using the generic IRQ handling infrastructure in the Linux kernel. Define PIL_DEVICE_IRQ and vector all device interrupts through there. Get rid of the ugly pil0_dummy_{bucket,desc}, instead vector the timer interrupt directly to a specific handler since the timer interrupt is the only event that will be signaled on PIL 14. The irq_worklist is now in the per-cpu trap_block[]. Signed-off-by: David S. Miller commit 3185d4d2873a46ca1620d784013f285522091aa0 tree 2235141eace69aec31aebe70a60bc3e030928181 parent 92d452f0eb10774fb7779abf876baf9dfb295e6f author Bob Breuer Tue, 20 Jun 2006 00:36:56 -0700 committer David S. Miller Tue, 20 Jun 2006 00:36:56 -0700 [SPARC]: Fix iommu_flush_iotlb end address Fix the calculation of the end address when flushing iotlb entries to ram. This bug has been a cause of esp dma errors, and it affects HyperSPARC systems much worse than SuperSPARC systems. Signed-off-by: Bob Breuer Signed-off-by: David S. Miller commit 92d452f0eb10774fb7779abf876baf9dfb295e6f tree b63a88962f899f88c962c88bcd9c30646e0e2b7e parent 61fc12d8e5c94176e7c2e04a2eab4c6e36d8dd41 author Bob Breuer Tue, 20 Jun 2006 00:36:10 -0700 committer David S. Miller Tue, 20 Jun 2006 00:36:10 -0700 [SPARC]: Mark smp init functions as cpuinit Fix the smp related section mismatch warnings by marking the smp init functions as cpuinit. Signed-off-by: Bob Breuer Signed-off-by: David S. Miller commit 61fc12d8e5c94176e7c2e04a2eab4c6e36d8dd41 tree d58e41a70395f3638435ba9f09c4bf5fa994a38f parent 7202fb496af235506a3c6fea836fe4c9957f730e author Bob Breuer Tue, 20 Jun 2006 00:35:13 -0700 committer David S. Miller Tue, 20 Jun 2006 00:35:13 -0700 [SPARC]: Add missing rw can_lock macros Fix a link failure by adding the missing can_lock macros for the rw locks. Signed-off-by: Bob Breuer Signed-off-by: David S. Miller commit 4d1a099828fb3ed52ff666fceb6a7d562d9048b8 tree 2356a2242e6a19ca0620c01e89e4c03fae84d1f0 parent ef4d04b87d16839500a77aa1279f80be7ec4ef2e author David S. Miller Tue, 20 Jun 2006 08:34:40 +0100 committer David Woodhouse Tue, 20 Jun 2006 08:34:40 +0100 Restrict headers exported to userspace for SPARC and SPARC64 Signed-off-by: David S. Miller Signed-off-by: David Woodhouse commit 7202fb496af235506a3c6fea836fe4c9957f730e tree 44e5338a62fe866da0f9bac2f9bfb75226e4ca32 parent a8cbdcea341ac2f404ee81aa1c19d54aaa0416b4 author Bob Breuer Tue, 20 Jun 2006 00:30:31 -0700 committer David S. Miller Tue, 20 Jun 2006 00:30:31 -0700 [SPARC]: Setup cpu_possible_map Setup cpu_possible_map so the secondary cpus will get started. Signed-off-by: Bob Breuer Signed-off-by: David S. Miller commit a8cbdcea341ac2f404ee81aa1c19d54aaa0416b4 tree b9aa7ac16fcbe287001bd27080a27b41db7eeb5b parent 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f author Bob Breuer Tue, 20 Jun 2006 00:28:33 -0700 committer David S. Miller Tue, 20 Jun 2006 00:28:33 -0700 [SPARC]: Add topology_init() Fix a crash in SMP mode by adding the missing topology_init. Also makes /proc/cpuinfo backwards compatible with 2.4. Signed-off-by: Bob Breuer Signed-off-by: David S. Miller commit 65fd28f743be6e3e3fd8eefa9a517656636fee42 tree c0534240f34ad9cf7c90ac844691e6f4f62a1941 parent 48d83325b61043e3bbd24dd37b9fe433744cf330 author David S. Miller Tue, 20 Jun 2006 00:07:52 -0700 committer David S. Miller Tue, 20 Jun 2006 00:07:52 -0700 [SCTP]: Fix unintentional change to SCTP_ASSERT when !SCTP_DEBUG A local debugging change slipped into a previous changeset. When SCTP_DEBUG is off SCTP_ASSERT should do nothing. Signed-off-by: David S. Miller commit 48d83325b61043e3bbd24dd37b9fe433744cf330 tree 00dc0682be0f096676ac885152b4ae14c4137338 parent d6cc7f1a3b33c89c91b3dfce1ff053178893470e author Herbert Xu Mon, 19 Jun 2006 23:57:59 -0700 committer David S. Miller Mon, 19 Jun 2006 23:57:59 -0700 [NET]: Prevent multiple qdisc runs Having two or more qdisc_run's contend against each other is bad because it can induce packet reordering if the packets have to be requeued. It appears that this is an unintended consequence of relinquinshing the queue lock while transmitting. That in turn is needed for devices that spend a lot of time in their transmit routine. There are no advantages to be had as devices with queues are inherently single-threaded (the loopback device is not but then it doesn't have a queue). Even if you were to add a queue to a parallel virtual device (e.g., bolt a tbf filter in front of an ipip tunnel device), you would still want to process the queue in sequence to ensure that the packets are ordered correctly. The solution here is to steal a bit from net_device to prevent this. BTW, as qdisc_restart is no longer used by anyone as a module inside the kernel (IIRC it used to with netif_wake_queue), I have not exported the new __qdisc_run function. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d6cc7f1a3b33c89c91b3dfce1ff053178893470e tree 8eb8796588b53648c42378a19a6089a5b8790308 parent d3dcd4efe2ad1ad1865b2fe5c863c1ebd9482a84 author Evgeniy Polyakov Mon, 19 Jun 2006 23:42:53 -0700 committer David S. Miller Mon, 19 Jun 2006 23:42:53 -0700 [CONNECTOR]: Initialize subsystem earlier. Attached patch declares connector init function as subsys_init() and returns -EAGAIN in case connector is not initialized yet. Signed-off-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit d3dcd4efe2ad1ad1865b2fe5c863c1ebd9482a84 tree 058379919390c78a18075fabf43e8fdd3d645418 parent 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f author Patrick McHardy Mon, 19 Jun 2006 23:39:45 -0700 committer David S. Miller Mon, 19 Jun 2006 23:39:45 -0700 [NETFILTER]: xt_sctp: fix endless loop caused by 0 chunk length Fix endless loop in the SCTP match similar to those already fixed in the SCTP conntrack helper (was CVE-2006-1527). Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6cad647da228486f36a9794137ad459e39b02590 tree a2def0c9e2caaa619547581f58dabf8e602eb25d parent e7bdd7a531320eb4a4a8160afbe0c7cc98ac7187 author Langsdorf, Mark Thu, 08 Jun 2006 10:33:19 -0500 committer Dave Jones Tue, 20 Jun 2006 01:46:04 -0400 [CPUFREQ] correct powernow-k8 fid/vid masks for extended parts The fid/vid masks for parts using the extended parts are slightly incorrect and can result in incorrect fid/vid codes being applied. No instances of this problem have been reported in the field but it could be a problem with future parts. Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones commit e7bdd7a531320eb4a4a8160afbe0c7cc98ac7187 tree 1b485fada2e6b00220019fdd46e391554bb4221f parent 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f author Langsdorf, Mark Thu, 08 Jun 2006 10:30:17 -0500 committer Dave Jones Tue, 20 Jun 2006 01:46:04 -0400 [CPUFREQ] Clarify powernow-k8 cpu_family statements This patch clarifies the meaning of the cpu_family if statements in the hw pstate driver patch for powernow-k8 Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones commit 98174e46974323e4941c72e46345f7277755e146 tree c4644c8f38a519cfb3929d1175fc7107eefe48b9 parent d8ce75324135ea7100124c1fff4ec5090a350607 parent 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f author Nathan Scott Tue, 20 Jun 2006 14:56:23 +1000 committer Nathan Scott Tue, 20 Jun 2006 14:56:23 +1000 Merge HEAD from ../linux-2.6 commit d8ce75324135ea7100124c1fff4ec5090a350607 tree 1233f6e07c5e9372a95a5ce07d8ee8a9c8bfd0ed parent d7b849da47a59d2be6d6aea1effb0efa91c30424 author Nathan Scott Tue, 20 Jun 2006 14:53:51 +1000 committer Nathan Scott Tue, 20 Jun 2006 14:53:51 +1000 [XFS] Remove files from the build that are now unused. Signed-off-by: Nathan Scott commit c5f2f261e7a47e4c72723cdcbe99e1bd771a81ea tree 2223901dd5dd2cfc33e81d3ac820e26a814bdda8 parent a4aec2622340e356e7dcd0e8fd05378dacb71c89 author Dave Jones Tue, 20 Jun 2006 00:44:38 -0400 committer Dave Jones Tue, 20 Jun 2006 00:44:38 -0400 [AGPGART] Suspend/Resume support for nVidia nForce AGP. Based on a patch from the Ubuntu kernel. Signed-off-by: Ben Collins Signed-off-by: Dave Jones commit a4aec2622340e356e7dcd0e8fd05378dacb71c89 tree 628d70558f413870fe8407177ce9bae48ea53522 parent 89d17b9604ae502392e119dbdbf43f6067745715 author Dave Jones Tue, 20 Jun 2006 00:42:04 -0400 committer Dave Jones Tue, 20 Jun 2006 00:42:04 -0400 [AGPGART] Suspend/Resume improvements for ATI AGP Based on patches in the Ubuntu kernel. Signed-off-by: Ben Collins Signed-off-by: Dave Jones commit 89d17b9604ae502392e119dbdbf43f6067745715 tree 49551854b744b1211992a6659e9e7b379ebcbecc parent 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f author Dave Jones Tue, 20 Jun 2006 00:39:19 -0400 committer Dave Jones Tue, 20 Jun 2006 00:39:19 -0400 [AGPGART] Whitespace cleanups for ati-agp Signed-off-by: Dave Jones commit d7b849da47a59d2be6d6aea1effb0efa91c30424 tree 5cbb616a4cf838f1491b8c5e517436fff93e2d1d parent f6c2d1fa6310a71b1c2e05fc6d9ff9b91489fa0e author Nathan Scott Tue, 20 Jun 2006 14:01:29 +1000 committer Nathan Scott Tue, 20 Jun 2006 14:01:29 +1000 [XFS] Fix a Makefile issue related to exports.o handling. Signed-off-by: Nathan Scott commit f6c2d1fa6310a71b1c2e05fc6d9ff9b91489fa0e tree 8541585188bfb903fc5198ea349122bf52d8ec96 parent da2f4d679c8070ba5b6a920281e495917b293aa0 author Nathan Scott Tue, 20 Jun 2006 13:04:51 +1000 committer Nathan Scott Tue, 20 Jun 2006 13:04:51 +1000 [XFS] Remove version 1 directory code. Never functioned on Linux, just pure bloat. SGI-PV: 952969 SGI-Modid: xfs-linux-melb:xfs-kern:26251a Signed-off-by: Nathan Scott commit da2f4d679c8070ba5b6a920281e495917b293aa0 tree 762c7fdc9692697a7a4177535461ba2f555b9623 parent 0d8fee3270f8a5e4bf95fbed3e81e21b57f8a5a0 author Nathan Scott Tue, 20 Jun 2006 13:01:38 +1000 committer Nathan Scott Tue, 20 Jun 2006 13:01:38 +1000 [XFS] Map EFSCORRUPTED to an actual error code, not just a made up one (990). Turns out some ye-olde unices used EUCLEAN as Filesystem-needs-cleaning, so now we use that too. SGI-PV: 953954 SGI-Modid: xfs-linux-melb:xfs-kern:26286a Signed-off-by: Nathan Scott commit 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f tree e0977d906193eadeafebc442775491b844be79d5 parent 4c84a39c8adba6bf2f829b217e78bfd61478191a parent 1723b4a34af85447684c9696af83929d2c1e8e6b author Linus Torvalds Mon, 19 Jun 2006 19:07:12 -0700 committer Linus Torvalds Mon, 19 Jun 2006 19:07:12 -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: (51 commits) [MIPS] Make timer interrupt frequency configurable from kconfig. [MIPS] Correct HAL2 Kconfig description [MIPS] Fix R4K cache macro names [MIPS] Add Missing R4K Cache Macros to IP27 & IP32 [MIPS] Support for the RM9000-based Basler eXcite smart camera platform. [MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins board [MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors. [MIPS] SN: include asm/sn/types.h for nasid_t. [MIPS] Random fixes for sb1250 [MIPS] Fix bcm1480 compile [MIPS] Remove support for NEC DDB5476. [MIPS] Remove support for NEC DDB5074. [MIPS] Cleanup memory managment initialization. [MIPS] SN: Declare bridge_pci_ops. [MIPS] Remove unused function alloc_pci_controller. [MIPS] IP27: Extract pci_ops into separate file. [MIPS] IP27: Use symbolic constants instead of magic numbers. [MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig. [MIPS] IP27: Cleanup N/M mode configuration. [MIPS] IP27: Throw away old unused hacks. ... commit 4c84a39c8adba6bf2f829b217e78bfd61478191a tree 0f0f415099cf49d894d65e5120563d30cf1a0fc9 parent d0b952a9837f81cd89e756b1b34293fa6e1cb59d parent 9ead190bfde2a434c74ea604382d08acb2eceef5 author Linus Torvalds Mon, 19 Jun 2006 19:01:59 -0700 committer Linus Torvalds Mon, 19 Jun 2006 19:01:59 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (46 commits) IB/uverbs: Don't serialize with ib_uverbs_idr_mutex IB/mthca: Make all device methods truly reentrant IB/mthca: Fix memory leak on modify_qp error paths IB/uverbs: Factor out common idr code IB/uverbs: Don't decrement usecnt on error paths IB/uverbs: Release lock on error path IB/cm: Use address handle helpers IB/sa: Add ib_init_ah_from_path() IB: Add ib_init_ah_from_wc() IB/ucm: Get rid of duplicate P_Key parameter IB/srp: Factor out common request reset code IB/srp: Support SRP rev. 10 targets [SCSI] srp.h: Add I/O Class values IB/fmr: Use device's max_map_map_per_fmr attribute in FMR pool. IB/mthca: Fill in max_map_per_fmr device attribute IB/ipath: Add client reregister event generation IB/mthca: Add client reregister event generation IB: Move struct port_info from ipath to IPoIB: Handle client reregister events IB: Add client reregister event type ... commit d0b952a9837f81cd89e756b1b34293fa6e1cb59d tree fbe488bc5f407afa0e91cefb262d9e9ee69062ac parent d90125bfe958ed0451c6b98f831c86aba08b43d5 parent 47552c4e555eefe381f3d45140b59a2ea4b16486 author Linus Torvalds Mon, 19 Jun 2006 18:55:56 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:55:56 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (109 commits) [ETHTOOL]: Fix UFO typo [SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer. [SCTP]: Send only 1 window update SACK per message. [SCTP]: Don't do CRC32C checksum over loopback. [SCTP] Reset rtt_in_progress for the chunk when processing its sack. [SCTP]: Reject sctp packets with broadcast addresses. [SCTP]: Limit association max_retrans setting in setsockopt. [PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate. [IPV6]: Sum real space for RTAs. [IRDA]: Use put_unaligned() in irlmp_do_discovery(). [BRIDGE]: Add support for NETIF_F_HW_CSUM devices [NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM [TG3]: Convert to non-LLTX [TG3]: Remove unnecessary tx_lock [TCP]: Add tcp_slow_start_after_idle sysctl. [BNX2]: Update version and reldate [BNX2]: Use CPU native page size [BNX2]: Use compressed firmware [BNX2]: Add firmware decompression [BNX2]: Allow WoL settings on new 5708 chips ... Manual fixup for conflict in drivers/net/tulip/winbond-840.c commit d90125bfe958ed0451c6b98f831c86aba08b43d5 tree 3a9ea24091f958a92e1d0d12f5135e50adf71b31 parent bfd189a8e944dd0b8135dea2c23ac399bbe34535 parent 2abac1db3522d9f56c695d1b42e77f3e52d4c51a author Linus Torvalds Mon, 19 Jun 2006 18:53:20 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:53:20 -0700 Merge branch 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6 * 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6: (25 commits) intelfb: fixup clock calculation debugging. Removed hard coded EDID buffer size. intelfb: use regular modedb table instead of VESA intelfb: use firmware EDID for mode database Revert "intelfb driver -- use the regular modedb table instead of the VESA" intelfb: int option fix sync modesetting code with X.org intelfb: align with changes from my X driver. intelfb driver -- use the regular modedb table instead of the VESA Adds support for 256MB aperture on 945 chipsets to the intelfb driver intelfb -- uses stride alignment of 64 on the 9xx chipsets. intelfb: some cleanups for intelfbhw intelfb: fixup pitch calculation like X does intelfb: fixup p calculation This patch makes a needlessly global struct static. intelfb: add i945GM support intelfb: fixup whitespace.. intelfb: add hw cursor support for i9xx intelfb: make i915 modeset intelfb: add support for i945G ... commit bfd189a8e944dd0b8135dea2c23ac399bbe34535 tree 89f2963ec3e2df7b9b980587ec2d2a334c7e2172 parent bbf70132db2767f66b411fa90488aacac72e06dd parent 81c246691535ee3f865fbe6804b3be1b2c159e95 author Linus Torvalds Mon, 19 Jun 2006 18:51:41 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:51:41 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] alpha-agp warning fix [AGPGART] uninorth-agp warning fixes [AGPGART] Remove pointless initialisation in intel-agp [AGPGART] Remove pointless code from agp_generic_create_gatt_table() commit bbf70132db2767f66b411fa90488aacac72e06dd tree 19bebd76503c351f74e2fc24ac161b20c8d30fd4 parent 2090af718014f3d434fb8b85b00eeea01ebcec19 parent 6ccf58ab22499139bacc683493c9fd70af55adbb author Linus Torvalds Mon, 19 Jun 2006 18:51:21 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:51:21 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq * master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] sets nforce2 minimum PLL divider to 2. [CPUFREQ] Make powernow-k7 work on SMP kernels. [CPUFREQ] cpufreq core {d,}printk adjustments [CPUFREQ] dprintk adjustments to cpufreq-speedstep-centrino [CPUFREQ] dprintk adjustments to cpufreq-nforce2 [CPUFREQ] Prepare powernow-k8 for future CPUs. [CPUFREQ] Make acpi-cpufreq 'sticky'. [CPUFREQ] Remove strange No-op from longrun.c [CPUFREQ] Remove more freq_table reinitialisations. [CPUFREQ] Fix another redundant initialisation in freq_table [CPUFREQ] Remove duplicate assignment in freq_table [CPUFREQ] CodingStyle nits in cpufreq_stats.c [CPUFREQ] Remove duplicate assignment from cpufreq-nforce2 [CPUFREQ] Remove pointless reinitialisations in acpi-cpufreq [CPUFREQ] Remove pointless reinitialisation from powernow-k8 [CPUFREQ] Remove redundant initialisation from longhaul. [CPUFREQ] Clean up longhaul's speed pretty-printer [CPUFREQ] Disambiguate loop indexes in powernow-k7 [CPUFREQ] Typo in powernow-k8 commit 2090af718014f3d434fb8b85b00eeea01ebcec19 tree 97eb6e655a3c2d90c212de79b563fa35837a341f parent 557240b48e2dc4f6fa878afc3fc767ad745ca7ed parent 4b6ace7f02cddb8c363ad27bb1e5014c6791e34a author Linus Torvalds Mon, 19 Jun 2006 18:50:43 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:50:43 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (166 commits) [PATCH] net: au1000_eth: PHY framework conversion [PATCH] 3c5zz ethernet: fix section warnings [PATCH] smc ethernet: fix section mismatch warnings [PATCH] hp ethernet: fix section mismatches [PATCH] Section mismatch in drivers/net/ne.o during modpost [PATCH] e1000: prevent statistics from getting garbled during reset [PATCH] smc911x Kconfig fix [PATCH] forcedeth: new device ids [PATCH] forcedeth config: version [PATCH] forcedeth config: module parameters [PATCH] forcedeth config: diagnostics [PATCH] forcedeth config: move functions [PATCH] forcedeth config: statistics [PATCH] forcedeth config: csum [PATCH] forcedeth config: wol [PATCH] forcedeth config: phy [PATCH] forcedeth config: flow control [PATCH] forcedeth config: ring sizes [PATCH] forcedeth config: tso cleanup [DOC] Update bonding documentation with sysfs info ... commit 557240b48e2dc4f6fa878afc3fc767ad745ca7ed tree 354e9de17c28b438db675f6a2b779415f1634c45 parent 5603509137940f4cbc577281cee62110d4097b1b author Linus Torvalds Mon, 19 Jun 2006 18:16:01 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:16:01 -0700 Add support for suspending and resuming the whole console subsystem Trying to suspend/resume with console messages flying all around is doomed to failure, when the devices that the messages are trying to go to are being shut down. Signed-off-by: Linus Torvalds commit 5603509137940f4cbc577281cee62110d4097b1b tree def89e77479baa644160ffa1467b1ead0ac88e2f parent 1cca0ebbb74298958dae1d1d3e7e9287c98a720c author Linus Torvalds Mon, 19 Jun 2006 18:05:09 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:05:09 -0700 Make sure to re-enable SCI after an ACPI suspend According to the ACPI spec, it should be enabled on return from suspend, but bugs happen. Apparently especially on the Apple Intel Macs. Signed-off-by: Linus Torvalds commit 1cca0ebbb74298958dae1d1d3e7e9287c98a720c tree b41fa520bf848584a91e4e0d9fd3aa22d99c0f86 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Linus Torvalds Mon, 19 Jun 2006 18:01:27 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:01:27 -0700 Improve SATA core suspend/resume Doing a full ata_busy_sleep() seems to get suspend and resume working fine on the Apple Mac Mini, at least. Signed-off-by: Linus Torvalds commit 67d59dfdeb21df2c16dcd478b66177e91178ecd0 tree ae85703651d81740f4a6cd398f9dd4d6aabe6a2f parent 6db874fbdbedba5e15e76cc03b42f52ea70338c0 author James Bottomley Tue, 13 Jun 2006 21:31:19 -0500 committer James Bottomley Mon, 19 Jun 2006 19:34:01 -0500 [SCSI] 53c700: remove reliance on deprecated cmnd fields This one's quite tricky. The 53c700 uses the now deprecated fields of the command structure for saving the prior command when it does autosense. To fix this, we have to add extra fields to the LUN to accommodate a copy of the real command. Signed-off-by: James Bottomley commit 6db874fbdbedba5e15e76cc03b42f52ea70338c0 tree fc55c8bb280cb1137468270cac12d12a9582e6e4 parent 4f2ddba39a550eba9233d9f0e8309092da0ba293 author James Bottomley Tue, 13 Jun 2006 21:40:34 -0500 committer James Bottomley Mon, 19 Jun 2006 19:32:04 -0500 [SCSI] hptiop: don't use cmnd->bufflen use cmnd->request_bufflen instead. Signed-off-by: James Bottomley commit 4f2ddba39a550eba9233d9f0e8309092da0ba293 tree 8fdfacf8a5b7ffcb58a093c5887ff1c9753e8d2e parent a623e14dafe72329dd1defe36ee2cd4ff4b2e6f1 author HighPoint Linux Team Wed, 14 Jun 2006 16:50:57 +0800 committer James Bottomley Mon, 19 Jun 2006 19:30:15 -0500 [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver Updates: - don't bypass SYNCHRONIZE_CACHE command - return SCSI_MLQUEUE_HOST_BUSY when no free request slots - move scsi_remove_host() to the begin of hpt_remove(), or it will not work after resources being released. Signed-off-by: HighPoint Linux Team Signed-off-by: James Bottomley commit a623e14dafe72329dd1defe36ee2cd4ff4b2e6f1 tree 68499cbb10448ea645cfab1e82cb7e5969266ee6 parent 75c3628db75c573870379094a5f90f690ee99b76 author Mark Haverkamp Thu, 08 Jun 2006 13:55:57 -0700 committer James Bottomley Mon, 19 Jun 2006 19:23:54 -0500 [SCSI] aacraid: small misc. cleanups Received from Mark Salyzyn Spelling correction, orphaned comment removal & update branch name. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 75c3628db75c573870379094a5f90f690ee99b76 tree 373db3823cb2a52e5809e335cf2ee33c347da9cf parent 821499a8241019be5591fad5ab925759fbcd9f32 author Mark Haverkamp Thu, 08 Jun 2006 13:55:42 -0700 committer James Bottomley Mon, 19 Jun 2006 19:23:07 -0500 [SCSI] aacraid: Update supported product information Received From Mark Salyzyn Some of the cards product names changed. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit ae6c859b7dcd708efadf1c76279c33db213e3506 tree c18c2e94537d5e3d4fde5bf52800333b7c237048 parent 5b4b7a236e7787f16af4e15a6253d46d8e794be6 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Len Brown Mon, 19 Jun 2006 18:01:24 -0400 committer Len Brown Mon, 19 Jun 2006 18:01:24 -0400 merge linus into release branch commit 9c64f9774805ba5d5ad4129899bdd822f61874e9 tree afa3c4325d7867f3417b44fecd4915b8f529c776 parent 9df7fde52c33075b9f9148ee31215c03824fcc38 author Jan Beulich Tue, 09 May 2006 00:50:31 -0700 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] PCI Hotplug: Fix recovery path from errors during pcie_init() Signed-off-by: Jan Beulich Cc: Kristen Accardi Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 9df7fde52c33075b9f9148ee31215c03824fcc38 tree debb5999dd3689639310d52632d26864ce208c24 parent 99ff124d1673a1e3f19061ebc82634608d1119ed author Eric Sesterhenn Thu, 01 Jun 2006 11:41:44 +0200 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] PCI Hotplug: fake NULL pointer dereferences in IBM Hot Plug Controller Driver Remove checks for value, since the hotplug core always provides a valid value. Signed-off-by: Eric Sesterhenn Signed-off-by: Greg Kroah-Hartman commit 99ff124d1673a1e3f19061ebc82634608d1119ed tree ab06a2edc2049dd8b32206cb8203aa7f6a88db7d parent ea83bc1dabdca9da643972b591259a7657459ff5 author Kenji Kaneshige Fri, 12 May 2006 11:13:50 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] shpchp: Cleanup improper info messages Current SHPCHP driver shows device number of slots in info messages, but it is useless and should be replaced with slot name. This patch replaces the device number shown in the info messages with the slot name. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit ea83bc1dabdca9da643972b591259a7657459ff5 tree f6eb9a99fdbb9063bb13e434f04403834488be0f parent f42639572680f4d69d9522f91c65e793ebeca098 author Kenji Kaneshige Fri, 12 May 2006 11:12:23 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] shpchp: Remove Unused hpc_evelnt_lock This patch removes unused hpc_event_lock. This patch has no functional change. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit f42639572680f4d69d9522f91c65e793ebeca098 tree 62a905ab3c2f5f11319d1e558bf87c0e75459f83 parent 4085399da3c2176ba8ed64e93a2722907d41df3f author Kenji Kaneshige Fri, 12 May 2006 11:13:02 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] shpchp: Cleanup interrupt polling timer This patch cleans up the interrupt polling timer code in shpchp_hpc.c. This has no functional changes. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 4085399da3c2176ba8ed64e93a2722907d41df3f tree fc923b10c70ededacf661b21285d852a8da8d886 parent c4cecc1937cafd8505151452a9f7eea876a5bd9c author Kenji Kaneshige Fri, 12 May 2006 11:11:48 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] shpchp: Cleanup SHPC commands This patch cleans up the code related to issuing SHPC commands. This patch has no functional changes. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit c4cecc1937cafd8505151452a9f7eea876a5bd9c tree e7464d502dc606d2197811fc969acbaf383c8859 parent d4fbf600666569c3921d12bdcfcfdb2cdb4fd5fb author Kenji Kaneshige Fri, 12 May 2006 11:10:56 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] shpchp: Cleanup interrupt handler This patch cleans up the interrupt handler of shpchp driver. This patch has no functional changes. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit d4fbf600666569c3921d12bdcfcfdb2cdb4fd5fb tree 3b5ac234da4a4498f4c17a3bf32e7d1c2543db95 parent 132066a9c84af6f5e8d893145a9c63f849143867 author Kenji Kaneshige Fri, 12 May 2006 11:05:59 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] shpchp: Remove unnecessary hpc_ctlr_handle check This patch removes unnecessary error check for hpc_ctlr_handle. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 132066a9c84af6f5e8d893145a9c63f849143867 tree b81ad81f65e79088e84666a98b0d53dcf2cb0b78 parent 6e33706b191ff8687f103a86de842b690fd8fb9d author Kenji Kaneshige Fri, 12 May 2006 13:39:45 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] pciehp: Implement get_address callback This patch implements .get_address callback of hotplug_slot_ops for PCIEHP driver. With this patch, we can see bus address of hotplug slots as follows: # cat /sys/bus/pci/slots/0010_0000/address 0000:0a:00 Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 6e33706b191ff8687f103a86de842b690fd8fb9d tree c41ba3730a875f650d53feeaef8d853a5a1a5dd7 parent 56bfada3e1a25c0da6f4590a4b04c67ec10910c2 author Kenji Kaneshige Fri, 12 May 2006 11:23:39 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] pciehp: Add missing pci_dev_put The PCIEHP driver leaks reference counter of pci_dev structures. This patch adds missing pci_dev_put() calls to PCIEHP driver. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 56bfada3e1a25c0da6f4590a4b04c67ec10910c2 tree 14df15811b0aed4b66ecdec8476b9edbda8d738b parent 466ee36b62b4b294ecf68a2eee2e18c6ff8c9be4 author Kenji Kaneshige Fri, 12 May 2006 11:22:24 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] pciehp: Replace pci_find_slot() with pci_get_slot() This patch replaces pci_find_slot() with pci_get_slot() in PCIEHP driver. This patch enables PCI Express Hotplug on the system which has multiple PCI domains. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 466ee36b62b4b294ecf68a2eee2e18c6ff8c9be4 tree 4dd5ed1ad7a0d1081f687ea535e05f9ea838b08c parent 82d5f4aaf182c306d2c2ef4d3a89d0fb8e386aa8 author Mike Habeck Sat, 06 May 2006 09:01:59 -0500 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] SGI Hotplug: Incorrect power status This is a repost of a patch submitted by Prarit Bhargava on 01-19-06 that never got integrated. The get_power_status function is currently reporting a bitwise mapping of the slot if the slot is powered on. It should return 1 if powered on and 0 if powered off. Signed-off-by: Mike Habeck Signed-off-by: Greg Kroah-Hartman commit 82d5f4aaf182c306d2c2ef4d3a89d0fb8e386aa8 tree ef7de5f12bee715364576d84bd47a05f61326d05 parent d49f2c49c39bbd0cb2069fe11c1630c709061037 author Kenji Kaneshige Wed, 03 May 2006 23:42:04 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] shpchp: Create shpchpd at controller probe time The workqueue thread of shpchp driver should be created only when SHPC based hotplug slots are detected on the system. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit d49f2c49c39bbd0cb2069fe11c1630c709061037 tree 5fcf4ccaef04d1e3fe28bcbeecf1d58908108419 parent e7138723692e43b7d43578746ad21bf194847527 author Kenji Kaneshige Wed, 03 May 2006 23:34:17 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] shpchp: Mask Global SERR and Intr at controller release time Global SERR and Interrupt should be masked at shpchp driver unload time. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit e7138723692e43b7d43578746ad21bf194847527 tree 7d8e769c25324381708536e9fbcadfb2f4754622 parent 795eb5c4a73bee30e8c2dbb29174b329da56051c author Kenji Kaneshige Tue, 02 May 2006 11:12:37 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] SHPC: Fix SHPC Contoller SERR-INT Register bits access Current SHPCHP driver doesn't take care of RsvdP/RsvdZ[*] bits in controller SERR-INT register. This might cause unpredicable results. This patch fixes this bug. [*] RsvdP and RsvdZ are defined in SHPC spec as follows: RsvdP - Reserved and Preserved. Register bits of this type are reserved for future use as R/W bits. The value read is undefined. Writes are ignored. Software must follow These rules when accessing RsvdP bits: - Software must ignore RsvdP bits when testing values read from these registers. - Software must not depend on RsvdP bit's ability to retain information when written - Software must always write back the value read in the RsvdP bits when writing one of these registers. RsvdZ - Reserved and Zero. Register bits of this type are reserved for future use as R/WC bits. The value read is undefined. Writes are ignored. Software must follow these rules when accessing RsvdZ bits: - Software must ignore RsvdZ bits when testing values read from these registers. - Software must not depends on a RsvdZ bit's ability to retain information when written. - Software must always write 0 to RsvdZ bits when writing one of these register. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 795eb5c4a73bee30e8c2dbb29174b329da56051c tree 2c489f1f647d46cdc29322839d766cbf37d55485 parent 5858759c2098c6792af1afa6d5ded94044740f9c author Kenji Kaneshige Tue, 02 May 2006 11:11:54 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] SHPC: Fix SHPC Logical Slot Register bits access Current SHPCHP driver doesn't take care of RsvdP/RsvdZ[*] bits in logical slot registers. This might cause unpredicable results. This patch fixes this bug. [*] RsvdP and RsvdZ are defined in SHPC spec as follows: RsvdP - Reserved and Preserved. Register bits of this type are reserved for future use as R/W bits. The value read is undefined. Writes are ignored. Software must follow These rules when accessing RsvdP bits: - Software must ignore RsvdP bits when testing values read from these registers. - Software must not depend on RsvdP bit's ability to retain information when written - Software must always write back the value read in the RsvdP bits when writing one of these registers. RsvdZ - Reserved and Zero. Register bits of this type are reserved for future use as R/WC bits. The value read is undefined. Writes are ignored. Software must follow these rules when accessing RsvdZ bits: - Software must ignore RsvdZ bits when testing values read from these registers. - Software must not depends on a RsvdZ bit's ability to retain information when written. - Software must always write 0 to RsvdZ bits when writing one of these register. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 5858759c2098c6792af1afa6d5ded94044740f9c tree 673a917583ba1f4e8c16027f0aa712bc04fb4b48 parent 2b34da7e61383b4b7773d2d4e776e58725794347 author Kenji Kaneshige Tue, 02 May 2006 11:10:37 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] SHPC: Cleanup SHPC Logical Slot Register bits access This patch cleans up the code to access bits in slot logical registers. This patch has no functional change. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 2b34da7e61383b4b7773d2d4e776e58725794347 tree 9f350ae052288ed099332f148f0b234330bb6e16 parent 75d97c59a192ca0fe2577974dac0c16a73a377eb author Kenji Kaneshige Tue, 02 May 2006 11:09:42 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] SHPC: Cleanup SHPC Logical Slot Register access This patch cleans up the code to access slot logical registers. This patch has no functional changes. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 75d97c59a192ca0fe2577974dac0c16a73a377eb tree bf0c4b2bd3bae7405d57bc9f9a219f25b2a4bd2a parent 40abb96c51bbcb06785e233e96f40c35657ade83 author Kenji Kaneshige Tue, 02 May 2006 11:08:42 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] SHPC: Cleanup SHPC register access This patch cleans up the code to access SHPC working register sets. This patch has no functional changes. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 40abb96c51bbcb06785e233e96f40c35657ade83 tree 646b5993ac5adf4f4ac7b7e1e498c3e367fbbded parent e22b73501608901bab7ee9b1f8cb67f15e8efb7a author Kenji Kaneshige Mon, 08 May 2006 18:34:09 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] pciehp: Fix programming hotplug parameters Current PCHEHP driver doesn't have any code to program hotplug parameters from firmware. So hotplug parameters are never programed at hot-add time. This patch add support for programming hotplug parameters to PCIEHP driver. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit e22b73501608901bab7ee9b1f8cb67f15e8efb7a tree 4edf850a0216b36c184b6abe43e32a600d4f7787 parent aad20cabaa3d6dfa1e0ebc8fb0537a96d3518b8f author Kenji Kaneshige Tue, 02 May 2006 10:57:14 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] acpi_pcihp: Add support for _HPX This patch adds support for _HPX (Hot Plug Parameter Extensions) defined in ACPI3.0a spec. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit aad20cabaa3d6dfa1e0ebc8fb0537a96d3518b8f tree 75f8e44cd25fe5ce7851815224f775b15cf9c8b3 parent 7430e34c70106a9576fc61d77604d164b187a1b7 author Kenji Kaneshige Wed, 10 May 2006 22:20:34 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] acpi_pcihp: Remove improper error message about OSHP This patch converts the improper error message about OSHP evaluation to debug message which is displayed only when pci_hotplug.ko is loaded with debugging mode enabled. To do this, this patch adds a new module parameter "debug_acpi" to pci_hotplug.ko for enabling/disabling debug messages in acpi_pcihp.c. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 7430e34c70106a9576fc61d77604d164b187a1b7 tree 4b9eeaaa3702c9be216f820e8eeaf11f93610d2c parent 2433ee2654f0ac86f7886e5a8d01bee7f3c7c6db author Kenji Kaneshige Tue, 02 May 2006 10:54:50 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] acpi_pcihp: Fix programming _HPP values This patch fixes the problem that hotplug parameters are not programed when PCI cards are hot-added by ACPIPHP, SHPCHP and PCIEHP driver. The pci_dev structure being hot-added is not bound to ACPI handle, so we need to trace PCI bus tree to find ACPI handle. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 2433ee2654f0ac86f7886e5a8d01bee7f3c7c6db tree 61e29c5f1adaccca28a6b059440b053d45da583a parent 81b26bcacd5df0f65344fb430b1bf7fe9cfbfe2a author Kristen Accardi Mon, 24 Apr 2006 15:50:59 -0700 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] pciehp: dont call pci_enable_dev Don't call pci_enable_device from pciehp because the pcie port service driver already does this. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit 81b26bcacd5df0f65344fb430b1bf7fe9cfbfe2a tree c56c0826fab80511af74ba4fe4b3b5ae85a01c50 parent cde0e5d722c77d1194f40de54a99c90afe365480 author Kristen Accardi Tue, 18 Apr 2006 14:36:43 -0700 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] PCI Hotplug: don't use acpi_os_free acpi_os_free should not be used by drivers outside of acpi/*/*.c. Replace with kfree(). Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit cde0e5d722c77d1194f40de54a99c90afe365480 tree 4c569d32f7ff40010e97a1a133bfbabed69e2b7d parent c14424736e76f3d8477a41de531e6b5dcce3d5b0 author MUNEDA Takahiro Wed, 22 Mar 2006 14:49:33 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] acpiphp: turn off slot power at error case When acpiphp_enable_slot() is failed, acpiphp does not change the slot->flags. Therefore, when user tries to read power status, acpiphp_get_power_status() returns the enable status whether the slot is not really enabled. This patch fixes this BUG. Signed-off-by: MUNEDA Takahiro Signed-off-by: Greg Kroah-Hartman commit c14424736e76f3d8477a41de531e6b5dcce3d5b0 tree 26a34143daf21ac1771b6862e019e0a875c9146a parent 551bcb75b3d9f23348a524210ccfff26d865e425 author MUNEDA Takahiro Wed, 22 Mar 2006 14:49:27 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] acpiphp: host and p2p hotplug I encountered the problem that when there are some hotplug slots are under the host bridge, the hotplug slots under the p2p bridge are not treated as hotpluggable. This patch fixes this BUG. Signed-off-by: MUNEDA Takahiro Signed-off-by: Greg Kroah-Hartman commit 551bcb75b3d9f23348a524210ccfff26d865e425 tree fd4990605440ffff56c041ebef87624d225a6c08 parent 92c9be95549632da09088320f202fa5c05b21ddf author MUNEDA Takahiro Wed, 22 Mar 2006 14:49:20 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] acpiphp: hotplug slot hotplug o hotplug slots add When the hot-added PCI device is p2p bridge, acpiphp calls find_p2p_bridge() to add hotplug slots. o hotplug slots remove When the hot-removing PCI device is p2p bridge, acpiphp calls cleanup_p2p_bridge() to remove hotplug slots. o notify handler exchange When the p2p bridge is added, acpiphp changes the notify hanlder. If no bridge device is inserted into the hotpluggable PCI slot, acpiphp installs the notify handler for function. After the p2p bridge hot-add, acpiphp has to install the notify handler for bridge. Because, the role of the handlers are not same. The hot-remove case is ditto. Signed-off-by: MUNEDA Takahiro Signed-off-by: Greg Kroah-Hartman commit 92c9be95549632da09088320f202fa5c05b21ddf tree 744691b15a41c90f9eb6747aff01396c55222834 parent e55dea58c5609aece6156a6cd2306b820a7794ef author MUNEDA Takahiro Wed, 22 Mar 2006 14:49:09 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:21 -0700 [PATCH] acpiphp: configure _PRT - V3 Current acpiphp does not free acpi_device structs when the PCI devices are removed. When the PCI device is added, acpi_bus_add() fails because acpi_device struct has already exists. So, _PRT method does not evaluate. This patch fixes this issue. Signed-off-by: MUNEDA Takahiro Signed-off-by: Greg Kroah-Hartman commit e55dea58c5609aece6156a6cd2306b820a7794ef tree 23ed63d8920d473029b50b5de7e04a03e511b681 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Prarit Bhargava Tue, 04 Apr 2006 09:26:46 -0400 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:21 -0700 [PATCH] PCI Hotplug: Tollhouse HP: SGI hotplug driver changes SGI hotplug driver changes required to support Tollhouse system PCI hotplug, and implements the PRF_HOTPLUG_SUPPORT feature bit. Signed-off-by: Prarit Bhargava Signed-off-by: Greg Kroah-Hartman commit faed568413e89f87cd60aa8b292cc4b9996bae42 tree 366c9f3e75f5e35f6ebf3b42d26c82e39248f471 parent f8703dc8cb10eca7f6fe6ef364d8e106fe07f034 author Richard Purdie Mon, 19 Jun 2006 20:46:05 +0100 committer Russell King Mon, 19 Jun 2006 20:46:05 +0100 [ARM] 3594/1: Poodle: Add touchscreen support + other updates Patch from Richard Purdie Poodle Updates: * Update corgi_ssp to make the GPIO chip selects optional * Enable corgi_ssp for use by poodle * Add corgi touchscreen platform device for poodle * Export locomo platform device. * Set framebuffer device parent correctly Signed-off-by: Richard Purdie Signed-off-by: Russell King commit f8703dc8cb10eca7f6fe6ef364d8e106fe07f034 tree 371f01b78f7fa205128b9ba9127b30904dfdd7b7 parent 88660351cb6daa85baf9700f12dff3af564dc14a author Richard Purdie Mon, 19 Jun 2006 19:58:52 +0100 committer Russell King Mon, 19 Jun 2006 19:58:52 +0100 [ARM] 3564/1: sharpsl_pm: Abstract some machine specific parameters Patch from Richard Purdie Abstract some machine specific parameters from the sharpsl_pm core into the machine specific drivers. This allows the core to support tosa/poodle. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 88660351cb6daa85baf9700f12dff3af564dc14a tree 8824d4dac6576324e9922d0acc72a42f39325af5 parent 74617fb6b825ea370ae72565f7543306bc08ef6e author Richard Purdie Mon, 19 Jun 2006 19:58:51 +0100 committer Russell King Mon, 19 Jun 2006 19:58:51 +0100 [ARM] 3561/1: Poodle: Correct the MMC/SD power control Patch from Richard Purdie Correct the Poodle power control for the MMC/SD port. Also add write protection switch support. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 74617fb6b825ea370ae72565f7543306bc08ef6e tree ac6032e0b476f1bf61bf03aba44240e448739d57 parent b7408aff2d325581dcafffa5dbcc09c42ae64b5d author Richard Purdie Mon, 19 Jun 2006 19:57:12 +0100 committer Russell King Mon, 19 Jun 2006 19:57:12 +0100 [ARM] 3593/1: Add reboot and shutdown handlers for Zaurus handhelds Patch from Richard Purdie Add functionality to allow machine specific reboot handlers on ARM. Add machine specific reboot and poweroff handlers for all PXA Zaurus models. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit afefc4158f3c8529e4bb99c1dc119fd792bac220 tree c985ca3b92ac101a6da45a5d372a2f873429ed02 parent 82dc0772a892f8b430a2d567c981fe47a11489c3 author Andrew Victor Mon, 19 Jun 2006 19:53:19 +0100 committer Russell King Mon, 19 Jun 2006 19:53:19 +0100 [ARM] 3592/1: AT91RM9200 Serial driver update Patch from Andrew Victor This patch includes a number of updates to the AT91RM9200 serial driver. Changes include: 1. Conversion to a platform_driver. [Ivan Kokshaysky] 2. Replaced all references to AT91RM9200 with AT91. This driver can now also be used for the AT91SAM9216. 3. Allow TIOCM_LOOP to configure local loopback mode. 4. Cleaned up the 'read_status_mask' usage and interrupt handler code. [Chip Coldwell] 5. Suspend/resume support. [David Brownell] There are a few 'unused variable' warning when compiling this - I removed the new DMA support to keep this first patch simpler. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit bf1c56a3aaa67ac74bc74e631ecc2a2673597cae tree 2600ec87aca8d4eecac84a3e12dd09a1a3d3cf5d parent 96ce2385dd2817da549910001a69ac0a2762a1b9 author Ben Dooks Mon, 19 Jun 2006 18:30:04 +0100 committer Russell King Mon, 19 Jun 2006 18:30:04 +0100 [ARM] 3591/1: Anubis: IDE device definitions Patch from Ben Dooks Platform device definitions for the two IDE ports on the Simtec Anubis board. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 82dc0772a892f8b430a2d567c981fe47a11489c3 tree db9e2e86f91e817ae1ad8e4478d402f1316edc2a parent 067bbada4cc574eaa4fa577483ecae4012049477 author Andrew Victor Mon, 19 Jun 2006 18:16:46 +0100 committer Russell King Mon, 19 Jun 2006 18:16:46 +0100 [ARM] 3590/1: AT91RM9200 Platform devices support Patch from Andrew Victor This patch includes the structures and exported functions required for the platform-device support (added in patch 3585/1). Also adds the arch_identify() function for run-time detection of which AT91 processor the code is running on. [Original patch from Ivan Kokshaysky] Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 067bbada4cc574eaa4fa577483ecae4012049477 tree ec609719b6b413cf0baf4fd9d57b1a0570274fc7 parent 466e6227e6a54d9b94b50972612fe8bf0450f786 author Andrew Victor Mon, 19 Jun 2006 18:16:45 +0100 committer Russell King Mon, 19 Jun 2006 18:16:45 +0100 [ARM] 3589/1: AT91RM9200 DK/EK board update Patch from Andrew Victor This patch updates the support for the Atmel DK and EK boards. The changes include: 1. Use the new at91_uart_config structure and device registration functions for the UARTs. 2. Registration of I2C and SPI platform devices. 3. The USB Device pullup line is connected to reset, so multidrive needs to be enabled on the line. [Patch from David Brownell]. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 1723b4a34af85447684c9696af83929d2c1e8e6b tree ffd16da24a0a6a661d21d1b1f8ef85f0f3b615d9 parent b97b36bfd761d83f714eb1b5d6bce519794fa650 author Atsushi Nemoto Tue, 20 Jun 2006 00:19:13 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:27 +0100 [MIPS] Make timer interrupt frequency configurable from kconfig. Make HZ configurable. DECSTATION can select 128/256/1024 HZ, JAZZ can only select 100 HZ, others can select 100/128/250/256/1000/1024 HZ if not explicitly specified). Also remove all mach-xxx/param.h files and update all defconfigs according to current HZ value. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit b97b36bfd761d83f714eb1b5d6bce519794fa650 tree 256963db26c9ce44451cb48ee893c64a1322453a parent c3b1c2de2254aa4721e7e3c8d418fa9302e6acb0 author Kumba Sun, 18 Jun 2006 02:17:08 -0400 committer Ralf Baechle Mon, 19 Jun 2006 17:39:26 +0100 [MIPS] Correct HAL2 Kconfig description The current HAL2 Kconfig description indicates it is only used on SGI Indy systems, however all members of the Indigo2 Family have this sound card as well. Plus a minor grammatical fix is included. Signed-off-by: Joshua Kinard Signed-off-by: Ralf Baechle commit c3b1c2de2254aa4721e7e3c8d418fa9302e6acb0 tree 81939a7c5aa1a7ec369d1899dd0df35fbe51d8ae parent 2493921c284813b9f512c95d972a302cf82296cb author Kumba Sun, 18 Jun 2006 02:17:01 -0400 committer Ralf Baechle Mon, 19 Jun 2006 17:39:26 +0100 [MIPS] Fix R4K cache macro names Several machines have the R4K cache macro name spelled incorrectly. Namely, they have cpu_has_4kcache defined instead of cpu_has_4k_cache. Signed-off-by: Joshua Kinard Signed-off-by: Ralf Baechle commit 2493921c284813b9f512c95d972a302cf82296cb tree cda347ae07400e2aa277b52ee5ba27d1b7b5588c parent 35189fad3cb5f6e3ab66c8321928a851de0cd2b1 author Kumba Sun, 18 Jun 2006 02:16:53 -0400 committer Ralf Baechle Mon, 19 Jun 2006 17:39:26 +0100 [MIPS] Add Missing R4K Cache Macros to IP27 & IP32 Keeping in accordance with other machines, IP27 and IP32 lack a few macros. IP27 lacks cpu_has_4kex & cpu_has_4k_cache macros while IP32 lacks just the cpu_has_4k_cache macro. Signed-off-by: Joshua Kinard Signed-off-by: Ralf Baechle commit 35189fad3cb5f6e3ab66c8321928a851de0cd2b1 tree 70dcd11a08d964da9ee27bc716b2205f250b42dd parent 355c471f2ff324c21f8a1fb8e2e242a0f2a4aa68 author Ralf Baechle Sun, 18 Jun 2006 16:39:46 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:26 +0100 [MIPS] Support for the RM9000-based Basler eXcite smart camera platform. Signed-off-by: Thomas Koeller Signed-off-by: Ralf Baechle commit 355c471f2ff324c21f8a1fb8e2e242a0f2a4aa68 tree 8a491d03e865b9e16686004dea765a141e048219 parent 4a0312fca6599299bbed944ce09278d90388a3e5 author dmitry pervushin Sun, 21 May 2006 14:53:06 +0400 committer Ralf Baechle Mon, 19 Jun 2006 17:39:26 +0100 [MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins board Signed-off-by: dmitry pervushin Signed-off-by: Ralf Baechle commit 4a0312fca6599299bbed944ce09278d90388a3e5 tree cde9b9d353eab1aa7ab062c2a958986bd45c1f24 parent b00f473e1af9a11454e572de1ea446eb672e700d author Thomas Bogendoerfer Tue, 13 Jun 2006 13:59:01 +0200 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors. Added support for RM200C machines with big endian firmware Added support for RM200-C40 (R5000 support) Signed-off-by: Florian Lohoff Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit b00f473e1af9a11454e572de1ea446eb672e700d tree daed429452901d2b1d3d09380e2b9467b4f68cda parent 4fb60a4b80f9db94605c2a47807d34dfb9ae44c8 author Ralf Baechle Sat, 17 Jun 2006 10:56:26 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] SN: include asm/sn/types.h for nasid_t. Signed-off-by: Ralf Baechle commit 4fb60a4b80f9db94605c2a47807d34dfb9ae44c8 tree 07f454d04edd7a02b8e6d8a8c7ec04b6b0d1aec6 parent b75d4c1d686aff4f8f9ea96b2e8908a3454a3ff3 author Thiemo Seufer Sun, 18 Jun 2006 05:23:47 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] Random fixes for sb1250 Random improvements for sb1250: Silence compiler warnings, a bugfix for the profiling code, and a comment typo. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit b75d4c1d686aff4f8f9ea96b2e8908a3454a3ff3 tree 037024e26c3f91919dbbcb35fb0af341970c64eb parent 470b160364db5b8096b8e557a23c97eb6612be67 author Thiemo Seufer Sun, 18 Jun 2006 05:17:54 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] Fix bcm1480 compile Fix compilation for bcm1480, a hpt is only available on sb1250/bcm112x. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit 470b160364db5b8096b8e557a23c97eb6612be67 tree e788b9548129880ecf5f6a7be89d7f1380050616 parent eaff3888742155bd397e45a1c3323c0173042e5b author Ralf Baechle Sun, 18 Jun 2006 05:28:38 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] Remove support for NEC DDB5476. As warned several times before. Signed-off-by: Ralf Baechle commit eaff3888742155bd397e45a1c3323c0173042e5b tree bf8ee6203072e01ce0d50db5898137c7552da6e5 parent 2925aba4223f4532e85f0c6f64584b3e0b2849c3 author Ralf Baechle Sun, 18 Jun 2006 04:58:57 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] Remove support for NEC DDB5074. As warned several times before. Signed-off-by: Ralf Baechle commit 2925aba4223f4532e85f0c6f64584b3e0b2849c3 tree 1a7d38a22db3b745926232d665d6653baa47ee61 parent 7ab2dc41d15f31e9d5472e46148337b4cf7c941c author Ralf Baechle Sun, 18 Jun 2006 01:32:22 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] Cleanup memory managment initialization. Historically plat_mem_setup did the entire platform initialization. This was rather impractical because it meant plat_mem_setup had to get away without any kind of memory allocator. To keep old code from breaking plat_setup was just renamed to plat_setup and a second platform initialization hook for anything else was introduced. Signed-off-by: Ralf Baechle commit 7ab2dc41d15f31e9d5472e46148337b4cf7c941c tree f42d6678527130086997dfb3fe8e7a7f41dbf933 parent 610019baddcb4c4c323c12cd44ca7f73d7145d6f author Ralf Baechle Sat, 17 Jun 2006 14:55:40 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] SN: Declare bridge_pci_ops. Signed-off-by: Ralf Baechle commit 610019baddcb4c4c323c12cd44ca7f73d7145d6f tree e08e7fbac1f2358b8725a5082ac456d66502d532 parent 9e0c7afd0ec6e6d788df14270b2b1b8f21a384a8 author Ralf Baechle Sat, 17 Jun 2006 14:54:32 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] Remove unused function alloc_pci_controller. Signed-off-by: Ralf Baechle commit 9e0c7afd0ec6e6d788df14270b2b1b8f21a384a8 tree 40ab41d3405e393c94b01b9d863263df94f39744 parent 3a11545615dedd8dd52ff110ddf6e970bfac963a author Ralf Baechle Sat, 17 Jun 2006 00:55:45 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] IP27: Extract pci_ops into separate file. Signed-off-by: Ralf Baechle commit 3a11545615dedd8dd52ff110ddf6e970bfac963a tree 54f72b728ff5c36d3134d2e18ad69ba4c6801325 parent c340cc504c91cf81561ecca10ec13396ae24dcc0 author Ralf Baechle Sat, 17 Jun 2006 00:46:27 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] IP27: Use symbolic constants instead of magic numbers. Signed-off-by: Ralf Baechle commit c340cc504c91cf81561ecca10ec13396ae24dcc0 tree aae1bca403ae101ee6c907447be7aa3936e151bc parent f456acae4fe9b4504db7d75c51fba6b8db787ee2 author Yoichi Yuasa Thu, 15 Jun 2006 23:29:37 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig. Remove unnecessary items from vr41xx/Kconfig. SYS_HA_CPU_VR41XX has already been selected by MACH_VR41XX. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit f456acae4fe9b4504db7d75c51fba6b8db787ee2 tree 0957b407a6ce53a67a3df333a83d24a9d47d3c9b parent 09866258612bd9f389b0d86b3a63fe98e855d3f0 author Ralf Baechle Wed, 14 Jun 2006 08:10:35 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] IP27: Cleanup N/M mode configuration. Signed-off-by: Ralf Baechle commit 09866258612bd9f389b0d86b3a63fe98e855d3f0 tree 0c6efa03ce82f343d4e6deeed9118a9ebc68aa71 parent d9b8d0da404cf952a425d990c37c29c166eec954 author Ralf Baechle Wed, 14 Jun 2006 08:01:30 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] IP27: Throw away old unused hacks. Signed-off-by: Ralf Baechle commit d9b8d0da404cf952a425d990c37c29c166eec954 tree 22083744b8735c22314f52cd276df35126c8a7b6 parent e53639d8f313974a87540015cbb0832905be6056 author Ralf Baechle Mon, 12 Jun 2006 12:20:09 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] Drop 0 definition for kern_addr_valid kern_addr_valid is currently only being used in kmem_ptr_validate which is making some vague attempt at verfying the validity of an address. Only IA-64, PARISC and x86-64 actually make some actual effort to verify the validity of the pointer. Most architecture definitions of kern_addr_valid() just define it as 1; the Alpha and CONFIG_DISCONTIGMEM on i386 and MIPS even as 0; the 0-definition will result in kmem_ptr_validate always failing which in turn will cause d_validate to always fail. d_validate's only two users are smbfs and ncpfs, so the 0 definition ended breaking those ... Signed-off-by: Ralf Baechle commit e53639d8f313974a87540015cbb0832905be6056 tree b6a442bd408c9c4f2d3de284097d06c69cae273f parent 952fa954a61cee43de5afba91ae605e30ed2586c author Ralf Baechle Mon, 12 Jun 2006 09:13:56 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] Consolidate definitions of pfn_valid in one file. Signed-off-by: Ralf Baechle commit 952fa954a61cee43de5afba91ae605e30ed2586c tree 8d94bd87614cb1c8a7eda02e383c7b6c4f45a474 parent aa9772e330d6c0a8a94316cb38ae8a7495885a60 author Rodolfo Giometti Mon, 05 Jun 2006 17:43:10 +0200 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] APM emu support Signed-off-by: Rodolfo Giometti Signed-off-by: Ralf Baechle commit aa9772e330d6c0a8a94316cb38ae8a7495885a60 tree 7371d03f0d86a74eb751d0e262fd562214bf8da5 parent bf5a312b26e9943613b765a29a8de5f4c762df11 author Ralf Baechle Mon, 12 Jun 2006 00:55:14 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] SN: Rename SGI_SN0_N_MODE -> SGI_SN_N_MODE. It's not SN0-specific. Signed-off-by: Ralf Baechle commit bf5a312b26e9943613b765a29a8de5f4c762df11 tree 163a30c499ad6f92f73cbbbd48bfcec73b9a9efc parent d8cb4e119f9a97f87f69a179d855f5dfc5d578c2 author Ralf Baechle Sat, 10 Jun 2006 00:37:20 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] SN: Move FRU header one level up; it is not SN0-specific. Signed-off-by: Ralf Baechle commit d8cb4e119f9a97f87f69a179d855f5dfc5d578c2 tree 65758baf0c2bb77c86d002ec602f4b3c75fa27c9 parent 3e0ba410a5d5595c2b79ecbfb85fb2466b998680 author Ralf Baechle Sun, 11 Jun 2006 23:03:08 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:21 +0100 [MIPS] Cleanup ARCH_DISCONTIGMEM_ENABLE and NUMA configuration. IP27 configuration isn't the only NUMA system - it just happens to be the currently only supported MIPS NUMA system. So move the necessary options back into the main MIPS Kconfig file. Signed-off-by: Ralf Baechle commit 3e0ba410a5d5595c2b79ecbfb85fb2466b998680 tree 22f2044fb6f8c630b02c1c86cc7a96ed017395d0 parent 8f2f360da9262091153c97d756c40eabdde75f1a author Ralf Baechle Wed, 07 Jun 2006 20:13:20 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:21 +0100 [MIPS] IP27: Remove #if 0'ed code. Signed-off-by: Ralf Baechle commit 8f2f360da9262091153c97d756c40eabdde75f1a tree 057e7afec78f5f2f56e487f4c8dea5d62553a3e6 parent edc123d18397008fcd4fdf04f60e033ba1042834 author Ralf Baechle Wed, 07 Jun 2006 20:10:06 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:21 +0100 [MIPS] IP27: Nuke leftovers of _STANDALONE Signed-off-by: Ralf Baechle commit edc123d18397008fcd4fdf04f60e033ba1042834 tree 27abf8dda80d61d46c3ee20502e236f1345f77d7 parent 8dbd1d3e65f0281ddf9f7b8123ef81763bc2051f author Ralf Baechle Wed, 07 Jun 2006 20:07:29 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:21 +0100 [MIPS] IP27: Remove leftovers of sable support. Signed-off-by: Ralf Baechle commit 8dbd1d3e65f0281ddf9f7b8123ef81763bc2051f tree 45f61ecc0a919451d4e4178f3baae69324ed3a22 parent b383f47ec71de66dbba5f7233479783041f5096a author Ralf Baechle Wed, 07 Jun 2006 20:04:23 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:21 +0100 [MIPS] IP27: Nuke last leftovers from FRUTEST Signed-off-by: Ralf Baechle commit b383f47ec71de66dbba5f7233479783041f5096a tree dec6cffd527d78e03cb784629f438e5208523672 parent 5e46c3aefe60d1398488410a0c39b4cd87738614 author Ralf Baechle Wed, 07 Jun 2006 20:02:21 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:20 +0100 [MIPS] IP27: Nuke last leftovers of CONFIG_SGI_IO. Signed-off-by: Ralf Baechle commit 5e46c3aefe60d1398488410a0c39b4cd87738614 tree 982f9820e63cee8aacc4a6132f124d1cef4fe901 parent cbb306962ec4b30e03423137e22d605281a8f598 author Ralf Baechle Sun, 04 Jun 2006 15:14:05 -0700 committer Ralf Baechle Mon, 19 Jun 2006 17:39:20 +0100 [MIPS] C99-ify struct resource initialization. Signed-off-by: Ralf Baechle commit cbb306962ec4b30e03423137e22d605281a8f598 tree 510435da13b336be64eb210f6d2a552503188c43 parent 1bd5e16168b58e73f7be432ba3558af9d38662cf author Ralf Baechle Sun, 04 Jun 2006 00:55:21 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:20 +0100 [MIPS] Remove duplicate declarations from Alchemy code. Signed-off-by: Ralf Baechle commit 1bd5e16168b58e73f7be432ba3558af9d38662cf tree f816acdb0a3a8015c2049c2a7bd1f655e2ec3a15 parent c0589f1ecea73e7bce09c569dca44b83e68a39b1 author Ralf Baechle Sat, 03 Jun 2006 21:59:51 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:20 +0100 [MIPS] Cleanup __emt() a bit. Signed-off-by: Ralf Baechle commit c0589f1ecea73e7bce09c569dca44b83e68a39b1 tree c601141cbcf2f80b28f41c1a27556b764f385540 parent fbd7a38ffb127da53a4c9fd0ad09e6ed937e8e3f author Yoichi Yuasa Wed, 31 May 2006 16:00:05 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:19 +0100 [MIPS] Remove unused definitions from addrspace.h. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit fbd7a38ffb127da53a4c9fd0ad09e6ed937e8e3f tree 2f06c671b67200e181c289949caf4bc08eb2a77e parent b0b0e13e7dd309be13ab9324e67893e62b136e44 author Sergei Shtylyov Sun, 28 May 2006 00:04:01 +0400 committer Ralf Baechle Mon, 19 Jun 2006 17:39:19 +0100 [MIPS] arch/mips/au1000/time.c cleanup Mark au1xxx_timer_setup() __init, just because it is. Get rid of unneeded extern's (note that (*do_gettimeoffset)() is already declared by ) and an unused variable. Kill some whitespace... Signed-off-by: Sergei Shtylyov Signed-off-by: Ralf Baechle commit b0b0e13e7dd309be13ab9324e67893e62b136e44 tree 522f2ee785c8ab5600a254cabe8b2d0326425a0c parent c583122c26ad04bb2379933dc5acc8b9479d6c67 author Ralf Baechle Thu, 18 May 2006 12:38:47 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:19 +0100 [MIPS] Remove unused instances of prom_build_cpu_map. Signed-off-by: Ralf Baechle commit c583122c26ad04bb2379933dc5acc8b9479d6c67 tree 8afc9153e18b300ab93ff6a675e0c0f6e464c518 parent eae89076e696f51762d81d6e2538c3beb59fa7bd author Thiemo Seufer Mon, 15 May 2006 18:59:34 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:19 +0100 [MIPS] Qemu system shutdown support Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit eae89076e696f51762d81d6e2538c3beb59fa7bd tree 7aab0972d6786721eb6c9b01d77a1b5f13263c49 parent 5deee2dbf495b2693629f7e8f846483432096278 author Atsushi Nemoto Tue, 16 May 2006 01:26:03 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:18 +0100 [MIPS] Unify mips_fpu_soft_struct and mips_fpu_hard_structs. The struct mips_fpu_soft_struct and mips_fpu_hard_struct are completely same now and the kernel fpu emulator assumes that. This patch unifies them to mips_fpu_struct and get rid of mips_fpu_union. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 5deee2dbf495b2693629f7e8f846483432096278 tree 8ab697ac6c3217a60a93e56e88df482230eb2f77 parent a240a469649eaab03f0c4c7fbb21ea5041bf5572 author Ralf Baechle Mon, 15 May 2006 15:08:22 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:18 +0100 [MIPS] Remove prototype for non-existing function. Signed-off-by: Ralf Baechle commit a240a469649eaab03f0c4c7fbb21ea5041bf5572 tree 71801adbf35a8a449a76398a4a5d7c34066313b4 parent a643d2b57403dc943fd4d9a3c803addd1c6b0ddc author Mark.Zhan Sat, 06 May 2006 17:04:20 +0800 committer Ralf Baechle Mon, 19 Jun 2006 17:39:18 +0100 [MIPS] Wind River 4KC PPMC Eval Board Support Support for the GT-64120-based Wind River 4KC PPMC Evaluation board. Signed-off-by: Rongkai.Zhan Signed-off-by: Ralf Baechle commit a643d2b57403dc943fd4d9a3c803addd1c6b0ddc tree c06e22a97cffe9f700874fba938eceb6226e50e8 parent 3c0094426f3ff37697062b940211712746419688 author Herbert Valerio Riedel Sun, 07 May 2006 15:48:25 +0200 committer Ralf Baechle Mon, 19 Jun 2006 17:39:17 +0100 [MIPS] Au1xxx: board specific irq code cleanup Convert sizeof/sizeof use to use of ARRAY_SIZE macro, and annotate irqmap structures as __initdata. Signed-off-by: Herbert Valerio Riedel Signed-off-by: Ralf Baechle commit 3c0094426f3ff37697062b940211712746419688 tree 9cf7f61829a9ac03294bc04e9b00257a17c2d2d9 parent 0307e8d024dffc00743fb54b9afa920a346f1adb author Ralf Baechle Fri, 16 Jun 2006 17:10:49 +0200 committer Ralf Baechle Mon, 19 Jun 2006 17:39:17 +0100 [MIPS] IP27: Fix collision with hardcoded interrupt number. Signed-off-by: Ralf Baechle commit 0307e8d024dffc00743fb54b9afa920a346f1adb tree 3e6ea1c677105501fc9efb57105cb23cec4e8f2d parent e1701fb2e2f3c02760684e26007e3379be23b690 author Atsushi Nemoto Sun, 11 Jun 2006 23:25:43 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:17 +0100 [MIPS] Fix futex_atomic_op_inuser. I found that NPTL's pthread_cond_signal() does not work properly on kernels compiled by gcc 4.1.x. I suppose inline asm for __futex_atomic_op() was wrong. I suppose: 1. "=&r" constraint should be used for oldval. 2. Instead of "r" (uaddr), "=R" (*uaddr) for output and "R" (*uaddr) for input should be used. 3. "memory" should be added to the clobber list. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit e1701fb2e2f3c02760684e26007e3379be23b690 tree ed27a4aa460a0fa5ae0a928e2dd86de0e555bd68 parent 4b29f6043dbb07823a0a618fb8b35ef3ac83e759 author [MIPS] James E Wilson Mon, 27 Feb 2006 15:04:38 -0800 committer Ralf Baechle Mon, 19 Jun 2006 17:39:16 +0100 [PATCH] Fix BCM1480 doubled process accounting times. Running a UP kernel on a bcm1480 board, I get nonsensical timing results, like this: release@unknown:~/tmp$ time ./a.out real 0m22.906s user 0m45.792s sys 0m0.010s According to my watch, this program took 23 seconds to run, so the real time clock is OK. It is process accounting that is broken. I tracked this down to a problem with the function bcm1480_timer_interrupt in the file sibyte/bcm1480/time.c. This function calls ll_timer_interrupt for cpu0, and ll_local_timer_interrupt for all cpus. However, both of these functions do process accounting. Thus processes running on cpu0 end up with doubled times. This is very obvious in a UP kernel where all processes run on cpu0. The correct way to do this is to only call ll_local_timer interrupt if this is not cpu0. This can be seen in the mips-board/generic/time.c file, and also in the sibyte/sb1250/time.c file, both of which handle this correctly. I fixed the bcm1480/time.c file by copying over the correct code from the sb1250/time.c file. With this fix, I now get sensible results. release@unknown:~/tmp$ time ./a.out real 0m22.903s user 0m22.894s sys 0m0.006s Signed-off-by: Ralf Baechle commit 4b29f6043dbb07823a0a618fb8b35ef3ac83e759 tree 60958a8df2a8b5e5cadb0df225753d5500a95f95 parent 72fbfb260197a52c2bc2583f3e8f15d261d0f924 author Ralf Baechle Wed, 07 Jun 2006 15:24:44 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:16 +0100 [MIPS] Mark PNX8550 support broken. Broken in too many way for me to fix it for 2.6.17. Signed-off-by: Ralf Baechle commit 72fbfb260197a52c2bc2583f3e8f15d261d0f924 tree 4801ed07d35013ece68ed9ca40f40421ff8f5e2a parent aac076f8805448a6331a526aa02cc438730ddd39 author Ralf Baechle Wed, 07 Jun 2006 13:25:37 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:16 +0100 [MIPS] Fix optimization for size build. It took a while longer than on other architectures but gcc has finally started to strike us as well ... This also fixes the damage by 6edfba1b33c701108717f4e036320fc39abe1912. Signed-off-by: Ralf Baechle commit aac076f8805448a6331a526aa02cc438730ddd39 tree 270ad4de03c5cf88e6a267335ac4888dcce09854 parent 973c789742b4dc957cd7feb96cae98988dd0cf01 author Ralf Baechle Wed, 07 Jun 2006 12:53:17 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:15 +0100 [MIPS] IP22: Fix ISA driver builds if CONFIG_EISA is selected. Signed-off-by: Ralf Baechle commit 973c789742b4dc957cd7feb96cae98988dd0cf01 tree f9a78f2c8fccf4b9be408eddf365d7fb68950743 parent c138e12f3a2e0421a4c8edf02587d2d394418679 author Yoichi Yuasa Wed, 07 Jun 2006 09:53:34 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:14 +0100 [MIPS] Cobalt: Fix undefined reference to disable_early_printk. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit c138e12f3a2e0421a4c8edf02587d2d394418679 tree 66abbf27cbfc9030958b469aa4d826242417a752 parent 734996820fd02b52a3fa0fcc09bdb914934bea4c author Atsushi Nemoto Tue, 23 May 2006 00:47:41 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:13 +0100 [MIPS] Fix fpu_save_double on 64-bit. > Without this fix, _save_fp() in 64-bit kernel is seriously broken. > > ffffffff8010bec0 <_save_fp>: > ffffffff8010bec0: 400d6000 mfc0 t1,c0_status > ffffffff8010bec4: 000c7140 sll t2,t0,0x5 > ffffffff8010bec8: 05c10011 bgez t2,ffffffff8010bf10 <_save_fp+0x50> > ffffffff8010becc: 00000000 nop > ffffffff8010bed0: f4810328 sdc1 $f1,808(a0) > ... Fix register usage in fpu_save_double() and make fpu_restore_double() more symmetric with fpu_save_double(). Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 734996820fd02b52a3fa0fcc09bdb914934bea4c tree 7d12e625c842bfc605b83506fd2423a44fad53ed parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Elizabeth Oldham Tue, 06 Jun 2006 10:57:09 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:13 +0100 [MIPS] Malta: Handle byteswapping hardare bug in big endian mode. The SOC-it system controller running in big endian mode might forget byteswapping when DMAing to the last word of physical memory. Fixed by ignoring the last page of memory. Signed-off-by: Ralf Baechle commit 466e6227e6a54d9b94b50972612fe8bf0450f786 tree b6704d537eac6deb9ba97a937460058e9ad19201 parent 82c583e3ae31ffa76d1280197274cc1e1cde3179 author Andrew Victor Mon, 19 Jun 2006 17:26:23 +0100 committer Russell King Mon, 19 Jun 2006 17:26:23 +0100 [ARM] 3588/1: AT91RM9200 CSB337/637 board update Patch from Andrew Victor This patch updates the support for the Cogent CSB337 and CSB637 boards. The changes include: 1. Use the new at91_uart_config structure and device registration functions for the UARTs. 2. Registration of I2C and SPI platform devices. 3. The CSB337 board uses PB0 & PB1 (and not PB2) for the LEDs. [Patch from David Brownell] Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 82c583e3ae31ffa76d1280197274cc1e1cde3179 tree e51bb66dd2a4f0a13f9089b5ddb4872ecdae7538 parent 7238d7ee82d325212e83630047e9844943225118 author Andrew Victor Mon, 19 Jun 2006 16:57:00 +0100 committer Russell King Mon, 19 Jun 2006 16:57:00 +0100 [ARM] 3587/1: AT91RM9200 hardware headers Patch from Andrew Victor These headers define the registers and bits for the SPI (Serial Peripheral Interface), SSC (Synchronous Serial), TC (Timer/Counter) and UDP (USB Device) peripherals integrated in the AT91RM9200 processor. (They will probably also be usable for the AT91SAM9 series of SoC processors) Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 7238d7ee82d325212e83630047e9844943225118 tree b0b9020419ef037650a3398de1525c52c961ef60 parent 2e83640270b4a76a3855131953c82bbc1919e589 author Andrew Victor Mon, 19 Jun 2006 16:57:00 +0100 committer Russell King Mon, 19 Jun 2006 16:57:00 +0100 [ARM] 3586/1: AT91RM9200 header update Patch from Andrew Victor Added definition for the bits in the Chip ID register. Corrected the capitalization of AT91_RTC_AMPM register name. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 2e83640270b4a76a3855131953c82bbc1919e589 tree 7130aceafd79421f20e9c7ffb7b1eb931b2a14a5 parent 814138ffa488824393d2f49f2720dcd197a7d4cf author Andrew Victor Mon, 19 Jun 2006 16:31:55 +0100 committer Russell King Mon, 19 Jun 2006 16:31:55 +0100 [ARM] 3585/1: AT91RM9200 Platform devices Patch from Andrew Victor This patch updates the platform device support for the AT91RM9200. The changes include: 1. USB Host device renamed to "at91_ohci" since the driver is also usable on the AT91SAM9261 processor. 2. Enabling multidrive on the USB Device's pullup pin should not be done for all boards. Moved into board-specific files. [Patch from David Brownell] 3. Move enabling of PCMCIA/Compact Flash pins out of the driver. 4. Added SPI device and resources. 5. Added Watchdog device and resources. [Patch from David Brownell] 6. Added UART device and resources. 7. The simple devices (watchdog, rtc, i2c) are now automatically registered and don't have to be registered separately in each board-specific file. [Patch from David Brownell] Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 5af29e56c221d709bdbd5fccaf190e21f290a30e tree 03c48002fd45ea4479345a9cf89b0e442305e1db parent 441ff855f3edf5d355bea30f557bbed6bcd42c6c author Russell King Mon, 19 Jun 2006 15:37:31 +0100 committer Russell King Mon, 19 Jun 2006 15:37:31 +0100 [ARM] Fix badge4 build error The Badge4 PCMCIA driver was referencing structure elements which had been renamed. Fix the missing renames. Signed-off-by: Russell King commit 441ff855f3edf5d355bea30f557bbed6bcd42c6c tree 6327490a1106630deb7fc20255c61072c85a943f parent 5e6423871772b89120c9fb356d2eabb67fea60bd author H. Peter Anvin Mon, 19 Jun 2006 15:35:36 +0100 committer Russell King Mon, 19 Jun 2006 15:35:36 +0100 [ARM] Fix byte order macros for Thumb The byte order functions are visible to userspace. Unfortunately, __arch_swab32() contains an assembly instruction which is invalid when compiling for Thumb. This reverts to the C version when compiling for Thumb. Signed-off-by: H. Peter Anvin Signed-off-by: Russell King commit 5e6423871772b89120c9fb356d2eabb67fea60bd tree b9ae5a7fa508fdf26bfa5e9a6b565352e4feaa97 parent 2697c5e1f799f201366d5fd7d25e96a21587f1a9 author Sascha Hauer Mon, 19 Jun 2006 15:30:21 +0100 committer Russell King Mon, 19 Jun 2006 15:30:21 +0100 [ARM] 3577/1: netX: Default config for netx based boards Patch from Sascha Hauer This patch adds the default config file for netx based boards. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit 2697c5e1f799f201366d5fd7d25e96a21587f1a9 tree 43e234d320316394a38be278ae0f002a5a7a7c3a parent af614ba072dab2940471fec1f30bd59b8272fc6b author Sascha Hauer Mon, 19 Jun 2006 15:29:45 +0100 committer Russell King Mon, 19 Jun 2006 15:29:45 +0100 [ARM] 3576/1: netX: board support for NXEB500HMI development board Patch from Sascha Hauer This patch adds the board specific code for the Hilscher NXEB500HMI development board. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit af614ba072dab2940471fec1f30bd59b8272fc6b tree 58dd752e79c50fc0342f8a7fa662c783a178b8d1 parent 693532dcff871543639743e9c2e2b99c492f8f8d author Sascha Hauer Mon, 19 Jun 2006 15:29:44 +0100 committer Russell King Mon, 19 Jun 2006 15:29:44 +0100 [ARM] 3575/1: netX: board support for NXDB500 development board Patch from Sascha Hauer This patch adds the board specific code for the Hilscher NXDB500 development board. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit 693532dcff871543639743e9c2e2b99c492f8f8d tree 88e5dd99441b2641f96ca9452aa1d496db8037c1 parent 8e77da68a6107ee47323fec5dfb3a93ebbc809e2 author Sascha Hauer Mon, 19 Jun 2006 15:29:43 +0100 committer Russell King Mon, 19 Jun 2006 15:29:43 +0100 [ARM] 3574/1: netX: board support for NXDKN development board Patch from Sascha Hauer This patch adds the board specific code for the Hilscher NXDKN development board. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit 8e77da68a6107ee47323fec5dfb3a93ebbc809e2 tree e7cee971204ddf5e9e5729f264c3480425e07e01 parent ef70cd4d247defcd7c0f789a5a98deab0afadf53 author Sascha Hauer Mon, 19 Jun 2006 15:28:20 +0100 committer Russell King Mon, 19 Jun 2006 15:28:20 +0100 [ARM] 3569/2: netX: driver for XMAC/XPEC engines Patch from Sascha Hauer The netX processors have generic network bitstream engines (XMAC/XPEC). This driver adds support for firmware loading and start, stop, reset commands. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit ef70cd4d247defcd7c0f789a5a98deab0afadf53 tree f70493a24f7e83aaf09c52ee274d7b1dc36ade28 parent bb6d8c8828123e01e2ae6c9d9c4870477889fd94 author Sascha Hauer Mon, 19 Jun 2006 15:28:19 +0100 committer Russell King Mon, 19 Jun 2006 15:28:19 +0100 [ARM] 3568/2: netX: pointer fifo driver Patch from Sascha Hauer This patch adds support for the pointer FIFOs on netX. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit bb6d8c8828123e01e2ae6c9d9c4870477889fd94 tree 43d7a6ec2cc15f1bf8810a65aa38d508c7fa955a parent 3095faf5295f2da9118469c925d2cfb7775ad287 author Sascha Hauer Mon, 19 Jun 2006 15:27:53 +0100 committer Russell King Mon, 19 Jun 2006 15:27:53 +0100 [ARM] 3567/2: arm: base support for Hilscher netX Patch from Sascha Hauer This patch adds the base support for Hilscher's netX network processors. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit 814138ffa488824393d2f49f2720dcd197a7d4cf tree 24e86542da43b8e797859a0b085b03a9a3cb5091 parent 683c66bf75ce277b90d658da0c1a0bf1a55cce4c author Andrew Victor Mon, 19 Jun 2006 15:26:54 +0100 committer Russell King Mon, 19 Jun 2006 15:26:54 +0100 [ARM] 3584/1: AT91RM9200 GPIO suspend/resume support Patch from Andrew Victor This patch adds suspend/resume/set_wake support for the AT91RM9200's GPIO interrupts. Original patch from David Brownell. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 683c66bf75ce277b90d658da0c1a0bf1a55cce4c tree 962a3d92b8eba3424df5642e5a02e66220876281 parent 37f2e4bc120bd784e7f69f961233e1c16b74d170 author Andrew Victor Mon, 19 Jun 2006 15:26:53 +0100 committer Russell King Mon, 19 Jun 2006 15:26:53 +0100 [ARM] 3583/1: AT91RM9200 IRQ suspend/resume support Patch from Andrew Victor Added suspend/resume/set_wake support for the AT91RM9200's AIC interrupt controller. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 37f2e4bc120bd784e7f69f961233e1c16b74d170 tree fbe1d1b32bc81c0b5f5cf030639a13a51f08906b parent 10e8e1fb758eed5cfb0cae1b770f842624851e7b author Andrew Victor Mon, 19 Jun 2006 15:26:52 +0100 committer Russell King Mon, 19 Jun 2006 15:26:52 +0100 [ARM] 3582/1: AT91RM9200 IRQ trigger types Patch from Andrew Victor The AIC interrupt controller's set_irq_type() can also be used for internal interrupts. IRQT_LOW and IRQT_FALLING are the only options not supported for the internal interrupts. [Original patch from Karl Olsen] Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 10e8e1fb758eed5cfb0cae1b770f842624851e7b tree 3276408aedaf5b1061c7f681ad5ea6dcf89925c2 parent 2a6f9902c6a799a9c0218b37e39b75690c3b9a70 author Andrew Victor Mon, 19 Jun 2006 15:26:51 +0100 committer Russell King Mon, 19 Jun 2006 15:26:51 +0100 [ARM] 3581/1: AT91RM9200 Internal SRAM Patch from Andrew Victor This patch maps the AT91RM9200's internal SRAM into the virtual memory address space - just below the internal peripheral registers. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 2a6f9902c6a799a9c0218b37e39b75690c3b9a70 tree ef35c9fd90421e0e667be719489422cb52c629c1 parent 963151f2471d0e6475d8b2d3a005417aec1766f7 author Andrew Victor Mon, 19 Jun 2006 15:26:50 +0100 committer Russell King Mon, 19 Jun 2006 15:26:50 +0100 [ARM] 3580/1: AT91RM9200 Timer suspend/resume support Patch from Andrew Victor Added suspend/resume support for the AT91RM9200 timer. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 963151f2471d0e6475d8b2d3a005417aec1766f7 tree 37602e1518fea1fea3243f7a527ea3c7deea3d34 parent 91f8ed835ffb34b4108cc16eefd3303e4068bee0 author Andrew Victor Mon, 19 Jun 2006 15:23:41 +0100 committer Russell King Mon, 19 Jun 2006 15:23:41 +0100 [ARM] 3579/1: AT91RM9200 Timer simplification Patch from Andrew Victor Use a global variable 'last_crtr' to store the time of the last timer tick instead of the ST_RTAR register. It's faster, frees up the ST_RTAR register for other uses, and hopefully makes the code more understandable. [Patch from Peter Menzebach] Also add the SA_TIMER flag to Timer IRQ. (It seems to be required for the realtime preempt patch). Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 3095faf5295f2da9118469c925d2cfb7775ad287 tree f874744f93762562c1a3263ba69c188d1dfc17e6 parent ab76fb13d73488ded53c87b77b1b5e38df2acf74 author Sascha Hauer Mon, 19 Jun 2006 13:30:58 +0100 committer Russell King Mon, 19 Jun 2006 13:30:58 +0100 [ARM] 3572/1: netX: framebuffer driver for Hilscher netX Patch from Sascha Hauer This patch adds framebuffer support for Hilscher's netX network processors. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit f8441e13449638e9fc3c160c35ada3b6f1f8d9c0 tree 10035c1a56d9f8d91e56ea6021a7aaa5ed7f9f52 parent 14228a49913850493c7f9eb4501438c32da353f7 author Sascha Hauer Mon, 19 Jun 2006 13:29:07 +0100 committer Russell King Mon, 19 Jun 2006 13:29:07 +0100 [ARM] 3571/1: netX: serial driver for Hilscher netX Patch from Sascha Hauer This patch adds the serial driver for Hilscher's netX network processors. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit ab76fb13d73488ded53c87b77b1b5e38df2acf74 tree f94b56e908875df9918df7e1bc2c72fc4f17a257 parent 91f8ed835ffb34b4108cc16eefd3303e4068bee0 author Sascha Hauer Mon, 19 Jun 2006 13:24:32 +0100 committer Russell King Mon, 19 Jun 2006 13:24:32 +0100 [ARM] 3566/1: netX: register definitions Patch from Sascha Hauer This patch adds the register definitions for Hilscher's netX network processors. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit 91f8ed835ffb34b4108cc16eefd3303e4068bee0 tree cb600e909c298ef9bede94e99bd911611ddc86d6 parent b7408aff2d325581dcafffa5dbcc09c42ae64b5d author Andrew Victor Mon, 19 Jun 2006 13:20:23 +0100 committer Russell King Mon, 19 Jun 2006 13:20:23 +0100 [ARM] 3578/1: AT91RM9200 Clock update Patch from Andrew Victor Some updates to the clock infrastructure for the AT91RM9200. 1. Hard-coded values replaced with names defined in at91rm9200_sys.h. 2. Added the four PIO clocks, which are enabled at startup. 3. At startup, disable all unused clocks. 4. Minor bugfix for usage counts associated with MCK. [Patch from David Brownell] 5. Added at91_clock_associate() function to associate device & function with a particular clock. [Patch from David Brownell] Signed-off-by: Andrew Victor Signed-off-by: Russell King commit b7408aff2d325581dcafffa5dbcc09c42ae64b5d tree d3f0c225b68108626853b1b40e4af49bd5be080c parent 96ce2385dd2817da549910001a69ac0a2762a1b9 author Richard Purdie Mon, 19 Jun 2006 13:08:39 +0100 committer Russell King Mon, 19 Jun 2006 13:08:39 +0100 [ARM] 3563/1: LED: Set the LOCOMO LED driver default triggers Patch from Richard Purdie Set the default triggers for the LOCOMO LED driver. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit b44fb7a09e6bb7d77c1b4b402591f6f953c1e51c tree 8460db80ce3d5f50cfdeeabc6425a457813ad6ac parent a3fd4a1b9ced850ac1a9d5bb9f8fab494d07f3fa author Andrew Victor Mon, 19 Jun 2006 13:06:05 +0100 committer Russell King Mon, 19 Jun 2006 13:06:05 +0100 [ARM] 3565/1: AT91RM9200 MMC update Patch from Andrew Victor This patch includes code cleanups and minor fixes to the AT91RM9200 MMC driver. 1. Replace calls to DBG() with pr_debug(). 2. 'host' can never be null, so don't bother checking for that case. 3. Remove SA_SAMPLE_RANDOM from request_irq(). [Patch from Matt Mackall] 4. clk_get() doesn't return NULL on error - need to test returned value with IS_ERR(). 5. Free resources if clk_get() or request_irq() fails. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit a3fd4a1b9ced850ac1a9d5bb9f8fab494d07f3fa tree dc2b9354fe087663cc862a966d12824601702c29 parent 12223dabc617a4babfba4e17feb1ed88e8cfeb8f author Russell King Sun, 04 Jun 2006 17:51:15 +0100 committer Russell King Mon, 19 Jun 2006 13:05:08 +0100 [MMC] Convert all hosts except mmci to use data->blksz The MMC specification allows non-power of two block sizes. As such, we should not pass the log2 block size to host drivers, but instead pass the byte size. However, ARM MMCI can only work with log2 block size, so continue to pass both the log2 block size and byte block size. This means that for the moment, the byte block size must remain a power of two, but this is the first stage of removing this restriction for other hosts. Signed-off-by: Russell King commit ad3b5fb772e6a824f1ac341eb8e392eca6fc524f tree 71efb4bd4406ad944afd0e1549c191d120ae4619 parent d1fef3c5e16327661be6cb127d68f5be379697a5 author Ben Dooks Mon, 19 Jun 2006 09:43:23 +0100 committer David Woodhouse Mon, 19 Jun 2006 09:43:23 +0100 [MTD NAND] S3C2410 driver cleanup Fix unused variables and commenting since tglx's new NAND updates Signed-off-by: Ben Dooks Signed-off-by: David Woodhouse commit d1fef3c5e16327661be6cb127d68f5be379697a5 tree edb5ac6e2a75619aec19a594b327eded84e301d5 parent 1046d88001e7b8819f60dece2eaf1b44bf4b4460 author Ben Dooks Mon, 19 Jun 2006 09:29:38 +0100 committer David Woodhouse Mon, 19 Jun 2006 09:29:38 +0100 [MTD NAND] s3c24x0 board: Fix clock handling, ensure proper initialisation. Signed-off-by: Ben Dooks Signed-off-by: David Woodhouse commit 0d8fee3270f8a5e4bf95fbed3e81e21b57f8a5a0 tree e965874962259a2f16980f19a4e5c03ef635a86f parent a805bad5daae8d4f92ce46f467484d4867e996d4 author Al Viro Mon, 19 Jun 2006 08:41:30 +1000 committer Nathan Scott Mon, 19 Jun 2006 08:41:30 +1000 [XFS] Kill direct access to ->count in valusema(); all we ever use it for is check if semaphore is actually locked, which can be trivially done in portable way. Code gets more reabable, while we are at it... SGI-PV: 953915 SGI-Modid: xfs-linux-melb:xfs-kern:26274a Signed-off-by: Al Viro Signed-off-by: Nathan Scott commit a805bad5daae8d4f92ce46f467484d4867e996d4 tree 60a028285061b29b4b86935dec699c918d190d5a parent 6fe90e6d1451a05db37b2a582410ddcb45af3606 author Nathan Scott Mon, 19 Jun 2006 08:40:27 +1000 committer Nathan Scott Mon, 19 Jun 2006 08:40:27 +1000 [XFS] Remove unneeded conditional code on NFS export interface related code paths. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26250a Signed-off-by: Nathan Scott commit 6fe90e6d1451a05db37b2a582410ddcb45af3606 tree 9eb884a4928582a563b835809bb6fc8d9786a3a0 parent 1e69dd0eb354d6f1a77098a3946b5ba57d4e3109 author Nathan Scott Mon, 19 Jun 2006 08:40:12 +1000 committer Nathan Scott Mon, 19 Jun 2006 08:40:12 +1000 [XFS] Remove an incorrect use of unlikely() on a relatively likely code path. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26249a Signed-off-by: Nathan Scott commit 1e69dd0eb354d6f1a77098a3946b5ba57d4e3109 tree f97ce9c94f72cf142831ad12a701fc6378dc279f parent 1d47bec290a6f1f366192946840efef5076d9fc7 author Nathan Scott Mon, 19 Jun 2006 08:39:53 +1000 committer Nathan Scott Mon, 19 Jun 2006 08:39:53 +1000 [XFS] Push some common code out of write path into core XFS code for sharing. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26248a Signed-off-by: Nathan Scott commit 1d47bec290a6f1f366192946840efef5076d9fc7 tree 06c46c4cdf4eba2b8bae974d443b310bd81df2cc parent d7ede1aa5dfff53e76dbabac5b8087341686f662 author Nathan Scott Mon, 19 Jun 2006 08:39:16 +1000 committer Nathan Scott Mon, 19 Jun 2006 08:39:16 +1000 [XFS] Remove unnecessary local from open_exec dmapi path. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26247a Signed-off-by: Nathan Scott commit 96ce2385dd2817da549910001a69ac0a2762a1b9 tree 18ec36e9e1e8a6b7c19aacb53c256fdb941c4ecd parent 66a9b49a370baac75d90b7da9a2445997a8a9438 author Ben Dooks Sun, 18 Jun 2006 23:06:41 +0100 committer Russell King Sun, 18 Jun 2006 23:06:41 +0100 [ARM] 3559/1: S3C2442: core and serial port Patch from Ben Dooks Core support for the Samsung S3C2442, and the serial port driver update to allow the serial port blocks to be used. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 66a9b49a370baac75d90b7da9a2445997a8a9438 tree 62b22d1559c1c1d1e02428f27c08dca0fb66aa83 parent 810c894f2b27b634883723f9fee10a7cf1d0bcb4 author Ben Dooks Sun, 18 Jun 2006 23:04:05 +0100 committer Russell King Sun, 18 Jun 2006 23:04:05 +0100 [ARM] 3557/1: S3C24XX: centralise and cleanup uart registration Patch from Ben Dooks All the S3C24XX based devices currently have similar uart blocks, in the same location. Make the process of adding new uart blocks easier by commonising the device definitions and adding a new init function for the cpu code. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 810c894f2b27b634883723f9fee10a7cf1d0bcb4 tree 5a4150fa4bd8c833990cd45eeabf1accbdde493e parent 9df5db80a781c1a1c67388c82f64f835093c3cc3 author Ben Dooks Sun, 18 Jun 2006 22:56:37 +0100 committer Russell King Sun, 18 Jun 2006 22:56:37 +0100 [ARM] 3558/1: SMDK24XX: LED platform devices Patch from Ben Dooks Platform devices for the LEDs on all the SMDK24XX boards Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 1046d88001e7b8819f60dece2eaf1b44bf4b4460 tree 82a8f62e785375b2f43bbb3f2b52da60775b5b56 parent fc6612f627c697b348a4ef64f16fb373d86dbd76 author David Woodhouse Sun, 18 Jun 2006 22:44:21 +0100 committer David Woodhouse Sun, 18 Jun 2006 22:44:21 +0100 [JFFS2] Check CRC32 on dirent and data nodes each time they're read Also, make sure dirents are marked REF_UNCHECKED when we 'discover' them through eraseblock summary. Signed-off-by: David Woodhouse commit fc6612f627c697b348a4ef64f16fb373d86dbd76 tree 5367b23890ea9ec990e4855f22115ee8e7f7f125 parent 2ba72cb754bb091bb24a44e9682f7105110f7f38 author David Woodhouse Sun, 18 Jun 2006 18:35:10 +0100 committer David Woodhouse Sun, 18 Jun 2006 18:39:38 +0100 [JFFS2] When retiring nextblock, allocate a node_ref for the wasted space Failing to do so makes the calculated length of the last node incorrect, when we're not using eraseblock summaries. Signed-off-by: David Woodhouse commit 9df5db80a781c1a1c67388c82f64f835093c3cc3 tree 65f80286fefe7a85a1d2cdb74a9befdcf9084564 parent ebc67da65fda03cbe5b4019d91229287fddd5c6e author David Brownell Sun, 18 Jun 2006 16:39:33 +0100 committer Russell King Sun, 18 Jun 2006 16:39:33 +0100 [ARM] 3534/1: add spi support to lubbock platform Patch from David Brownell This adds the platform device for SSP/SPI controller, and declares the ads7846 device hooked up to it. Not all Lubbock boards appear to populate the connector needed to use this instead of the ucb1400 chip, but it can always be used as a temperature sensor. In short, this is probably most useful as an example of how to provide the configuration data used by the pxa2xx_spi driver. (Last tested against a slightly earlier version of that driver.) Signed-off-by: David Brownell Signed-off-by: Russell King commit ebc67da65fda03cbe5b4019d91229287fddd5c6e tree 7f1f77aa0525eecfca86f066d64938c62794e663 parent 36fe6a83b4a52276eebb929ff94896fa65d83401 author Tony Lindgren Sun, 18 Jun 2006 16:26:58 +0100 committer Russell King Sun, 18 Jun 2006 16:26:58 +0100 [ARM] 3554/1: ARM: Fix dyntick locking Patch from Tony Lindgren This patch fixes some dyntick locking issues on ARM as pointed out by Russell King. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 36fe6a83b4a52276eebb929ff94896fa65d83401 tree 503562ded0a767c7879b70d44e3f2309012a6903 parent 68d5969378fc21d9f70c0fdbc25176a68d873922 author Ben Dooks Sun, 18 Jun 2006 16:21:53 +0100 committer Russell King Sun, 18 Jun 2006 16:21:53 +0100 [ARM] 3553/1: S3C24XX: earlier print of cpu idcode info Patch from Ben Dooks Move the printk of the CPU information and IDCODE before the checking of the table entry validity to aide in debugging new cpu entries. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 68d5969378fc21d9f70c0fdbc25176a68d873922 tree 117635d7e73759a97bd34966320941c7f7b801a1 parent 4833acb2e19f669ce87c439a7d91ead600d8a7c9 author Ben Dooks Sun, 18 Jun 2006 16:21:52 +0100 committer Russell King Sun, 18 Jun 2006 16:21:52 +0100 [ARM] 3552/1: S3C24XX: Move VA of GPIO for low-level debug Patch from Ben Dooks Using the low-level debug routines early in the kernel debug cause the 1:1 mapping to get into the TLB, which is not flushed until after the CPU detection process (which needs the GPIO VA). This patch moves the VA for the GPIO to the same offset as the physical offset of the UART to the GPIO. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 4833acb2e19f669ce87c439a7d91ead600d8a7c9 tree 696cd2a5efa20f6780cb3c724ffad57f22c79a72 parent e2e5810f41646a400a9c6f941000db88d2ca10eb author Ben Dooks Sun, 18 Jun 2006 16:21:51 +0100 committer Russell King Sun, 18 Jun 2006 16:21:51 +0100 [ARM] 3551/1: S3C24XX: PM code failes to compile with CONFIG_DCACHE_WRITETHROUGH Patch from Ben Dooks If CONFIG_CPU_DCACHE_WRITETHOUGH is set, then the S3C24XX PM code fails to compile, as there is no need to flush the D-cache, the flush function arm920_flush_kern_cache_all() is not compiled. Fix the code to not use this if the config is set. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit e2e5810f41646a400a9c6f941000db88d2ca10eb tree d14e742b461939b44050677a7bc59752dfa3980c parent 45a7b9cf8e0634fa546e9e7ad29af990ab4afcf2 author Ben Dooks Sun, 18 Jun 2006 16:21:50 +0100 committer Russell King Sun, 18 Jun 2006 16:21:50 +0100 [ARM] 3550/1: OSIRIS: fix serial port map for 1:1 Patch from Ben Dooks The default serial port-mapping for the Osiris has the port 2 mapped onto the first serial port, and no port1. Correct this so port 1 is port. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 45a7b9cf8e0634fa546e9e7ad29af990ab4afcf2 tree 2a9910617eeebe7f70b4406fe7843908b2a0359e parent 5247593c9634309d1b9f7b549495b8e5ad521688 author Catalin Marinas Sun, 18 Jun 2006 16:21:50 +0100 committer Russell King Sun, 18 Jun 2006 16:21:50 +0100 [ARM] 3548/1: Fix the ARMv6 CPU id in compressed/head.S Patch from Catalin Marinas This code was still using the old format for the ARMv6 CPU id and it wasn't flushing the caches on the MPCore CPU (and other ARM1176 cores). The patch changes the mask bits to cope with the new id format. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit aca6ca10974aa78adfb47291722ce851160213e4 tree 5e1daa21e63d19c5bab1a2f00eb6b8e1dcc6e9ea parent 680714844fd1dcc6f03b22353103985be9d58db6 author Russell King Thu, 15 Jun 2006 20:28:03 +0100 committer Russell King Sun, 18 Jun 2006 16:17:45 +0100 [ARM] Gather common sigframe saving code into setup_sigframe() Gather the common sigmask savbing code inside setup_sigcontext(), and rename the function setup_sigframe(). Pass it a sigframe structure. Signed-off-by: Russell King commit 680714844fd1dcc6f03b22353103985be9d58db6 tree 9e0a0b1835690c4f796bdad5ca4e9eca720256f5 parent cb3504e8fa84870aabcf51c67e29675817e30836 author Russell King Thu, 15 Jun 2006 20:23:02 +0100 committer Russell King Sun, 18 Jun 2006 16:17:44 +0100 [ARM] Gather common sigframe restoration code into restore_sigframe() Gather the sigmask restoration code inside restore_sigcontext(), and rename the function restore_sigframe(). Pass it a sigframe structure. Signed-off-by: Russell King commit cb3504e8fa84870aabcf51c67e29675817e30836 tree 7c46380f8672e87ecc40cecb004772f5301ea0f8 parent 7d4fdc19fc134f69f3711c14e63caef56aee0f2a author Russell King Thu, 15 Jun 2006 20:18:25 +0100 committer Russell King Sun, 18 Jun 2006 16:17:43 +0100 [ARM] Re-use sigframe within rt_sigframe sigframe is now a contained subset of rt_sigframe, so we can start to re-use code which accesses sigframe data for both rt and non-rt signals. Signed-off-by: Russell King commit 7d4fdc19fc134f69f3711c14e63caef56aee0f2a tree 85d88f7807f295284cc05afd747e95c56ba2bc57 parent cc1a852137d6c12d50c372d61a1c5f763998536b author Russell King Thu, 15 Jun 2006 20:13:25 +0100 committer Russell King Sun, 18 Jun 2006 16:17:42 +0100 [ARM] Merge sigcontext and sigmask members of sigframe ucontext contains both the sigcontext and sigmask structures, and is also used for rt signal contexts. Re-use this structure for non-rt signals. Signed-off-by: Russell King commit cc1a852137d6c12d50c372d61a1c5f763998536b tree d7c01ac23534b98ae76af22f1a914b4a569176dc parent ce7a3fdc5c55fd01d8e2deda0daef84473644f8b author Russell King Thu, 15 Jun 2006 18:02:25 +0100 committer Russell King Sun, 18 Jun 2006 16:17:42 +0100 [ARM] Replace extramask with a full copy of the sigmask There's not much point in splitting the sigmask between two different locations, so copy it entirely into a proper sigset_t. This will eventually allow rt_sigframe and sigframe to share more code. Signed-off-by: Russell King commit ce7a3fdc5c55fd01d8e2deda0daef84473644f8b tree b2aad3635d9026b0cf9c415cffc6345f0af05295 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Russell King Thu, 15 Jun 2006 18:00:34 +0100 committer Russell King Sun, 18 Jun 2006 16:17:41 +0100 [ARM] Remove rt_sigframe puc and pinfo pointers These two members appear to be surplus to requirements. Discussing this issue with glibc folk: | > Additionally, do you see any need for these weird "puc" and "pinfo" | > pointers in the kernels rt_sigframe structure? Can we kill them? | | We can kill them. I checked with Phil B. about them last week, and he | didn't remember any reason they still needed to be there. And nothing | should know where they are on the stack. Unfortunately, doing this | will upset GDB, which knows that the saved registers are 0x88 bytes | above the stack pointer on entrance to an rt signal trampoline; but, | since puc and pinfo are quite recognizable, I can adapt GDB to support | the new layout if you want to remove them. So remove them. Signed-off-by: Russell King commit 5247593c9634309d1b9f7b549495b8e5ad521688 tree b9744271e43b76b22a43fd70d09c4b2aa81aa95f parent 254a1564fb6f9242782f9a8e5d59a212424686e8 author Paul Brook Tue, 16 May 2006 14:25:55 +0100 committer Russell King Sun, 18 Jun 2006 16:16:57 +0100 [ARM] 3335/1: Old-abi Thumb sys_syscall broken Patch from Paul Brook The old-abi sys_syscall syscall is broken when called from Thumb mode. It assumes the syscall number is an Arm syscall number (ie. starts from __NR_OABI_SYSCALL_BASE). In thumb mode syscall numbers start from zero. The patch below fixes this by clearing the nigh bits of the syscall number instead of inverting them. Technically this means we accept some invalid syscall numbers, but I can't see how that could be a problem. The two sets of numbers far apart that unimplemented syscalls should still be rejected. Signed-off-by: Paul Brook Signed-off-by: Russell King commit 254a1564fb6f9242782f9a8e5d59a212424686e8 tree cdac58eb69e29a35a1d744e4d29faaf56b16a276 parent 78818e477bf785391b02672d053fdbb2e111fb50 author Vitaly Wool Tue, 16 May 2006 11:54:38 +0100 committer Russell King Sun, 18 Jun 2006 16:16:56 +0100 [ARM] 3467/1: [3/3] Support for Philips PNX4008 platform: defconfig Patch from Vitaly Wool This patch adds default configuration file PNX4008 ARM platform. It\'s basically the same as the previos one. Signed-off-by: Vitaly Wool Signed-off-by: Dmitry Pervushin Signed-off-by: Russell King commit 78818e477bf785391b02672d053fdbb2e111fb50 tree d1a43ddfb1b966fe981c10c874bae4faad070f29 parent a5a503038e71a6b7d4bd9e596ac13087274e60c7 author Vitaly Wool Tue, 16 May 2006 11:54:37 +0100 committer Russell King Sun, 18 Jun 2006 16:16:55 +0100 [ARM] 3466/1: [2/3] Support for Philips PNX4008 platform: chip support Patch from Vitaly Wool This patch adds basic chip support for PNX4008 ARM platform. It's basically the same as the previous one, but with the rmk's comments taken into account. Signed-off-by: Vitaly Wool Signed-off-by: Dmitry Pervushin Signed-off-by: Russell King commit a5a503038e71a6b7d4bd9e596ac13087274e60c7 tree 81d8f31ba42d54ff65d4223584be7a77c3be38df parent 51cb21a9cd2e3bba8a69948794eb9480facdef45 author Vitaly Wool Tue, 16 May 2006 11:54:36 +0100 committer Russell King Sun, 18 Jun 2006 16:16:53 +0100 [ARM] 3465/1: [1/3] Support for Philips PNX4008 platform: headers Patch from Vitaly Wool This patch adds kernel headers for PNX4008 ARM platform. It's basically the same as the previos one, but with the rmk's comments taken into account. Signed-off-by: Vitaly Wool Signed-off-by: Dmitry Pervushin Signed-off-by: Russell King commit 51cb21a9cd2e3bba8a69948794eb9480facdef45 tree fde0724d77635c2f4c681b9f35b07e17314b6cf5 parent d4adcffb6574d3414f2e39d6ca1be5eccf97ac52 author Marc Singer Tue, 16 May 2006 11:41:43 +0100 committer Russell King Sun, 18 Jun 2006 16:16:51 +0100 [ARM] 3407/1: lpd7x: documetation update Patch from Marc Singer New documentation for the touchscreen controllers and LCD panels. Signed-off-by: Marc Singer Signed-off-by: Russell King commit d4adcffb6574d3414f2e39d6ca1be5eccf97ac52 tree 1604f18abc55dd1bf0679affb5e9b62fa31fc54e parent c97898614bf0ac9605333a2c99bdbcf4276a22bd author Marc Singer Tue, 16 May 2006 11:41:40 +0100 committer Russell King Sun, 18 Jun 2006 16:16:50 +0100 [ARM] 3406/1: lpd7x: compilation fix for smc91x Patch from Marc Singer Reworking of the adaptation macros to allow driver to compile again for the lpd7x's. Also, support added for the lh79520 so it may use the smc91x. Signed-off-by: Marc Singer Signed-off-by: Russell King commit c97898614bf0ac9605333a2c99bdbcf4276a22bd tree 9b947f1f4dd0f1e14ef0579cf4e48078ac7a2009 parent 903e2bbda92e5a14f8050154046a14230abb800b author Marc Singer Tue, 16 May 2006 11:41:32 +0100 committer Russell King Sun, 18 Jun 2006 16:16:49 +0100 [ARM] 3405/1: lpd7a40x: CPLD ssp driver Patch from Marc Singer Driver for operating SSP devices through LPD7A40X CPLD chip. This driver is used by the audio codecs. Signed-off-by: Marc Singer Signed-off-by: Russell King commit 903e2bbda92e5a14f8050154046a14230abb800b tree bbadc3277c9f72ea45d88a2e7892e7b001449aad parent 2514581eb13f778d70bdc270b8dc36bd6eaac4f8 author Marc Singer Tue, 16 May 2006 11:41:30 +0100 committer Russell King Sun, 18 Jun 2006 16:16:48 +0100 [ARM] 3404/1: lpd7a40x: AMBA CLCD support Patch from Marc Singer Board support and LCD panel configurations to integrate lh7a40x's with the amba clcd driver. Signed-off-by: Marc Singer Signed-off-by: Russell King commit 2514581eb13f778d70bdc270b8dc36bd6eaac4f8 tree 6b3bdfe588d0a55377b3344babe128dc745bde07 parent fb62c5a7043617dd9d678beafc368b217aa28da4 author Marc Singer Tue, 16 May 2006 11:41:29 +0100 committer Russell King Sun, 18 Jun 2006 16:16:47 +0100 [ARM] 3403/1: lpd7a40x: updated default configurations Patch from Marc Singer Revised default configuration files. Signed-off-by: Marc Singer Signed-off-by: Russell King commit fb62c5a7043617dd9d678beafc368b217aa28da4 tree 0e97b7e1ae185f0bfaef618c92d59d8b1368954d parent 638b266630db8d492255d340e18d46ba6ab1b057 author Marc Singer Tue, 16 May 2006 11:41:29 +0100 committer Russell King Sun, 18 Jun 2006 16:16:46 +0100 [ARM] 3402/1: lpd7a40x: serial driver bug fix Patch from Marc Singer The serial driver now sets up the third UART when it is to be used. Signed-off-by: Marc Singer Signed-off-by: Russell King commit 638b266630db8d492255d340e18d46ba6ab1b057 tree 305dbef19f1bbec6daaec98a52d38c15d47d3824 parent 2295196c30ea686389519f699f0ccbfbc5c3b94c author Marc Singer Tue, 16 May 2006 11:41:28 +0100 committer Russell King Sun, 18 Jun 2006 16:16:45 +0100 [ARM] 3401/1: lpd7a40x: platform update Patch from Marc Singer Updates to the lpd7a40x_platform files. Includes support for new architecture, lpd7a400. Signed-off-by: Marc Singer Signed-off-by: Russell King commit 2295196c30ea686389519f699f0ccbfbc5c3b94c tree 312918803ae8ec19276d7fd6ba1bcfbcdb31ecbf parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Marc Singer Tue, 16 May 2006 11:41:27 +0100 committer Russell King Sun, 18 Jun 2006 16:16:44 +0100 [ARM] 3400/1: lpd7a40x: platform headers update Patch from Marc Singer Updates to the lpd7a40x platform headers. Includes support for new architecture, lpd7a400. Signed-off-by: Marc Singer Signed-off-by: Russell King commit 14228a49913850493c7f9eb4501438c32da353f7 tree c2a7659494be68b310d94723ca0c3196038449e2 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Russell King Sun, 18 Jun 2006 13:00:48 +0100 committer Russell King Sun, 18 Jun 2006 13:00:48 +0100 [SERIAL] PARPORT_SERIAL should depend on SERIAL_8250_PCI Since parport_serial uses symbols from 8250_pci, there should be a dependency between the configuration symbols for these two modules. Problem reported by Andrey Borzenkov Signed-off-by: Russell King commit ef4d04b87d16839500a77aa1279f80be7ec4ef2e tree 58cd5908c66f90810c75505ff555023d9be00073 parent 57e580f885a62c21fe75e35e9e445fb6fb82509c author David Woodhouse Sun, 18 Jun 2006 12:58:53 +0100 committer David Woodhouse Sun, 18 Jun 2006 12:58:53 +0100 Add empty Kbuild files for 'make headers_install' in remaining arches. These include nothing more than the basic set of files listed in asm-generic/Kbuild.asm. Any extra arch-specific files will need to be added. Signed-off-by: David Woodhouse commit 57e580f885a62c21fe75e35e9e445fb6fb82509c tree f745b3e51d826908bb3de2a3a4a479fa6b7fd4a4 parent a29ee9f3bf49d9a19def177145dcb85fc021c096 author David Woodhouse Sun, 18 Jun 2006 12:45:15 +0100 committer David Woodhouse Sun, 18 Jun 2006 12:45:15 +0100 Add Kbuild file for Alpha 'make headers_install' Signed-off-by: David Woodhouse commit a29ee9f3bf49d9a19def177145dcb85fc021c096 tree ba748458b5107bc01187cf020f9230ed8a330557 parent dc901d6d2596d45f2c398e735125e5123b4e2774 author David Woodhouse Sun, 18 Jun 2006 12:22:49 +0100 committer David Woodhouse Sun, 18 Jun 2006 12:22:49 +0100 Add Kbuild file for SPARC 'make headers_install' Signed-off-by: David Woodhouse commit dc901d6d2596d45f2c398e735125e5123b4e2774 tree dca3099e14cc4066b2e1ae327213f7a04aee60ff parent 1e7c34994d809820dbe31220397b62660d8d1514 author David Woodhouse Sun, 18 Jun 2006 12:22:20 +0100 committer David Woodhouse Sun, 18 Jun 2006 12:22:20 +0100 Add Kbuild file for IA64 'make headers_install' Signed-off-by: David Woodhouse commit 1e7c34994d809820dbe31220397b62660d8d1514 tree 7a189d63f4971da727ea7dfb0c012838fab5c0ac parent c509075e711305d591760e4f0e8f57ff178cd501 author David Woodhouse Sun, 18 Jun 2006 12:22:02 +0100 committer David Woodhouse Sun, 18 Jun 2006 12:22:02 +0100 Add Kbuild file for S390 'make headers_install' Signed-off-by: David Woodhouse commit c509075e711305d591760e4f0e8f57ff178cd501 tree 2086c50437b3ae3cfc7ccb61b0027d9cc4932b1a parent 54863bb0d8782bbc81fe0275f1d20042fa14e32f author David Woodhouse Sun, 18 Jun 2006 12:19:46 +0100 committer David Woodhouse Sun, 18 Jun 2006 12:19:46 +0100 Add Kbuild file for i386 'make headers_install' Signed-off-by: David Woodhouse commit 54863bb0d8782bbc81fe0275f1d20042fa14e32f tree 2c13d5fdedd99b4b19522b5631742e1325fbea87 parent 6a87a86d064cee49b3c298c558b990b65d736cf4 author David Woodhouse Sun, 18 Jun 2006 12:19:11 +0100 committer David Woodhouse Sun, 18 Jun 2006 12:19:11 +0100 Add Kbuild file for x86_64 'make headers_install' Signed-off-by: David Woodhouse commit 6a87a86d064cee49b3c298c558b990b65d736cf4 tree b0f9971307adf3f7c25b15a64e375097ffc34025 parent 8555255f0b426858d8648c6206b70eb906cf4ec7 author David Woodhouse Sun, 18 Jun 2006 12:17:47 +0100 committer David Woodhouse Sun, 18 Jun 2006 12:17:47 +0100 Add Kbuild file for PowerPC 'make headers_install' Signed-off-by: David Woodhouse commit 8555255f0b426858d8648c6206b70eb906cf4ec7 tree 3afe2ae27f6390bd6cb2350a578fafc690fa7803 parent 684753599afc76aa8f66c731bafb7204b39265b8 author David Woodhouse Sun, 18 Jun 2006 12:14:01 +0100 committer David Woodhouse Sun, 18 Jun 2006 12:14:01 +0100 Add generic Kbuild files for 'make headers_install' This adds the Kbuild files listing the files which are to be installed by the 'headers_install' make target, in generic directories. Signed-off-by: David Woodhouse commit 684753599afc76aa8f66c731bafb7204b39265b8 tree 660da6e957637f063735c5f27090674d4249c573 parent 8d730cfb50cc77da6d00f941daef440918a1922f author David Woodhouse Sun, 18 Jun 2006 12:02:10 +0100 committer David Woodhouse Sun, 18 Jun 2006 12:02:10 +0100 Basic implementation of 'make headers_check' Based on the 'headers_install' target, this performs a basic sanity check on the exported headers -- so far only checking that they do not include any other headers which aren't selected for import, but easily extendable. Signed-off-by: David Woodhouse commit 8d730cfb50cc77da6d00f941daef440918a1922f tree 9679a9ba79e3c496058d351417a058432c42257d parent 9348f0de2d2b541b4ba64fb1f4efee9710a3d731 author David Woodhouse Sun, 18 Jun 2006 11:58:39 +0100 committer David Woodhouse Sun, 18 Jun 2006 11:58:39 +0100 Basic implementation of 'make headers_install' This adds a make target which exports a subset of headers which contain definitions which are useful for system libraries and tools. It uses the BSD 'unifdef' tool to remove instances of #ifdef __KERNEL__, and uses sed to remove markers like __user. Based on an original implementation by Arnd Bergmann Hacked about by David Woodhouse Reviewed and cleaned up by Sam Ravnborg Signed-off-by: David Woodhouse commit 2ba72cb754bb091bb24a44e9682f7105110f7f38 tree bff0ce7740916296861f7a40114bdc6d030d4c70 parent 3877f0b6c9f54d43e55e532404a935b90393b635 author David Woodhouse Sun, 18 Jun 2006 10:22:40 +0100 committer David Woodhouse Sun, 18 Jun 2006 10:22:40 +0100 [JFFS2] Mark XATTR support as experimental, for now Signed-off-by: David Woodhouse commit 2abac1db3522d9f56c695d1b42e77f3e52d4c51a tree e1a93a13f8dfb44dd5018e5dda2b074304baadac parent 72109368de7aaa5d489d9ca4641f4a11a6fc7653 author Dave Airlie Sun, 18 Jun 2006 16:12:27 +1000 committer Dave Airlie Sun, 18 Jun 2006 16:12:27 +1000 intelfb: fixup clock calculation debugging. The debugging code for pll clocks was wrong and causing div by 0. Signed-off-by: Dave Airlie commit 47552c4e555eefe381f3d45140b59a2ea4b16486 tree 674bb6f7371745fd49404f635404cea14af70f45 parent d5b9f4c083b0e3102f3101545279f623680cb3a0 author Herbert Xu Sat, 17 Jun 2006 23:00:20 -0700 committer David S. Miller Sat, 17 Jun 2006 23:00:20 -0700 [ETHTOOL]: Fix UFO typo The function ethtool_get_ufo was referring to ETHTOOL_GTSO instead of ETHTOOL_GUFO. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d5b9f4c083b0e3102f3101545279f623680cb3a0 tree 86d5f77d14a8ae687e585ec4535ca8038e450ab9 parent d7c2c9e3977e4312d093ac092761798d4d47c9e0 author Neil Horman Sat, 17 Jun 2006 22:59:03 -0700 committer David S. Miller Sat, 17 Jun 2006 22:59:03 -0700 [SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer. In the event that our entire receive buffer is full with a series of chunks that represent a single gap-ack, and then we accept a chunk (or chunks) that fill in the gap between the ctsn and the first gap, we renege chunks from the end of the buffer, which effectively does nothing but move our gap to the end of our received tsn stream. This does little but move our missing tsns down stream a little, and, if the sender is sending sufficiently large retransmit frames, the result is a perpetual slowdown which can never be recovered from, since the only chunk that can be accepted to allow progress in the tsn stream necessitates that a new gap be created to make room for it. This leads to a constant need for retransmits, and subsequent receiver stalls. The fix I've come up with is to deliver the frame without reneging if we have a full receive buffer and the receiving sockets sk_receive_queue is empty(indicating that the receive buffer is being blocked by a missing tsn). Signed-off-by: Neil Horman Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit d7c2c9e3977e4312d093ac092761798d4d47c9e0 tree 1228ed1e6729f8dd6069698e9221ac35790cf0c5 parent 503b55fd77d11381b1950d1651d3bc782c0cc2cd author Tsutomu Fujii Sat, 17 Jun 2006 22:58:28 -0700 committer David S. Miller Sat, 17 Jun 2006 22:58:28 -0700 [SCTP]: Send only 1 window update SACK per message. Right now, every time we increase our rwnd by more then MTU bytes, we trigger a SACK. When processing large messages, this will generate a SACK for almost every other SCTP fragment. However since we are freeing the entire message at the same time, we might as well collapse the SACK generation to 1. Signed-off-by: Tsutomu Fujii Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 503b55fd77d11381b1950d1651d3bc782c0cc2cd tree a960542bcc10b97218a601a94e56e579595c0a2c parent 4c9f5d5305a23851e67471b147e0d459a7166717 author Sridhar Samudrala Sat, 17 Jun 2006 22:57:28 -0700 committer David S. Miller Sat, 17 Jun 2006 22:57:28 -0700 [SCTP]: Don't do CRC32C checksum over loopback. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 4c9f5d5305a23851e67471b147e0d459a7166717 tree 6cacecfa0b61248b996dfe54d1f944c5bab32d6d parent 5636bef7324f49e36f05ec8a5f6284e11b1bcca4 author Vlad Yasevich Sat, 17 Jun 2006 22:56:08 -0700 committer David S. Miller Sat, 17 Jun 2006 22:56:08 -0700 [SCTP] Reset rtt_in_progress for the chunk when processing its sack. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 5636bef7324f49e36f05ec8a5f6284e11b1bcca4 tree b5e9e42560ba86ffbbd63a582df87844996b6d03 parent 402d68c43326d2f0e7e2e9a9013cd4c098d9b87c author Vlad Yasevich Sat, 17 Jun 2006 22:55:35 -0700 committer David S. Miller Sat, 17 Jun 2006 22:55:35 -0700 [SCTP]: Reject sctp packets with broadcast addresses. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 402d68c43326d2f0e7e2e9a9013cd4c098d9b87c tree a493d4130e07f14e29e89cc746a59475cbb073f4 parent c7ce1ae21223fe1f905feba272bc14b87994a57d author Vlad Yasevich Sat, 17 Jun 2006 22:54:51 -0700 committer David S. Miller Sat, 17 Jun 2006 22:54:51 -0700 [SCTP]: Limit association max_retrans setting in setsockopt. When using ASSOCINFO socket option, we need to limit the number of maximum association retransmissions to be no greater than the sum of all the path retransmissions. This is specified in Section 7.1.2 of the SCTP socket API draft. However, we only do this if the association has multiple paths. If there is only one path, the protocol stack will use the assoc_max_retrans setting when trying to retransmit packets. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit c7ce1ae21223fe1f905feba272bc14b87994a57d tree cd527489396fd9def8d19416fd05c2c11f794394 parent c5396a31b20991c856facbce18a2a56d1a14e8d0 author Tushar Gohad Sat, 17 Jun 2006 22:54:03 -0700 committer David S. Miller Sat, 17 Jun 2006 22:54:03 -0700 [PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate. Signed-off-by: Tushar Gohad Signed-off-by: David S. Miller commit c5396a31b20991c856facbce18a2a56d1a14e8d0 tree 39213f3e9cabee6ba2ffe7440a7a4efef8a1e033 parent b293acfd3133393a81bcd382eb71a210c9cf9526 author YOSHIFUJI Hideaki Sat, 17 Jun 2006 22:48:48 -0700 committer David S. Miller Sat, 17 Jun 2006 22:48:48 -0700 [IPV6]: Sum real space for RTAs. This patch fixes RTNLGRP_IPV6_IFINFO netlink notifications. Issue pointed out by Patrick McHardy . Signed-off-by: YOSHIFUJI Hideaki Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 4b6ace7f02cddb8c363ad27bb1e5014c6791e34a tree df99b49818371ee6dcdbfedaee66f457dafc3a68 parent b5ed7639c9f502898af4109e778f5613dacbfd9c parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Jeff Garzik Sun, 18 Jun 2006 01:22:42 -0400 committer Jeff Garzik Sun, 18 Jun 2006 01:22:42 -0400 Merge branch 'master' into upstream commit b293acfd3133393a81bcd382eb71a210c9cf9526 tree 0b940bd69064a6fafa725d442ce6d93ebbe5254c parent 2c6cc0d8539f121c3c75aa3641c19b67e8723379 author David S. Miller Sat, 17 Jun 2006 22:16:13 -0700 committer David S. Miller Sat, 17 Jun 2006 22:16:13 -0700 [IRDA]: Use put_unaligned() in irlmp_do_discovery(). irda_device_info->hints[] is byte aligned but is being accessed as a u16 Based upon a patch by Luke Yang . Signed-off-by: David S. Miller commit ea6e1e94f2cb9ae54bd1428e1ef3e84a749ceed8 tree 712ae925e95105b763b2fd851348288c53e78d55 parent db9ca5803566078aafe63cf364ef98b5097e4194 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Jeff Garzik Sun, 18 Jun 2006 01:15:45 -0400 committer Jeff Garzik Sun, 18 Jun 2006 01:15:45 -0400 Merge branch 'master' into upstream commit 2c6cc0d8539f121c3c75aa3641c19b67e8723379 tree dbc8cc8a5b3fd83734dc6b80b614136e663a017e parent 8648b3053bff39a7ee4c711d74268079c928a657 author Herbert Xu Sat, 17 Jun 2006 22:06:45 -0700 committer David S. Miller Sat, 17 Jun 2006 22:06:45 -0700 [BRIDGE]: Add support for NETIF_F_HW_CSUM devices As it is the bridge will only ever declare NETIF_F_IP_CSUM even if all its constituent devices support NETIF_F_HW_CSUM. This patch fixes this by supporting the first one out of NETIF_F_NO_CSUM, NETIF_F_HW_CSUM, and NETIF_F_IP_CSUM that is supported by all constituent devices. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 8648b3053bff39a7ee4c711d74268079c928a657 tree 6de70eedf63c4b965d04040323827f1bc520ccdf parent 00b7050426da8e7e58c889c5c80a19920d2d41b3 author Herbert Xu Sat, 17 Jun 2006 22:06:05 -0700 committer David S. Miller Sat, 17 Jun 2006 22:06:05 -0700 [NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM The current stack treats NETIF_F_HW_CSUM and NETIF_F_NO_CSUM identically so we test for them in quite a few places. For the sake of brevity, I'm adding the macro NETIF_F_GEN_CSUM for these two. We also test the disjunct of NETIF_F_IP_CSUM and the other two in various places, for that purpose I've added NETIF_F_ALL_CSUM. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 00b7050426da8e7e58c889c5c80a19920d2d41b3 tree 55a07464fdf81b23fced966feca2b041af77c6f6 parent c71302d61f844f766a44e1b04258086cc41f624e author Michael Chan Sat, 17 Jun 2006 21:58:45 -0700 committer David S. Miller Sat, 17 Jun 2006 21:58:45 -0700 [TG3]: Convert to non-LLTX Herbert Xu pointed out that it is unsafe to call netif_tx_disable() from LLTX drivers because it uses dev->xmit_lock to synchronize whereas LLTX drivers use private locks. Convert tg3 to non-LLTX to fix this issue. tg3 is a lockless driver where hard_start_xmit and tx completion handling can run concurrently under normal conditions. A tx_lock is only needed to prevent netif_stop_queue and netif_wake_queue race condtions when the queue is full. So whether we use LLTX or non-LLTX, it makes practically no difference. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c71302d61f844f766a44e1b04258086cc41f624e tree 678780353e025222ce87667466bba599c4c21d97 parent 35089bb203f44e33b6bbb6c4de0b0708f9a48921 author Michael Chan Sat, 17 Jun 2006 21:55:55 -0700 committer David S. Miller Sat, 17 Jun 2006 21:55:55 -0700 [TG3]: Remove unnecessary tx_lock Remove tx_lock where it is unnecessary. tg3 runs lockless and so it requires interrupts to be disabled and sync'ed, netif_queue and NAPI poll to be stopped before the device can be reconfigured. After stopping everything, it is no longer necessary to get the tx_lock. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 35089bb203f44e33b6bbb6c4de0b0708f9a48921 tree 3e9ca3dbc12a063121c3ecba2558400307d4acd5 parent 9e1881dec9e3e8f8408551cddfda489857a7ec99 author David S. Miller Tue, 13 Jun 2006 22:33:04 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:53 -0700 [TCP]: Add tcp_slow_start_after_idle sysctl. A lot of people have asked for a way to disable tcp_cwnd_restart(), and it seems reasonable to add a sysctl to do that. Signed-off-by: David S. Miller commit 9e1881dec9e3e8f8408551cddfda489857a7ec99 tree 2b4b131ee096e2ad604117d14a85cbd49c7090e5 parent c86a31f452f7dd132a1765d6d7160b0947f37b14 author Michael Chan Tue, 13 Jun 2006 15:04:12 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:51 -0700 [BNX2]: Update version and reldate Update driver version to 1.4.42. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c86a31f452f7dd132a1765d6d7160b0947f37b14 tree b531650af625d24958bb59b511a1e4157525dc1e parent 7a6400cd3dbcfc3bbffcdb6dac4ffc957fb50e19 author Michael Chan Tue, 13 Jun 2006 15:03:47 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:49 -0700 [BNX2]: Use CPU native page size Use CPU native page size to determine various ring sizes. This allows order-0 memory allocations on all systems. Added check to limit the page size to 16K since that's the maximum rx ring size that will be used. This will prevent using unnecessarily large page sizes on some architectures with large page sizes. [Suggested by David Miller] Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 7a6400cd3dbcfc3bbffcdb6dac4ffc957fb50e19 tree 521d780caa40ccf034c4f612cdd0c916f146a96b parent fba9fe911bb4213c3de1d142fe0ee127cd361a78 author Michael Chan Mon, 12 Jun 2006 22:22:17 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:47 -0700 [BNX2]: Use compressed firmware Change bnx2_fw.h to use compressed text for all CPU images. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit fba9fe911bb4213c3de1d142fe0ee127cd361a78 tree 2fc7a68e612644cc8ce3ff8e44f210e20f6964b4 parent 160882722cb21cbe5cead55cf38a5e70fc3af63e author Michael Chan Mon, 12 Jun 2006 22:21:25 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:44 -0700 [BNX2]: Add firmware decompression Add functions to decompress firmware before loading to the internal CPUs. Compressing the firmware reduces the driver size significantly. Added file name length sanity check in the gzip header to prevent going past the end of buffer [suggested by DaveM]. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 160882722cb21cbe5cead55cf38a5e70fc3af63e tree 76753321be54ae173132df788cece79a12651901 parent cea94db9b496d7fe25bbd3ebd0f24afaac2069d5 author Michael Chan Mon, 12 Jun 2006 22:16:43 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:42 -0700 [BNX2]: Allow WoL settings on new 5708 chips Allow WOL settings on 5708 B2 and newer chips that have the problem fixed. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit cea94db9b496d7fe25bbd3ebd0f24afaac2069d5 tree e425453a1f5fcc28c4db9c750f825161a58d03ac parent bc726a71d2799f0f8b68a17f49d86aa030f64abc author Michael Chan Mon, 12 Jun 2006 22:16:13 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:40 -0700 [BNX2]: Add an rx drop counter Add a counter for packets dropped by firmware. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit bc726a71d2799f0f8b68a17f49d86aa030f64abc tree d16e9cc28069700c8f0a7cc8878ef04edab2206e parent b3a92eabe5b67bd207a38ae13dd51f4e08c1f6f7 author Luca De Cicco Sun, 11 Jun 2006 23:02:19 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:38 -0700 [TCP] Westwood: reset RTT min after FRTO RTT_min is updated each time a timeout event occurs in order to cope with hard handovers in wireless scenarios such as UMTS. Signed-off-by: Luca De Cicco Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b3a92eabe5b67bd207a38ae13dd51f4e08c1f6f7 tree 511472b1fb5e71e810dd73c9d8b11c12d9aa0efe parent b7d7a9e3c900f0733bf2aabdd41e6dbc70eae94b author Luca De Cicco Sun, 11 Jun 2006 23:01:59 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:36 -0700 [TCP] Westwood: bandwidth filter startup The bandwidth estimate filter is now initialized with the first sample in order to have better performances in the case of small file transfers. Signed-off-by: Luca De Cicco Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b7d7a9e3c900f0733bf2aabdd41e6dbc70eae94b tree fa8d5b51f68ea0decac901026f7f6d6648d75614 parent f61e29018a30c738e1298e1b13be956aa17ee17b author Luca De Cicco Sun, 11 Jun 2006 23:01:39 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:34 -0700 [TCP] Westwood: comment fixes Cleanup some comments and add more references Signed-off-by: Luca De Cicco Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f61e29018a30c738e1298e1b13be956aa17ee17b tree 1ea51ae6fd477d9e3271d8eb8b2cec24f6fa39b2 parent bdeb04c6d9a957ae2a51c3033414467b82b2a736 author Stephen Hemminger Sun, 11 Jun 2006 23:01:02 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:32 -0700 [TCP] Westwood: fix first sample Need to update send sequence number tracking after first ack. Rework of patch from Luca De Cicco. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit bdeb04c6d9a957ae2a51c3033414467b82b2a736 tree 7e457169cd43dc8367067bff23f1b3fad6eb98b2 parent d1e100ba69131bb788e89a07b94b08f6e006725a author Stephen Hemminger Sun, 11 Jun 2006 21:20:38 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:30 -0700 [NET]: net.ipv4.ip_autoconfig sysctl removal The sysctl net.ipv4.ip_autoconfig is a legacy value that is not used. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d1e100ba69131bb788e89a07b94b08f6e006725a tree 8ece0a94f8920803b8a36e6ecdce7d0196e978d3 parent 8ef80aef118e405f2b6505f623830e6e73224f85 author Alexey Dobriyan Sun, 11 Jun 2006 20:57:17 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:28 -0700 [BNX2]: Endian fixes. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 8ef80aef118e405f2b6505f623830e6e73224f85 tree 6abecac69d73eb3ffb884e29eb6ecc3c1d39cb7e parent f8d596211291a8d98efa47ae0261326218f310cf author Nick Fedchik Sun, 11 Jun 2006 20:56:02 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:26 -0700 [IRDA]: irda-usb.c: STIR421x cleanups This cleans the STIR421x part of the irda-usb code. We also no longer try to load all existing firmwares but only the matching one (according to the USB id we get from the dongle). Signed-off-by: Nick Fedchik Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit f8d596211291a8d98efa47ae0261326218f310cf tree 957501662f985e72ab2ec6f086bc9feefb9e6a60 parent 3cc0e873986fe594d0e96d07259b11f755325cb2 author Alexey Dobriyan Sat, 10 Jun 2006 18:05:35 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:24 -0700 [IPX]: Endian bug in ipxrtr_route_packet() Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 3cc0e873986fe594d0e96d07259b11f755325cb2 tree 5d3e9a57333a2d7088a6a63c09bc97db98f480af parent b38dfee3d616ffadb58d4215e3ff9d1d7921031e author Herbert Xu Fri, 09 Jun 2006 16:13:38 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:22 -0700 [NET]: Warn in __skb_trim if skb is paged It's better to warn and fail rather than rarely triggering BUG on paths that incorrectly call skb_trim/__skb_trim on a non-linear skb. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b38dfee3d616ffadb58d4215e3ff9d1d7921031e tree 55ae104c8522e973291f490c9902580de798ae93 parent c8c9f9a3de2c50c876b1068dd41f9a06c5749f80 author Herbert Xu Fri, 09 Jun 2006 16:13:01 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:20 -0700 [NET]: skb_trim audit I found a few more spots where pskb_trim_rcsum could be used but were not. This patch changes them to use it. Also, sk_filter can get paged skb data. Therefore we must use pskb_trim instead of skb_trim. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit c8c9f9a3de2c50c876b1068dd41f9a06c5749f80 tree 18cb4685232e030518d637fa7496a95bc69fc6d8 parent 364c6badde0dd62a0a38e5ed67f85d87d6665780 author Herbert Xu Fri, 09 Jun 2006 16:11:27 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:18 -0700 [NET] ppp: Remove unnecessary pskb_may_pull In ppp_receive_nonmp_frame, we call pskb_may_pull(skb, skb->len) if the tailroom is >= 124. This is pointless because this pskb_may_pull is only needed if the skb is non-linear. However, if it is non-linear then the tailroom would be zero. So it can be safely removed. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 364c6badde0dd62a0a38e5ed67f85d87d6665780 tree 56c8ad3e3f45fafec010da4f5858825db5dbc86c parent 932ff279a43ab7257942cddff2595acd541cc49b author Herbert Xu Fri, 09 Jun 2006 16:10:40 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:16 -0700 [NET]: Clean up skb_linearize The linearisation operation doesn't need to be super-optimised. So we can replace __skb_linearize with __pskb_pull_tail which does the same thing but is more general. Also, most users of skb_linearize end up testing whether the skb is linear or not so it helps to make skb_linearize do just that. Some callers of skb_linearize also use it to copy cloned data, so it's useful to have a new function skb_linearize_cow to copy the data if it's either non-linear or cloned. Last but not least, I've removed the gfp argument since nobody uses it anymore. If it's ever needed we can easily add it back. Misc bugs fixed by this patch: * via-velocity error handling (also, no SG => no frags) Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 932ff279a43ab7257942cddff2595acd541cc49b tree e60130673a20d71becdac858c2589d8dfbf3ae1f parent bf0857ea32addb6bc8b46383604b218b8ec09f19 author Herbert Xu Fri, 09 Jun 2006 12:20:56 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:14 -0700 [NET]: Add netif_tx_lock Various drivers use xmit_lock internally to synchronise with their transmission routines. They do so without setting xmit_lock_owner. This is fine as long as netpoll is not in use. With netpoll it is possible for deadlocks to occur if xmit_lock_owner isn't set. This is because if a printk occurs while xmit_lock is held and xmit_lock_owner is not set can cause netpoll to attempt to take xmit_lock recursively. While it is possible to resolve this by getting netpoll to use trylock, it is suboptimal because netpoll's sole objective is to maximise the chance of getting the printk out on the wire. So delaying or dropping the message is to be avoided as much as possible. So the only alternative is to always set xmit_lock_owner. The following patch does this by introducing the netif_tx_lock family of functions that take care of setting/unsetting xmit_lock_owner. I renamed xmit_lock to _xmit_lock to indicate that it should not be used directly. I didn't provide irq versions of the netif_tx_lock functions since xmit_lock is meant to be a BH-disabling lock. This is pretty much a straight text substitution except for a small bug fix in winbond. It currently uses netif_stop_queue/spin_unlock_wait to stop transmission. This is unsafe as an IRQ can potentially wake up the queue. So it is safer to use netif_tx_disable. The hamradio bits used spin_lock_irq but it is unnecessary as xmit_lock must never be taken in an IRQ handler. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit bf0857ea32addb6bc8b46383604b218b8ec09f19 tree 84b92a237f4f5e538f401dcbcc2725c75cc06955 parent 2b2283d0302d520f08ded41c2ca17886dfbb865a author Patrick McHardy Fri, 09 Jun 2006 12:18:47 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:11 -0700 [NETFILTER]: hashlimit match: fix random initialization hashlimit does: if (!ht->rnd) get_random_bytes(&ht->rnd, 4); ignoring that 0 is also a valid random number. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 2b2283d0302d520f08ded41c2ca17886dfbb865a tree 35b8cfa9a50107a73b6e47552eae433133f16931 parent a0e889bb1bdc083dbbdb02cce9698765847b841f author Patrick McHardy Fri, 09 Jun 2006 12:18:17 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:09 -0700 [NETFILTER]: recent match: missing refcnt initialization Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a0e889bb1bdc083dbbdb02cce9698765847b841f tree 3f176b4be0d7821f7104303f856839579deb0091 parent 4e5ab4cb85683cf77b507ba0c4d48871e1562305 author Patrick McHardy Fri, 09 Jun 2006 12:17:41 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:07 -0700 [NETFILTER]: recent match: fix "sleeping function called from invalid context" create_proc_entry must not be called with locks held. Use a mutex instead to protect data only changed in user context. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 4e5ab4cb85683cf77b507ba0c4d48871e1562305 tree aef7ba8b6050fcaccbaf0d05f8e5ba860a143eaf parent 100468e9c05c10fb6872751c1af523b996d6afa9 author James Morris Fri, 09 Jun 2006 00:33:33 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:05 -0700 [SECMARK]: Add new packet controls to SELinux Add new per-packet access controls to SELinux, replacing the old packet controls. Packets are labeled with the iptables SECMARK and CONNSECMARK targets, then security policy for the packets is enforced with these controls. To allow for a smooth transition to the new controls, the old code is still present, but not active by default. To restore previous behavior, the old controls may be activated at runtime by writing a '1' to /selinux/compat_net, and also via the kernel boot parameter selinux_compat_net. Switching between the network control models requires the security load_policy permission. The old controls will probably eventually be removed and any continued use is discouraged. With this patch, the new secmark controls for SElinux are disabled by default, so existing behavior is entirely preserved, and the user is not affected at all. It also provides a config option to enable the secmark controls by default (which can always be overridden at boot and runtime). It is also noted in the kconfig help that the user will need updated userspace if enabling secmark controls for SELinux and that they'll probably need the SECMARK and CONNMARK targets, and conntrack protocol helpers, although such decisions are beyond the scope of kernel configuration. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 100468e9c05c10fb6872751c1af523b996d6afa9 tree 2ad0e988897a3636cbe5353a7624232c62b0968a parent 7c9728c393dceb724d66d696cfabce82151a78e5 author James Morris Fri, 09 Jun 2006 00:32:39 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:03 -0700 [SECMARK]: Add CONNSECMARK xtables target Add a new xtables target, CONNSECMARK, which is used to specify rules for copying security marks from packets to connections, and for copyying security marks back from connections to packets. This is similar to the CONNMARK target, but is more limited in scope in that it only allows copying of security marks to and from packets, as this is all it needs to do. A typical scenario would be to apply a security mark to a 'new' packet with SECMARK, then copy that to its conntrack via CONNMARK, and then restore the security mark from the connection to established and related packets on that connection. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 7c9728c393dceb724d66d696cfabce82151a78e5 tree af2b67ff7c579d669d01f28af33929f780b9c1b3 parent 5e6874cdb8de94cd3c15d853a8ef9c6f4c305055 author James Morris Fri, 09 Jun 2006 00:31:46 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:01 -0700 [SECMARK]: Add secmark support to conntrack Add a secmark field to IP and NF conntracks, so that security markings on packets can be copied to their associated connections, and also copied back to packets as required. This is similar to the network mark field currently used with conntrack, although it is intended for enforcement of security policy rather than network policy. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 5e6874cdb8de94cd3c15d853a8ef9c6f4c305055 tree 3f289088db7512d55d6e46d1d14c5d18f07f9b4f parent 984bc16cc92ea3c247bf34ad667cfb95331b9d3c author James Morris Fri, 09 Jun 2006 00:30:57 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:59 -0700 [SECMARK]: Add xtables SECMARK target Add a SECMARK target to xtables, allowing the admin to apply security marks to packets via both iptables and ip6tables. The target currently handles SELinux security marking, but can be extended for other purposes as needed. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 984bc16cc92ea3c247bf34ad667cfb95331b9d3c tree 2342638457f43980501179056f4ba1e4e3c2c1aa parent c749b29fae74ed59c507d84025b3298202b42609 author James Morris Fri, 09 Jun 2006 00:29:17 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:57 -0700 [SECMARK]: Add secmark support to core networking. Add a secmark field to the skbuff structure, to allow security subsystems to place security markings on network packets. This is similar to the nfmark field, except is intended for implementing security policy, rather than than networking policy. This patch was already acked in principle by Dave Miller. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c749b29fae74ed59c507d84025b3298202b42609 tree c06b1fb17cce425692f7ab40b2df8c5b00d8c931 parent 29a395eac4c320c570e73f0a90d8953d80da8359 author James Morris Fri, 09 Jun 2006 00:28:25 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:55 -0700 [SECMARK]: Add SELinux exports Add and export new functions to the in-kernel SELinux API in support of the new secmark-based packet controls. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 29a395eac4c320c570e73f0a90d8953d80da8359 tree 9d34d7987754004e76de76d3f9facbee804779b7 parent 3e3ff15e6d8ba931fa9a6c7f9fe711edc77e96e5 author James Morris Fri, 09 Jun 2006 00:27:28 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:53 -0700 [SECMARK]: Add new flask definitions to SELinux Secmark implements a new scheme for adding security markings to packets via iptables, as well as changes to SELinux to use these markings for security policy enforcement. The rationale for this scheme is explained and discussed in detail in the original threads: http://thread.gmane.org/gmane.linux.network/34927/ http://thread.gmane.org/gmane.linux.network/35244/ Examples of policy and rulesets, as well as a full archive of patches for iptables and SELinux userland, may be found at: http://people.redhat.com/jmorris/selinux/secmark/ The code has been tested with various compilation options and in several scenarios, including with 'complicated' protocols such as FTP and also with the new generic conntrack code with IPv6 connection tracking. This patch: Add support for a new object class ('packet'), and associated permissions ('send', 'recv', 'relabelto'). These are used to enforce security policy for network packets labeled with SECMARK, and for adding labeling rules. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 3e3ff15e6d8ba931fa9a6c7f9fe711edc77e96e5 tree e3b3edcf5092e9533539f6e8abdda83eee2cb96d parent 6f68dc37759b1d6ff3b4d4a9d097605a09f8f043 author Christopher J. PeBenito Fri, 09 Jun 2006 00:25:03 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:51 -0700 [SELINUX]: add security class for appletalk sockets Add a security class for appletalk sockets so that they can be distinguished in SELinux policy. Please apply. Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 6f68dc37759b1d6ff3b4d4a9d097605a09f8f043 tree 7d0be960b8c0ec5b947637a0650f1c639002103a parent 9dadaa19cb11a8db38072a92a3f95deab7a797fb author David S. Miller Thu, 08 Jun 2006 23:58:52 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:49 -0700 [NET]: Fix warnings after LSM-IPSEC changes. Assignment used as truth value in xfrm_del_sa() and xfrm_get_policy(). Wrong argument type declared for security_xfrm_state_delete() when SELINUX is disabled. Signed-off-by: David S. Miller commit 9dadaa19cb11a8db38072a92a3f95deab7a797fb tree 30a173768a0a84194c89898ecba1cb2a1bd49619 parent c8c05a8eec6f1258f6d5cb71a44ee5dc1e989b63 author Dave Jones Thu, 08 Jun 2006 23:42:09 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:47 -0700 [NET]: NET_TCPPROBE Kconfig fix Just spotted this typo in a new option. Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c8c05a8eec6f1258f6d5cb71a44ee5dc1e989b63 tree b4a04dd9e2b940cb5b2911fb67fbe49c5f8b3fbf parent cec6f7f39c3db7d9f6091bf2f8fc8d520f372719 author Catherine Zhang Thu, 08 Jun 2006 23:39:49 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:45 -0700 [LSM-IPsec]: SELinux Authorize This patch contains a fix for the previous patch that adds security contexts to IPsec policies and security associations. In the previous patch, no authorization (besides the check for write permissions to SAD and SPD) is required to delete IPsec policies and security assocations with security contexts. Thus a user authorized to change SAD and SPD can bypass the IPsec policy authorization by simply deleteing policies with security contexts. To fix this security hole, an additional authorization check is added for removing security policies and security associations with security contexts. Note that if no security context is supplied on add or present on policy to be deleted, the SELinux module allows the change unconditionally. The hook is called on deletion when no context is present, which we may want to change. At present, I left it up to the module. LSM changes: The patch adds two new LSM hooks: xfrm_policy_delete and xfrm_state_delete. The new hooks are necessary to authorize deletion of IPsec policies that have security contexts. The existing hooks xfrm_policy_free and xfrm_state_free lack the context to do the authorization, so I decided to split authorization of deletion and memory management of security data, as is typical in the LSM interface. Use: The new delete hooks are checked when xfrm_policy or xfrm_state are deleted by either the xfrm_user interface (xfrm_get_policy, xfrm_del_sa) or the pfkey interface (pfkey_spddelete, pfkey_delete). SELinux changes: The new policy_delete and state_delete functions are added. Signed-off-by: Catherine Zhang Signed-off-by: Trent Jaeger Acked-by: James Morris Signed-off-by: David S. Miller commit cec6f7f39c3db7d9f6091bf2f8fc8d520f372719 tree 08142a001fa9b010056202293697c7b5aea6bae8 parent f86502bfc177f69bbabbedb78ebf710579ae0e54 author Andreas Schwab Mon, 05 Jun 2006 21:21:57 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:43 -0700 [CONNECTOR]: Fix warning in cn_queue.c cn_queue.c:130: warning: value computed is not used There is no point in testing the atomic value if the result is thrown away. From Evgeniy: It was created to put implicit smp barrier, but it is not needed there. Signed-off-by: Andreas Schwab Signed-off-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit f86502bfc177f69bbabbedb78ebf710579ae0e54 tree 07a1551eb832f1c7c437c2d959f44d68e7c24a6a parent 6d7416535097ed0943bdae8e69c14ba43061cab1 author David S. Miller Mon, 05 Jun 2006 21:19:24 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:41 -0700 [IPV4] icmp: Kill local 'ip' arg in icmp_redirect(). It is typed wrong, and it's only assigned and used once. So just pass in iph->daddr directly which fixes both problems. Based upon a patch by Alexey Dobriyan. Signed-off-by: David S. Miller commit 6d7416535097ed0943bdae8e69c14ba43061cab1 tree f71792b9ac32edd8016900067b55dff8f3941cf3 parent 338fcf9886df9ad2873772197a73a57818973316 author Alexey Dobriyan Mon, 05 Jun 2006 21:06:41 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:39 -0700 [IPV4]: Right prototype of __raw_v4_lookup() All users pass 32-bit values as addresses and internally they're compared with 32-bit entities. So, change "laddr" and "raddr" types to __be32. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 338fcf9886df9ad2873772197a73a57818973316 tree 3d58fed24e4c171110788ad479093a9b4ba27133 parent 70df2311ee3fc607e7511873d7dade5bd17d593d author Alexey Dobriyan Mon, 05 Jun 2006 21:04:39 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:37 -0700 [IPV4] igmp: Fixup struct ip_mc_list::multiaddr type All users except two expect 32-bit big-endian value. One is of ->multiaddr = ->multiaddr variety. And last one is "%08lX". Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 70df2311ee3fc607e7511873d7dade5bd17d593d tree b47ade0173eef5c30fbe57cc9ceea204783b2def parent 738980ffa658c86bd494ebb242ce8e44aff16a9e author David S. Miller Mon, 05 Jun 2006 17:59:20 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:35 -0700 [TCP]: Fix compile warning in tcp_probe.c The suseconds_t et al. are not necessarily any particular type on every platform, so cast to unsigned long so that we can use one printf format string and avoid warnings across the board Signed-off-by: David S. Miller commit 738980ffa658c86bd494ebb242ce8e44aff16a9e tree 92076c6d40f3024d760a5439e564473d70511af0 parent a42e9d6ce89cfd19aee9f990b7231ce697f0d00f author Stephen Hemminger Mon, 05 Jun 2006 17:30:56 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:33 -0700 [TCP]: Limited slow start for Highspeed TCP Implementation of RFC3742 limited slow start. Added as part of the TCP highspeed congestion control module. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a42e9d6ce89cfd19aee9f990b7231ce697f0d00f tree 3afea026bdf3698fd81509925d8cf7d5f1e95fbd parent 72dc5b9225c53310c010b68a70ea97c8c8e24bdf author Stephen Hemminger Mon, 05 Jun 2006 17:30:32 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:31 -0700 [TCP]: TCP Probe congestion window tracing This adds a new module for tracking TCP state variables non-intrusively using kprobes. It has a simple /proc interface that outputs one line for each packet received. A sample usage is to collect congestion window and ssthresh over time graphs. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 72dc5b9225c53310c010b68a70ea97c8c8e24bdf tree ebd23e7cbe9846414b6fa8f8327f37043447e019 parent a4ed25849532728effaa0665c92e08e029e41407 author Stephen Hemminger Mon, 05 Jun 2006 17:30:08 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:29 -0700 [TCP]: Minimum congestion window consolidation. Many of the TCP congestion methods all just use ssthresh as the minimum congestion window on decrease. Rather than duplicating the code, just have that be the default if that handle in the ops structure is not set. Minor behaviour change to TCP compound. It probably wants to use this (ssthresh) as lower bound, rather than ssthresh/2 because the latter causes undershoot on loss. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a4ed25849532728effaa0665c92e08e029e41407 tree 812c1da0f0052715ae07e3beb088344115c27daf parent f890f921040fef6a35e39d15b729af1fd1a35f29 author Stephen Hemminger Mon, 05 Jun 2006 17:29:39 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:27 -0700 [TCP]: TCP Compound quad root function The original code did a 64 bit divide directly, which won't work on 32 bit platforms. Rather than doing a 64 bit square root twice, just implement a 4th root function in one pass using Newton's method. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f890f921040fef6a35e39d15b729af1fd1a35f29 tree 130ee6a827a092cc205d6054d2e11f185e60ad1c parent 76f1017757aa0c308a0b83ca611c9a89ee9a79a4 author Angelo P. Castellani Mon, 05 Jun 2006 17:29:09 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:25 -0700 [TCP]: TCP Compound congestion control TCP Compound is a sender-side only change to TCP that uses a mixed Reno/Vegas approach to calculate the cwnd. For further details look here: ftp://ftp.research.microsoft.com/pub/tr/TR-2005-86.pdf Signed-off-by: Angelo P. Castellani Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 76f1017757aa0c308a0b83ca611c9a89ee9a79a4 tree 2599325e5774525b5ea0088f1c64cbd2e1f40410 parent 7c106d7e782bd4805f39da30e81018f861b4b8c5 author Bin Zhou Mon, 05 Jun 2006 17:28:30 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:23 -0700 [TCP]: TCP Veno congestion control TCP Veno module is a new congestion control module to improve TCP performance over wireless networks. The key innovation in TCP Veno is the enhancement of TCP Reno/Sack congestion control algorithm by using the estimated state of a connection based on TCP Vegas. This scheme significantly reduces "blind" reduction of TCP window regardless of the cause of packet loss. This work is based on the research paper "TCP Veno: TCP Enhancement for Transmission over Wireless Access Networks." C. P. Fu, S. C. Liew, IEEE Journal on Selected Areas in Communication, Feb. 2003. Original paper and many latest research works on veno: http://www.ntu.edu.sg/home/ascpfu/veno/veno.html Signed-off-by: Bin Zhou Cheng Peng Fu Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 7c106d7e782bd4805f39da30e81018f861b4b8c5 tree a0bf2f8820c599151ee951a412e86039da3a11ba parent 2f45c340e09242641d4f11498c3be48b35abb926 author Wong Hoi Sing Edison Mon, 05 Jun 2006 17:27:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:21 -0700 [TCP]: TCP Low Priority congestion control TCP Low Priority is a distributed algorithm whose goal is to utilize only the excess network bandwidth as compared to the ``fair share`` of bandwidth as targeted by TCP. Available from: http://www.ece.rice.edu/~akuzma/Doc/akuzma/TCP-LP.pdf Original Author: Aleksandar Kuzmanovic See http://www-ece.rice.edu/networks/TCP-LP/ for their implementation. As of 2.6.13, Linux supports pluggable congestion control algorithms. Due to the limitation of the API, we take the following changes from the original TCP-LP implementation: o We use newReno in most core CA handling. Only add some checking within cong_avoid. o Error correcting in remote HZ, therefore remote HZ will be keeped on checking and updating. o Handling calculation of One-Way-Delay (OWD) within rtt_sample, sicne OWD have a similar meaning as RTT. Also correct the buggy formular. o Handle reaction for Early Congestion Indication (ECI) within pkts_acked, as mentioned within pseudo code. o OWD is handled in relative format, where local time stamp will in tcp_time_stamp format. Port from 2.4.19 to 2.6.16 as module by: Wong Hoi Sing Edison Hung Hing Lun Signed-off-by: Wong Hoi Sing Edison Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 2f45c340e09242641d4f11498c3be48b35abb926 tree 9a14226719f9a1e10d7ef219e24404570be155f2 parent c45fb1089e714146206d7e295ff337893424c874 author Andrew Morton Fri, 02 Jun 2006 16:29:20 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:19 -0700 [LLC]: Fix double receive of SKB. Oops fix from Stephen: remove duplicate rcv() calls. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c45fb1089e714146206d7e295ff337893424c874 tree 6482dbb72e3670e4ab7ee3b81683383dad4f7c9c parent ae5b7d8ba2c28d7d9835856fe0ca5f6ec95ea768 author Alexey Dobriyan Mon, 29 May 2006 18:27:32 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:17 -0700 [NETFILTER]: PPTP helper: fixup gre_keymap_lookup() return type GRE keys are 16-bit wide. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ae5b7d8ba2c28d7d9835856fe0ca5f6ec95ea768 tree 54de467b6ee9344a51c8b254be3da933b57cc531 parent e44ab66a75e20c02193440a5e27c16c91630109b author Patrick McHardy Mon, 29 May 2006 18:27:09 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:15 -0700 [NETFILTER]: Add SIP connection tracking helper Add SIP connection tracking helper. Originally written by Christian Hentschel , some cleanup, minor fixes and bidirectional SIP support added by myself. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e44ab66a75e20c02193440a5e27c16c91630109b tree 13aa30980b223b19720ff5d864d43e3708339fdc parent c0d4cfd96dd0cc0dbf49435898808b5553af4822 author Patrick McHardy Mon, 29 May 2006 18:26:47 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:13 -0700 [NETFILTER]: H.323 helper: replace internal_net_addr parameter by routing-based heuristic Call Forwarding doesn't need to create an expectation if both peers can reach each other without our help. The internal_net_addr parameter lets the user explicitly specify a single network where this is true, but is not very flexible and even fails in the common case that calls will both be forwarded to outside parties and inside parties. Use an optional heuristic based on routing instead, the assumption is that if bpth the outgoing device and the gateway are equal, both peers can reach each other directly. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c0d4cfd96dd0cc0dbf49435898808b5553af4822 tree aa8fb9afbed9da300bb22adfd3798fe7e196cee0 parent c95261693467f0aeac7fafa69860ddfb02bc12f8 author Jing Min Zhao Mon, 29 May 2006 18:26:27 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:11 -0700 [NETFILTER]: H.323 helper: Add support for Call Forwarding Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c95261693467f0aeac7fafa69860ddfb02bc12f8 tree 07d8686091cfe893d021e6d897983331fc596b3c parent 7d8c50181778b6ba10c2bba9a2f22db9493bb245 author Patrick McHardy Mon, 29 May 2006 18:25:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:09 -0700 [NETFILTER]: amanda helper: convert to textsearch infrastructure When a port number within a packet is replaced by a differently sized number only the packet is resized, but not the copy of the data. Following port numbers are rewritten based on their offsets within the copy, leading to packet corruption. Convert the amanda helper to the textsearch infrastructure to avoid the copy entirely. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7d8c50181778b6ba10c2bba9a2f22db9493bb245 tree b0a87854e0c377eccca3849351951d5456687729 parent 695ecea3299dba2239d1cb4fd4d4e4c95a5b9ce7 author Patrick McHardy Mon, 29 May 2006 18:25:38 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:07 -0700 [NETFILTER]: FTP helper: search optimization Instead of skipping search entries for the wrong direction simply index them by direction. Based on patch by Pablo Neira Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 695ecea3299dba2239d1cb4fd4d4e4c95a5b9ce7 tree 5262c56a6d34a355ac424a0b63757eb32d94ac08 parent 89f2e21883b59a6ff1e64d0b4924d06b1c6101ba author Patrick McHardy Mon, 29 May 2006 18:25:14 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:05 -0700 [NETFILTER]: SNMP helper: fix debug module param type debug is the debug level, not a bool. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 89f2e21883b59a6ff1e64d0b4924d06b1c6101ba tree 86c26d648afcfa3a37270189a33867cbf0d38f9b parent 3726add76643c715d437aceda320d319153b6113 author Patrick McHardy Mon, 29 May 2006 18:24:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:03 -0700 [NETFILTER]: ctnetlink: change table dumping not to require an unique ID Instead of using the ID to find out where to continue dumping, take a reference to the last entry dumped and try to continue there. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3726add76643c715d437aceda320d319153b6113 tree 70b343ab57ae6575ebc2828cc1e8bab24c4df120 parent 997ae831ade74bdaed4172b1c02060b9efd6e206 author Patrick McHardy Mon, 29 May 2006 18:24:39 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:01 -0700 [NETFILTER]: ctnetlink: fix NAT configuration The current configuration only allows to configure one manip and overloads conntrack status flags with netlink semantic. Signed-off-by: Patrick Mchardy Signed-off-by: David S. Miller commit 997ae831ade74bdaed4172b1c02060b9efd6e206 tree feca25f5c27c47724ecfbcc66f4f437619fb57ed parent 39a27a35c5c1b5be499a0576a35c45a011788bf8 author Eric Leblond Mon, 29 May 2006 18:24:20 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:59 -0700 [NETFILTER]: conntrack: add fixed timeout flag in connection tracking Add a flag in a connection status to have a non updated timeout. This permits to have connection that automatically die at a given time. Signed-off-by: Eric Leblond Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 39a27a35c5c1b5be499a0576a35c45a011788bf8 tree ec5383eec578c455ca5a14184dc9398bbc5f9afb parent 6442f1cf897643d4ca597f2f7d3464b765bae960 author Patrick McHardy Mon, 29 May 2006 18:23:54 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:57 -0700 [NETFILTER]: conntrack: add sysctl to disable checksumming Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6442f1cf897643d4ca597f2f7d3464b765bae960 tree 0708a7d312c1db1f78c20df9cbdfc9f5e6218523 parent 404bdbfd242cb99ca0e9d3eb5fbb5bcd54123081 author Patrick McHardy Mon, 29 May 2006 18:21:53 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:55 -0700 [NETFILTER]: conntrack: don't call helpers for related ICMP messages None of the existing helpers expects to get called for related ICMP packets and some even drop them if they can't parse them. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 404bdbfd242cb99ca0e9d3eb5fbb5bcd54123081 tree a6a0ad112275016d3e622d4ab53cac6f2e0dcd3d parent f3389805e53a13bd969ee1c8fc5a4137b7c6c167 author Patrick McHardy Mon, 29 May 2006 18:21:34 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:53 -0700 [NETFILTER]: recent match: replace by rewritten version Replace the unmaintainable ipt_recent match by a rewritten version that should be fully compatible. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f3389805e53a13bd969ee1c8fc5a4137b7c6c167 tree f73b639579da1f201c1886027d59960380c2296a parent 62b7743483b402f8fb73545d5d487ca714e82766 author Patrick McHardy Mon, 29 May 2006 18:21:00 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:51 -0700 [NETFILTER]: x_tables: add statistic match Add statistic match which is a combination of the nth and random matches. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 62b7743483b402f8fb73545d5d487ca714e82766 tree f90e434e85c1f4391ad46310ee128ce25c1dca57 parent 957dc80ac30f3c4d53259fa936df807663ba54fa author Patrick McHardy Mon, 29 May 2006 18:20:32 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:49 -0700 [NETFILTER]: x_tables: add quota match Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 957dc80ac30f3c4d53259fa936df807663ba54fa tree 4815a3d43700d79868f50c83b4850502a12a7dd4 parent 3e72b2fe5b31791f976350b023b7a37ef59c02c1 author Patrick McHardy Mon, 29 May 2006 18:19:56 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:47 -0700 [NETFILTER]: x_tables: add SCTP/DCCP support where missing Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3e72b2fe5b31791f976350b023b7a37ef59c02c1 tree 94c34d9264d68141c11530cb94f58ed4d03a1dbd parent 73654d61e556483ad324b90989eae26b22df6ef6 author Patrick McHardy Mon, 29 May 2006 18:19:19 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:45 -0700 [NETFILTER]: x_tables: remove some unnecessary casts Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 73654d61e556483ad324b90989eae26b22df6ef6 tree f3aee3be0e35bb6012917b71ed77301de6b39ad4 parent 31a4ab93025719e62e7cf7ce899f71c34ecde5a0 author Herbert Xu Sat, 27 May 2006 23:06:33 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:43 -0700 [IPSEC] xfrm: Use IPPROTO_MAX instead of 256 The size of the type_map array (256) comes from the number of IP protocols, i.e., IPPROTO_MAX. This patch is based on a suggestion from Ingo Oeser. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 31a4ab93025719e62e7cf7ce899f71c34ecde5a0 tree 60404c5fd1124882753b38e334656a15f8de0804 parent b59f45d0b2878ab76f8053b0973654e6621828ee author Herbert Xu Sat, 27 May 2006 23:06:13 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:41 -0700 [IPSEC] proto: Move transport mode input path into xfrm_mode_transport Now that we have xfrm_mode objects we can move the transport mode specific input decapsulation code into xfrm_mode_transport. This removes duplicate code as well as unnecessary header movement in case of tunnel mode SAs since we will discard the original IP header immediately. This also fixes a minor bug for transport-mode ESP where the IP payload length is set to the correct value minus the header length (with extension headers for IPv6). Of course the other neat thing is that we no longer have to allocate temporary buffers to hold the IP headers for ESP and IPComp. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b59f45d0b2878ab76f8053b0973654e6621828ee tree 40dc5e2ede2620f7935fb3dae0d0eb199851f611 parent 546be2405be119ef55467aace45f337a16e5d424 author Herbert Xu Sat, 27 May 2006 23:05:54 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:39 -0700 [IPSEC] xfrm: Abstract out encapsulation modes This patch adds the structure xfrm_mode. It is meant to represent the operations carried out by transport/tunnel modes. By doing this we allow additional encapsulation modes to be added without clogging up the xfrm_input/xfrm_output paths. Candidate modes include 4-to-6 tunnel mode, 6-to-4 tunnel mode, and BEET modes. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 546be2405be119ef55467aace45f337a16e5d424 tree 9b09f0041f9f82a20ab25ace3c7360e4a4b7989f parent 9cb3528cdbffc513eb9fb8faa45d41e397355830 author Herbert Xu Sat, 27 May 2006 23:03:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:37 -0700 [IPSEC] xfrm: Undo afinfo lock proliferation The number of locks used to manage afinfo structures can easily be reduced down to one each for policy and state respectively. This is based on the observation that the write locks are only held by module insertion/removal which are very rare events so there is no need to further differentiate between the insertion of modules like ipv6 versus esp6. The removal of the read locks in xfrm4_policy.c/xfrm6_policy.c might look suspicious at first. However, after you realise that nobody ever takes the corresponding write lock you'll feel better :) As far as I can gather it's an attempt to guard against the removal of the corresponding modules. Since neither module can be unloaded at all we can leave it to whoever fixes up IPv6 unloading :) Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 9cb3528cdbffc513eb9fb8faa45d41e397355830 tree 468eaacb1e62026f737c621f9c3e00806be71fd1 parent df3e6548186f0baa727cd6d3a492891854bd31f2 author Michael Chan Sat, 17 Jun 2006 21:28:28 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:28 -0700 [TG3]: update version and reldate Update version to 3.60. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit df3e6548186f0baa727cd6d3a492891854bd31f2 tree 525617b51451b730b0723d57258c6a8bf7f53d09 parent 30b6c28d2aca4669f2e609ad5d77ea2a6cf0dd3a author Michael Chan Fri, 26 May 2006 17:48:07 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:26 -0700 [TG3]: Add recovery logic when MMIOs are re-ordered Add recovery logic when we suspect that the system is re-ordering MMIOs. Re-ordered MMIOs to the send mailbox can cause bogus tx completions and hit BUG_ON() in the tx completion path. tg3 already has logic to handle re-ordered MMIOs by flushing the MMIOs that must be strictly ordered (such as the send mailbox). Determining when to enable the flush is currently a manual process of adding known chipsets to a list. The new code replaces the BUG_ON() in the tx completion path with the call to tg3_tx_recover(). It will set the TG3_FLAG_MBOX_WRITE_REORDER flag and reset the chip later in the workqueue to recover and start flushing MMIOs to the mailbox. A message to report the problem will be printed. We will then decide whether or not to add the host bridge to the list of chipsets that do re-ordering. We may add some additional code later to print the host bridge's ID so that the user can report it more easily. The assumption that re-ordering can only happen on x86 systems is also removed. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 30b6c28d2aca4669f2e609ad5d77ea2a6cf0dd3a tree eb7d8cf4f45b1030aaa17cb816fe1bbdbd35abd8 parent 898b1d16f8230fb912a0c2248df685735c6ceda3 author Michael Chan Fri, 26 May 2006 17:44:45 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:24 -0700 [TG3]: Add 5786 PCI ID Add PCI ID for BCM5786 which is a variant of 5787. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 898b1d16f8230fb912a0c2248df685735c6ceda3 tree e5e78b80373b4e2c74d9870d70f9deee0b3f7677 parent bc1d6937e6cf4e81a5afeae2c9cf35ffb0905ba5 author Samuel Ortiz Thu, 25 May 2006 16:21:10 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:22 -0700 [IRDA]: ali-ircc: using device model power management This patch gets rid of the old power management code and now uses the device model for the ali-ircc driver. Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit bc1d6937e6cf4e81a5afeae2c9cf35ffb0905ba5 tree b8cbfa60a9f296d24c0ca558906cd7457062bf97 parent c6ae522e3a50fc1ec483d7f03ece9c7a25e6de95 author Christoph Hellwig Thu, 25 May 2006 16:20:19 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:20 -0700 [IRDA]: stir4200, switching to the kthread API stir4200 uses a kernel thread for its TX/RX operations, and it is now converted to the kernel kthread API. Tested on an STIR4200 based dongle. Signed-off-by: Christoph Hellwig Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit c6ae522e3a50fc1ec483d7f03ece9c7a25e6de95 tree 98a67649b473bfc64751458283aeb3bb47e76703 parent 15986e1aadbbf40a331cddd0470bb434d156431d author Samuel Ortiz Thu, 25 May 2006 16:19:22 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:18 -0700 [IRDA]: Initial support for MCS7780 based dongles The MosChip MCS7780 chipset is an IrDA USB bridge that doesn't conform with the IrDA-USB standard and thus needs its separate driver. Tested on an actual MCS7780 based dongle. Original implementation by Brian Pugh Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 15986e1aadbbf40a331cddd0470bb434d156431d tree bcfa9d6d58fbf89184a951c4738d9d3ec8cae0d5 parent 11dc1f36a6701b502ecb695f308aae46ede8bac6 author David S. Miller Thu, 25 May 2006 16:11:14 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:16 -0700 [TCP]: tcp_rcv_rtt_measure_ts() call in pure-ACK path is superfluous We only want to take receive RTT mesaurements for data bearing frames, here in the header prediction fast path for a pure-sender, we know that we have a pure-ACK and thus the checks in tcp_rcv_rtt_mesaure_ts() will not pass. Signed-off-by: David S. Miller commit 11dc1f36a6701b502ecb695f308aae46ede8bac6 tree e510f5514b3885489c8fe9a1661a7fa7b9e88f8d parent c090971326db094ed702c1f8f2dbe04b7e3b8f27 author Stephen Hemminger Thu, 25 May 2006 16:00:12 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:14 -0700 [BRIDGE]: netlink interface for link management Add basic netlink support to the Ethernet bridge. Including: * dump interfaces in bridges * monitor link status changes * change state of bridge port For some demo programs see: http://developer.osdl.org/shemminger/prototypes/brnl.tar.gz These are to allow building a daemon that does alternative implementations of Spanning Tree Protocol. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c090971326db094ed702c1f8f2dbe04b7e3b8f27 tree 9c964fc79298455eb4b45981a34a6117175ff846 parent 9ef513bed68534110727381ab652f06756803f5a author Stephen Hemminger Thu, 25 May 2006 15:59:33 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:12 -0700 [BRIDGE]: fix module startup error handling Return address in use, if some other kernel code has the SAP. Propogate out error codes from netfilter registration and unwind. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 9ef513bed68534110727381ab652f06756803f5a tree d4981dbce1d613c68d022ed3509eb3bf41c7c4fb parent bc0e646796928918e45b6465e02616f2fe65c3c1 author Stephen Hemminger Thu, 25 May 2006 15:58:54 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:10 -0700 [BRIDGE]: optimize conditional in forward path Small optimizations of bridge forwarding path. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit bc0e646796928918e45b6465e02616f2fe65c3c1 tree 8c7a52563188e7e4168cd98b58b980c8096c02ce parent 8f182b494f87799d6ae20a1401825c516da46081 author Stephen Hemminger Thu, 25 May 2006 15:10:37 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:08 -0700 [LLC]: add multicast support for datagrams Allow mulitcast reception of datagrams (similar to UDP). All sockets bound to the same SAP receive a clone. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8f182b494f87799d6ae20a1401825c516da46081 tree 509fc735e59cb1094cd68029a9e0a4b9a9a01e86 parent 23dbe7912dad6be71bb9e69cb819d05e2442d362 author Stephen Hemminger Thu, 25 May 2006 15:10:02 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:06 -0700 [LLC]: allow applications to get copy of kernel datagrams It is legal for an application to bind to a SAP that is also being used by the kernel. This happens if the bridge module binds to the STP SAP, and the user wants to have a daemon for STP as well. It is possible to have kernel doing STP on one bridge, but let application do RSTP on another bridge. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 23dbe7912dad6be71bb9e69cb819d05e2442d362 tree 89fedd1d2c2c1ab710cfd90e8a8bb1f513935797 parent 29efcd2666b3a465b40aa07ef1f4d79847303e2f author Stephen Hemminger Thu, 25 May 2006 15:09:37 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:04 -0700 [LLC]: use rcu_dereference on receive handler The receive hander pointer might be modified during network changes of protocol. So use rcu_dereference (only matters on alpha). Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 29efcd2666b3a465b40aa07ef1f4d79847303e2f tree 6d1b3bb6543a24a6aa1a319adea20fbcea7b930a parent aecbd4e45c2e469e0452ffb2c0b0d881e2815bb8 author Stephen Hemminger Thu, 25 May 2006 15:08:59 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:02 -0700 [LLC]: allow datagram recvmsg LLC receive is broken for SOCK_DGRAM. If an application does recv() on a datagram socket and there is no data present, don't return "not connected". Instead, just do normal datagram semantics. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit aecbd4e45c2e469e0452ffb2c0b0d881e2815bb8 tree 4e5a1e9e2625287acfcb27e693c634700bf57611 parent 17f3ae08b6e7fd778371f2cafbd1c988a67ee343 author Stephen Hemminger Thu, 25 May 2006 15:08:30 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:00 -0700 [LLC]: use more efficient ether address routines Use more cache efficient Ethernet address manipulation functions in etherdevice.h. Signed-off-by: Stephen Hemminger commit 17f3ae08b6e7fd778371f2cafbd1c988a67ee343 tree 9e33f603469628d9bbe679bede945d61e7417dbf parent 1a2449a87bb7606113b1aa1a9d3c3e78ef189a1c author Andrew Morton Thu, 25 May 2006 13:26:53 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:58 -0700 [I/OAT]: Do not use for_each_cpu(). for_each_cpu() is going away (and is gone in -mm). Signed-off-by: Andrew Morton Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 1a2449a87bb7606113b1aa1a9d3c3e78ef189a1c tree 86e833a8694f201de138697646e7e8469e9c8ef6 parent 9593782585e0cf70babe787a8463d492a68b1744 author Chris Leech Tue, 23 May 2006 18:05:53 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:56 -0700 [I/OAT]: TCP recv offload to I/OAT Locks down user pages and sets up for DMA in tcp_recvmsg, then calls dma_async_try_early_copy in tcp_v4_do_rcv Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 9593782585e0cf70babe787a8463d492a68b1744 tree 149401a3973036452a07bed899e70d3b92abe1bf parent 624d1164730d58a494cc5aa4afa37d02c41e83a7 author Chris Leech Tue, 23 May 2006 18:02:55 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:54 -0700 [I/OAT]: Add a sysctl for tuning the I/OAT offloaded I/O threshold Any socket recv of less than this ammount will not be offloaded Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 624d1164730d58a494cc5aa4afa37d02c41e83a7 tree b6cc0776a826f8f2611eff41149410c7f4ccb355 parent 0e4b4992b8007c6b62ec143cbbb292f98813ca11 author Chris Leech Tue, 23 May 2006 18:01:28 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:52 -0700 [I/OAT]: Make sk_eat_skb I/OAT aware. Add an extra argument to sk_eat_skb, and make it move early copied packets to the async_wait_queue instead of freeing them. Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 0e4b4992b8007c6b62ec143cbbb292f98813ca11 tree fccdef8ec226d1febc5f7c22a793b10337026187 parent 97fc2f0848c928c63c2ae619deee61a0b1107b69 author Chris Leech Tue, 23 May 2006 18:00:16 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:50 -0700 [I/OAT]: Rename cleanup_rbuf to tcp_cleanup_rbuf and make non-static Needed to be able to call tcp_cleanup_rbuf in tcp_input.c for I/OAT Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 97fc2f0848c928c63c2ae619deee61a0b1107b69 tree 651f5ec78128605736d6c777a13697d5e58a1b62 parent de5506e155276d385712c2aa1c2d9a27cd4ed947 author Chris Leech Tue, 23 May 2006 17:55:33 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:48 -0700 [I/OAT]: Structure changes for TCP recv offload to I/OAT Adds an async_wait_queue and some additional fields to tcp_sock, and a dma_cookie_t to sk_buff. Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit de5506e155276d385712c2aa1c2d9a27cd4ed947 tree 219c30dab27b9aef2597d8735dfc19db8454849e parent db21733488f84a596faaad0d05430b3f51804692 author Chris Leech Tue, 23 May 2006 17:50:37 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:46 -0700 [I/OAT]: Utility functions for offloading sk_buff to iovec copies Provides for pinning user space pages in memory, copying to iovecs, and copying from sk_buffs including fragmented and chained sk_buffs. Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit db21733488f84a596faaad0d05430b3f51804692 tree a2c1f6d39ce27d2e86b395f2bf536c1ab7396411 parent 57c651f74cd8383df10a648e677902849de1bc0b author Chris Leech Sat, 17 Jun 2006 21:24:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:24:58 -0700 [I/OAT]: Setup the networking subsystem as a DMA client Attempts to allocate per-CPU DMA channels Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 57c651f74cd8383df10a648e677902849de1bc0b tree caf432ce2828b25e17cea3cff523e481c740c65e parent 6b00c92c4b26428cd80e966380c07103556f7b14 author David S. Miller Tue, 23 May 2006 17:39:49 -0700 committer David S. Miller Sat, 17 Jun 2006 21:18:50 -0700 [I/OAT]: Move PCI_DEVICE_ID_INTEL_IOAT to linux/pci_ids.h Signed-off-by: David S. Miller commit 6b00c92c4b26428cd80e966380c07103556f7b14 tree ffaa433a8a0f64285e2365084cf83b329f2070cb parent 0bbd5f4e97ff9c057b385a1886b4aed1fb0300f1 author David S. Miller Tue, 23 May 2006 17:37:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:18:48 -0700 [I/OAT]: ioatdma.c needs linux/dma-mapping.h For DMA_*_MASK defines. Signed-off-by: David S. Miller commit 0bbd5f4e97ff9c057b385a1886b4aed1fb0300f1 tree 0c3d8528c31e8291fb78c2e7a287910987ed2888 parent c13c8260da3155f2cefb63b0d1b7dcdcb405c644 author Chris Leech Tue, 23 May 2006 17:35:34 -0700 committer David S. Miller Sat, 17 Jun 2006 21:18:46 -0700 [I/OAT]: Driver for the Intel(R) I/OAT DMA engine Adds a new ioatdma driver Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit c13c8260da3155f2cefb63b0d1b7dcdcb405c644 tree ecfe02fa44a423a948f5fb5ad76497da2bb7a402 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Chris Leech Tue, 23 May 2006 17:18:44 -0700 committer David S. Miller Sat, 17 Jun 2006 21:18:43 -0700 [I/OAT]: DMA memcpy subsystem Provides an API for offloading memory copies to DMA devices Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 9ead190bfde2a434c74ea604382d08acb2eceef5 tree 937f1bb8dedea56efc46aed12370bb3865898763 parent c93b6fbaa99bb3a1552e14317296be14dde51dfb author Roland Dreier Sat, 17 Jun 2006 20:44:49 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:44:49 -0700 IB/uverbs: Don't serialize with ib_uverbs_idr_mutex Currently, all userspace verbs operations that call into the kernel are serialized by ib_uverbs_idr_mutex. This can be a scalability issue for some workloads, especially for devices driven by the ipath driver, which needs to call into the kernel even for datapath operations. Fix this by adding reference counts to the userspace objects, and then converting ib_uverbs_idr_mutex into a spinlock that only protects the idrs long enough to take a reference on the object being looked up. Because remove operations may fail, we have to do a slightly funky two-step deletion, which is described in the comments at the top of uverbs_cmd.c. This also still leaves ib_uverbs_idr_lock as a single lock that is possibly subject to contention. However, the lock hold time will only be a single idr operation, so multiple threads should still be able to make progress, even if ib_uverbs_idr_lock is being ping-ponged. Surprisingly, these changes even shrink the object code: add/remove: 23/5 grow/shrink: 4/21 up/down: 633/-693 (-60) Signed-off-by: Roland Dreier commit c93b6fbaa99bb3a1552e14317296be14dde51dfb tree bad61dc728f0eb28fcfdf01953cd0ae43a4b2350 parent c9c5d9feef86debee4d8e77a738ad86877cf371a author Roland Dreier Sat, 17 Jun 2006 20:37:41 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:41 -0700 IB/mthca: Make all device methods truly reentrant Documentation/infiniband/core_locking.txt says: All of the methods in struct ib_device exported by a low-level driver must be fully reentrant. The low-level driver is required to perform all synchronization necessary to maintain consistency, even if multiple function calls using the same object are run simultaneously. However, mthca's modify_qp, modify_srq and resize_cq methods are currently not reentrant. Add a mutex to the QP, SRQ and CQ structures so that these calls can be properly serialized. Signed-off-by: Roland Dreier commit c9c5d9feef86debee4d8e77a738ad86877cf371a tree 692adc21d8337a063be7e159860ded87b6e6829a parent 3463175d6ee55fdbd5cda2a03415e2068599b2b7 author Roland Dreier Sat, 17 Jun 2006 20:37:41 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:41 -0700 IB/mthca: Fix memory leak on modify_qp error paths Some error paths after the mthca_alloc_mailbox() call in mthca_modify_qp() just do a "return -EINVAL" without freeing the mailbox. Convert these returns to "goto out" to avoid leaking the mailbox storage. Signed-off-by: Roland Dreier commit 3463175d6ee55fdbd5cda2a03415e2068599b2b7 tree f629b7c65894d591d861bb121a71f67d0b960f36 parent 92b1582268e269b3a9e54e186e740396f0f2012b author Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 IB/uverbs: Factor out common idr code Factor out common code for adding a userspace object to an idr into a function idr_add_uobj(). This shrinks both the source and object code: add/remove: 1/0 grow/shrink: 0/6 up/down: 57/-220 (-163) function old new delta idr_add_uobj - 57 +57 ib_uverbs_create_ah 543 512 -31 ib_uverbs_create_srq 662 630 -32 ib_uverbs_reg_mr 737 699 -38 ib_uverbs_create_cq 639 600 -39 ib_uverbs_alloc_pd 485 446 -39 ib_uverbs_create_qp 1020 979 -41 Signed-off-by: Roland Dreier commit 92b1582268e269b3a9e54e186e740396f0f2012b tree 6dee998bb8c363ccecdf1f36f155875aea80cdc1 parent 77f76013e3ffda605b20184db5862ce1efcb6f5a author Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 IB/uverbs: Don't decrement usecnt on error paths In error paths when destroying an object, uverbs should not decrement associated objects' usecnt, since ib_dereg_mr(), ib_destroy_qp(), etc. already do that. Signed-off-by: Roland Dreier commit 77f76013e3ffda605b20184db5862ce1efcb6f5a tree ce0c5fb39d891027e2609f74a160eb54b15dce37 parent ca222c6b2c48e1e0be330a55611ba394251330cb author Ganapathi CH Sat, 17 Jun 2006 20:37:40 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 IB/uverbs: Release lock on error path If ibdev->alloc_ucontext() fails then ib_uverbs_get_context() does not unlock file->mutex before returning error. Signed-off by: Ganapathi CH Signed-off-by: Roland Dreier commit ca222c6b2c48e1e0be330a55611ba394251330cb tree 80491af9034f3cadad8b68fdb140bb6909f4e48e parent 6d969a471ba107d94cf03dab3c69f45b9733f500 author Sean Hefty Sat, 17 Jun 2006 20:37:40 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 IB/cm: Use address handle helpers Use new ib_init_ah_from_wc() and ib_init_ah_from_path() helper functions to clean up the IB CM. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6d969a471ba107d94cf03dab3c69f45b9733f500 tree 7a9fea5c2a321434e5c4c3bc590393728b85b4dd parent 4e00d69454a8747798de11dc4eeef1edeee5ce98 author Sean Hefty Sat, 17 Jun 2006 20:37:39 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:39 -0700 IB/sa: Add ib_init_ah_from_path() Add a call to initialize address handle attributes given a path record. This is used by the CM, and would be useful for users of UD QPs. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 4e00d69454a8747798de11dc4eeef1edeee5ce98 tree e09582595f80e1e7479c4f8b5a559be0db9ac251 parent 75af9088514432ef0c1052ba3767ceb0beb6f101 author Sean Hefty Sat, 17 Jun 2006 20:37:39 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:39 -0700 IB: Add ib_init_ah_from_wc() Add a function to initialize address handle attributes from a work completion. This functionality is duplicated by both verbs and the CM. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 75af9088514432ef0c1052ba3767ceb0beb6f101 tree 92f312a058889beef2c85a18b9b7f231947c7590 parent 526b4caa0a48382115fa9d8f7d8caf68dbcaa2bf author Sean Hefty Sat, 17 Jun 2006 20:37:39 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:39 -0700 IB/ucm: Get rid of duplicate P_Key parameter The P_Key is provided into a SIDR REQ in two places, once as a parameter, and again in the path record. Remove the P_Key as a parameter and always use the one given in the path record. This change has no practical effect on ABI functionality. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 526b4caa0a48382115fa9d8f7d8caf68dbcaa2bf tree 82383da15f298a7d42f161e12bea175f55b78dea parent 0c0450db31481aa01a04e7faecc93ee6841972d6 author Ishai Rabinovitz Sat, 17 Jun 2006 20:37:38 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:38 -0700 IB/srp: Factor out common request reset code Misc cleanups in ib_srp: 1) I think that it is more efficient to move the req entries from req_list to free_list in srp_reconnect_target (rather than rebuild the free_list). (In any case this code is shorter). 2) This allows us to reuse code in srp_reset_device and srp_reconnect_target and call a new function srp_reset_req. Signed-off-by: Ishai Rabinovitz Signed-off-by: Roland Dreier commit 0c0450db31481aa01a04e7faecc93ee6841972d6 tree c7a1ed2896345d022011831f8a9aaa21e8d8ff00 parent 73c0996b1ca60338fa50e42acfcebd32b7636a8b author Ramachandra K Sat, 17 Jun 2006 20:37:38 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:38 -0700 IB/srp: Support SRP rev. 10 targets There has been a change in the format of port identifiers between revision 10 of the SRP specification and the current revision 16A. Revision 10 specifies port identifier format as lower 8 bytes : GUID upper 8 bytes : Extension Whereas revision 16A specifies it as lower 8 bytes : Extension upper 8 bytes : GUID There are older targets (e.g. SilverStorm Virtual Fibre Channel Bridge) which conform to revision 10 of the SRP specification. The I/O class of revision 10 is 0xFF00 and the I/O class of revision 16A is 0x0100. For supporting older targets, this patch: 1) Adds a new optional target creation parameter "io_class". Default value of io_class is 0x0100 (i.e. revision 16A) 2) Uses the correct port identifier format for targets with IO class of 0xFF00 (i.e. conforming to revision 10) Signed-off-by: Ramachandra K Signed-off-by: Roland Dreier commit 73c0996b1ca60338fa50e42acfcebd32b7636a8b tree d4c0378fbac112b25e3a1adf66b06a8d0a32087d parent 6c8c1aa25d213a288df381f431ce5b6a155146ec author Ramachandra K Sat, 17 Jun 2006 20:37:38 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:38 -0700 [SCSI] srp.h: Add I/O Class values Add enum values for I/O Class values from rev. 10 and rev. 16a SRP drafts. The values are used to detect targets that implement obsolete revisions of SRP, so that the initiator can use the old format for port identifier when connecting to them. Signed-off-by: Ramachandra K Signed-off-by: Roland Dreier commit 6c8c1aa25d213a288df381f431ce5b6a155146ec tree 379670131076d3ca0af68f9e91f6f038e86e0e96 parent d4cb0784fd1ea99ef3d20526811bd5608146fe60 author Or Gerlitz Sat, 17 Jun 2006 20:37:37 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:37 -0700 IB/fmr: Use device's max_map_map_per_fmr attribute in FMR pool. When creating a FMR pool, query the IB device and use the returned max_map_map_per_fmr attribute as for the max number of FMR remaps. If the device does not suport querying this attribute, use the original IB_FMR_MAX_REMAPS (32) default. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit d4cb0784fd1ea99ef3d20526811bd5608146fe60 tree 214f2e6923c9a04c27b09d790968736cc90c0cdd parent 6eddb5cb906ac5c9a17a1b76464eadacd88b6c92 author Or Gerlitz Sat, 17 Jun 2006 20:37:37 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:37 -0700 IB/mthca: Fill in max_map_per_fmr device attribute Report the true max_map_per_fmr value from mthca_query_device(), taking into account the change in FMR remapping introduced by the Sinai performance optimization. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 6eddb5cb906ac5c9a17a1b76464eadacd88b6c92 tree 8f12b13a64030e422b7c7d753009dab3dce3aa6b parent 12bbb2b7be7f5564952ebe0196623e97464b8ac5 author Roland Dreier Sat, 17 Jun 2006 20:37:37 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:37 -0700 IB/ipath: Add client reregister event generation Generate a client reregister event instead of a LID change event when client reregister bit is set. Signed-off-by: Roland Dreier commit 12bbb2b7be7f5564952ebe0196623e97464b8ac5 tree 2c2aed2ffd043a145ba0369a799d9e8a1bd29ede parent da2ab62ab5e430e6ffafc2d0e6046dcd2780f570 author Leonid Arsh Sat, 17 Jun 2006 20:37:36 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:36 -0700 IB/mthca: Add client reregister event generation Change the mthca snoop of MADs that set PortInfo to check if the SM has set the client reregister bit, and if it has, generate a client reregister event. If the bit is not set, just generate a LID change event as usual. Signed-off-by: Leonid Arsh Signed-off-by: Roland Dreier commit da2ab62ab5e430e6ffafc2d0e6046dcd2780f570 tree 8628b70e91c193cd2ed90dca062974dc90fe16d7 parent 508e434123b136c96d1bf989e8d4ab0c8d7498b1 author Leonid Arsh Sat, 17 Jun 2006 20:37:36 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:36 -0700 IB: Move struct port_info from ipath to Move ipath's struct port_info into , so that it can be used by mthca to implement client reregister support. Remove the __attribute__((packed)) because all the members of the struct are naturally aligned anyway. Signed-off-by: Leonid Arsh Signed-off-by: Roland Dreier commit 508e434123b136c96d1bf989e8d4ab0c8d7498b1 tree 1085714b3d50f6a8706e6ab5fb5ba721cac38209 parent 63942c9a981ecfa2aabfb27ff1a87b88f2ee9f5b author Leonid Arsh Sat, 17 Jun 2006 20:37:36 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:36 -0700 IPoIB: Handle client reregister events Handle client reregister events by treating them just like LID or SM changes -- flush all cached paths and rejoin multicast groups. Signed-off-by: Leonid Arsh Signed-off-by: Roland Dreier commit 63942c9a981ecfa2aabfb27ff1a87b88f2ee9f5b tree 40ddf2d6a967564c979fb198b5a78a4e888fea84 parent 37c22a77212c13201497378cc8becc5c95d0f3f5 author Leonid Arsh Sat, 17 Jun 2006 20:37:35 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:35 -0700 IB: Add client reregister event type Add IB_EVENT_CLIENT_REREGISTER to enum so low-level drivers can generate "client reregister" events. Signed-off-by: Leonid Arsh Signed-off-by: Roland Dreier commit 37c22a77212c13201497378cc8becc5c95d0f3f5 tree 5a38388266a09c9892e5d8e336d7287ae763e7c0 parent 31c02e215700c2b704d9441f629ae87bb9aeb561 author Jack Morgenstein Mon, 29 May 2006 19:14:05 +0300 committer Roland Dreier Sat, 17 Jun 2006 20:37:35 -0700 IPoIB: Fix kernel unaligned access on ia64 Fix misaligned access faults on ia64: never cast a misaligned neighbour->ha + 4 pointer to union ib_gid type; pass a void * pointer instead. The memcpy was being optimized to use full word accesses because the compiler thought that union ib_gid is always aligned. The cast in IPOIB_GID_ARG is safe, since it is fixed to access each byte separately. Signed-off-by: Jack Morgenstein Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 31c02e215700c2b704d9441f629ae87bb9aeb561 tree 057b5e1de62cbecbbe6a0a4532e7eab0fd0313e4 parent 9874e746550fbd366484621b8838b98589bb2a15 author Roland Dreier Sat, 17 Jun 2006 20:37:34 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:34 -0700 IPoIB: Avoid using stale last_send counter when reaping AHs The comparisons of priv->tx_tail to ah->last_send in ipoib_free_ah() and ipoib_post_receive() are slightly unsafe, because priv->tx_lock is not held and hence a stale value of ah->last_send might be used, which would lead to freeing an AH before the driver was really done with it. The simple way to fix this is to the optimization of early free from ipoib_free_ah() and unconditionally queue AHs for reaping, and then take priv->tx_lock in __ipoib_reap_ah(). Signed-off-by: Roland Dreier commit 9874e746550fbd366484621b8838b98589bb2a15 tree 8927d1f6a2c082591a539e42202c3b266a684ae0 parent 6fb9cdbf2cdb2ea187e57ec2e16cc59df2adf86a author Jack Morgenstein Sat, 17 Jun 2006 20:37:34 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:34 -0700 IB/mad: Check GID/LID when matching requests Check GID/LID for requester side when searching for request which matches received response. This is in order to guarantee uniqueness if the same TID is used when requesting via multiple source LIDs (when LMC is not zero). Use ports' cached LMC to perform the check. Further, do not perform LID check for direct-routed packets, since the permissive LID makes a proper check impossible. Signed-off-by: Jack Morgenstein Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6fb9cdbf2cdb2ea187e57ec2e16cc59df2adf86a tree 329eb272835bd3105696ddbc60cdaea971aa2a6e parent 856c256f883f027a14b546164294b4a86fea81a4 author Jack Morgenstein Sat, 17 Jun 2006 20:37:34 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:34 -0700 IB: Add caching of ports' LMC Add an LMC cache to struct ib_device, and add a function ib_get_cached_lmc() to query the cache. Signed-off-by: Jack Morgenstein Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 856c256f883f027a14b546164294b4a86fea81a4 tree c505262354179db879aed2c8a48806f98ba6c614 parent 4be10c1e6dcafec993ac4f9abfa5fdcd83728302 author Michael S. Tsirkin Thu, 25 May 2006 14:51:33 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:33 -0700 IB/cm: remove unneeded flush_workqueue destroy_workqueue() already does flush_workqueue(). Signed-off-by: Michael S. Tsirkin Signed-off-by: Sean Hefty commit 4be10c1e6dcafec993ac4f9abfa5fdcd83728302 tree c7f804d21f0fb39cf3a7b7e85266eeb020957af2 parent 6bfa24fa3e189269e113197a80e12862c211b3d3 author Sean Hefty Thu, 25 May 2006 10:03:23 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:33 -0700 IB/ucm: convert semaphore to mutex Convert semaphore in ib_ucm_file to a real mutex. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6bfa24fa3e189269e113197a80e12862c211b3d3 tree cdd5adcb58ce726708a48636d3b657155000e8cf parent b7ac4ab497e44cba75fb0e9e5afca06776518934 author Roland Dreier Sat, 17 Jun 2006 20:37:33 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:33 -0700 IB/srp: Get rid of "Target has req_lim 0" messages It's perfectly valid for a connection to an SRP target to have a request limit of 0, so get rid of the message about it, which can spam kernel logs even with printk_ratelimit(). Keep a count of such events in a "zero_req_lim" SCSI host attribute instead, so someone who cares can look at the statistics. Signed-off-by: Roland Dreier commit b7ac4ab497e44cba75fb0e9e5afca06776518934 tree d0d513d83ef71ea7530a3e57ccac41c3684a4fcb parent ac83cbaa9a41344c3adf329ede607e58d887f354 author Ishai Rabinovitz Sat, 17 Jun 2006 20:37:32 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:32 -0700 IB/srp: Handle DREQ events from CM Handle IB_CM_DREQ_ERROR and IB_CM_DREQ_RECEIVED events from the CM, instead of just printing "Unhandled CM event". In the case of DREQ_ERROR, just ignore the event -- a TIMEWAIT_EXIT will be generated also. For DREQ_RECEIVED, send a DREP in response to shut the connection down cleanly. Signed-off-by: Ishai Rabinovitz Signed-off-by: Roland Dreier commit ac83cbaa9a41344c3adf329ede607e58d887f354 tree 5523955d6c776951827f36024e9dc93a3bbdcbab parent 74b0a15b5e18e44206c98419745a472c3d28e561 author Roland Dreier Sat, 17 Jun 2006 20:37:32 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:32 -0700 IPoIB: Mention RFC numbers in documentation Now that the IETF has released RFCs covering IPoIB, give the numbers in the documentation for IPoIB. Signed-off-by: Roland Dreier commit 74b0a15b5e18e44206c98419745a472c3d28e561 tree 9aa9846193df826cc81d2072a0ca56a569ea9668 parent 52fb2b50c4baa1430064c1e6c1c7df473d469df1 author Vu Pham Sat, 17 Jun 2006 20:37:32 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:32 -0700 IB/srp: Allow sg_tablesize to be adjusted Make the sg_tablesize used by SRP adjustable at module load time via a module parameter. Calculate the corresponding IU length required to support this. Signed-off-by: Vu Pham Signed-off-by: Roland Dreier commit 52fb2b50c4baa1430064c1e6c1c7df473d469df1 tree 7d538c270d6b9064b5674a8fd6f7cf81d8b8580f parent 0c5b395239cdea4db3d9c23a5738fdaf3b9ada4c author Vu Pham Sat, 17 Jun 2006 20:37:31 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:31 -0700 IB/srp: Allow cmd_per_lun to be set per target port Allow userspace to throttle traffic on a given connection to a target port by adding "max_cmd_per_lun=xyz" to lower the cmd_per_lun value set for that scsi_host. Signed-off-by: Vu Pham Signed-off-by: Roland Dreier commit 0c5b395239cdea4db3d9c23a5738fdaf3b9ada4c tree 92262c3a2480603bee7e8b8b405a3a4060433315 parent 403a496fd4af3036c12e1f9c90a89cf846fadd35 author Ishai Rabinovitz Sat, 17 Jun 2006 20:37:31 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:31 -0700 IB/srp: Clean up loop in srp_remove_one() Interrupts will always be enabled in srp_remove_one(), so spin_lock_irq() can be used instead of spin_lock_irqsave(). Also, the loop takes target->scsi_host->host_lock, so target->state can just be set to SRP_TARGET_REMOVED witout testing the old value. Signed-off-by: Ishai Rabinovitz Signed-off-by: Roland Dreier commit 403a496fd4af3036c12e1f9c90a89cf846fadd35 tree a2aaa788cb21341f9245db9c7f5c2dfb459d206b parent b3589fd49067bab9fe0c60430860e6befbd5ba37 author Roland Dreier Sat, 17 Jun 2006 20:37:31 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:31 -0700 IB: Make needlessly global ib_mad_cache static Signed-off-by: Roland Dreier commit b3589fd49067bab9fe0c60430860e6befbd5ba37 tree be054dba4fd5d39e4af03d18e1d57d3b88033ca7 parent 549c5fc2c8149498118f2494a1b6a4938ca05985 author Matthew Wilcox Sat, 17 Jun 2006 20:37:30 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:30 -0700 IB/srp: Change target_mutex to a spinlock The SRP driver never sleeps while holding target_mutex, and it's just used to protect some simple list operations, so hold times will be short. So just convert it to a spinlock, which is smaller and faster. Signed-off-by: Matthew Wilcox Signed-off-by: Roland Dreier commit 549c5fc2c8149498118f2494a1b6a4938ca05985 tree 409aff9ba655db4a58d475a7f74f7917d8eca31e parent 1962a4a1e4b3716aa836ebeb5b80c804a7f7c5ba author Matthew Wilcox Sat, 17 Jun 2006 20:37:30 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:30 -0700 IB/srp: Get rid of unneeded use of list_for_each_entry_safe() list_for_each_entry_safe() is used in one place where the list isn't modified. So just change it to list_for_each_entry(). Signed-off-by: Matthew Wilcox Signed-off-by: Roland Dreier commit 1962a4a1e4b3716aa836ebeb5b80c804a7f7c5ba tree f88f56331bdae7d46a16261c1c31ab8731b1ac91 parent e9cd59418f049966a690372c4919e98c88bb119b author Matthew Wilcox Sat, 17 Jun 2006 20:37:30 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:30 -0700 IB/srp: Use SCAN_WILD_CARD from SCSI headers SCAN_WILD_CARD is indeed available from , which is already included. So get rid of private hack. Signed-off-by: Matthew Wilcox Signed-off-by: Roland Dreier commit e9cd59418f049966a690372c4919e98c88bb119b tree 7624e7d85f4f927692771483a763dafa9f8bb8d5 parent f5358a172f79e3f995919224401b25637f4324f6 author Roland Dreier Sat, 17 Jun 2006 20:37:30 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:30 -0700 IB/mthca: Convert FW commands to use wait_for_completion_timeout() The kernel has had wait_for_completion_timeout() for a long time now. mthca should use it to handle FW commands timing out, instead of implementing the same thing in a much more complicated way by using wait_for_completion() along with a timer that does complete(). Signed-off-by: Roland Dreier commit f5358a172f79e3f995919224401b25637f4324f6 tree 52980f6f7707af3fca77958d04e88b9cee3c1a2a parent a26026c1221c3e78e6e9f156994c41fb74e99022 author Roland Dreier Sat, 17 Jun 2006 20:37:29 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:29 -0700 IB/srp: Use FMRs to map gather/scatter lists Create an SRP FMR pool on HCAs that support FMRs, and use FMRs to map gather/scatter lists that have more than one entry into a single memory region that appears virtually contiguous to the SRP target (which is the RDMA initiator). This patch bails out on FMR mapping for SCSI commands where the gather/scatter list cannot be mapped into a single FMR because there are sub-page-sized entries in middle of the list. An unaligned start or end of the list is OK. Based on a patch by Vu Pham . Signed-off-by: Roland Dreier commit a26026c1221c3e78e6e9f156994c41fb74e99022 tree 3c5cf6f6e43ffc8d078d096809490a29df7c23e4 parent e51060f08a61965c4dd91516d82fe90617152590 author Michael S. Tsirkin Sat, 17 Jun 2006 20:37:29 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:29 -0700 IB/mthca: Remove dead code Kill some dead code in mthca_eq.c Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit e51060f08a61965c4dd91516d82fe90617152590 tree 19a8a0cc519e215e12ce460258a356cdac842f6e parent 7025fcd36bd62af2c6ca0ea3490c00b216c4d168 author Sean Hefty Sat, 17 Jun 2006 20:37:29 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:29 -0700 IB: IP address based RDMA connection manager Kernel connection management agent over InfiniBand that connects based on IP addresses. The agent defines a generic RDMA connection abstraction to support clients wanting to connect over different RDMA devices. The agent also handles RDMA device hotplug events on behalf of clients. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 7025fcd36bd62af2c6ca0ea3490c00b216c4d168 tree e2fda3944176fcafb24876680d6eb8b6be394fe6 parent a1e8733e557bb390e13aa00ef044a6022c8d0bb2 author Sean Hefty Sat, 17 Jun 2006 20:37:28 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:28 -0700 IB: address translation to map IP toIB addresses (GIDs) Add an address translation service that maps IP addresses to InfiniBand GID addresses using IPoIB. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit a1e8733e557bb390e13aa00ef044a6022c8d0bb2 tree 52f2d60bc33d19806ce0522c62d84fba33d80691 parent 6e61d04f2d8c7ac4f67e1f498ed2a2a3ad8edaa3 author Sean Hefty Sat, 17 Jun 2006 20:37:28 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:28 -0700 [NET]: Export ip_dev_find() Export ip_dev_find() to allow locating a net_device given an IP address. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6e61d04f2d8c7ac4f67e1f498ed2a2a3ad8edaa3 tree cf184fe1a9ebc7187cd452b2427234726436da94 parent 6a9af2e18a5c6ebcf8283309d20ac0e9fa35e346 author Sean Hefty Sat, 17 Jun 2006 20:37:28 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:28 -0700 IB/cm: Match connection requests based on private data Extend matching connection requests to listens in the InfiniBand CM to include private data checks. This allows applications to listen on the same service identifier, with private data directing the request to the appropriate application. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6a9af2e18a5c6ebcf8283309d20ac0e9fa35e346 tree 550bf42e4fff6b89160224fdf130085fefd0fe2e parent 4e56ea794ec8636991e21942fc2e0d071ea8ee1d author Sean Hefty Sat, 17 Jun 2006 20:37:27 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:27 -0700 IB: common handling for marshalling parameters to/from userspace Provide common handling for marshalling data between userspace clients and kernel InfiniBand drivers. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 4e56ea794ec8636991e21942fc2e0d071ea8ee1d tree eb03f5a3246c69fdaf6dd485395b13d33aef158d parent 13aa6ecb47990cfc78e20e347fdd3f1df6189426 author Michael S. Tsirkin Tue, 13 Jun 2006 17:19:42 +0300 committer Roland Dreier Sat, 17 Jun 2006 20:37:20 -0700 IB/mthca: memfree completion with error FW bug workaround Memfree firmware is in rare cases reporting WQE index == base - 1 in receive completion with error, instead of (rq size - 1); base is 0 in mthca. Here is a patch to avoid kernel crash and report a correct WR id in this case. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 13aa6ecb47990cfc78e20e347fdd3f1df6189426 tree d26f2ed61becb6603aff5dc1467270a370483333 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Michael S. Tsirkin Mon, 12 Jun 2006 16:57:51 +0300 committer Roland Dreier Sat, 17 Jun 2006 20:37:00 -0700 IB/mthca: restore missing PCI registers after reset mthca does not restore the following PCI-X/PCI Express registers after reset: PCI-X device: PCI-X command register PCI-X bridge: upstream and downstream split transaction registers PCI Express : PCI Express device control and link control registers This causes instability and/or bad performance on systems where one of these registers is set to a non-default value by BIOS. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 3877f0b6c9f54d43e55e532404a935b90393b635 tree b22e658ee19ea83c630c6464ed9c7a46d8073606 parent 21c8db9eff95260e543535dfc6f27164c4c0c0ff author David Woodhouse Sun, 18 Jun 2006 00:05:26 +0100 committer David Woodhouse Sun, 18 Jun 2006 00:05:26 +0100 [JFFS2] Don't trust node headers before the CRC is checked. Especially when summary code is used, we can have in-memory data structures referencing certain nodes without them actually being readable on the flash. Discard the nodes gracefully in that case, rather than triggering a BUG(). Signed-off-by: David Woodhouse commit 216b2f1f718d653795024a085636d063693dd9a9 tree 6bf642676b0341c0b55f051692913efd9c88d0e7 parent 29b0c89953fee8597b4a9cbdd763c294ae0eb4c7 author Uwe Zeisberger Fri, 16 Jun 2006 08:48:48 +0200 committer Sam Ravnborg Sat, 17 Jun 2006 00:08:17 +0200 kbuild: append -dirty for updated but uncommited changes Compare the working copy with the last commit, instead of the index. Signed-off-by: Uwe Zeisberger Acked-by: Ryan Anderson Signed-off-by: Sam Ravnborg commit 29b0c89953fee8597b4a9cbdd763c294ae0eb4c7 tree bed171b01b2ef2c5dc82ac4b0f0473dd703074d2 parent 9ac545b0f7161eaf2e180acc406c1dd6fdd77686 author Uwe Zeisberger Fri, 16 Jun 2006 08:47:57 +0200 committer Sam Ravnborg Sat, 17 Jun 2006 00:08:17 +0200 kbuild: append git revision for all untagged commits adds revision suffix for untagged commits that are reachable from a tag I'm bisecting and don't get the -g...... suffix. The reason is, that git name-rev --tags HEAD returns e.g. HEAD tags/v2.6.17-rc1^0~1067 which is currently good enough for setlocalversion to skip the suffix. This introduces a dependecy to grep -E, which should be fine. Signed-off-by: Uwe Zeisberger Acked-By: Ryan Anderson Signed-off-by: Sam Ravnborg commit 9ac545b0f7161eaf2e180acc406c1dd6fdd77686 tree 641d17f54937941fa198c75992491fe1eaac975f parent 566f81ca598f80de03e80a9a743e94b65b4e017e author Laurent Riffard Sun, 11 Jun 2006 08:02:06 +0200 committer Sam Ravnborg Fri, 16 Jun 2006 23:45:45 +0200 kbuild: fix module.symvers parsing in modpost read_dump didn't split lines between module name and export type. Signed-off-by: Laurent Riffard Signed-off-by: Sam Ravnborg commit 5b4b7a236e7787f16af4e15a6253d46d8e794be6 tree f38fce923719c0d2cb893fe04f5513cf8009755b parent 785fcccd68bd4dc436f75fd4cd40e8557966c86d parent 872d83d00f67021e036d75aab3b7c6e3fc7e29ee author Len Brown Thu, 15 Jun 2006 23:17:14 -0400 committer Len Brown Thu, 15 Jun 2006 23:17:14 -0400 Pull button into release branch commit 872d83d00f67021e036d75aab3b7c6e3fc7e29ee tree 54d3940f3de7f97f3773973acdfd0a48d10a796d parent d8c3291c73b958243b33f8509d4507e76dafd055 author Arnaud Patard Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Thu, 15 Jun 2006 23:16:05 -0400 ACPI: suppress power button event on S3 resume http://bugzilla.kernel.org/show_bug.cgi?id=6612 Note that this fix depends on a fix in ACPICA 20060608 to replace a semaphore with a spin-lock. Signed-off-by: Arnaud Patard Acked-by: "Yu, Luming" Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 785fcccd68bd4dc436f75fd4cd40e8557966c86d tree 92fbac7035de7751a9db89c4761e4bdbac346749 parent d42510a0f58c2583c37c8e9b7548e3a68545863a author Len Brown Thu, 15 Jun 2006 22:19:31 -0400 committer Len Brown Thu, 15 Jun 2006 22:19:31 -0400 ACPI: resolve merge conflict between sem2mutex and processor_perflib.c Signed-off-by: Len Brown commit d42510a0f58c2583c37c8e9b7548e3a68545863a tree 9d44b95405b9f0083e911a66cc5512860293f95a parent 8f2ddb37e564a9616c05fa0d5652e0049072a730 parent 193de0c79da580eb33a66113b62e2378fc1fb629 author Len Brown Thu, 15 Jun 2006 21:39:25 -0400 committer Len Brown Thu, 15 Jun 2006 21:39:25 -0400 Pull bugzilla-5737 into release branch Conflicts: arch/x86_64/kernel/acpi/processor.c commit 8f2ddb37e564a9616c05fa0d5652e0049072a730 tree a28df8762bb77979b0ff8cc14cfcc12a1204ca09 parent 5b542e4422766d644ca303b8a47b27ec9eeeef3a parent 74ce1468128e299fe6a85e7e78e528e45e72d6d9 author Len Brown Thu, 15 Jun 2006 21:36:11 -0400 committer Len Brown Thu, 15 Jun 2006 21:36:11 -0400 Pull bugzilla-5000 into release branch commit 5b542e4422766d644ca303b8a47b27ec9eeeef3a tree e489ca691577a09baf337d9837ff25a5fa882d67 parent e4151eaa7f231296d027b8fb34e2b855a3480836 parent f9a6ee1afb84fd767508428ec5d1df4fb60a03ad author Len Brown Thu, 15 Jun 2006 21:34:21 -0400 committer Len Brown Thu, 15 Jun 2006 21:34:21 -0400 Pull bugzilla-5764 into release branch commit e4151eaa7f231296d027b8fb34e2b855a3480836 tree 9821c60756cff4b4a0d8cca3b4a9889ea66dee49 parent c080a3e69dfb58ae9b8c7e70a1e33f4f4e493ea7 parent 42adb53cb36d19862a02d3087e2e3d9dab39e5fa author Len Brown Thu, 15 Jun 2006 21:33:36 -0400 committer Len Brown Thu, 15 Jun 2006 21:33:36 -0400 Pull ibm_acpi into release branch commit c080a3e69dfb58ae9b8c7e70a1e33f4f4e493ea7 tree 849d913226a6d38b66bf5ad1ccf6ea07559009af parent bf891bd65de65284f3964216fcde493dba5149db parent 36e430951af0b0d1bdfd50ce22e70079d02646df author Len Brown Thu, 15 Jun 2006 21:31:47 -0400 committer Len Brown Thu, 15 Jun 2006 21:31:47 -0400 Pull sem2mutex into release branch commit bf891bd65de65284f3964216fcde493dba5149db tree 082056dd77fa9599034424c46ef8a67f93565e89 parent de59e3aa6eda7fc7cd6c717f084930f6a841b602 parent 9c576ff1bc9ab42d06457e68e39c121481138562 author Len Brown Thu, 15 Jun 2006 21:31:17 -0400 committer Len Brown Thu, 15 Jun 2006 21:31:17 -0400 Pull trivial2 into release branch commit de59e3aa6eda7fc7cd6c717f084930f6a841b602 tree 0b763a7992a75885ca74f130b0807b4def2c341a parent 69cd291c6bbc6647fe3783257c5a2e076e808f71 parent 973bf491a55b825740f0d8d300b50bcd3d6fb8de author Len Brown Thu, 15 Jun 2006 21:30:59 -0400 committer Len Brown Thu, 15 Jun 2006 21:30:59 -0400 Pull video into release branch commit 69cd291c6bbc6647fe3783257c5a2e076e808f71 tree 6f65a2d7d29228129cef09343c485aad64e3a3f1 parent 35a5d9ed9fedb74c22cb19ff7d749289473144e0 parent 06ea8e08ae7e7e450b6a78e7ce5e10b3c5f954ea author Len Brown Thu, 15 Jun 2006 21:28:57 -0400 committer Len Brown Thu, 15 Jun 2006 21:28:57 -0400 Pull acpi_bus_register_driver into release branch Conflicts: drivers/acpi/asus_acpi.c drivers/acpi/scan.c commit 1668b19f75cb949f930814a23b74201ad6f76a53 tree fecf28d203ec6263372f2772c0adc5b72841ac79 parent 553698f944ed715dfe023b4cef07601f0ce735f0 author Pedro Alejandro López-Valencia Thu, 15 Jun 2006 22:46:44 +0200 committer Francois Romieu Thu, 15 Jun 2006 23:02:00 +0200 sundance: PCI ID for ip100a Patch provided by Pedro Alejandro López-Valencia in http://bugzilla.kernel.org/show_bug.cgi?id=6691 The patch is derived from IC+ GPL'ed rework of sundance driver available at http://www.icplus.com.tw/pp-IP100A.html Patch closes http://bugzilla.kernel.org/show_bug.cgi?id=5858 as well. Signed-off-by: Francois Romieu Cc: Pedro Alejandro López-Valencia commit 89c318ed3985da1271e00ad586f2dce8a6e75656 tree b8be0c7a76b11a971650eff3508efe197e896fe1 parent 7bd6b91800c996da328bd57e40e62b3f73760fbe author Zhu Yi Thu, 08 Jun 2006 22:19:49 -0700 committer John W. Linville Thu, 15 Jun 2006 15:48:14 -0400 [PATCH] ipw2200 locking fix Well, this is not 100% if when the card fires two consecutive interrupts. Though unlikely, it's better to protect early than seeing some "weird" bugs one day. I proposed attached patch. If you can help to test, that will be appreciated (I cannot see the lockdep warning on my box somehow). Cc: Frederik Deweerdt Cc: Arjan van de Ven Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 7bd6b91800c996da328bd57e40e62b3f73760fbe tree ff1ae357b6789c5439864a0b611d5e7ba10949dd parent 12a3768792dc27f11a5edb96e38db32bcdc5fd27 author Larry Finger Thu, 08 Jun 2006 09:47:42 -0500 committer John W. Linville Thu, 15 Jun 2006 15:48:14 -0400 [PATCH] wireless: correct dump of WPA IE In net/ieee80211/softmac/ieee80211softmac_wx.c, there is a bug that prints extended sign information whenever the byte value exceeds 0x7f. The following patch changes the printk to use a u8 cast to limit the output to 2 digits. This bug was first noticed by Dan Williams . This patch applies to the current master branch of the Linville tree. Signed-Off-By: Larry Finger Signed-off-by: John W. Linville commit 12a3768792dc27f11a5edb96e38db32bcdc5fd27 tree eaf1362f4b3280cdc9347cccee69f49e1f3d310f parent 91769e7dd9cef7988dc4280f74ed168351beb5b8 author Jiri Slaby Mon, 05 Jun 2006 22:20:07 +0200 committer John W. Linville Thu, 15 Jun 2006 15:48:13 -0400 [PATCH] pci: bcm43xx avoid pci_find_device bcm43xx avoid pci_find_device Change pci_find_device to safer pci_get_device with support for more devices. Signed-off-by: Jiri Slaby Signed-off-by: John W. Linville commit 91769e7dd9cef7988dc4280f74ed168351beb5b8 tree ef854d83ec881882b94a3e88b580e2468f62bac1 parent 78ff56a06edc3407996173daf63e48f6b90c7062 author Michael Buesch Mon, 05 Jun 2006 20:24:21 +0200 committer John W. Linville Thu, 15 Jun 2006 15:48:13 -0400 [PATCH] bcm43xx: preemptible periodic work Make the heavy periodic work preemptible to avoid disabling local IRQs for several msecs. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 78ff56a06edc3407996173daf63e48f6b90c7062 tree 93ddfccd648ee84faeb95bcf8f5183ac91d873f7 parent 74f4903363579d3336c294ebb11f02c8f35845ca author Michael Buesch Mon, 05 Jun 2006 20:24:10 +0200 committer John W. Linville Thu, 15 Jun 2006 15:48:13 -0400 [PATCH] bcm43xx: redesign locking Redesign the bcm43xx locking. This is pre-work to get a preemptible periodic work handler. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 74f4903363579d3336c294ebb11f02c8f35845ca tree 61050f4d54dc69a24cef2deb5ca86b228de0767f parent 76df73ff90e99681a99e457aec4cfe0a240b7982 author Larry Finger Tue, 30 May 2006 11:55:42 -0500 committer John W. Linville Thu, 15 Jun 2006 15:48:13 -0400 [PATCH] wireless: Changes to ieee80211.h for user space regulatory daemon Attached are two small patches for include/net/ieee80211.h to prepare for later submission of code to implement a user-space daemon that supplies 802.11 regulatory information. The first change adds a bit indicating that 802.11h rules are to be applied to a channel. As discussed earlier in this list, a single bit is unlikely to be sufficient; however, at this time I have been unable to find any regulations implementing differences between 802.11a and 802.11h other than DFS, radar detection and passive scanning. A single bit is thus sufficient to convey to the driver that these rules should be obeyed. The second change adds comments to the freq and max_power fields of struct ieee80211_channel to indicate the units that are used. Signed-Off-By: Larry Finger Signed-off-by: John W. Linville commit 35a5d9ed9fedb74c22cb19ff7d749289473144e0 tree c414a1aeac5d4fe6db3a411685ca66e733f71496 parent 3e8e7c93d7eb091463839b5212789c4aae09459e parent 0eacee585a89ce5827b572a73a024931506bef48 author Len Brown Thu, 15 Jun 2006 15:42:14 -0400 committer Len Brown Thu, 15 Jun 2006 15:42:14 -0400 Pull bugzilla-5452 into release branch commit 3e8e7c93d7eb091463839b5212789c4aae09459e tree 697a04ce1202b8d8ff398b96944be844329b713c parent 36a557d1f48669c57f59e37d9334400a29e4e53c parent ffd642e748c867a7339b57225b8bf8b9a0dcd9c5 author Len Brown Thu, 15 Jun 2006 15:41:53 -0400 committer Len Brown Thu, 15 Jun 2006 15:41:53 -0400 Pull bugzilla-5653 into release branch commit 36a557d1f48669c57f59e37d9334400a29e4e53c tree 6d97b3eb9fefa6a82dd11dd7caeb799f986bdc48 parent 4e8f10b7ccf1c3c53a818a157962074a7340732e parent 6665bda76461308868bd1e52caf627f4cb29ed32 author Len Brown Thu, 15 Jun 2006 15:40:39 -0400 committer Len Brown Thu, 15 Jun 2006 15:40:39 -0400 Pull trivial into release branch commit 4e8f10b7ccf1c3c53a818a157962074a7340732e tree b5b60b535b9068541bd7c1504216c2428c5cb109 parent 63518472c05a351d779f35803e6ccfb361ae630a parent 9cfda2c94df61c9f859b474abe774c65a4464d0a author Len Brown Thu, 15 Jun 2006 15:38:30 -0400 committer Len Brown Thu, 15 Jun 2006 15:38:30 -0400 Pull novell-bugzilla-156426 into release branch Conflicts: arch/i386/kernel/acpi/boot.c commit 63518472c05a351d779f35803e6ccfb361ae630a tree d3668e960f945a7a1204cfb839bc8aaabcdf2341 parent e44e20ff1273cf96c7f195297208f654c49295cf parent e6f1f3c54974a30c65ea0b699809d12f0aa04272 author Len Brown Thu, 15 Jun 2006 15:37:09 -0400 committer Len Brown Thu, 15 Jun 2006 15:37:09 -0400 Pull trivial1 into release branch commit e44e20ff1273cf96c7f195297208f654c49295cf tree 7ed673b54106774752053acafb1de71b77a2dd40 parent 3145012c1c34a3504a2234bd2034ca6ea4767bc5 parent 1c6e7d0aeecac38e66b1bb63e3eff07b2a1c2f2c author Len Brown Thu, 15 Jun 2006 15:36:43 -0400 committer Len Brown Thu, 15 Jun 2006 15:36:43 -0400 Pull pnpacpi into release branch commit 3145012c1c34a3504a2234bd2034ca6ea4767bc5 tree 21eb2109e7b00f16bb6c3dc72a1e835c0bf3dd33 parent 1465887cfe79889273e3fd3aaf862e7ec3ee244f parent cd090eedd85256829f762677d0752a846c1b88b9 author Len Brown Thu, 15 Jun 2006 15:36:16 -0400 committer Len Brown Thu, 15 Jun 2006 15:36:16 -0400 Pull motherboard into release branch commit 1465887cfe79889273e3fd3aaf862e7ec3ee244f tree 210930f245d2bdd47b65480e11ed8ea24a564550 parent 60e04a5c533785c23ce6b76a6e5058328fe68edb parent 1300124f69cafc54331bc06e968a8dd67863f989 author Len Brown Thu, 15 Jun 2006 15:35:57 -0400 committer Len Brown Thu, 15 Jun 2006 15:35:57 -0400 Pull Kconfig into release branch commit 60e04a5c533785c23ce6b76a6e5058328fe68edb tree 233d985e2195ae5917ec91cec650d8d11bae2e40 parent 61fb46c5b3578fda7cc780e8bc53b3e8f8c1a143 parent ff2fc3e9e3edb918b6c6b288485c6cb267bc865e author Len Brown Thu, 15 Jun 2006 15:35:37 -0400 committer Len Brown Thu, 15 Jun 2006 15:35:37 -0400 Pull ec into release branch commit 61fb46c5b3578fda7cc780e8bc53b3e8f8c1a143 tree dd1772adc6c3bd5cd73467009b586fe9d53396da parent 59f720eb5a4337b2c4fc0b4c6cfd9c144e492aa8 parent eefa27a93a0490902f33837ac86dbcf344b3aa29 author Len Brown Thu, 15 Jun 2006 15:35:15 -0400 committer Len Brown Thu, 15 Jun 2006 15:35:15 -0400 Pull cpu-hotplug into release branch commit 59f720eb5a4337b2c4fc0b4c6cfd9c144e492aa8 tree 455c48b0c8158846fe1e34c226a4389c663f45c4 parent b3899c6613160b18f79e4356184de55311302fe4 parent 9224a867c497053842dc595e594ca6d32112221f author Len Brown Thu, 15 Jun 2006 15:34:42 -0400 committer Len Brown Thu, 15 Jun 2006 15:34:42 -0400 Pull address_range into release branch commit b3899c6613160b18f79e4356184de55311302fe4 tree 4aa7945bac59cbe5bb5d863be2d4ded285d3e936 parent 553698f944ed715dfe023b4cef07601f0ce735f0 parent 4c90ece249992c7a2e3fc921e5cdb8eb92193067 author Len Brown Thu, 15 Jun 2006 15:19:48 -0400 committer Len Brown Thu, 15 Jun 2006 15:19:48 -0400 Pull acpica into release branch commit 12223dabc617a4babfba4e17feb1ed88e8cfeb8f tree c749ed8c0b6e0fc83ecf89b62bd949384b2e02bc parent e474c66b1c76f9755f5d6dd5bfe88ce5e0435184 author Russell King Thu, 15 Jun 2006 13:28:52 +0100 committer Russell King Thu, 15 Jun 2006 13:28:52 +0100 [MMC] Add (MMC) to entry in MAINTAINERS file Juha Yrjola suggests that adding the string "MMC" to the maintainers file entry will make it easier to find. Add it to the file. Signed-off-by: Russell King commit 2ba73b1d6fa62ddaa235c3c5fdf6095cae6ba748 tree cd1d84913a99e685fbc2a6a088ca86afc7d25501 parent 4312dc76a88146c4f1d693fc4643d1df12aaf755 author Matthias Fuchs Wed, 14 Jun 2006 15:35:05 +0200 committer Paul Mackerras Thu, 15 Jun 2006 19:31:27 +1000 [POWERPC] ppc32: fix CPCI405 board support Hi, this patch brings the CPCI405 board support up to date and fixes several outstanding issues: -add bios_fixup() -enable RTC only when CONFIG_GEN_RTC defined -corrected CompactPCI interrupt map -added cpci405_early_serial_map for correct UART clocking -removed unused code Matthias Signed-off-by: Matthias Fuchs Signed-off-by: Paul Mackerras commit 4312dc76a88146c4f1d693fc4643d1df12aaf755 tree dc416a6b6c562c2563c37d00656fcf6ad2166c12 parent 368a6ba5d188552aea2a668301a259164c9f355e author Johannes Berg Tue, 13 Jun 2006 17:43:42 +0200 committer Paul Mackerras Thu, 15 Jun 2006 19:31:27 +1000 [POWERPC] make pmf irq_client functions safe against pmf interrupts coming in This fixes the pmf irq_client functions to be safe against pmf interrupts coming in while a client is registered/unregistered. Signed-off-by: Johannes Berg Signed-off-by: Paul Mackerras commit 368a6ba5d188552aea2a668301a259164c9f355e tree d22916e2870618b2b4ff26588df8f66a5928ac64 parent 0e4aa9c2009187fff1c999fe0aaa134c1a84f48a author Dave C Boutcher Mon, 12 Jun 2006 19:49:20 -0500 committer Paul Mackerras Thu, 15 Jun 2006 19:31:27 +1000 [POWERPC] check firmware state before suspending Currently the kernel blindly halts all the processors and calls the ibm,suspend-me rtas call. If the firmware is not in the correct state, we then re-start all the processors and return. It is much smarter to first check the firmware state, and only if it is waiting, call the ibm,suspend-me call. Signed-off-by: Paul Mackerras commit 0e4aa9c2009187fff1c999fe0aaa134c1a84f48a tree 9680eac732205bd6e0c0b2135357b718a336b95c parent 6fe87675314b4b1ac7ba339e2a4ab8d739b600d6 author Amos Waterland Mon, 12 Jun 2006 23:45:02 -0400 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] Fix builtin command line interaction with firmware It seems that prom_init's early_cmdline_parse is broken on at least Apple 970 xserves and IBM JS20 blades with SLOF. The firmware of these machines returns -1 and 1 respectively when getprop is called for the bootargs property of /chosen, causing Linux to ignore its builtin command line in favor of a null string. This patch makes Linux use its builtin command line if getprop returns an error or a null string. Signed-off-by: Amos Waterland Acked-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 6fe87675314b4b1ac7ba339e2a4ab8d739b600d6 tree 76e61aa0b25f2a0c568f5c541fad5dc25ae977f0 parent bd19c8994a828e70b5472f0ce9df5831c6c3db84 author Anton Blanchard Sun, 11 Jun 2006 11:40:43 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] update pmac32_defconfig Some updates to the pmac32_defconfig to make it more useful: - Enable LSF (large single files) since we enable LBD (large block devices) - Enable IPSEC related options - Enable remaining raid/dm options as modules - Disable eth1394, I doubt any has that hardware and it has a nasty habit of auto loading first and skewing network device numbering - Enable dummy and tun as modules, always useful to have them around - Enable EHCI, no wonder my usb2 disk was so slow - Enable USB storage - Enable ext3 acls - Disable autofs and enable autofsv4 instead - Enable nfs v3/v4 client and server. Dont want to be left in the dark ages of pre v3 - Enable all crypto as modules, things like cryptsetup want some of them I havent enabled the BCM43xx, perhaps we should now? Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit bd19c8994a828e70b5472f0ce9df5831c6c3db84 tree 5462c6d574b995084aa9ed4472257851c4b6ad54 parent 9e6e3c2c796f1e0ef335804d5c87073e365dea50 author Anton Blanchard Sun, 11 Jun 2006 01:15:55 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] system call micro optimisation In the syscall path we currently have: crclr so mfcr r9 If we shift the crclr up we can avoid a stall on some CPUs. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 9e6e3c2c796f1e0ef335804d5c87073e365dea50 tree 0d749f2b5f2c9eb67f9084c88ef10151199cc4ff parent df310656c7552ae7b8252e4b3d8e300cff164b16 author Anton Blanchard Sat, 10 Jun 2006 23:14:51 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] Fix HV bit handling on non partitioned machines On non partitioned machines we currently set the HV bit in kernel space only. It turns out we are supposed to maintain the HV bit in both user and kernel space. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit df310656c7552ae7b8252e4b3d8e300cff164b16 tree 89644b8725237c755422853d749acfb0c7a49c57 parent ca1588e71b70534e18368a46a3aad9b25dff941d author Anton Blanchard Sat, 10 Jun 2006 23:04:39 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] cleanup dma_mapping_ops For pseries IOMMU bypass I want to be able to fall back to the regular IOMMU ops. Do this by creating a dma_mapping_ops struct, and convert the others while at it. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit ca1588e71b70534e18368a46a3aad9b25dff941d tree 5bee264d69ba4cbd8b5f5ffaf7f981cab161a52b parent 357518fa34d9dceda42bfc09642356a58370050d author Anton Blanchard Sat, 10 Jun 2006 20:58:08 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] node local IOMMU tables Allocate IOMMU tables local to the relevant node. Signed-off-by: Anton Blanchard Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 357518fa34d9dceda42bfc09642356a58370050d tree c75689198fa2667a3d73d89ff125d910061b4fcf parent f2b09c8189bc7b64a42753e98f7006b11bae1bdc author Anton Blanchard Sat, 10 Jun 2006 20:53:06 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] pcibus_to_node fixes of_node_to_nid returns -1 if the associativity cannot be found. This means pcibus_to_cpumask has to be careful not to pass a negative index into node_to_cpumask. Since pcibus_to_node could be used a lot, and of_node_to_nid is slow (it walks a list doing strcmps), lets also cache the node in the pci_controller struct. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit f2b09c8189bc7b64a42753e98f7006b11bae1bdc tree 7e2cdda3b2fa25b632299a18c9fcd67bc3112474 parent 227318bbde6c8309b1d20ab46532ec2b737e1fee author Anton Blanchard Sat, 10 Jun 2006 20:37:24 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] Update pseries defconfig pseries defconfig updates: - Enable jsm and re-enable qlogic FC drivers as modules. - Enable ocfs2, autofs4 and fuse filesystems as modules. - Enable Kprobes. - Enable ebus, binfmt_misc, sas attrs, md5 reshape, hvc rtas backend and some infiniband options. - Finally disable debug options: DEBUG_MUTEXES and DEBUG_STACK_USAGE. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 227318bbde6c8309b1d20ab46532ec2b737e1fee tree de8bbbda0d69fc641629c10e5a0a1070a09bdde7 parent 8555a0029b1b0840237b750e55d4835a52cc719b author Anton Blanchard Sat, 10 Jun 2006 20:32:01 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] Remove stale 64bit on 32bit kernel code Remove some stale POWER3/POWER4/970 on 32bit kernel support. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 8555a0029b1b0840237b750e55d4835a52cc719b tree fb17c491f12deb3d7ac93397091ec900fbce46e9 parent 3a2c48cfc97f9046abbd810f1efb1aa824bcfaf1 author Anton Blanchard Sat, 10 Jun 2006 20:23:54 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:25 +1000 [POWERPC] Optimise some TOC usage Micro-optimisation - add no-minimal-toc to some more arch/powerpc Makefiles. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 3a2c48cfc97f9046abbd810f1efb1aa824bcfaf1 tree afcd54f2ad36353abcf2282fdf15a05e77fcba4a parent 30d8caf7c625203b295a78f143820cdc3124830b author Anton Blanchard Sat, 10 Jun 2006 20:18:39 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:25 +1000 [POWERPC] 64bit FPSCR support Forthcoming machines will extend the FPSCR to 64 bits. We already had a 64-bit save area for the FPSCR, but we need to use a new form of the mtfsf instruction. Fortunately this new form is decoded as an ordinary mtfsf by existing 64-bit processors. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 30d8caf7c625203b295a78f143820cdc3124830b tree a8a759a1fcf3d8b53e1d9a587943932b4fc9011c parent 204face4fb3ba2ca09a4073e7debc595e14c2388 author mostrows@watson.ibm.com Fri, 09 Jun 2006 09:06:12 -0400 committer Paul Mackerras Thu, 15 Jun 2006 19:31:25 +1000 [POWERPC] Editable kernel command-line in zImage binary. zImage will set /chosen/bootargs (if it is otherwise empty) with the contents of a buffer in the section "__builtin_cmdline". This permits tools to edit zImage binaries to set the command-line eventually processed by vmlinux. -- Signed-off-by: Michal Ostrowski Signed-off-by: Paul Mackerras commit 204face4fb3ba2ca09a4073e7debc595e14c2388 tree c98c1b576d249b392669a0d534598718af40478d parent bb53bb3dcb12d79efdee3d82bff46a204af377f3 author Jake Moilanen Wed, 07 Jun 2006 16:15:10 -0500 committer Paul Mackerras Thu, 15 Jun 2006 19:31:25 +1000 [POWERPC] MSI abstraction Instead of trying to make PPC64 MSI fit in a Intel-centric MSI layer, a simple short-term solution is to hook the pci_{en/dis}able_msi() calls and make a machdep call. The rest of the MSI functions are superfluous for what is needed at this time. Many of which can have machdep calls added as needed. Ben and Michael Ellerman are looking into rewrite the MSI layer to be more generic. However, in the meantime this works as a interim solution. Signed-off-by: Jake Moilanen Signed-off-by: Paul Mackerras commit bb53bb3dcb12d79efdee3d82bff46a204af377f3 tree 3bbe796265817fdf461a5caa0ad6253445460309 parent 0f582bc1f2cccacd613c411fbea55873d17c3429 author Jake Moilanen Wed, 07 Jun 2006 16:05:46 -0500 committer Paul Mackerras Thu, 15 Jun 2006 19:31:25 +1000 [POWERPC] Add support for PCI-Express nodes in the device tree This adds support to recognize the PCIe device_type "pciex" and made the portdrv buildable. Signed-off-by: Jake Moilanen Signed-off-by: Paul Mackerras commit 0f582bc1f2cccacd613c411fbea55873d17c3429 tree 83fc9e579bb520a876ffd75910861c811a0eac14 parent bf72aeba2ffef599d1d386425c9e46b82be657cd author Paul Mackerras Thu, 15 Jun 2006 18:03:32 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:25:50 +1000 powerpc: Simplify push_end definition in pci_32.c The push_end macro in arch/powerpc/kernel/pci_32.c uses integer division and multiplication to achieve the effect of rounding a resource end address up and then advancing it to the end of a power-of-2 sized region. This changes it to an equivalent computation that only needs an integer add and OR. This is partly based on an earlier patch by Mel Gorman. Signed-off-by: Paul Mackerras commit bf72aeba2ffef599d1d386425c9e46b82be657cd tree ead8e5111dbcfa22e156999d1bb8a96e50f06fef parent 31925323b1b51bb65db729e029472a8b1f635b7d author Paul Mackerras Thu, 15 Jun 2006 10:45:18 +1000 committer Paul Mackerras Thu, 15 Jun 2006 10:45:18 +1000 powerpc: Use 64k pages without needing cache-inhibited large pages Some POWER5+ machines can do 64k hardware pages for normal memory but not for cache-inhibited pages. This patch lets us use 64k hardware pages for most user processes on such machines (assuming the kernel has been configured with CONFIG_PPC_64K_PAGES=y). User processes start out using 64k pages and get switched to 4k pages if they use any non-cacheable mappings. With this, we use 64k pages for the vmalloc region and 4k pages for the imalloc region. If anything creates a non-cacheable mapping in the vmalloc region, the vmalloc region will get switched to 4k pages. I don't know of any driver other than the DRM that would do this, though, and these machines don't have AGP. When a region gets switched from 64k pages to 4k pages, we do not have to clear out all the 64k HPTEs from the hash table immediately. We use the _PAGE_COMBO bit in the Linux PTE to indicate whether the page was hashed in as a 64k page or a set of 4k pages. If hash_page is trying to insert a 4k page for a Linux PTE and it sees that it has already been inserted as a 64k page, it first invalidates the 64k HPTE before inserting the 4k HPTE. The hash invalidation routines also use the _PAGE_COMBO bit, to determine whether to look for a 64k HPTE or a set of 4k HPTEs to remove. With those two changes, we can tolerate a mix of 4k and 64k HPTEs in the hash table, and they will all get removed when the address space is torn down. Signed-off-by: Paul Mackerras commit 21c8db9eff95260e543535dfc6f27164c4c0c0ff tree 68dd7562b241b5cc95e5e45c8fa555fbbe26875f parent 783ed81ff39d3f938a6b2efd09fbad96e41e5c1f author David Woodhouse Wed, 14 Jun 2006 21:39:48 +0100 committer David Woodhouse Wed, 14 Jun 2006 21:39:48 +0100 [MTD] Restore MTD_ROM and MTD_RAM types Let's not attempt the abolition of mtd->type until/unless it's properly thought through. And certainly, let's not do it by halves. Signed-off-by: David Woodhouse commit 783ed81ff39d3f938a6b2efd09fbad96e41e5c1f tree 31cdfd9c39c9451ba37866dcb6e82e68c770216c parent f9068876f5ef583f8e9ebf4acd2ef5b35b113db9 author Artem B. Bityutskiy Wed, 14 Jun 2006 19:53:44 +0400 committer Artem B. Bityutskiy Wed, 14 Jun 2006 19:53:44 +0400 [MTD] assume mtd->writesize is 1 for NOR flashes Signed-off-by: Artem B. Bityitskiy commit 9348f0de2d2b541b4ba64fb1f4efee9710a3d731 tree a7ba0a32697123ff7fbcc12e37d2472249963d41 parent d27317657ae18cfbc45def8f566e4c3ed1f51d74 author Martin Schwidefsky Wed, 14 Jun 2006 14:10:51 +0100 committer David Woodhouse Wed, 14 Jun 2006 14:10:51 +0100 [S390] __FD_foo definitions. Make the definitions of __FD_SET, __FD_CLR and __FD_ISSET independent from asm/bitops.h and remove the macro magic that tests for __GLIBC__. Use simple C inline functions instead of set_bit, clear_bit and test_bit. Signed-off-by: Martin Schwidefsky Signed-off-by: David Woodhouse commit 4c90ece249992c7a2e3fc921e5cdb8eb92193067 tree e145ffe472802ef870ba1eaea150b688c19e45ca parent 4119532c95547821dbe72d6916dfa1b2148475b3 author Bob Moore Thu, 08 Jun 2006 16:29:00 -0400 committer Len Brown Wed, 14 Jun 2006 02:45:47 -0400 ACPI: ACPICA 20060608 Converted the locking mutex used for the ACPI hardware to a spinlock. This change should eliminate all problems caused by attempting to acquire a semaphore at interrupt level, and it means that all ACPICA external interfaces that directly access the ACPI hardware can be safely called from interrupt level. Fixed a regression introduced in 20060526 where the ACPI device initialization could be prematurely aborted with an AE_NOT_FOUND if a device did not have an optional _INI method. Fixed an IndexField issue where a write to the Data Register should be limited in size to the AccessSize (width) of the IndexField itself. (BZ 433, Fiodor Suietov) Fixed problem reports (Valery Podrezov) integrated: - Allow store of ThermalZone objects to Debug object. http://bugzilla.kernel.org/show_bug.cgi?id=5369 http://bugzilla.kernel.org/show_bug.cgi?id=5370 Fixed problem reports (Fiodor Suietov) integrated: - acpi_get_table_header() doesn't handle multiple instances correctly (BZ 364) Removed four global mutexes that were obsolete and were no longer being used. Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 4119532c95547821dbe72d6916dfa1b2148475b3 tree 564eb8f69924fb7dc72e93526faf1547acac7d30 parent b8d35192c55fb055792ff0641408eaaec7c88988 author Bob Moore Fri, 26 May 2006 16:36:00 -0400 committer Len Brown Wed, 14 Jun 2006 02:44:35 -0400 ACPI: ACPICA 20060526 Restructured, flattened, and simplified the internal interfaces for namespace object evaluation - resulting in smaller code, less CPU stack use, and fewer interfaces. (With assistance from Mikhail Kouzmich) Fixed a problem with the CopyObject operator where the first parameter was not typed correctly for the parser, interpreter, compiler, and disassembler. Caused various errors and unexpected behavior. Fixed a problem where a ShiftLeft or ShiftRight of more than 64 bits produced incorrect results with some C compilers. Since the behavior of C compilers when the shift value is larger than the datatype width is apparently not well defined, the interpreter now detects this condition and simply returns zero as expected in all such cases. (BZ 395) Fixed problem reports (Valery Podrezov) integrated: - Update String-to-Integer conversion to match ACPI 3.0A spec http://bugzilla.kernel.org/show_bug.cgi?id=5329 Allow interpreter to handle nested method declarations http://bugzilla.kernel.org/show_bug.cgi?id=5361 Fixed problem reports (Fiodor Suietov) integrated: - acpi_terminate() doesn't free debug memory allocation list objects (BZ 355) - After Core Subsystem shutdown, acpi_subsystem_status() returns AE_OK (BZ 356) - acpi_os_unmap_memory() for RSDP can be invoked inconsistently (BZ 357) - Resource Manager should return AE_TYPE for non-device objects (BZ 358) - Incomplete cleanup branch in AcpiNsEvaluateRelative (BZ 359) - Use acpi_os_free() instead of ACPI_FREE in acpi_rs_set_srs_method_data (BZ 360) - Incomplete cleanup branch in acpi_ps_parse_aml (BZ 361) - Incomplete cleanup branch in acpi_ds_delete_walk_state (BZ 362) - acpi_get_table_header returns AE_NO_ACPI_TABLES until DSDT is loaded (BZ 365) - Status of the Global Initialization Handler call not used (BZ 366) - Incorrect object parameter to Global Initialization Handler (BZ 367) Signed-off-by: Bob Moore Signed-off-by: Len Brown commit b8d35192c55fb055792ff0641408eaaec7c88988 tree 87272903bda56a4ddedcc513d35a74f072ab1f5d parent 958dd242b691f64ab4632b4903dbb1e16fee8269 author Alexey Starikovskiy Fri, 05 May 2006 03:23:00 -0400 committer Len Brown Wed, 14 Jun 2006 02:43:23 -0400 ACPI: execute Notify() handlers on new thread http://bugzilla.kernel.org/show_bug.cgi?id=5534 Thanks to Peter Wainwright for isolating the issue. Thanks to Andi Kleen and Bob Moore for feedback. Thanks to Richard Mace and others for testing. Updates by Konstantin Karasyov. Signed-off-by: Konstantin Karasyov Signed-off-by: Len Brown commit 958dd242b691f64ab4632b4903dbb1e16fee8269 tree ddf4932fb4e3023dd0d1914571f17f2e3b03978d parent b229cf92eee616c7cb5ad8cdb35a19b119f00bc8 author Bob Moore Fri, 12 May 2006 17:12:00 -0400 committer Len Brown Wed, 14 Jun 2006 02:34:48 -0400 ACPI: ACPICA 20060512 Replaced the acpi_os_queue_for_execution() with a new interface named acpi_os_execute(). The major difference is that the new interface does not have a Priority parameter, this appeared to be useless and has been replaced by a Type parameter. The Type tells the OS what type of execution is being requested, such as global lock handler, notify handler, GPE handler, etc. This allows the host to queue and execute the request as appropriate for the request type, possibly using different work queues and different priorities for the various request types. This enables fixes for multithreading deadlock problems such as http://bugzilla.kernel.org/show_bug.cgi?id=5534 (Alexey Starikovskiy and Bob Moore) Fixed a possible memory leak associated with the support for the so-called "implicit return" ACPI extension. Reported by FreeBSD (Fiodor Suietov) http://bugzilla.kernel.org/show_bug.cgi?id=6514 Fixed a problem with the Load() operator where a table load from an operation region could overwrite an internal table buffer by up to 7 bytes and cause alignment faults on IPF systems. (With assistance from Luming Yu) Signed-off-by: Bob Moore Signed-off-by: Len Brown commit b229cf92eee616c7cb5ad8cdb35a19b119f00bc8 tree 74b52bec6ec029859c2320aba227290a503af31a parent 793c2388cae3fd023b3b5166354931752d42353c author Bob Moore Fri, 21 Apr 2006 17:15:00 -0400 committer Len Brown Wed, 14 Jun 2006 02:30:55 -0400 ACPI: ACPICA 20060421 Removed a device initialization optimization introduced in 20051216 where the _STA method was not run unless an _INI was also present for the same device. This optimization could cause problems because it could allow _INI methods to be run within a not-present device subtree (If a not-present device had no _INI, _STA would not be run, the not-present status would not be discovered, and the children of the device would be incorrectly traversed.) Implemented a new _STA optimization where namespace subtrees that do not contain _INI are identified and ignored during device initialization. Selectively running _STA can significantly improve boot time on large machines (with assistance from Len Brown.) Implemented support for the device initialization case where the returned _STA flags indicate a device not-present but functioning. In this case, _INI is not run, but the device children are examined for presence, as per the ACPI specification. Implemented an additional change to the IndexField support in order to conform to MS behavior. The value written to the Index Register is not simply a byte offset, it is a byte offset in units of the access width of the parent Index Field. (Fiodor Suietov) Defined and deployed a new OSL interface, acpi_os_validate_address(). This interface is called during the creation of all AML operation regions, and allows the host OS to exert control over what addresses it will allow the AML code to access. Operation Regions whose addresses are disallowed will cause a runtime exception when they are actually accessed (will not affect or abort table loading.) Defined and deployed a new OSL interface, acpi_os_validate_interface(). This interface allows the host OS to match the various "optional" interface/behavior strings for the _OSI predefined control method as appropriate (with assistance from Bjorn Helgaas.) Restructured and corrected various problems in the exception handling code paths within DsCallControlMethod and DsTerminateControlMethod in dsmethod (with assistance from Takayoshi Kochi.) Modified the Linux source converter to ignore quoted string literals while converting identifiers from mixed to lower case. This will correct problems with the disassembler and other areas where such strings must not be modified. The ACPI_FUNCTION_* macros no longer require quotes around the function name. This allows the Linux source converter to convert the names, now that the converter ignores quoted strings. Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 793c2388cae3fd023b3b5166354931752d42353c tree 6859cde48677cf1e9b9766cd1d95081a863c060c parent 61686124f47d7c4b78610346c5f8f9d8a6d46bb5 author Bob Moore Fri, 31 Mar 2006 00:00:00 -0500 committer Len Brown Wed, 14 Jun 2006 02:04:16 -0400 ACPI: ACPICA 20060331 Implemented header file support for the following additional ACPI tables: ASF!, BOOT, CPEP, DBGP, MCFG, SPCR, SPMI, TCPA, and WDRT. With this support, all current and known ACPI tables are now defined in the ACPICA headers and are available for use by device drivers and other software. Implemented support to allow tables that contain ACPI names with invalid characters to be loaded. Previously, this would cause the table load to fail, but since there are several known cases of such tables on existing machines, this change was made to enable ACPI support for them. Also, this matches the behavior of the Microsoft ACPI implementation. https://bugzilla.novell.com/show_bug.cgi?id=147621 Fixed a couple regressions introduced during the memory optimization in the 20060317 release. The namespace node definition required additional reorganization and an internal datatype that had been changed to 8-bit was restored to 32-bit. (Valery Podrezov) Fixed a problem where a null pointer passed to acpi_ut_delete_generic_state() could be passed through to acpi_os_release_object which is unexpected. Such null pointers are now trapped and ignored, matching the behavior of the previous implementation before the deployment of acpi_os_release_object(). (Valery Podrezov, Fiodor Suietov) Fixed a memory mapping leak during the deletion of a SystemMemory operation region where a cached memory mapping was not deleted. This became a noticeable problem for operation regions that are defined within frequently used control methods. (Dana Meyers) Reorganized the ACPI table header files into two main files: one for the ACPI tables consumed by the ACPICA core, and another for the miscellaneous ACPI tables that are consumed by the drivers and other software. The various FADT definitions were merged into one common section and three different tables (ACPI 1.0, 1.0+, and 2.0) Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 61686124f47d7c4b78610346c5f8f9d8a6d46bb5 tree 6fd91b2c1749907e58ef136107e53d634d7978c4 parent 144c87b4e03759214c362d267e01c2905f1ab095 author Bob Moore Fri, 17 Mar 2006 16:44:00 -0500 committer Len Brown Wed, 14 Jun 2006 01:22:20 -0400 [ACPI] ACPICA 20060317 Implemented the use of a cache object for all internal namespace nodes. Since there are about 1000 static nodes in a typical system, this will decrease memory use for cache implementations that minimize per-allocation overhead (such as a slab allocator.) Removed the reference count mechanism for internal namespace nodes, since it was deemed unnecessary. This reduces the size of each namespace node by about 5%-10% on all platforms. Nodes are now 20 bytes for the 32-bit case, and 32 bytes for the 64-bit case. Optimized several internal data structures to reduce object size on 64-bit platforms by packing data within the 64-bit alignment. This includes the frequently used ACPI_OPERAND_OBJECT, of which there can be ~1000 static instances corresponding to the namespace objects. Added two new strings for the predefined _OSI method: "Windows 2001.1 SP1" and "Windows 2006". Split the allocation tracking mechanism out to a separate file, from utalloc.c to uttrack.c. This mechanism appears to be only useful for application-level code. Kernels may wish to not include uttrack.c in distributions. Removed all remnants of the obsolete ACPI_REPORT_* macros and the associated code. (These macros have been replaced by the ACPI_ERROR and ACPI_WARNING macros.) Signed-off-by: Bob Moore Signed-off-by: Len Brown commit b5ed7639c9f502898af4109e778f5613dacbfd9c tree abe908c60ce1ea8f201028c9fc830cacd25c724b parent 0638dec01e89059c853515ab71c55fd13ba5a8ea parent eb35cf60e462491249166182e3e755d3d5d91a28 author Jeff Garzik Tue, 13 Jun 2006 20:29:04 -0400 committer Jeff Garzik Tue, 13 Jun 2006 20:29:04 -0400 Merge branch 'master' into upstream commit db9ca5803566078aafe63cf364ef98b5097e4194 tree ce330cdf21728f00801004e3900c79e4195cd516 parent bf717b11aec20965d48dea36dea3eea18a75d18c parent eb35cf60e462491249166182e3e755d3d5d91a28 author Jeff Garzik Tue, 13 Jun 2006 20:28:05 -0400 committer Jeff Garzik Tue, 13 Jun 2006 20:28:05 -0400 Merge branch 'master' into upstream commit bf717b11aec20965d48dea36dea3eea18a75d18c tree 4e2d1051910cc983d689c6b4ce86eb497e6667cf parent f0eb62b81dd16bfc4034916418c3406ba20011e1 author Jeff Garzik Tue, 13 Jun 2006 20:27:03 -0400 committer Jeff Garzik Tue, 13 Jun 2006 20:27:03 -0400 [libata] Update docs to reflect current driver API commit 0fd1ffe0633b4b039b343b753598e6df435e034d tree 2b7aca82f26ed911dd86f47af80456b35ea776b8 parent 6344a423e5806d138923caa1d7699f3b7809fe43 author Pavel Machek Tue, 13 Jun 2006 21:31:39 +0000 committer Steve French Tue, 13 Jun 2006 21:31:39 +0000 [CIFS] Fix suspend/resume problem which causes EIO on subsequent access to the mount. Signed-off-by: Pavel Machek Signed-off-by: Steve French commit 76df73ff90e99681a99e457aec4cfe0a240b7982 tree 0a6302b1a8e5d11aeed8aa49f7e846f35aad4f5a parent 5c601d0c942f5aaf7f3cff7e08f61047d70a964e parent 86bc843a268058df558844b6bf64531617fbc698 author John W. Linville Tue, 13 Jun 2006 15:38:11 -0400 committer John W. Linville Tue, 13 Jun 2006 15:38:11 -0400 Merge branch 'from-linus' into upstream commit d7ede1aa5dfff53e76dbabac5b8087341686f662 tree a5c973fc20ed782dca3b52ae15fe4bd517028bf9 parent b190f1138b0f30fbe837b3f09fb6ffdb2fc4da24 author Nathan Scott Tue, 13 Jun 2006 16:28:11 +1000 committer Nathan Scott Tue, 13 Jun 2006 16:28:11 +1000 [XFS] Minor XFS documentation updates. Signed-off-by: Nathan Scott commit 31925323b1b51bb65db729e029472a8b1f635b7d tree e902a594508124adc74d07018834f5dce49af052 parent 430644312810645a6e05855db50a978df9ba3ad3 author Paul Mackerras Tue, 13 Jun 2006 13:43:00 +1000 committer Paul Mackerras Tue, 13 Jun 2006 13:43:00 +1000 powerpc: Fix some missed ppc32 mm->context.id conversions Signed-off-by: Paul Mackerras commit 7136b8073f0123918e3e50269ae021bbb09e1a81 tree 65643f892bcac13e27f65bf53dd6a00f1969c071 parent 2c4b69bd7bff85ae9e8b2032179aee9c04da70ba author Ben Collins Mon, 12 Jun 2006 18:16:25 -0400 committer Ben Collins Mon, 12 Jun 2006 18:16:25 -0400 eth1394: replace __constant_htons by htons ...and __constant_ntohs, __constant_ntohl, __constant_cpu_to_be32 too where possible. Htons and friends are resolved to constants in these places anyway. Also fix an endianess glitch in a log message, spotted by Alexey Dobriyan. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 2c4b69bd7bff85ae9e8b2032179aee9c04da70ba tree 1e6033068a2725c7e42da0fe006066b2ea40615c parent 445151932e869fd76b23bccff75ae2a600ccf3c9 author Ben Collins Mon, 12 Jun 2006 18:16:16 -0400 committer Ben Collins Mon, 12 Jun 2006 18:16:16 -0400 ieee1394: adjust code formatting in highlevel.c Replace spaces by tabulators, wrap lines at 80 columns, delete some blank lines and superfluous braces. Collapse some if()-within-if() constructs. Replace a literal CSR address by its preprocessor constant. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 445151932e869fd76b23bccff75ae2a600ccf3c9 tree 5d71807bde779cd3f7454f02085a3d4b27cd7399 parent f654240f330d77eb198af4abde89131e2a0e4f90 author Ben Collins Mon, 12 Jun 2006 18:16:01 -0400 committer Ben Collins Mon, 12 Jun 2006 18:16:01 -0400 ieee1394: hl_irqs_lock is taken in hardware interrupt context ohci1394 and pcilynx call highlevel_host_reset from their hardware interrupt handler (via hpsb_selfid_complete). Therefore all readers and writers of hl_irqs_lock have to disable interrupts. Reported by Jiri Slaby and J. A. Magallon. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit f654240f330d77eb198af4abde89131e2a0e4f90 tree 60693ba031145a7ec6bb0c82f89ab9e8419d48dd parent dd082c670523231dc9a26dafee1dc22b57df2921 author Ben Collins Mon, 12 Jun 2006 18:15:50 -0400 committer Ben Collins Mon, 12 Jun 2006 18:15:50 -0400 ieee1394_core: switch to kthread API This gets also rid of the MODPOST warning "drivers/ieee1394/ieee1394.o - Section mismatch: reference to .exit.text: from .smp_locks after '' (at offset 0x18)". Signed-off-by: Christoph Hellwig Signed-off-by: Jody McIntyre Signed-off-by: Stefan Richter Signed-off-by: Andrew Morton Signed-off-by: Ben Collins commit dd082c670523231dc9a26dafee1dc22b57df2921 tree 1fc7145e190d5e9869c626125eed58be36185f58 parent 6737231ead125c7cee7ce4d3a74179bdac085529 author Ben Collins Mon, 12 Jun 2006 18:15:40 -0400 committer Ben Collins Mon, 12 Jun 2006 18:15:40 -0400 ieee1394: sbp2: Kconfig fix We only support x86 and ppc, due to the use of bus_to_virt() and friends. Signed-off-by: Stefan Richter Signed-off-by: Andrew Morton Signed-off-by: Ben Collins commit 6737231ead125c7cee7ce4d3a74179bdac085529 tree f0c996c8c48d07398c47ada5a2dacdcbf0800770 parent e269d276792684a13ab0d9acd8c024ec7d6c5f4d author Ben Collins Mon, 12 Jun 2006 18:15:31 -0400 committer Ben Collins Mon, 12 Jun 2006 18:15:31 -0400 ieee1394: add preprocessor constant for invalid csr address Replace occurrences of the magic value ~(u64)0 for invalid CSR address spaces by a named constant for better readability. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit e269d276792684a13ab0d9acd8c024ec7d6c5f4d tree 18d02851685f4e458a52984e290ced6aaa976998 parent 02f4213fc43dbddc3a3ab9fa4d2dc2501a2d30dc author Ben Collins Mon, 12 Jun 2006 18:15:20 -0400 committer Ben Collins Mon, 12 Jun 2006 18:15:20 -0400 sbp2: fix deregistration of status fifo address space The proper designator of an invalid CSR address is ~(u64)0, not (u64)0. Use the correct value in initialization and deregistration. Also, scsi_id->sbp2_lun does not need to be initialized twice. (scsi_id was kzalloc'd.) Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 02f4213fc43dbddc3a3ab9fa4d2dc2501a2d30dc tree 933b5873408730694f64470aa7bc218b0c380827 parent b21efb59c5d317a2a972b9d66939cbfeababd982 author Ben Collins Mon, 12 Jun 2006 18:15:11 -0400 committer Ben Collins Mon, 12 Jun 2006 18:15:11 -0400 [PATCH] eth1394: endian fixes Signed-off-by: Alexey Dobriyan Signed-off-by: Ben Collins commit b21efb59c5d317a2a972b9d66939cbfeababd982 tree c9a33f904597a5ab9e1e6e021963bc3db3411fcd parent 05db5055b1844bf39d1429a0c43078959198cd1d author Ben Collins Mon, 12 Jun 2006 18:15:03 -0400 committer Ben Collins Mon, 12 Jun 2006 18:15:03 -0400 Fix broken suspend/resume in ohci1394 I've been experimenting to track down the cause of suspend/resume problems on my Compaq Presario X1050 laptop: http://bugzilla.kernel.org/show_bug.cgi?id=6075 Essentially the ACPI Embedded Controller and keyboard controller would get into a bizarre, confused state after resume. I found that unloading the ohci1394 module before suspend and reloading it after resume made the problem go away. Diffing the dmesg output from resume, with and without the module loaded, I found that with the module loaded I was missing these: PM: Writing back config space on device 0000:02:00.0 at offset 1. (Was 2100080, writing 2100007) PM: Writing back config space on device 0000:02:00.0 at offset 3. (Was 0, writing 8008) PM: Writing back config space on device 0000:02:00.0 at offset 4. (Was 0, writing 90200000) PM: Writing back config space on device 0000:02:00.0 at offset 5. (Was 1, writing 2401) PM: Writing back config space on device 0000:02:00.0 at offset f. (Was 20000100, writing 2000010a) The default PCI driver performs the pci_restore_state when no driver is loaded for the device. When the ohci1394 driver is loaded, it is supposed to do this, however it appears not to do so. I created the patch below and tested it, and it appears to resolve the suspend problems I was having with the module loaded. I only added in the pci_save_state and pci_restore_state - however, though I know little of this hardware, surely the driver should really be doing more than this when suspending and resuming? Currently it does almost nothing, what if there are commands in progress, etc? Signed-off-by: Robert Hancock Cc: Jody McIntyre Cc: Ben Collins Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Ben Collins commit 05db5055b1844bf39d1429a0c43078959198cd1d tree c0848d2d8fa638987479b4146a90976e27f1964c parent bccbccdbf8f866a8e01967a48241db548e12adf2 author Ben Collins Mon, 12 Jun 2006 18:14:47 -0400 committer Ben Collins Mon, 12 Jun 2006 18:14:47 -0400 sbp2: use __attribute__((packed)) for on-the-wire structures It seems to have worked without the attribute during all the years just because sizes of all struct members are multiples of 32 bits. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit bccbccdbf8f866a8e01967a48241db548e12adf2 tree 0248baa7bbd23ba6c4b3afab8167ff187f60b698 parent d0aef39f9b5941beb322924986ddee8c4903cd72 author Ben Collins Mon, 12 Jun 2006 18:14:36 -0400 committer Ben Collins Mon, 12 Jun 2006 18:14:36 -0400 sbp2: provide helptext for CONFIG_IEEE1394_SBP2_PHYS_DMA and mark it experimental It appears I will not get it fixed overnight. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit d0aef39f9b5941beb322924986ddee8c4903cd72 tree bcbc3d99dc5b1f5d3b852e0aa5556698d77c7f2c parent fd23ade80e2bef156aa096459c31c010dacbea1e author Ben Collins Mon, 12 Jun 2006 18:14:27 -0400 committer Ben Collins Mon, 12 Jun 2006 18:14:27 -0400 Update feature removal of obsolete raw1394 ISO requests. Signed-off-by: Jody McIntyre Signed-off-by: Ben Collins commit fd23ade80e2bef156aa096459c31c010dacbea1e tree 7e381b0be5a7475d18c11b9795520e2eb0eba19a parent 40ae6c5e88790c2558013640ca4e0a5017c54162 author Ben Collins Mon, 12 Jun 2006 18:14:14 -0400 committer Ben Collins Mon, 12 Jun 2006 18:14:14 -0400 sbp2: fix S800 transfers if phys_dma is off If sbp2 is forced to move data via ARM handler, the maximum packet size allowed for S800 transfers exceeds ohci1394's buffer size on platforms where PAGE_SIZE is 4096. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 40ae6c5e88790c2558013640ca4e0a5017c54162 tree 1dd23d5c0ad48fed0266e75da9fe7fac78aa36fe parent fa9b73997cc621b9a15c96f07dda26775e61ac6a author Ben Collins Mon, 12 Jun 2006 18:13:49 -0400 committer Ben Collins Mon, 12 Jun 2006 18:13:49 -0400 sbp2: remove ohci1394 specific constant Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit fa9b73997cc621b9a15c96f07dda26775e61ac6a tree 2bb2606a0bda551d662ae75554ebb044cc02e749 parent 4611ed38030a2ce3661de999c3487e5a1eed0dc0 author Ben Collins Mon, 12 Jun 2006 18:13:42 -0400 committer Ben Collins Mon, 12 Jun 2006 18:13:42 -0400 ohci1394: make phys_dma parameter read-only Being able to switch physical DMA on and off at run time would be a nice feature but a PITA to support by highlevel drivers and userspace apps. Therefore allow it only to be set when the driver is being loaded. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 4611ed38030a2ce3661de999c3487e5a1eed0dc0 tree bd0924844e1b5b5ccefc4ee5cf81c917b8781e5c parent 8aef63ff033fb0e7ba02d8e760d268eb0aafc58c author Ben Collins Mon, 12 Jun 2006 18:13:32 -0400 committer Ben Collins Mon, 12 Jun 2006 18:13:32 -0400 ohci1394: set address range properties This patch supplies the API extension introduced by patch "ieee1394: extend lowlevel API for address range properties" with proper addresses. Like in patch ''ohci1394, sbp2: fix "scsi_add_device failed" with PL-3507 based devices'', 1 TeraByte is chosen as physical upper bound. This leaves a window for the middle address range. This choice is only relevant for adapters which actually have a programmable pysical upper bound register. (Only ALi and Fujitsu adapters are known for this. Most adapters have a fixed bound at 4 GB.) The middle address range is suitable for posted writes. AFAIK, PCILynx does not support physical DMA nor posted writes, therefore no equivalent change in the pcilynx driver is necessary. There is also a driver for GP2Lynx, although not in mainline Linux. I assume this hardware does not support these OHCI features either. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 8aef63ff033fb0e7ba02d8e760d268eb0aafc58c tree 0e458c802e8e409c29fb53752b93b757b1a141c7 parent 20f4578156995e95613497baf16d5b2d54921e5d author Ben Collins Mon, 12 Jun 2006 18:13:21 -0400 committer Ben Collins Mon, 12 Jun 2006 18:13:21 -0400 ieee1394: extend lowlevel API for address range properties Host adapter hardware imposes certain restrictions and features on address ranges. Instead of hard-wire such ranges into the ieee1394 core or even into protocol drivers, let lowlevel drivers specify these ranges via struct hpsb_host. Patch "ohci1394: set address range properties" must be applied too, else hpsb_allocate_and_register_addrspace() won't work properly. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 20f4578156995e95613497baf16d5b2d54921e5d tree 65e6431950cda92aa16bd587c5a05d5acbc7beff parent fe42b05a9929e159355bde6025ae46db2ac88658 author Ben Collins Mon, 12 Jun 2006 18:13:11 -0400 committer Ben Collins Mon, 12 Jun 2006 18:13:11 -0400 sbp2: log number of supported concurrent logins Since this is useful information, promote it from a debug macro to a regular log message. The message appears only if the user set exclusive_login=0, therefore won't clutter the logs in normal use. Also update the comment on exclusive_login. Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Signed-off-by: Ben Collins commit fe42b05a9929e159355bde6025ae46db2ac88658 tree 61a4bd4dd7b138e3d3148f1b288158eb53361c37 parent eaf88450d21fc839c3e77fa6942b8d4192bdfe53 author Ben Collins Mon, 12 Jun 2006 18:12:59 -0400 committer Ben Collins Mon, 12 Jun 2006 18:12:59 -0400 sbp2: remove manipulation of inquiry response This code became ineffective a few Linux releases ago and is not required anyway. Note from Christoph Hellwig: scsi_cmnd.request_buffer is always a scatterlist these days. Checking random bites into it and then mangling the data in sbp2_check_sbp2_response will cause really bad memory corruption when you're not lucky enough to have the check not trigger by luck. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit eaf88450d21fc839c3e77fa6942b8d4192bdfe53 tree 5684c02796ac92f1283c06bd9179f5730a32632d parent 647dcb5fae0ebb5da1272ed2773df0d3f152c303 author Ben Collins Mon, 12 Jun 2006 18:12:49 -0400 committer Ben Collins Mon, 12 Jun 2006 18:12:49 -0400 ieee1394: save RAM by using a single tlabel for broadcast transactions Since broadcast transactions are already complete when the request has been sent, the same transaction label can be reused all over again, see IEEE 1394 7.3.2.5 and 6.2.4.3. Therefore we can reduce the footprint of struct hpsb_host by the size of one struct hpsb_tlabel_pool. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 647dcb5fae0ebb5da1272ed2773df0d3f152c303 tree 31d6a6ab3fd8acb2dc9335dfa181972f4433158a parent 57fdb58fa5a140bdd52cf4c4ffc30df73676f0a5 author Ben Collins Mon, 12 Jun 2006 18:12:37 -0400 committer Ben Collins Mon, 12 Jun 2006 18:12:37 -0400 ieee1394: support for slow links or slow 1394b phy ports Add support for the following types of hardware: + nodes that have a link speed < PHY speed + 1394b PHYs that are less than S800 capable + 1394b/1394a adapter cable between two 1394b PHYs Also, S1600 and S3200 are now supported if IEEE1394_SPEED_MAX is raised. A probing function is added to nodemgr's config ROM fetching routine which adjusts the allowable speed if an access problem was encountered. Pros and Cons of the approach: + minimum code footprint to support this less widely used hardware + nearly no overhead for unaffected hardware - ineffective before nodemgr began to read the ROM of affected nodes - ineffective if ieee1394 is loaded with disable_nodemgr=1 The speed map CSRs which are published to the bus are not touched by the patch. Signed-off-by: Stefan Richter Cc: Hakan Ardo Cc: Calculex Cc: Robert J. Kosinski Signed-off-by: Ben Collins commit 57fdb58fa5a140bdd52cf4c4ffc30df73676f0a5 tree 336c32051f005771cbfad5501a5a73caa6493eb1 parent 7597028a833b6bfafae0a8fbc18992a278467adf author Ben Collins Mon, 12 Jun 2006 18:12:21 -0400 committer Ben Collins Mon, 12 Jun 2006 18:12:21 -0400 ieee1394/ohci1394: CycleTooLong interrupt management This patch modifies the ohci1394.c file to enable and manage the "cycle too long" interrupt. If this interrupt occurs, the "LinkControl.CycleMaster" bit of the host controller is reseted. This implies, that the host controller does not send "cycle start" packet anymore freezing then the isochronous communication. The management of the interrupt added by the patch is that when the interrupt occurs, the OHCI irq handler prints a kernel log warning and then sets the "LinkControl.CycleMaster" bit again resuming the isochronous communication. Signed-off-by: Jean-Baptiste Mur Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 7597028a833b6bfafae0a8fbc18992a278467adf tree 7ab3352fbac05b650662d158eb82c334e3dfd008 parent fa7614de60d10460a607c3ca22ea080d021c3fef author Ben Collins Mon, 12 Jun 2006 18:12:10 -0400 committer Ben Collins Mon, 12 Jun 2006 18:12:10 -0400 raw1394: fix whitespace after x86_64 compat patch Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit fa7614de60d10460a607c3ca22ea080d021c3fef tree 527366903701b51a0f9425886e547f8dc4de4788 parent 4b9a334703cf99a1a5b9f64cf9f028e3e1ae91ff author Ben Collins Mon, 12 Jun 2006 18:11:07 -0400 committer Ben Collins Mon, 12 Jun 2006 18:11:07 -0400 From: Arjan van de Ven Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Cc: Ben Collins Cc: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Ben Collins commit 4b9a334703cf99a1a5b9f64cf9f028e3e1ae91ff tree cccba18796585dd7e31f1b81c08ef529f45a4501 parent ff34d3bddf2a1d7ae1e96a25e73e16042778c4c4 author Ben Collins Mon, 12 Jun 2006 18:10:18 -0400 committer Ben Collins Mon, 12 Jun 2006 18:10:18 -0400 sbp2: make TSB42AA9 workaround specific to Momobay CX-1 The workarounds are not required for DViCO Momobay FX-3A and AFAIR not for Momobay CX-2. These contain an TSB42AA9A but feature the same firmware_revision value as the older DViCO Momobay CX-1. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit ff34d3bddf2a1d7ae1e96a25e73e16042778c4c4 tree e23906b6f9ce5d66d67133df305507bf0b7ba491 parent 9bb2bcdb4b6f9a04363c8ea4cf72c592d6c7af71 author Ben Collins Mon, 12 Jun 2006 17:53:31 -0400 committer Ben Collins Mon, 12 Jun 2006 17:53:31 -0400 ohci1394: Remove superfluous call to free_dma_rcv_ctx, spotted by Adrian Bunk. Also remove some superfluous comments. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 9bb2bcdb4b6f9a04363c8ea4cf72c592d6c7af71 tree 5821a1f75856b45997856f19c0760a932d9709d0 parent f54b1bdff1b470ff4461de3a73a7ceaf3a52e10a author Ben Collins Mon, 12 Jun 2006 17:52:59 -0400 committer Ben Collins Mon, 12 Jun 2006 17:52:59 -0400 ieee1394: speed up of dma_region_sync_for_cpu when attempting to find the 'last' part of the dma region continue the search from where we left off, instead of starting the search over. Signed-off-by: Jim Westfall Signed-off-by: Ben Collins commit f54b1bdff1b470ff4461de3a73a7ceaf3a52e10a tree ce424168fcab891cc04e6fc2440ab2ed172ab0c5 parent 0e838b72d54ed189033939258a961f2a0cd59647 author Ben Collins Mon, 12 Jun 2006 17:52:16 -0400 committer Ben Collins Mon, 12 Jun 2006 17:52:16 -0400 video1394: be quiet When working with multiple cameras and intensive applications, our logs get flooded with video1394 information which isn't of much interest. Any objections to demoting these messages to debug messages? Signed-off-by: Daniel Drake Signed-off-by: Ben Collins commit e474c66b1c76f9755f5d6dd5bfe88ce5e0435184 tree 4034e9825a19b1ae1bed578ca03f595c0c282c36 parent 0e838b72d54ed189033939258a961f2a0cd59647 author Andrew Morton Mon, 12 Jun 2006 22:10:22 +0100 committer Russell King Mon, 12 Jun 2006 22:10:22 +0100 [MMC] sdhci truncated pointer fix On 64-bit machines, we just lost the uppermost 32 bits. Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 821499a8241019be5591fad5ab925759fbcd9f32 tree 2a68cbe5ad747412afa085fbca2fc56b19d10722 parent c5943d36aebb79589ac3983eec418bbeca897573 author Mark Haverkamp Mon, 12 Jun 2006 10:53:58 -0700 committer James Bottomley Mon, 12 Jun 2006 14:47:55 -0500 [SCSI] aacraid: Fix return code interpretation Received from Mark Salyzyn clear_user return is 0 for success, the code fragment is written to assume that it is the count of the number of bytes zero'd. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit c5943d36aebb79589ac3983eec418bbeca897573 tree 6412182aab9b3f97e2163346cfc6c0a04af70be3 parent 8d7feac3c7504425aaf61dc7d804685a6b89ee43 author James Bottomley Mon, 12 Jun 2006 09:09:18 -0500 committer James Bottomley Mon, 12 Jun 2006 10:38:51 -0500 [SCSI] scsi_transport_sas: fix panic in sas_free_rphy This is a hold over from the end device/expander conversion. Apparently the rphy list pointer is never initialised, so list_del() on the uninitialised pointer can panic the system Signed-off-by: James Bottomley commit f0eb62b81dd16bfc4034916418c3406ba20011e1 tree c051e5da940044e189b2227ede4ccb373d0fa169 parent d01712698c7c52bc71f41192e864dccc90a1217d author Tejun Heo Mon, 12 Jun 2006 23:05:38 +0900 committer Jeff Garzik Mon, 12 Jun 2006 10:23:21 -0400 [PATCH] libata: add host_set->next for legacy two host_sets case, take #3 For a legacy ATA controller, libata registers two separate host sets. There was no connection between the two hosts making it impossible to traverse all ports related to the controller. This patch adds host_set->next which points to the second host_set and makes ata_pci_remove_one() remove all associated host_sets. * On device removal, all ports hanging off the device are properly detached. Prior to this patch, ports on the first host_set weren't detached casuing oops on driver unloading. * On device removal, both host_sets are properly freed This will also be used by new power management code to suspend and resume all ports of a controller. host_set/port representation will be improved to handle legacy controllers better and this host_set linking will go away with it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d01712698c7c52bc71f41192e864dccc90a1217d tree f7736e757162618bb7f1dbebe3f60a78f861a49a parent d4c85325a817d3351e61c4be64b437116e8483b4 author Tejun Heo Mon, 12 Jun 2006 22:51:14 +0900 committer Jeff Garzik Mon, 12 Jun 2006 10:23:21 -0400 [PATCH] libata: fix oops caused rescanning NULL sdev Depending on timing, ata_scsi_dev_rescan() might encounter a device which is enabled but not yet attached to sdev. On such cases, the original code caused oops. This patch makes ata_scsi_dev_rescan() rescan only device which are attached to sdevs. While at it, properly indent leading comment and add description about how it's synchronized with sdev attach/detach. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d4c85325a817d3351e61c4be64b437116e8483b4 tree 6a97a2e92a3068782cca7d139456e695c82935ec parent aeb2ecd6096182cc080d37679080c0f088dcd4a4 author Tejun Heo Mon, 12 Jun 2006 18:45:55 +0900 committer Jeff Garzik Mon, 12 Jun 2006 09:37:21 -0400 [PATCH] sata_sil: update device hotplug handling, take #2 SIEN on some 3112 controllers doesn't mask SATA IRQ properly. IRQ stays asserted even after SIEN is masked and IRQ is acked. Also, even while frozen, any SATA PHY event including hardreset raises SATA IRQ. Clearing SError seems to be the only way to deassert SATA IRQ. This patch makes sil_host_intr() clear SError on SATA IRQs and ignore SATA IRQs reported while frozen so that hardreset doesn't trigger hotplug event (which ends up hardresetting again). In such cases, the port still gets re-frozen to minimize the danger of screaming interrupts. This results in one nil EH repeat on controllers with broken SIEN but other than that does no harm. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 430644312810645a6e05855db50a978df9ba3ad3 tree 2363ddbb95af2b3df95c0071060d9c69044e28ba parent 7a0c58d0513c246ac5438ef4a55ce8b93395ae0e author Paul Mackerras Mon, 12 Jun 2006 18:38:21 +1000 committer Paul Mackerras Mon, 12 Jun 2006 18:38:21 +1000 powerpc: Remove unused paca->pgdir field The pgdir field in the paca was a leftover from the dynamic VSIDs patch, and is not used in the current kernel code. This removes it. Signed-off-by: Paul Mackerras commit 7a0c58d0513c246ac5438ef4a55ce8b93395ae0e tree d18f58349ced242aa62e622e381e60933f71d451 parent 6218a761bbc27acc65248c80024875bcc06d52b1 parent 289a1e995e74734b5ec76ca8a5490058f4fecc24 author Paul Mackerras Mon, 12 Jun 2006 17:53:34 +1000 committer Paul Mackerras Mon, 12 Jun 2006 17:53:34 +1000 Merge branch 'merge' commit aeb2ecd6096182cc080d37679080c0f088dcd4a4 tree 8e103a541f59c8a31656666352a4d5ea10c00088 parent f9be7113b56eb5d013a611d9c65e8d1d2d3f7c94 author Tejun Heo Mon, 12 Jun 2006 14:11:43 +0900 committer Jeff Garzik Mon, 12 Jun 2006 02:10:26 -0400 [PATCH] libata: fast exit from EH while unloading Make EH exit fast if the port is being unloaded. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f9be7113b56eb5d013a611d9c65e8d1d2d3f7c94 tree e500b57b88989563a4b073f34a1ce8a9a1f48353 parent 551e8889509c30cda31e464e5cbe7572c4e1febd author Tejun Heo Mon, 12 Jun 2006 14:11:01 +0900 committer Jeff Garzik Mon, 12 Jun 2006 02:10:26 -0400 [PATCH] libata: fix ATA_EH_REVALIDATE clearing ATA_EH_REVALIDATE should be cleared after all devices on the target port have been revalidated. Fix ata_eh_revalidate_and_attach() accordingly. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 551e8889509c30cda31e464e5cbe7572c4e1febd tree 80dd36adfea622ffdf7c35a7a3496b6d1e1c7487 parent 23fa9618094975f803ed0c6a44604b16747b9637 author Tejun Heo Mon, 12 Jun 2006 14:09:49 +0900 committer Jeff Garzik Mon, 12 Jun 2006 02:10:26 -0400 [PATCH] libata: fix comment above ata_exec_internal() Add RETURNS comment above ata_exec_internal() and kill extra blank line. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 23fa9618094975f803ed0c6a44604b16747b9637 tree 6ddba8a0202624cb34a9a5b6cb98ae503b466faf parent 3b01b8af2414b6684051da4a1507dfacdbf24f86 author Tejun Heo Mon, 12 Jun 2006 14:18:51 +0900 committer Jeff Garzik Mon, 12 Jun 2006 02:10:26 -0400 [PATCH] sata_sil: add controller unplug detection in sil_interrupt() Short-circuit interrupt handling if BMDMA2 is reported as 0xffffffff indicating device removal. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 3b01b8af2414b6684051da4a1507dfacdbf24f86 tree fe47e129a121047ac39e7ed4501d65338c3a1f57 parent 3057ac3c1a992ee135cbb7b7d1a12e58d81f0739 author Jeff Garzik Mon, 12 Jun 2006 00:22:04 -0400 committer Jeff Garzik Mon, 12 Jun 2006 00:22:04 -0400 libata: fix build, by adding required workqueue member to port struct commit 6344a423e5806d138923caa1d7699f3b7809fe43 tree b5299ce6b2d8194bdd9fd71097f9209a0d576be2 parent 1717ffc58850dfa9e08b4977f8d0323cb3336863 author Steve French Mon, 12 Jun 2006 04:18:35 +0000 committer Steve French Mon, 12 Jun 2006 04:18:35 +0000 [CIFS] fix minor compile warning when config_cifs_weak_security is off Signed-off-by: Steve French commit 3057ac3c1a992ee135cbb7b7d1a12e58d81f0739 tree 38d83a88ee949b9db8f6655f90f98d88f8a5f2fd parent 39b07ce6d9f7cd4da8567baed844801e0aaa7b1a author zhao, forrest Mon, 12 Jun 2006 12:01:34 +0800 committer Jeff Garzik Mon, 12 Jun 2006 00:18:35 -0400 [PATCH] Snoop SET FEATURES - WRITE CACHE ENABLE/DISABLE command(v5) This patch makes libata snoop 'SET FEATURES - WRITE CACHE ENABLE/DISABLE' command, executing requisite revalidation processes to update cached data. Signed-off-by: Forrest Zhao Signed-off-by: Jeff Garzik commit 39b07ce6d9f7cd4da8567baed844801e0aaa7b1a tree cbae130d51c51f9c5f37fafb5c48ff9d41cfd10b parent 233277cad6dacca6a8e53743641cf43ef7f37c4a author Jeff Garzik Sun, 11 Jun 2006 23:59:44 -0400 committer Jeff Garzik Sun, 11 Jun 2006 23:59:44 -0400 libata: more verbose request_irq() failure Suggested by Jarek P. commit 233277cad6dacca6a8e53743641cf43ef7f37c4a tree 06cc72070888f7ec35f3ffb3144b9f3f35eaac24 parent bd5d825c9434b83925a88bd30eb9eef51908a3c9 author Brian King Wed, 07 Jun 2006 11:25:31 -0500 committer Jeff Garzik Sun, 11 Jun 2006 23:24:25 -0400 [PATCH] libata: Setup nbytes in ata_sg_init_one Setup nbytes in ata_sg_init_one to the total transfer length of the command. This is needed by some HBAs that need to know the total transfer length of each command. Signed-off-by: Brian King Signed-off-by: Jeff Garzik commit 0638dec01e89059c853515ab71c55fd13ba5a8ea tree 7743a5714b03ef408b3147475cfe61127d580ed3 parent 96e672c79fb114ec38a868dc864e743205c24332 author Herbert Valerio Riedel Thu, 01 Jun 2006 09:41:04 +0200 committer Jeff Garzik Sun, 11 Jun 2006 23:19:00 -0400 [PATCH] net: au1000_eth: PHY framework conversion convert au1000_eth driver to use PHY framework and garbage collected functions and identifiers that became unused/obsolete in the process Signed-off-by: Herbert Valerio Riedel Signed-off-by: Jeff Garzik commit bd5d825c9434b83925a88bd30eb9eef51908a3c9 tree 1b95f111b90d2a6909d325a100d3c75840e3991c parent b47725743cc53203d275ede5c54985ad92c15f42 author Borislav Petkov Sun, 11 Jun 2006 23:17:01 -0400 committer Jeff Garzik Sun, 11 Jun 2006 23:17:01 -0400 libata: Adjust initial debugging levels through preprocessor defines. Signed-off-by: Signed-off-by: Jeff Garzik commit b47725743cc53203d275ede5c54985ad92c15f42 tree 4d8d51d660ba507acdc705fd791424fa6fa085a4 parent fec69a97489f961026e24536dbb7b86ac663948c author Alexey Dobriyan Tue, 06 Jun 2006 07:31:14 +0400 committer Jeff Garzik Sun, 11 Jun 2006 23:07:19 -0400 [PATCH] sata_sil24: endian anotations With help from Tejun Heo. Signed-off-by: Alexey Dobriyan Signed-off-by: Jeff Garzik commit fec69a97489f961026e24536dbb7b86ac663948c tree 869713470d81ebc261598489a2711960336c7c37 parent 1049cb478783c74ca8c99ef70e7d2bf920b9335b parent 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320 author Jeff Garzik Sun, 11 Jun 2006 23:04:37 -0400 committer Jeff Garzik Sun, 11 Jun 2006 23:04:37 -0400 Merge branch 'upstream-fixes' into upstream Conflicts: drivers/scsi/sata_sil24.c commit 96e672c79fb114ec38a868dc864e743205c24332 tree 0bad9a61fdab616e7e4070dbfc972045b34b0954 parent a2bd2ec8d1bef7479d26d375162963106757e8e9 author Randy Dunlap Sat, 10 Jun 2006 13:33:48 -0700 committer Jeff Garzik Sun, 11 Jun 2006 12:16:01 -0400 [PATCH] 3c5zz ethernet: fix section warnings Priority: not critical; makes init code discardable. Fix section mismatch warnings: WARNING: drivers/net/3c501.o - Section mismatch: reference to .init.text:el1_probe from .text between 'init_module' (at offset 0x812) and 'cleanup_module' WARNING: drivers/net/3c503.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x661) and 'cleanup_card' WARNING: drivers/net/3c505.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x228d) and 'cleanup_module' WARNING: drivers/net/3c507.o - Section mismatch: reference to .init.text:el16_probe from .text between 'init_module' (at offset 0xa99) and 'cleanup_module' WARNING: drivers/net/3c523.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x12e7) and 'cleanup_module' WARNING: drivers/net/3c527.o - Section mismatch: reference to .init.text:mc32_probe from .text between 'init_module' (at offset 0xd8d) and 'cleanup_module' Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit a2bd2ec8d1bef7479d26d375162963106757e8e9 tree dc68527991d0bdaddec167bbe8ab4119c82faf7e parent 29f9f6d234753da97b74402f746981c63ec0b2f0 author Randy Dunlap Sat, 10 Jun 2006 13:30:10 -0700 committer Jeff Garzik Sun, 11 Jun 2006 12:16:01 -0400 [PATCH] smc ethernet: fix section mismatch warnings Priority: not critical; makes init code discardable. Removes one duplicate assignment. Fix section mismatch warnings: WARNING: drivers/net/smc-ultra.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x369) and 'cleanup_card' WARNING: drivers/net/smc-ultra32.o - Section mismatch: reference to .init.text:ultra32_probe from .text between 'init_module' (at offset 0x254) and 'cleanup_module' WARNING: drivers/net/smc9194.o - Section mismatch: reference to .init.text:smc_init from .text between 'init_module' (at offset 0x997) and 'cleanup_module' WARNING: drivers/net/smc9194.o - Section mismatch: reference to .init.data: from .data between 'smcdev.0' (at offset 0x44) and '__param_str_io' Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 29f9f6d234753da97b74402f746981c63ec0b2f0 tree e563c6e8b676255300e4f6fa9efc3a15fa458dc9 parent 5d1f16c6c4d64d1e4f53e277e39c0ada89f00a48 author Randy Dunlap Sat, 10 Jun 2006 13:32:12 -0700 committer Jeff Garzik Sun, 11 Jun 2006 12:16:01 -0400 [PATCH] hp ethernet: fix section mismatches Priority: not critical; makes init code discardable. Fix section mismatch warnings: WARNING: drivers/net/hp-plus.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x387) and 'cleanup_card' WARNING: drivers/net/hp.o - Section mismatch: reference to .init.data: from .text between 'hp_init_card' (at offset 0x310) and 'init_module' WARNING: drivers/net/hp.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x367) and 'cleanup_card' Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 5d1f16c6c4d64d1e4f53e277e39c0ada89f00a48 tree be867e13fb4d36b740b5a306d965bef900ff3556 parent 282f33c98618a3877043ec9dd5ac777c5e7c117d author Randy.Dunlap Sat, 10 Jun 2006 12:13:35 -0700 committer Jeff Garzik Sun, 11 Jun 2006 12:16:01 -0400 [PATCH] Section mismatch in drivers/net/ne.o during modpost On Sat, 10 Jun 2006 14:11:42 +0200 (MEST) Mikael Pettersson wrote: > While compiling 2.6.17-rc6 for a 486 with an NE2000 ISA ethernet card, I got: > > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.data:isapnp_clone_list from .text between 'init_module' (at offset 0x158) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.data:isapnp_clone_list from .text between 'init_module' (at offset 0x176) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.data:isapnp_clone_list from .text between 'init_module' (at offset 0x183) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.data:isapnp_clone_list from .text between 'init_module' (at offset 0x1ea) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.data:isapnp_clone_list from .text between 'init_module' (at offset 0x251) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x266) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x29b) and 'ne_block_input' > > Not sure how serious this is; the driver seems to work fine later on. Doesn't look serious. init_module() is not __init, but it calls some __init functions and touches some __initdata. BTW, I would be happy to see some consistent results from modpost section checking. I don't see all of these warnings (I see only 1) when using gcc 3.3.6. What gcc version are you using? Does that matter? (not directed at anyone in particular) Patch below fixes it for me. Please test/report. Signed-off-by: Jeff Garzik commit 282f33c98618a3877043ec9dd5ac777c5e7c117d tree 2194a2b7b067f8718aa42486cc14f29062e19dae parent b89fa8b6d738d71c3a9eff584177bb7de13f33b9 author Linas Vepstas Thu, 08 Jun 2006 22:19:44 -0700 committer Jeff Garzik Sun, 11 Jun 2006 10:35:15 -0400 [PATCH] e1000: prevent statistics from getting garbled during reset If a PCI bus error/fault triggers a PCI bus reset, attempts to get the ethernet packet count statistics from the hardware will fail, returning garbage data upstream. This patch skips statistics data collection if the PCI device is not on the bus. This patch presumes that an earlier patch, [PATCH] PCI Error Recovery: e1000 network device driver has already been applied. Signed-off-by: Linas Vepstas Cc: John Ronciak Cc: Jesse Brandeburg Cc: Jeff Kirsher Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit b89fa8b6d738d71c3a9eff584177bb7de13f33b9 tree 7a46854faeb856065b8686f14c48a1d5e9a99011 parent c99ce7ee75db7836e2faba932affd2aadd1e942f author Andrew Morton Thu, 08 Jun 2006 22:19:41 -0700 committer Jeff Garzik Sun, 11 Jun 2006 10:34:40 -0400 [PATCH] smc911x Kconfig fix In file included from drivers/net/smc911x.c:84: drivers/net/smc911x.h:46:9: warning: "SMC_USE_16BIT" is not defined drivers/net/smc911x.h:60:9: warning: "SMC_USE_32BIT" is not defined drivers/net/smc911x.h:73:10: warning: "SMC_USE_PXA_DMA" is not defined drivers/net/smc911x.c: In function `smc911x_reset': drivers/net/smc911x.c:247: warning: implicit declaration of function `SMC_inl' drivers/net/smc911x.c:249: warning: implicit declaration of function `SMC_outl' Cc: Dustin McIntire Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 1049cb478783c74ca8c99ef70e7d2bf920b9335b tree 724c27376039622a09504555e1df946a62b9aaaa parent 9a9c77dc4c4eed9dfb74080e768c0b3c9d905496 author Tejun Heo Thu, 08 Jun 2006 22:15:42 -0700 committer Jeff Garzik Sun, 11 Jun 2006 10:21:13 -0400 [PATCH] libata: add missing ->data_xfer for pdc_adma pdc_adma use libata-core PIO path but were left out during ->data_xfer conversion. Initialize with proper callbacks. This patch is against the current libata-dev#ALL. Controllers which implement their own PIO HSM (ahci and sil24) don't need ->data_xfer, so the above two are the only drivers which were left out during conversion. From: "Barry K. Nathan" Signed-off-by: Barry K. Nathan Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit c99ce7ee75db7836e2faba932affd2aadd1e942f tree f390bcb4658ba6149d72773f3963ee5599554968 parent ebe611a48378f8f5c347d86dc403a2d56c320f1c author Ayaz Abdulla Sat, 10 Jun 2006 22:48:28 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth: new device ids This patch contains new device ids for forcedeth ethernet. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit ebe611a48378f8f5c347d86dc403a2d56c320f1c tree 7c76f60f82b1434e5c79caf2000a10a1c9b10ea0 parent 69fe3fd7b1adac55f794cb2b34cb1c13a0b19f05 author Ayaz Abdulla Sat, 10 Jun 2006 22:48:24 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth config: version This patch bumps up the version number for config support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 69fe3fd7b1adac55f794cb2b34cb1c13a0b19f05 tree 7c5e668c6bbb8a8b1abd17c3b5c649304023475c parent 9589c77a0de19c0c95370d5212eb1f9006d8abcb author Ayaz Abdulla Sat, 10 Jun 2006 22:48:18 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth config: module parameters This patch adds (and modifies) module parameter support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 9589c77a0de19c0c95370d5212eb1f9006d8abcb tree 428c84c41d0e53bef95577fbb74ef764e7b8be89 parent 7a1854b7977d36360fde4e06c2d9cedcc3dd0933 author Ayaz Abdulla Sat, 10 Jun 2006 22:48:13 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth config: diagnostics This patch adds support for diagnostic tests through ethtool support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 7a1854b7977d36360fde4e06c2d9cedcc3dd0933 tree 65bc7ef5a9df892f35436847dd2769bf075bad14 parent 52da35789c305f6f44d0e85b294a9845c1271898 author Ayaz Abdulla Sat, 10 Jun 2006 22:48:08 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth config: move functions This patch moves a few functions (no logic change) so that the next patch has these functions defined. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 52da35789c305f6f44d0e85b294a9845c1271898 tree 08a3300452bdd23fbf2d835721fe64700739bd34 parent 5ed2616f621b41d3477d4f4ae2ba0e0a0e80bdce author Ayaz Abdulla Sat, 10 Jun 2006 22:48:04 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth config: statistics This patch exposes hardware statistic counters through ethtool support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 5ed2616f621b41d3477d4f4ae2ba0e0a0e80bdce tree 3455e8f39b655cd9cef5c347fb345383be43b008 parent c42d9df932ce3732044dc1394114380140ccffe0 author Ayaz Abdulla Sat, 10 Jun 2006 22:47:59 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: csum This patch allows for configurable rx and tx checksum offloads through ethtool support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit c42d9df932ce3732044dc1394114380140ccffe0 tree d268f5e64c67d4c4e8b88f7db2ab2b3a17be3143 parent f9430a015a4331ba950eba1d7661dcd876c29f3c author Ayaz Abdulla Sat, 10 Jun 2006 22:47:52 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: wol This patch fixes configuration bugs when modifying wol settings. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit f9430a015a4331ba950eba1d7661dcd876c29f3c tree 52433da933bc935fe3be5f5bf0cc617ca4ac017c parent b6d0773fa7943fd93d564056395a7ff29b81213b author Ayaz Abdulla Sat, 10 Jun 2006 22:47:47 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: phy This patch fixes configuration bugs when modifying phy settings. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit b6d0773fa7943fd93d564056395a7ff29b81213b tree 119a6000893c91ed6a5aa7c29d5e84bf1aeab069 parent eafa59f6bcc6e46b756198a5388d195c4f0e671a author Ayaz Abdulla Sat, 10 Jun 2006 22:47:42 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: flow control This patch allows for configurable flow control through ethtool support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit eafa59f6bcc6e46b756198a5388d195c4f0e671a tree 9530cd65e90c8b53e1dd4293c30b5eced199ecee parent 6a78814f6c9e35e9b4815c1973c988555212d6ef author Ayaz Abdulla Sat, 10 Jun 2006 22:47:34 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: ring sizes This patch allows for configurable ring size through ethtool support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 6a78814f6c9e35e9b4815c1973c988555212d6ef tree d786e34f58b786664f0b776d2e82fecbd127b7b3 parent cac925a4aab1b7233d3beb591f53498816058a08 author Ayaz Abdulla Sat, 10 Jun 2006 22:47:26 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: tso cleanup There are a series of patches for configuration support in forcedeth and one patch for device ids. This patch is a cleanup of the a previous TSO patch. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 6218a761bbc27acc65248c80024875bcc06d52b1 tree 59a278c4c189f838ede99de5fd46241d1923f52b parent 050613545b389825c1f5beb67fa2667b727f866d author Paul Mackerras Sun, 11 Jun 2006 14:15:17 +1000 committer Paul Mackerras Sun, 11 Jun 2006 14:15:17 +1000 powerpc: add context.vdso_base for 32-bit too This adds a vdso_base element to the mm_context_t for 32-bit compiles (both for ARCH=powerpc and ARCH=ppc). This fixes the compile errors that have been reported in arch/powerpc/kernel/signal_32.c. Signed-off-by: Paul Mackerras commit 9a9c77dc4c4eed9dfb74080e768c0b3c9d905496 tree a87eb0896be71537a99748f54184887785bf383e parent 0a1b622ef495d8ebba9ad8982414c6661c16b604 author Tejun Heo Sun, 11 Jun 2006 11:19:00 +0900 committer Tejun Heo Sun, 11 Jun 2006 11:19:00 +0900 [PATCH] libata: cosmetic change in struct ata_port Cosmetic change in struct ata_port. Signed-off-by: Tejun Heo commit 0a1b622ef495d8ebba9ad8982414c6661c16b604 tree f5aeae33e8e0347635a9e309c46f90387156c42a parent d87fa38e70853a9607dc34a02d15cf5f149f49f2 author Tejun Heo Sun, 11 Jun 2006 11:01:38 +0900 committer Tejun Heo Sun, 11 Jun 2006 11:01:38 +0900 [PATCH] libata: add missing finish_wait() call in ata_port_wait_eh() Add missing finish_wait() call after wait loop in ata_port_wait_eh(). Signed-off-by: Tejun Heo commit 8d7feac3c7504425aaf61dc7d804685a6b89ee43 tree 0dd98c8cbfea10bdc748951cf9dc10b44f0042eb parent beb40487508290f5d6565598c60a3f44261beef2 author Christoph Hellwig Sat, 10 Jun 2006 18:37:19 +0200 committer James Bottomley Sat, 10 Jun 2006 16:25:21 -0500 [SCSI] remove RQ_SCSI_* flags The RQ_SCSI_* flags are a vestiage of a long past history. The EH code still sets them but we never make use of that information. The other users is pluto.c which never had a chance to work but needs to be kept compiling to keep Davem happy, so copy over the definition there. We could probably get rid of RQ_ACTIVE/RQ_INACTIVE aswell with some work, there's only two more or less bogus looking uses in ubd and scsi. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit beb40487508290f5d6565598c60a3f44261beef2 tree ca63df47d8db8f1b1161b5db094b0a9c2b541d91 parent 1951d099dfd8fa529e86f4ac81d1a34554fbe302 author Christoph Hellwig Sat, 10 Jun 2006 18:01:03 +0200 committer James Bottomley Sat, 10 Jun 2006 16:24:40 -0500 [SCSI] remove scsi_request infrastructure With Achim patch the last user (gdth) is switched away from scsi_request so we an kill it now. Also disables some code in i2o_scsi that was broken since the sg driver stopped using scsi_requests. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 1951d099dfd8fa529e86f4ac81d1a34554fbe302 tree e5a92385151b77254c7c527653ee99d99206d1ff parent d6be06c84da9626b10443c664ee55bda96fb3514 author Michael Reed Wed, 24 May 2006 15:08:10 -0500 committer James Bottomley Sat, 10 Jun 2006 16:02:21 -0500 [SCSI] mptfusion: change driver revision to 3.03.10 Bump driver version number to reflect addition of various fibre channel patches. Signed-off-by: Michael Reed Signed-off-by: James Bottomley commit d6be06c84da9626b10443c664ee55bda96fb3514 tree 603c279d787722b9a64208ae7255c34a74af7405 parent 419835e285c3e39cd62c8c8426da0aebea9cd89f author Michael Reed Wed, 24 May 2006 15:07:57 -0500 committer James Bottomley Sat, 10 Jun 2006 16:01:52 -0500 [SCSI] mptfc: abort of board reset leaves port dead requiring reboot The driver uses msleep_interruptible() in the code path responsible for resetting the card's ports via the lsiutil command. If a is received during the reset it can leave a port in such a state that the only way to regain its use is to reboot the system. Changing from msleep_interruptible() to msleep() corrects the problem. Signed-off-by: Michael Reed Signed-off-by: James Bottomley commit 419835e285c3e39cd62c8c8426da0aebea9cd89f tree e550176245f09598ccf7ffff915524ff07d75c88 parent ca2f938efe71ca48cbc689db4df8d4f04b5d8f07 author Michael Reed Wed, 24 May 2006 15:07:40 -0500 committer James Bottomley Sat, 10 Jun 2006 16:00:03 -0500 [SCSI] mptfc: fix fibre channel infinite request/response loop While doing board reset testing I was able to put the system in an infinite request/response loop between the scsi layer and mptscsih_qcmd() by aborting the reset. This patch installs a "SETUP RESET" handler which calls fc_remote_port_delete() for all registered rports. This blocks the target which prevents the loop. Additionally, should the reset fail to complete, the transport will now terminate i/o to the target. Signed-off-by: Michael Reed Signed-off-by: James Bottomley commit ca2f938efe71ca48cbc689db4df8d4f04b5d8f07 tree 044df117f00aa7838d83a78aa40ed41c1f0baf31 parent 80d3ac77a84987d5132726f3d7cef342a280f7d9 author Michael Reed Wed, 24 May 2006 15:07:24 -0500 committer James Bottomley Sat, 10 Jun 2006 15:59:19 -0500 [SCSI] mptfc: set fibre channel fw target missing timers to one second The fibre channel firmware provides a timer which is similar in purpose to the fibre channel transport's device loss timer. The effect of this timer is to extend the total time that a target will be missing beyond the value associated with the transport's timer. This patch changes the firmware timer to a default of one second which significantly reduces the lag between when a target goes missing and the notification of the fibre channel transport. Signed-off-by: Michael Reed Signed-off-by: James Bottomley commit 80d3ac77a84987d5132726f3d7cef342a280f7d9 tree cb126b63a06eed078cd7daa95a998d01f3df015e parent f0cd91a68acdc9b49d7f6738b514a426da627649 author Michael Reed Wed, 24 May 2006 15:07:09 -0500 committer James Bottomley Sat, 10 Jun 2006 15:58:37 -0500 [SCSI] mptfusion: move fc event/reset handling to mptfc Move fibre channel event and reset handling to mptfc. This will result in fewer changes over time that need to be applied to either mptbase.c or mptscsih.c. Signed-off-by: Michael Reed Signed-off-by: James Bottomley commit f0cd91a68acdc9b49d7f6738b514a426da627649 tree 8ad73564015794197583b094217ae0a71e71e753 parent 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e parent 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 author James Bottomley Sat, 10 Jun 2006 13:47:26 -0500 committer James Bottomley Sat, 10 Jun 2006 13:47:26 -0500 Merge ../linux-2.6 commit 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e tree 6aedae05234660d5e188328c6165a760fbde4727 parent b2d8bfe18578c4e50e8ba52011c9b260a1b51dac author James Bottomley Sat, 10 Jun 2006 10:51:23 -0500 committer James Bottomley Sat, 10 Jun 2006 10:51:23 -0500 [SCSI] spi transport: don't allow dt to be set on SE or HVD buses This is really just a belt and braces test. The standards require disks to respond DT not capable on a non-LVD bus ... however, not all disks follow the standards ... Signed-off-by: James Bottomley commit b2d8bfe18578c4e50e8ba52011c9b260a1b51dac tree ab949e11e1e6d4e46ccb2bd5f8c9401cf46052a7 parent b9f051eb6cc013b90cb6062a1e2502e9c0adf0f4 author James Bottomley Sat, 10 Jun 2006 10:49:07 -0500 committer James Bottomley Sat, 10 Jun 2006 10:49:07 -0500 [SCSI] aic7xxx: expose the bus setting to sysfs Read the transciever register and display in the host transport properties. I'm still not entirely sure what this does for multiple transciever adapters (like some 160 ones) however, I suspect it displays the transciever state of the switchable bus segment. Signed-off-by: James Bottomley commit b9f051eb6cc013b90cb6062a1e2502e9c0adf0f4 tree 57255361ec2100e2193ef0d80ce820514cdcf073 parent 6391a11375de5e2bb1eb8481e54619761dc65d9f author Arthur Othieno Thu, 08 Jun 2006 22:23:45 -0700 committer James Bottomley Sat, 10 Jun 2006 10:46:01 -0500 [SCSI] scsi: remove Documentation/scsi/cpqfc.txt cpqfc driver flushed out with: [SCSI] remove broken driver cpqfc (commit ca61f10ab2b874b889e89d14ea09fae2dcccdca6) but somehow Documentation/scsi/cpqfc.txt managed to survive the blast. Signed-off-by: Arthur Othieno Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 6391a11375de5e2bb1eb8481e54619761dc65d9f tree 956aae1d278a3f731b2e6148ff40a69aa7957ea8 parent 9dc399de0840a478adb71278becf598d3ab3aacc author Tobias Klauser Thu, 08 Jun 2006 22:23:48 -0700 committer James Bottomley Sat, 10 Jun 2006 10:45:30 -0500 [SCSI] drivers/scsi: Use ARRAY_SIZE macro Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]) and remove duplicates of the macro. Signed-off-by: Tobias Klauser Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 9dc399de0840a478adb71278becf598d3ab3aacc tree 3fed70eebb84f14f75b813843a887408dfe67580 parent ede1e6f8b43246a9796583346839669b1f4b77d4 author Guennadi Liakhovetski Fri, 09 Jun 2006 22:25:23 +0200 committer James Bottomley Sat, 10 Jun 2006 10:38:24 -0500 [SCSI] Remove last page_address from dc395x.c Dynamically map scattergather buffer instead of using page_address(). Signed-off-by: Guennadi Liakhovetski Signed-off-by: James Bottomley commit ede1e6f8b43246a9796583346839669b1f4b77d4 tree 9fd35517168bf363bec59205f211db59d36beedf parent cbd5f69b98bb5d7a0d207230bcf8fa51fca3f3cf author HighPoint Linux Team Tue, 16 May 2006 14:38:09 +0800 committer James Bottomley Sat, 10 Jun 2006 10:36:13 -0500 [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver HighPoint RocketRAID 3220/3320 series 8 channel PCI-X SATA RAID Host Adapters. Fixes from original submission: Merge Andrew Morton's patches: - Provide locking for global list - Fix debug printks - uninline function with multiple callsites - coding style fixups - remove unneeded casts of void* - kfree(NULL) is legal - Don't "succeed" if register_chrdev() failed - otherwise we'll later unregister a not-registered chrdev. - Don't return from hptiop_do_ioctl() with the spinlock held. - uninline __hpt_do_ioctl() Update for Arjan van de Ven's comments: - put all asm/ includes after the linux/ ones - replace mdelay with msleep - add pci posting flush - do not set pci command reqister in map_pci_bar - do not try merging sg elements in hptiop_buildsgl() - remove unused outstandingcommands member from hba structure - remove unimplemented hptiop_abort() handler - remove typedef u32 hpt_id_t Other updates: - fix endianess Signed-off-by: HighPoint Linux Team Signed-off-by: James Bottomley commit cbd5f69b98bb5d7a0d207230bcf8fa51fca3f3cf tree f828a83b0e8006316b6b7a61819f4ef4ce6eac04 parent 5d5ff44fe6775ccb922fd1f7d478b2ba9ca95068 author Leubner, Achim Fri, 09 Jun 2006 11:34:29 -0700 committer James Bottomley Sat, 10 Jun 2006 10:24:40 -0500 [SCSI] remove the scsi_request interface from the gdth driver Initial pass at converting the gdth driver away from the scsi_request interface so that the request interface can be removed post 2.6.18 without breaking gdth. Based on changes from Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 050613545b389825c1f5beb67fa2667b727f866d tree d1d06c033d5254052dcc4824c1051a9966727c5b parent 6b81e80049a8815dc457fec4dadb6ae535c3b988 author Paul Mackerras Sat, 10 Jun 2006 18:17:35 +1000 committer Paul Mackerras Sat, 10 Jun 2006 18:17:35 +1000 powerpc: Fix bug in iommu_alloc_coherent causing hang during boot In commit 8eb6c6e3b9c8bfed3d75536ab142d7694627c2e5, Christoph Hellwig made iommu_alloc_coherent able to do node-local allocations, but unfortunately got the order of the arguments to alloc_pages_node wrong. This fixes it. Signed-off-by: Paul Mackerras commit 566f81ca598f80de03e80a9a743e94b65b4e017e tree d10821892ddef2329b025f196d23b930d8cde035 parent ff5417107b7615fcef772cabcb717f4a715ffadc author Sam Ravnborg Sat, 10 Jun 2006 09:15:27 +0200 committer Sam Ravnborg Sat, 10 Jun 2006 09:15:27 +0200 kbuild: ignore make's built-in rules & variables kbuild does explicitly specify what to do in all cases, and each time make's built-in rules & variables has been used it has been a bug. So to speed up things and to avoid the hard-to-debug error situations ignore the built-in definitions. If any part of the kernel uses the built-in definitions the build will just stop there and it should be trivial to fix. Signed-off-by: Sam Ravnborg commit ff5417107b7615fcef772cabcb717f4a715ffadc tree 80141c25462524a559764df128016584cce8cf6c parent 6449bd621ba51ef652ac5bda632eeabbc18dd296 author Nickolay Fri, 09 Jun 2006 21:24:14 +0400 committer Sam Ravnborg Sat, 10 Jun 2006 09:07:04 +0200 kbuild: bugfix with initramfs This patch fix double inclusion of ramfs-input. Signed-off-by: Nickolay Vinogradov Signed-off-by: Sam Ravnborg commit 6449bd621ba51ef652ac5bda632eeabbc18dd296 tree e43c03946cf1c45c62247981db5c12c6f9668b71 parent b817f6feff4a565b08f0e699a5790b4008b8f494 author Andrew Morton Fri, 09 Jun 2006 20:45:06 -0700 committer Sam Ravnborg Sat, 10 Jun 2006 07:58:14 +0200 kbuild: modpost build fix scripts/mod/modpost.c: In function `check_license': scripts/mod/modpost.c:1094: parse error before `const' scripts/mod/modpost.c:1095: `basename' undeclared (first use in this function) scripts/mod/modpost.c:1095: (Each undeclared identifier is reported only once scripts/mod/modpost.c:1095: for each function it appears in.) Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit f9068876f5ef583f8e9ebf4acd2ef5b35b113db9 tree 9347def6b7859dfa6c08e54640ee0f6c94f1ede3 parent f24ff6bf8c903bc0c645bf87fbe87f9a6d9f634f author David Woodhouse Sat, 10 Jun 2006 00:53:16 +0100 committer David Woodhouse Sat, 10 Jun 2006 00:53:16 +0100 [MTD NAND] Fix s3c2410 NAND driver so it at least _looks_ like it compiles Fix the control bit handling so it even looks like it might work, too. Bad tglx. No biscuit. Signed-off-by: David Woodhouse commit b817f6feff4a565b08f0e699a5790b4008b8f494 tree b33ca0f4477c500380bc409cc272ab7f207ed77b parent bd5cbcedf446e2f37cf2a37f533a7e1d7dff9312 author Sam Ravnborg Fri, 09 Jun 2006 21:53:55 +0200 committer Sam Ravnborg Fri, 09 Jun 2006 21:53:55 +0200 kbuild: check license compatibility when building modules Modules that uses GPL symbols can no longer be build with kbuild, the build will fail during the modpost step. When a GPL-incompatible module uses a EXPORT_SYMBOL_GPL_FUTURE symbol then warn during modpost so author are actually notified. The actual license compatibility check is shared with the kernel to make sure it is in sync. Patch originally from: Andreas Gruenbacher and Ram Pai Signed-off-by: Sam Ravnborg commit bd5cbcedf446e2f37cf2a37f533a7e1d7dff9312 tree 97cf8ea555684697b50a9444d75c33d28af0f0f4 parent 031ecc6de7d17752c57720a118a37e97a8454872 author Ram Pai Thu, 08 Jun 2006 22:12:53 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 20:33:10 +0200 kbuild: export-type enhancement to modpost.c This patch provides the ability to identify the export-type of each exported symbols in Module.symvers. NOTE: It updates the Module.symvers file with the additional information as shown below. 0x0f8b92af platform_device_add_resources vmlinux EXPORT_SYMBOL_GPL 0xcf7efb2a ethtool_op_set_tx_csum vmlinux EXPORT_SYMBOL Signed-off-by: Andreas Gruenbacher Signed-off-by: Ram Pai Signed-off-by: Avantika Mathur Signed-off-by: Valdis Kletnieks Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 031ecc6de7d17752c57720a118a37e97a8454872 tree a6f00ae22ecc879a123cb1005c4cc0bfdd75d499 parent c30a02e022576c1b49a6c9b39ad83559167399c6 author Zach Brown Thu, 08 Jun 2006 22:12:37 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 16:31:44 +0200 kbuild: add dependency on kernel.release to the package targets The binrpm-pkg target uses KERNELRELEASE when generated its .spec file. When binrpm-pkg was the first build target run in a tree it generated the .spec before kernel.release so the Version: tag in the .spec was empty. I don't know if this is the best fix, but binrpm-pkg works when we explicitly build kernel.release before descending into package-dir. Signed-off-by: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit c30a02e022576c1b49a6c9b39ad83559167399c6 tree 04c40d988ea2ae7d256fef070ef128bcc7bef840 parent 14cdd3c402bf7c66f0bcd76e290f0770a54a4b21 author Roman Zippel Thu, 08 Jun 2006 22:12:50 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 16:31:44 +0200 kbuild: `make kernelrelease' speedup Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 14cdd3c402bf7c66f0bcd76e290f0770a54a4b21 tree 1a58bdd177f1d5723a1a695e6165c5904c641c55 parent 250725aa13f5c9595e5bc265ebed8471e816d8b4 author Roman Zippel Thu, 08 Jun 2006 22:12:51 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 16:28:07 +0200 kconfig: KCONFIG_OVERWRITECONFIG If you set KCONFIG_OVERWRITECONFIG in environment, Kconfig will not break symlinks when .config is a symlink to somewhere else. Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 250725aa13f5c9595e5bc265ebed8471e816d8b4 tree 3a9929b80ab81d1ad1ef513fa5683c165c684740 parent e55a3e8aed99626dd9a9a6732fc0eb5b75ef29bd author Randy Dunlap Thu, 08 Jun 2006 22:12:50 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 16:28:07 +0200 kconfig: exit if no beginning filename If the beginning Kconfig file is missing, config segfaults so it might as well exit after the error message. Signed-off-by: Randy Dunlap Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit e55a3e8aed99626dd9a9a6732fc0eb5b75ef29bd tree a30fd1b93d804a0badc031936c730363c05c5bd5 parent f001f7f89689d3226678ab3986f3a486f54aa069 author Roman Zippel Thu, 08 Jun 2006 22:12:49 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 16:28:07 +0200 kconfig: remove leading whitespace in menu prompts This removes all the leading whitespace kconfig now warns about. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit f001f7f89689d3226678ab3986f3a486f54aa069 tree a787f4902da63ef277857c2b04aac75e56cb381a parent b65a47e1ac494777d853d7952cef611eedc22037 author Roman Zippel Thu, 08 Jun 2006 22:12:48 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 16:28:07 +0200 kconfig: warn about leading whitespace for menu prompts Kconfig does its own indentation of menu prompts, so warn about and ignore leading whitespace. Remove also a few unnecessary newlines after other warning prints. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit b65a47e1ac494777d853d7952cef611eedc22037 tree 1ad1b133e65fd2600631667c441b63ccc9ae3348 parent ab45d190fd4acf0b0e5d307294ce24a90a69cc23 author Roman Zippel Thu, 08 Jun 2006 22:12:47 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 16:28:07 +0200 kconfig: jump to linked menu prompt If clicking on of the links, which leads to a visible prompt, jump to it in the symbol list. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit ab45d190fd4acf0b0e5d307294ce24a90a69cc23 tree ca58fb441f19fb71f9baf7df924be3905bf825f2 parent 7fc925fd6a4c24e1db879d227fc0a0f65a335aa1 author Roman Zippel Thu, 08 Jun 2006 22:12:47 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 16:28:07 +0200 kconfig: create links in info window Extend the expression print helper function to allow customization of the symbol output and use it to add links to the info window. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit f24ff6bf8c903bc0c645bf87fbe87f9a6d9f634f tree 7138c0fad5b093e6e6762bfb31e5e3414685e428 parent 4ed0156f774cf50252e7f51032d1cc857fe86879 author Andrew Morton Fri, 09 Jun 2006 15:12:34 +0100 committer David Woodhouse Fri, 09 Jun 2006 15:12:34 +0100 [MTD] Prepare physmap for 64-bit-resources Fallout from the incoming 64-bit-resource stuff: drivers/mtd/maps/physmap.c: In function 'physmap_flash_probe': drivers/mtd/maps/physmap.c:94: warning: format '%.8lx' expects type 'long unsigned int', but argument 2 has type 'resource_size_t' drivers/mtd/maps/physmap.c:94: warning: format '%.8lx' expects type 'long unsigned int', but argument 3 has type 'resource_size_t' Cc: Vivek Goyal Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 4ed0156f774cf50252e7f51032d1cc857fe86879 tree 5b8e8b038309ce99d3a88e600f46b66ca7392b94 parent 3bcc86f507f5a0b6f5bfa312f37ec33711558acb author David Woodhouse Fri, 09 Jun 2006 15:06:42 +0100 committer David Woodhouse Fri, 09 Jun 2006 15:06:42 +0100 [JFFS2] Fix more breakage caused by janitorial meddling. jffs2_zlib_exit() and free_workspaces() shouldn't be marked __exit because they get called in the error case from the init functions. Signed-off-by: David Woodhouse commit 28df955a2ad484d602314b30183ea8496a9aa34a tree c62632b2a0a49df114283f10764244c1b1b5f506 parent 5046791417dcac1ba126b77b8062af15a2f0b8e1 author Trond Myklebust Fri, 09 Jun 2006 09:40:27 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:40:27 -0400 NLM: Fix reclaim races Currently it is possible for a task to remove its locks at the same time as the NLM recovery thread is trying to recover them. This quickly leads to an Oops. Protect the locks using an rw semaphore while they are being recovered. Signed-off-by: Trond Myklebust commit 5046791417dcac1ba126b77b8062af15a2f0b8e1 tree a59f8eecd3e089046859cd4489c550df7b6b1ead parent 3134cbec5e172c3a86e2c3ef4af34b6cfd380bfa author Trond Myklebust Fri, 09 Jun 2006 09:40:24 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:40:24 -0400 NLM: sem to mutex conversion Signed-off-by: Trond Myklebust commit 3134cbec5e172c3a86e2c3ef4af34b6cfd380bfa tree fb72cf27eb4ede283503f7b615437288c62b858d parent 81039f1f204a0fd2952112a240284e114f1a25e6 author Marc Eshel Fri, 09 Jun 2006 09:40:20 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:40:20 -0400 locks.c: add the fl_owner to nlm_compare_locks Add the fl_owner to NLM compare locks. Since two different client can present the same pid to the server it is not enough to distinguish locks from different clients. The fl_owner field is a pointer to the struct nlm_host which is unique for each client. Signed-off-by: Marc Eshel Signed-off-by: Trond Myklebust commit 81039f1f204a0fd2952112a240284e114f1a25e6 tree 511625e9ea5361dc240ef0540aff7e5cde1551cb parent f7b422b17ee5ee4920e8ae24a6ad04bf3481ce72 author Trond Myklebust Fri, 09 Jun 2006 09:34:34 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:34 -0400 NFS: Display the chosen RPCSEC_GSS security flavour in /proc/mounts Signed-off-by: Trond Myklebust commit f7b422b17ee5ee4920e8ae24a6ad04bf3481ce72 tree 4ae8372762efc092ceb4f884b57cad1efe6594de parent 4e5ccf60c5aa79d325c123f47d288a068166f389 author David Howells Fri, 09 Jun 2006 09:34:33 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:33 -0400 NFS: Split fs/nfs/inode.c As fs/nfs/inode.c is rather large, heterogenous and unwieldy, the attached patch splits it up into a number of files: (*) fs/nfs/inode.c Strictly inode specific functions. (*) fs/nfs/super.c Superblock management functions for NFS and NFS4, normal access, clones and referrals. The NFS4 superblock functions _could_ move out into a separate conditionally compiled file, but it's probably not worth it as there're so many common bits. (*) fs/nfs/namespace.c Some namespace-specific functions have been moved here. (*) fs/nfs/nfs4namespace.c NFS4-specific namespace functions (this could be merged into the previous file). This file is conditionally compiled. (*) fs/nfs/internal.h Inter-file declarations, plus a few simple utility functions moved from fs/nfs/inode.c. Additionally, all the in-.c-file externs have been moved here, and those files they were moved from now includes this file. For the most part, the functions have not been changed, only some multiplexor functions have changed significantly. I've also: (*) Added some extra banner comments above some functions. (*) Rearranged the function order within the files to be more logical and better grouped (IMO), though someone may prefer a different order. (*) Reduced the number of #ifdefs in .c files. (*) Added missing __init and __exit directives. Signed-Off-By: David Howells commit 4e5ccf60c5aa79d325c123f47d288a068166f389 tree acc16e1c85eb4348f4faf5288463f236d61e0fcc parent 860de07139980afe9856cc31eb5efbf321bbcea4 author Trond Myklebust Fri, 09 Jun 2006 09:34:32 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:32 -0400 NFS: Fix typo in nfs_do_clone_mount() Doh! Signed-off-by: Trond Myklebust commit 860de07139980afe9856cc31eb5efbf321bbcea4 tree e32a6c758b299f62978426c7e263f6f554678731 parent 87e4ba1a62af8e05ee3e8f8aaca622714386ffb0 author Trond Myklebust Fri, 09 Jun 2006 09:34:31 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:31 -0400 NFS: Fix compile errors introduced by referrals patches Signed-off-by: Trond Myklebust commit 87e4ba1a62af8e05ee3e8f8aaca622714386ffb0 tree f37f00e2c5cc5904f57395f800e8e6544eb062d9 parent 33a43f2802d8d7be3a9b541785c4ca9ad79e4310 author Trond Myklebust Fri, 09 Jun 2006 09:34:30 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:30 -0400 NFSv4: Ensure that referral mounts bind to a reserved port Signed-off-by: Trond Myklebust commit 33a43f2802d8d7be3a9b541785c4ca9ad79e4310 tree dd55121ea9031401fce8b03554654a332a4c38df parent 6b97fd3da1eab2cc490cfe884c7d4956522eaf8b author Andy Adamson Fri, 09 Jun 2006 09:34:30 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:30 -0400 NFSv4: A root pathname is sent as a zero component4 Signed-off-by: Trond Myklebust commit 6b97fd3da1eab2cc490cfe884c7d4956522eaf8b tree 055f5f603101a15f783ae52081e4714ddc3edc96 parent 9cdb3883c38f883436a84c2353a4cf964ff890a2 author Manoj Naik Fri, 09 Jun 2006 09:34:29 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:29 -0400 NFSv4: Follow a referral Respond to a moved error on NFS lookup by setting up the referral. Note: We don't actually follow the referral during lookup/getattr, but later when we detect fsid mismatch in inode revalidation (similar to the processing done for cloning submounts). Referrals will have fake attributes until they are actually followed or traversed. Signed-off-by: Manoj Naik Signed-off-by: Trond Myklebust commit 9cdb3883c38f883436a84c2353a4cf964ff890a2 tree 7961aebf94c66d7d55bb6e7c715e99d28ad3ab9d parent 61f5164cab1f6fdf06871ea9d60fe2f912184078 author Manoj Naik Fri, 09 Jun 2006 09:34:28 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:28 -0400 NFSv4: Ensure client submounts when following a referral Set up mountpoint when hitting a referral on moved error by getting fs_locations. Signed-off-by: Manoj Naik Signed-off-by: Trond Myklebust commit 61f5164cab1f6fdf06871ea9d60fe2f912184078 tree 966e8279f9563ceda4b919f309832c3336642abb parent c818ba43f9ca2e8214412ab5f126b1f436c35098 author Manoj Naik Fri, 09 Jun 2006 09:34:27 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:27 -0400 NFS: Expand clone mounts to include other servers Signed-off-by: Manoj Naik Signed-off-by: Trond Myklebust commit c818ba43f9ca2e8214412ab5f126b1f436c35098 tree 02e3646c172000c8bc71d6de52d4991bbeb3db14 parent 830b8e33fe1900b87c8eb7ec5c646117a9f298d6 author Manoj Naik Fri, 09 Jun 2006 09:34:26 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:26 -0400 NFSv4: Create NFSv4 transport and client Move existing code into a separate function so that it can be also used by referral code. Signed-off-by: Manoj Naik Signed-off-by: Trond Myklebust commit 830b8e33fe1900b87c8eb7ec5c646117a9f298d6 tree 8e4aa4c7ecd0485a288254433edf76305852c846 parent 361e624f6d8bfbeac53769603d995d47535cfd46 author Manoj Naik Fri, 09 Jun 2006 09:34:25 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:25 -0400 NFSv4: Define an fs_locations bitmap This is (similar to getattr bitmap) but includes fs_locations and mounted_on_fileid attributes. Use this bitmap for encoding in fs_locations requests. Note: We can probably do better by requesting locations as part of fsinfo itself. Signed-off-by: Manoj Naik Signed-off-by: Trond Myklebust commit 361e624f6d8bfbeac53769603d995d47535cfd46 tree 9cf400058ff4c4960a4e573b3753baff41cb5cf0 parent 99baf625d3b9b8944920acc7c2d06079a37458c5 author Manoj Naik Fri, 09 Jun 2006 09:34:24 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:24 -0400 NFSv4: GETATTR attributes on referral Per referral draft, only fs_locations, fsid, and mounted_on_fileid can be requested in a GETATTR on referrals. Signed-off-by: Manoj Naik Signed-off-by: Trond Myklebust commit 99baf625d3b9b8944920acc7c2d06079a37458c5 tree 2878013e4a44562502fe18ce4ecff0cd0dcaf4ec parent 7aaa0b3bd4d215d9ce4d62b6c2043a63ba650f93 author Manoj Naik Fri, 09 Jun 2006 09:34:24 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:24 -0400 NFSv4: Decode mounted_on_fileid attribute in getattr. It is ignored if fileid is also requested. This will be used on referrals (fs_locations). Signed-off-by: Manoj Naik Signed-off-by: Trond Myklebust commit 7aaa0b3bd4d215d9ce4d62b6c2043a63ba650f93 tree 122b502bc56a00dcb60d2de211e5ea6eeac9e028 parent 683b57b435326eb512c7305892683b6205669448 author Manoj Naik Fri, 09 Jun 2006 09:34:23 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:23 -0400 NFSv4: convert fs-locations-components to conform to RFC3530 Use component4-style formats for decoding list of servers and pathnames in fs_locations. Signed-off-by: Manoj Naik Signed-off-by: Trond Myklebust commit 683b57b435326eb512c7305892683b6205669448 tree ca1e526ab5b27993c0c143c37bb31e18889eeb61 parent 8b23ea7bedb8b45a5bb56745fa3ff11018acf04e author Trond Myklebust Fri, 09 Jun 2006 09:34:22 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:22 -0400 NFSv4: Implement the fs_locations function call NFSv4 allows for the fact that filesystems may be replicated across several servers or that they may be migrated to a backup server in case of failure of the primary server. fs_locations is an NFSv4 operation for retrieving information about the location of migrated and/or replicated filesystems. Based on an initial implementation by Jiaying Zhang Signed-off-by: Trond Myklebust commit 8b23ea7bedb8b45a5bb56745fa3ff11018acf04e tree b312b3d0d9e27704792fd7dfcd9bc041b1122bef parent 51d8fa6a109589d522c18a8e9bf3fb167a91b1bc author Trond Myklebust Fri, 09 Jun 2006 09:34:21 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:21 -0400 RPC: Allow struc xdr_stream to read the page section of an xdr_buf Signed-off-by: Trond Myklebust commit 51d8fa6a109589d522c18a8e9bf3fb167a91b1bc tree a9ec5e642bfa64f7cf1fde01617b30bac385bac6 parent 55a975937d40cac582e981ddc8ed783b3dcc043c author Trond Myklebust Fri, 09 Jun 2006 09:34:20 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:20 -0400 NFS: Add timeout to submounts Make automounted partitions expire using the mark_mounts_for_expiry() function. The timeout is controlled via a sysctl. Signed-off-by: Trond Myklebust commit 55a975937d40cac582e981ddc8ed783b3dcc043c tree 13507eaebdab5e9c9dd615fe373ec6c0ddcbade4 parent 8b4bdcf8995dd92b23d2ec22b32aee8fbbb50e1c author Trond Myklebust Fri, 09 Jun 2006 09:34:19 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:19 -0400 NFS: Ensure the client submounts, when it crosses a server mountpoint. Signed-off-by: Trond Myklebust commit 8b4bdcf8995dd92b23d2ec22b32aee8fbbb50e1c tree 8ebe9ec2ed5cb58592097123cf6b34af997316c7 parent 8b512d9a88875affe584bb3d2a7a235f84343b9e author Trond Myklebust Fri, 09 Jun 2006 09:34:19 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:19 -0400 NFS: Store the file system "fsid" value in the NFS super block. This should enable us to detect if we are crossing a mountpoint in the case where the server is exporting "nohide" mounts. Signed-off-by: Trond Myklebust commit 8b512d9a88875affe584bb3d2a7a235f84343b9e tree 80c46a675aeffaedd8d18e2bb6361768f4f4845a parent 5528f911b4c43a5de5da34bcbd7e3f2a62503617 author Trond Myklebust Fri, 09 Jun 2006 09:34:18 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:18 -0400 VFS: Remove dependency of ->umount_begin() call on MNT_FORCE Allow filesystems to decide to perform pre-umount processing whether or not MNT_FORCE is set. Signed-off-by: Trond Myklebust commit 5528f911b4c43a5de5da34bcbd7e3f2a62503617 tree 2c888b1dc0b3743855d795a1a02730637d6ba0aa parent 1f5ce9e93aa96a867f195ed45f6f77935175f12e author Trond Myklebust Fri, 09 Jun 2006 09:34:17 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:17 -0400 VFS: Add shrink_submounts() Allow a submount to be marked as being 'shrinkable' by means of the vfsmount->mnt_flags, and then add a function 'shrink_submounts()' which attempts to recursively unmount these submounts. Signed-off-by: Trond Myklebust commit 1f5ce9e93aa96a867f195ed45f6f77935175f12e tree caa9b6635990f69d47c1729524bd127e968b23f5 parent bb4a58bf46473e3e83d84054bbc110db3a0f85e4 author Trond Myklebust Fri, 09 Jun 2006 09:34:16 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:16 -0400 VFS: Unexport do_kern_mount() and clean up simple_pin_fs() Replace all module uses with the new vfs_kern_mount() interface, and fix up simple_pin_fs(). Signed-off-by: Trond Myklebust commit bb4a58bf46473e3e83d84054bbc110db3a0f85e4 tree 41ee38709c36f86d565c1a3f311b8fa9546b3c8e parent da6d503aa0a75ec44f17d985a2b500077e7f6a74 author Trond Myklebust Fri, 09 Jun 2006 09:34:15 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:15 -0400 VFS: Add GPL_EXPORTED function vfs_kern_mount() do_kern_mount() does not allow the kernel to use private mount interfaces without exposing the same interfaces to userland. The problem is that the filesystem is referenced by name, thus meaning that it and its mount interface must be registered in the global filesystem list. vfs_kern_mount() passes the struct file_system_type as an explicit parameter in order to overcome this limitation. Signed-off-by: Trond Myklebust commit da6d503aa0a75ec44f17d985a2b500077e7f6a74 tree 863dbb7c8a2bdda8b2ef3e462722c867ce6e6c46 parent d2ccddf042c403b146159beea438c6bfc4a445e2 author Trond Myklebust Thu, 01 Jun 2006 17:26:35 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:14 -0400 NFS: Remove nfs_delete_inode() Now that we have a real nfs_invalidate_page() to ensure that truncate_inode_pages() does the right thing when there are pending dirty pages, we can get rid of nfs_delete_inode(). Signed-off-by: Trond Myklebust commit d2ccddf042c403b146159beea438c6bfc4a445e2 tree e38f5faeccb73cacd442e899328ae44b75f15559 parent c04871e6345e4c6dfda564e302d7fd8c66420fd5 author Trond Myklebust Wed, 31 May 2006 01:13:38 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:14 -0400 NFS: Flesh out nfs_invalidate_page() In the case of a call to truncate_inode_pages(), we should really try to cancel any pending writes on the page. Signed-off-by: Trond Myklebust commit c04871e6345e4c6dfda564e302d7fd8c66420fd5 tree 4b2a2b0fb5f282ffd5c95f64691476c647acd29f parent 3873bc50e2271504da45799257f69222774d9550 author J. Bruce Fields Tue, 30 May 2006 16:28:58 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:13 -0400 NFSv4: remove obviously bogus comparison from decode_getacl We just set *acl_len to zero, and attrlen is unsigned, so this comparison is clearly bogus. I have no idea what I was thinking. Fixes a bug that caused getacl to fail over krb5p. Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 3873bc50e2271504da45799257f69222774d9550 tree 0a79d0364b896b469db2ef520048fe380727e25f parent 4814f56d19137b3b9fa8e00e1d332b3683b950de author Alexey Dobriyan Sat, 27 May 2006 03:31:12 +0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:12 -0400 NFSv4: really return status from decode_recall_args() Signed-off-by: Alexey Dobriyan Signed-off-by: Trond Myklebust commit 4814f56d19137b3b9fa8e00e1d332b3683b950de tree 41575affcd777e41d1ade756867697cd27bfc2ec parent 1842bfb447cea8b344fd91af97fb6d604ecb11fa author Andreas Gruenbacher Thu, 25 May 2006 01:41:03 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:11 -0400 NFSv3: Client-side nfsacl caching fix Fix two errors in the client-side acl cache: First, when nfs3_proc_getacl requests only the default acl of a file and the access acl is not cached already, a NULL access acl entry is cached instead of ERR_PTR(-EAGAIN) ("not cached"). Second, update the cached acls in nfs3_proc_setacls: nfs_refresh_inode does not always invalidate the cached acls, and when it does not, the cached acls get out of sync. Signed-off-by: Andreas Gruenbacher Signed-off-by: Trond Myklebust commit 1842bfb447cea8b344fd91af97fb6d604ecb11fa tree 8f3fb5f9fac687ccee3b98e3f0a513816fe35b36 parent 44b11874ff583b6e766a05856b04f3c492c32b84 author Trond Myklebust Thu, 25 May 2006 01:41:01 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:10 -0400 NFS: Fix up inode revalidation accounting Currently, we are accounting for all calls to nfs_revalidate_inode(), but not to nfs_revalidate_mapping(), or nfs_lookup_verify_inode(), etc... Signed-off-by: Trond Myklebust commit 44b11874ff583b6e766a05856b04f3c492c32b84 tree b17effcaf70ed67f61b1ec2ed2dea1ea2f884d60 parent 38478b24e37587f1c4fedf8ac070ca54f052ed28 author Trond Myklebust Thu, 25 May 2006 01:40:59 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:09 -0400 NFS: Separate metadata and page cache revalidation mechanisms Separate out the function of revalidating the inode metadata, and revalidating the mapping. The former may be called by lookup(), and only really needs to check that permissions, ctime, etc haven't changed whereas the latter needs only done when we want to read data from the page cache, and may need to sync and then invalidate the mapping. Signed-off-by: Trond Myklebust commit 38478b24e37587f1c4fedf8ac070ca54f052ed28 tree da4d900a8bfe27f1243fb0e037b51fae2a7e3256 parent f1bb0b92ba2cdfffe6e437f7a7da53138cf08d52 author Trond Myklebust Thu, 25 May 2006 01:40:57 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:09 -0400 NFS: More page cache revalidation fixups Whenever the directory changes, we want to make sure that we always invalidate its page cache. Fix up update_changeattr() and nfs_mark_for_revalidate() so that they do so. Signed-off-by: Trond Myklebust commit f1bb0b92ba2cdfffe6e437f7a7da53138cf08d52 tree 2870bd8f3e08b3b1b387f31713d965c3fcb7863f parent 0d0b5cb36faf7002a11736032313f06d6f3d881c author Trond Myklebust Thu, 25 May 2006 01:40:55 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:08 -0400 NFS: Fix page cache revalidation Fix up a bug in the handling of NFS_INO_REVAL_PAGECACHE: make sure that nfs_update_inode() clears it when we're sure we're not racing with other updates. Signed-off-by: Trond Myklebust commit 0d0b5cb36faf7002a11736032313f06d6f3d881c tree d767ae12fde00b553546aab9f5aa3e23cd86069d parent bf3fcf89552f24657bcfb6a9d73cd167ebb496c6 author Chuck Lever Thu, 25 May 2006 01:40:53 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:07 -0400 NFS: Optimize allocation of nfs_read/write_data structures Clean up use of page_array, and fix an off-by-one error noticed by Tom Talpey which causes kmalloc calls in cases where using the page_array is sufficient. Test plan: Normal client functional testing with r/wsize=32768. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit bf3fcf89552f24657bcfb6a9d73cd167ebb496c6 tree 83ffe1cbdcd4a6358f97b92962f57d557158f317 parent b85d88068444ae5dcb1639bcef770ccbf085dd4e author Chuck Lever Thu, 25 May 2006 01:40:51 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:06 -0400 SUNRPC: NFS_ROOT always uses the same XIDs The XID generator uses get_random_bytes to generate an initial XID. NFS_ROOT starts up before the random driver, though, so get_random_bytes doesn't set a random XID for NFS_ROOT. This causes NFS_ROOT mount points to reuse XIDs every time the client is booted. If the client boots often enough, the server will start serving old replies out of its DRC. Use net_random() instead. Test plan: I/O intensive workloads should perform well and generate no errors. Traces taken during client reboots should show that NFS_ROOT mounts use unique XIDs after every reboot. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit b85d88068444ae5dcb1639bcef770ccbf085dd4e tree bcce3ef7e2f66465b09dc485fb1a280c111b2e31 parent 73a3d07c1082145a3b78407bb5252df290470c4c author Chuck Lever Thu, 25 May 2006 01:40:49 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:05 -0400 SUNRPC: select privileged port numbers at random Make the RPC client select privileged ephemeral source ports at random. This improves DRC behavior on the server by using the same port when reconnecting for the same mount point, but using a different port for fresh mounts. The Linux TCP implementation already does this for nonprivileged ports. Note that TCP sockets in TIME_WAIT will prevent quick reuse of a random ephemeral port number by leaving the port INUSE until the connection transitions out of TIME_WAIT. Test plan: Connectathon against every known server implementation using multiple mount points. Locking especially. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 73a3d07c1082145a3b78407bb5252df290470c4c tree 58ae6256401e19750f2d5f916c1ca5636a14905b parent 9d1e9232223a7f065be7f956a7b749a4cbbbe16d author Trond Myklebust Thu, 25 May 2006 01:40:47 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:04 -0400 NFS: Clean up inode metadata updates Signed-off-by: Trond Myklebust commit 9d1e9232223a7f065be7f956a7b749a4cbbbe16d tree cf535655bda226c5d306fffdb40bc22fbeb5aedb parent 1de3fc12ea085690547a54b6efa01c7348f1cebd author Trond Myklebust Thu, 25 May 2006 01:40:46 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:04 -0400 NFSv4: Some NFSv4 servers have broken behaviour for the change attribute The Linux NFSv4 server violates RFC3530 in that the change attribute is not guaranteed to be updated for every change to the inode. Our optimisation for checking whether or not the inode metadata has changed or not is broken too. Grr.... Signed-off-by: Trond Myklebust commit 1de3fc12ea085690547a54b6efa01c7348f1cebd tree ea865786120cfcefac563c54693fef8d3d718f10 parent 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 author Trond Myklebust Thu, 25 May 2006 01:40:44 -0400 committer Trond Myklebust Fri, 09 Jun 2006 09:34:03 -0400 NFS: Clean up and fix page zeroing when we have short reads The code that is supposed to zero the uninitialised partial pages when the server returns a short read is currently broken: it looks at the nfs_page wb_pgbase and wb_bytes fields instead of the equivalent nfs_read_data values when deciding where to start truncating the page. Also ensure that we are more careful about setting PG_uptodate before retrying a short read: the retry will change the nfs_read_data args.pgbase and args.count. Signed-off-by: Trond Myklebust commit 6b81e80049a8815dc457fec4dadb6ae535c3b988 tree 410158801f1ed00ad6011d34da1fd23d9e9edb40 parent b53744612f276ad20c5d7ef33ac991ec13101417 author Michael Ellerman Wed, 07 Jun 2006 17:10:09 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:24:20 +1000 [PATCH] powerpc: Cleanup hvc_rtas.c a little A few cleanups in hvc_rtas.c: 1. Remove unused RTASCONS_PUT_ATTEMPTS 2. Remove unused rtascons_put_delay. 3. Use i as a loop counter like everyone else on earth. 4. Remove pointless variables, eg. x = foo; if (x) return something_else; 5. Whitespace cleanups and formatting. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit b53744612f276ad20c5d7ef33ac991ec13101417 tree 937dbded1be6edd989e325fbc9b803931946c7f5 parent e9370ae15dc2f8ba1e1889ce26f13cda565b6ecb author Michael Ellerman Wed, 07 Jun 2006 17:10:03 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:24:18 +1000 [PATCH] powerpc: Make rtas console _much_ faster Currently the hvc_rtas driver is painfully slow to use. Our "benchmark" is ls -R /etc, which spits out about 27866 characters. The theoretical maximum speed would be about 2.2 seconds, the current code takes ~50 seconds. The core of the problem is that sometimes when the tty layer asks us to push characters the firmware isn't able to handle some or all of them, and so returns an error. The current code sees this and just returns to the tty code with the buffer half sent. The khvcd thread will eventually wake up and try to push more characters, which will usually work because by then the firmware's had time to make room. But the khvcd thread only wakes up every 10 milliseconds, which isn't fast enough. So change the khvcd thread logic so that if there's an incomplete write we yield() and then immediately try writing again. Doing so makes POLL_QUICK and POLL_WRITE synonymous, so remove POLL_QUICK. With this patch our "benchmark" takes ~2.8 seconds. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit e9370ae15dc2f8ba1e1889ce26f13cda565b6ecb tree 338ed732f7a6607bc168795008e244f180876cda parent fab5db97e44f76461f76b24adfa8ccb14d4df498 author Paul Mackerras Wed, 07 Jun 2006 16:15:39 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:24:16 +1000 [PATCH] powerpc: Implement PR_[GS]ET_UNALIGN prctls for powerpc This gives the ability to control whether alignment exceptions get fixed up or reported to the process as a SIGBUS, using the existing PR_SET_UNALIGN and PR_GET_UNALIGN prctls. We do not implement the option of logging a message on alignment exceptions. Signed-off-by: Paul Mackerras commit fab5db97e44f76461f76b24adfa8ccb14d4df498 tree 123026a1a6f1702468220189b7410077479ae8a2 parent 651d765d0b2c72d33430487c8b6ef64c60cd2134 author Paul Mackerras Wed, 07 Jun 2006 16:14:40 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:24:15 +1000 [PATCH] powerpc: Implement support for setting little-endian mode via prctl This adds the PowerPC part of the code to allow processes to change their endian mode via prctl. This also extends the alignment exception handler to be able to fix up alignment exceptions that occur in little-endian mode, both for "PowerPC" little-endian and true little-endian. We always enter signal handlers in big-endian mode -- the support for little-endian mode does not amount to the creation of a little-endian user/kernel ABI. If the signal handler returns, the endian mode is restored to what it was when the signal was delivered. We have two new kernel CPU feature bits, one for PPC little-endian and one for true little-endian. Most of the classic 32-bit processors support PPC little-endian, and this is reflected in the CPU feature table. There are two corresponding feature bits reported to userland in the AT_HWCAP aux vector entry. This is based on an earlier patch by Anton Blanchard. Signed-off-by: Paul Mackerras commit 651d765d0b2c72d33430487c8b6ef64c60cd2134 tree 3a7253dc0b80585a03ddd581e0c00fc0f8bda7a0 parent 3b5e905ee3bd23e9311951890aba57a0dbc81ca4 author Anton Blanchard Wed, 07 Jun 2006 16:10:19 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:24:13 +1000 [PATCH] Add a prctl to change the endianness of a process. This new prctl is intended for changing the execution mode of the processor, on processors that support both a little-endian mode and a big-endian mode. It is intended for use by programs such as instruction set emulators (for example an x86 emulator on PowerPC), which may find it convenient to use the processor in an alternate endianness mode when executing translated instructions. Note that this does not imply the existence of a fully-fledged ABI for both endiannesses, or of compatibility code for converting system calls done in the non-native endianness mode. The program is expected to arrange for all of its system call arguments to be presented in the native endianness. Switching between big and little-endian mode will require some care in constructing the instruction sequence for the switch. Generally the instructions up to the instruction that invokes the prctl system call will have to be in the old endianness, and subsequent instructions will have to be in the new endianness. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 3b5e905ee3bd23e9311951890aba57a0dbc81ca4 tree 700e3dd7e21b09006216647fb0dec284b682f2ab parent e78dbc800c37f035d476c4fdebdf43cdecfcb731 author Benjamin Herrenschmidt Wed, 07 Jun 2006 12:06:20 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:24:10 +1000 [PATCH] powerpc: Add udbg-immortal kernel option When debugging early kernel crashes that happen after console_init() and before a proper console driver takes over, we often have to go hack into udbg.c to prevent it from unregistering so we can "see" what is happening. This patch adds a kernel command line option "udbg-immortal" instead to avoid having to modify the kernel. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit e78dbc800c37f035d476c4fdebdf43cdecfcb731 tree 3b5ff1242c284e0c77e755b62d7e8600aafceb25 parent 8eb6c6e3b9c8bfed3d75536ab142d7694627c2e5 author Michael Neuling Thu, 08 Jun 2006 14:42:34 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:24:05 +1000 [PATCH] powerpc: oprofile support for POWER6 POWER6 moves some of the MMCRA bits and also requires some bits to be cleared each PMU interrupt. Signed-off-by: Michael Neuling Acked-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 8eb6c6e3b9c8bfed3d75536ab142d7694627c2e5 tree 7dd9c4146f60e88ca1fc8ebe976e1b7a3ae6ea2c parent 318facbee05417fb432603a8309a10cdb942a87b author Christoph Hellwig Tue, 06 Jun 2006 16:11:35 +0200 committer Paul Mackerras Fri, 09 Jun 2006 21:24:01 +1000 [PATCH] powerpc: node-aware dma allocations Make sure dma_alloc_coherent allocates memory from the local node. This is important on Cell where we avoid going through the slow cpu interconnect. Note: I could only test this patch on Cell, it should be verified on some pseries machine by those that have the hardware. Signed-off-by: Christoph Hellwig Signed-off-by: Paul Mackerras commit 318facbee05417fb432603a8309a10cdb942a87b tree 753d84a8213b9e6639e661d329d5473b35e6c191 parent 507279db1819aacf4022e790b3fc8bc8cf56debf author Christoph Hellwig Tue, 06 Jun 2006 16:09:39 +0200 committer Paul Mackerras Fri, 09 Jun 2006 21:21:08 +1000 [PATCH] powerpc: implement pcibus_to_node and pcibus_to_cpumask On 64bit powerpc we can find out what node a pci bus hangs off, so implement the topology.h macros that export this information. For 32bit this seems a little more difficult, but I don't know of 32bit powerpc NUMA machines either, so let's leave it out for now. Signed-off-by: Christoph Hellwig Signed-off-by: Paul Mackerras commit 507279db1819aacf4022e790b3fc8bc8cf56debf tree e5e95d50b093f0eab31e7856b9f596caa6e097af parent 4a3ecc622465dbff7404139a8ad18bf4cb99f836 author John Rose Mon, 05 Jun 2006 16:31:48 -0500 committer Paul Mackerras Fri, 09 Jun 2006 21:21:06 +1000 [PATCH] powerpc: reorg RTAS delay code This patch attempts to handle RTAS "busy" return codes in a more simple and consistent manner. Typical callers of RTAS shouldn't have to manage wait times and delay calls. This patch also changes the kernel to use msleep() rather than udelay() when a runtime delay is necessary. This will avoid CPU soft lockups for extended delay conditions. Signed-off-by: John Rose Signed-off-by: Paul Mackerras commit 4a3ecc622465dbff7404139a8ad18bf4cb99f836 tree a63244b945c4ef6cecacedbbe9ba841e6106a1b5 parent 87af41beb9b70f06f760fc973b793488f2825853 author Andrew Morton Thu, 01 Jun 2006 20:36:04 -0700 committer Paul Mackerras Fri, 09 Jun 2006 21:21:05 +1000 [PATCH] powerpc kbuild warning fix From: Andrew Morton arch/powerpc/Kconfig:339:warning: leading whitespace ignored arch/powerpc/Kconfig:347:warning: leading whitespace ignored arch/powerpc/Kconfig:357:warning: leading whitespace ignored arch/powerpc/Kconfig:373:warning: leading whitespace ignored arch/powerpc/Kconfig:382:warning: leading whitespace ignored arch/powerpc/Kconfig:394:warning: leading whitespace ignored arch/powerpc/Kconfig:842:warning: leading whitespace ignored arch/powerpc/Kconfig:847:warning: leading whitespace ignored Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras commit 87af41beb9b70f06f760fc973b793488f2825853 tree e33fbd7da48404c05d950d5184a0c2474d3d13f9 parent 03ac829b0046d5769eef3dd841cec33a211db96e author Anton Blanchard Fri, 05 May 2006 05:44:26 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:21:03 +1000 [PATCH] powerpc: add num_pmcs to 970MP cputable entry The 970MP cputable entry needs a num_pmcs entry for oprofile to work. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 03ac829b0046d5769eef3dd841cec33a211db96e tree fbabaac94b4848f1906c49d7cbdbe9dbcd066372 parent c5cf0e30bf3d8cb56758abb612827647c0a821cf author Will Schmidt Tue, 30 May 2006 13:38:40 -0500 committer Paul Mackerras Fri, 09 Jun 2006 21:21:02 +1000 [PATCH] powerpc: fix of_parse_dma_window My js20 appears to lack the ibm,#dma- properties, and boot fails with a "Kernel panic - not syncing: iommu_init_table: Can't allocate 0 bytes" message. This adds a fallback to the "#address-cells" property in case the "#ibm,dma-address-cells" property is missing. Tested on js20 and power5 lpar. Unless there is a more elegant solution... :-) Signed-off-by: Will Schmidt Signed-off-by: Paul Mackerras commit c5cf0e30bf3d8cb56758abb612827647c0a821cf tree 54a471818e91204db11f14544df0bb38bd03058f parent a5bba930d802009c259e56c8d53086d96f63813b author Benjamin Herrenschmidt Tue, 30 May 2006 14:14:19 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:20:59 +1000 [PATCH] powerpc: Fix buglet with MMU hash management Our MMU hash management code would not set the "C" bit (changed bit) in the hardware PTE when updating a RO PTE into a RW PTE. That would cause the hardware to possibly to a write back to the hash table to set it on the first store access, which in addition to being a performance issue, might also hit a bug when running with native hash management (non-HV) as our code is specifically optimized for the case where no write back happens. Thus there is a very small therocial window were a hash PTE can become corrupted if that HPTE has just been upgraded to read write, a store access happens on it, and that races with another processor evicting that same slot. Since eviction (caused by an almost full hash) is extremely rare, the bug is very unlikely to happen fortunately. This fixes by allowing the updating of the protection bits in the native hash handling to also set (but not clear) the "C" bit, and, in order to also improve performances in the general case, by always setting that bit on newly inserted hash PTE so that writeback really never happens. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit a5bba930d802009c259e56c8d53086d96f63813b tree 8dd60002042bc0795b3d0544fcae7f5082405b16 parent 98a90c02792f22afd8161f96fc9b9f0f0eb0880e author Benjamin Herrenschmidt Tue, 30 May 2006 13:51:37 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:20:57 +1000 [PATCH] powerpc vdso updates This patch cleans up some locking & error handling in the ppc vdso and moves the vdso base pointer from the thread struct to the mm context where it more logically belongs. It brings the powerpc implementation closer to Ingo's new x86 one and also adds an arch_vma_name() function allowing to print [vsdo] in /proc//maps if Ingo's x86 vdso patch is also applied. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 98a90c02792f22afd8161f96fc9b9f0f0eb0880e tree df721c929ab40ab986793369ece2eed6029e3227 parent c029cc66cb3d83f70c02e0c182f0eed1419f8020 author Renzo Davoli Sun, 21 May 2006 20:06:58 +0200 committer Paul Mackerras Fri, 09 Jun 2006 21:20:51 +1000 [PATCH] powerpc: enable PPC_PTRACE_[GS]ETREGS on ppc32 I have tested PPC_PTRACE_GETREGS and PPC_PTRACE_SETREGS on umview. I do not understand why historically these tags has been defined as PPC_PTRACE_GETREGS and PPC_PTRACE_SETREGS instead of simply PTRACE_[GS]ETREGS. The other "originality" is that the address must be put into the "addr" field instead of the "data" field as stated in the manual. Signed-off-by: renzo davoli Signed-off-by: Paul Mackerras commit b190f1138b0f30fbe837b3f09fb6ffdb2fc4da24 tree 319fb258e80786451928f7f98aa85c31b06ba599 parent 477829ef2e9e831c56c98948cfef6dfcec305c3a author Nathan Scott Fri, 09 Jun 2006 17:13:15 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:13:15 +1000 [XFS] Fix broken const use inside local suffix_strtoul routine. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26201a Signed-off-by: Nathan Scott commit 477829ef2e9e831c56c98948cfef6dfcec305c3a tree 9256a402252489fd3867d06b1379c1eca21738ac parent 421ad134583bff86c0ae068e2ddcb17f530957ab author Mandy Kirkconnell Fri, 09 Jun 2006 17:13:04 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:13:04 +1000 [XFS] Fix nused counter. It's currently getting set to -1 rather than getting decremented by 1. Since nused never reaches 0, the "if (!free->hdr.nused)" check in xfs_dir2_leafn_remove() fails every time and xfs_dir2_shrink_inode() doesn't get called when it should. This causes extra blocks to be left on an empty directory and the directory in unable to be converted back to inline extent mode. SGI-PV: 951958 SGI-Modid: xfs-linux-melb:xfs-kern:211382a Signed-off-by: Mandy Kirkconnell Signed-off-by: Nathan Scott commit 421ad134583bff86c0ae068e2ddcb17f530957ab tree cf910641c032ca5381a8bd30c0f56dfca9dcaa97 parent 4d1a2ed3d8d6e306d20f5d99a5ae12ac4c8b787b author Nathan Scott Fri, 09 Jun 2006 17:12:46 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:12:46 +1000 [XFS] Fix mismerge of the fs_writable cleanup patch causing a freeze/thaw test hang. SGI-PV: 953563 SGI-Modid: xfs-linux-melb:xfs-kern:26182a Signed-off-by: Nathan Scott commit 4d1a2ed3d8d6e306d20f5d99a5ae12ac4c8b787b tree a6d6def1330a320787dcf688a7e02d537d9b5b7b parent a916e2bd15b7572d9e791ae2a9333f74175470cd author Nathan Scott Fri, 09 Jun 2006 17:12:28 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:12:28 +1000 [XFS] Fix up debug code so that bulkstat wont generate thousands of fsstress warnings. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26111a Signed-off-by: Nathan Scott commit a916e2bd15b7572d9e791ae2a9333f74175470cd tree f1910dc6cdf930ca0927ed257f836ab3435179f9 parent 34327e138481137a81a2e33060b8eb0944013801 author Nathan Scott Fri, 09 Jun 2006 17:12:17 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:12:17 +1000 [XFS] Remove unused parameter from di2xflags routine. SGI-PV: 904192 SGI-Modid: xfs-linux-melb:xfs-kern:26110a Signed-off-by: Nathan Scott commit 34327e138481137a81a2e33060b8eb0944013801 tree d78521e82598c0b1aae46e466f38a5fa99a2b842 parent 8285fb58e75bfdb447c7a2c533ec9efdb238f966 author Nathan Scott Fri, 09 Jun 2006 17:11:55 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:11:55 +1000 [XFS] Cleanup a missed porting conversion, and freezing. SGI-PV: 953338 SGI-Modid: xfs-linux-melb:xfs-kern:26109a Signed-off-by: Nathan Scott commit 8285fb58e75bfdb447c7a2c533ec9efdb238f966 tree 4bcfa74d3328ff5d71437556d24019be98c1d9fa parent 67fcaa73adafb19139a7cd8ab133592b6a0a0901 author Nathan Scott Fri, 09 Jun 2006 17:07:12 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:07:12 +1000 [XFS] Resolve a namespace collision on remaining vtypes for FreeBSD porters. SGI-PV: 953338 SGI-Modid: xfs-linux-melb:xfs-kern:26108a Signed-off-by: Nathan Scott commit 67fcaa73adafb19139a7cd8ab133592b6a0a0901 tree 6e7b83e7c8b0a1d8b4776af1537d6f07ebe9435d parent b83bd1388133e914c38bd31d69bc90143e6ab10c author Nathan Scott Fri, 09 Jun 2006 17:00:52 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:00:52 +1000 [XFS] Resolve a namespace collision on vnode/vnodeops for FreeBSD porters. SGI-PV: 953338 SGI-Modid: xfs-linux-melb:xfs-kern:26107a Signed-off-by: Nathan Scott commit b83bd1388133e914c38bd31d69bc90143e6ab10c tree 3f7fecf3913d1aa8216e06f109746c63ec0ac501 parent 932f2c323196c214e645d5a572a1d7b562c0f93f author Nathan Scott Fri, 09 Jun 2006 16:48:30 +1000 committer Nathan Scott Fri, 09 Jun 2006 16:48:30 +1000 [XFS] Resolve a namespace collision on vfs/vfsops for FreeBSD porters. SGI-PV: 9533338 SGI-Modid: xfs-linux-melb:xfs-kern:26106a Signed-off-by: Nathan Scott commit 7fc925fd6a4c24e1db879d227fc0a0f65a335aa1 tree 35ff433ba285d150a3347bee23afcd79a3d2aa31 parent 43bf612af2d4f2615dcbf86af8206e2f40231237 author Roman Zippel Thu, 08 Jun 2006 22:12:46 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 07:31:31 +0200 kconfig: finer customization via popup menus This allows to configure every symbol list and info window separately via a popup menu, these settings are also separately saved and restored. Cleanup the ConfigSettings class a bit to reduce the number of #ifdef. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 43bf612af2d4f2615dcbf86af8206e2f40231237 tree 416d6a9384813049784dc5090e79da532fd3c86d parent face4374e288372fba67c865eb0c92337f50d5a4 author Roman Zippel Thu, 08 Jun 2006 22:12:45 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 07:31:31 +0200 kconfig: Add search option for xconfig Implement a simple search request for xconfig. Currently the capabilities are rather simple (the same as menuconfig). Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit face4374e288372fba67c865eb0c92337f50d5a4 tree 81a9535cc6af701a9fd1d23338449268498447ed parent f6a88aa86027bdecfc74ef7c6bf6c68233e86bb3 author Roman Zippel Thu, 08 Jun 2006 22:12:45 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 07:31:30 +0200 kconfig: add defconfig_list/module option This makes it possible to change two options which were hardcoded sofar. 1. Any symbol can now take the role of CONFIG_MODULES 2. The more useful option is to change the list of default file names, which kconfig uses to load the base configuration if .config isn't available. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit f6a88aa86027bdecfc74ef7c6bf6c68233e86bb3 tree 524a366add362ffae3fa550fd822293ffd84984e parent f1d28fb043b325dad8944647a52b20287e59d8a1 author Roman Zippel Thu, 08 Jun 2006 22:12:44 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 07:31:30 +0200 kconfig: add symbol option config syntax This adds the general framework to the parser to define options for config symbols with a syntax like: config FOO option bar[="arg"] Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit f1d28fb043b325dad8944647a52b20287e59d8a1 tree de1e263125b6944d0c821537c81235f7cbdd1bf0 parent 2e3646e51b2d6415549b310655df63e7e0d7a080 author Roman Zippel Thu, 08 Jun 2006 22:12:43 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 07:31:30 +0200 kconfig: move .kernelrelease This moves the .kernelrelease file into include/config directory. Remove its generation from the config step, if the config step doesn't leave a proper .config behind, it triggers a call to silentoldconfig. Instead its generation can be done via proper dependencies. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 2e3646e51b2d6415549b310655df63e7e0d7a080 tree f717c0ede91122ab776a6b0fce9b8c941797f170 parent 669bfad906522e74ee8d962801552a8c224c0d63 author Roman Zippel Thu, 08 Jun 2006 22:12:42 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 07:31:30 +0200 kconfig: integrate split config into silentoldconfig Now that kconfig can load multiple configurations, it becomes simple to integrate the split config step, by simply comparing the new .config file with the old auto.conf (and then saving the new auto.conf). A nice side effect is that this saves a bit of disk space and cache, as no data needs to be read from or saved into the splitted config files anymore (e.g. include/config is now 648KB instead of 5.2MB). Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 669bfad906522e74ee8d962801552a8c224c0d63 tree 84b7e85d7d731b7f188c38d83139f9b6d4acaa56 parent 0c1822e6991a10da6dc391f0a2e2cf5fb2e31238 author Roman Zippel Thu, 08 Jun 2006 22:12:42 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 07:31:30 +0200 kconfig: allow loading multiple configurations Extend conf_read_simple() so it can load multiple configurations. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 0c1822e6991a10da6dc391f0a2e2cf5fb2e31238 tree f86393b38a29d7f5e3ef34b060e04fb34c283044 parent c0e150acde52e4661675539bf5323309270f2e83 author Roman Zippel Thu, 08 Jun 2006 22:12:41 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 07:31:30 +0200 kconfig: allow multiple default values per symbol Extend struct symbol to allow storing multiple default values, which can be used to hold multiple configurations. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit c0e150acde52e4661675539bf5323309270f2e83 tree 0a2d1a7a3725e88c321ffb6980aea3d6c90b5bd4 parent c955ccafc38e77312b4c65e5a70960080fb8a3f2 author Roman Zippel Thu, 08 Jun 2006 22:12:40 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 07:31:30 +0200 kconfig: remove SYMBOL_{YES,MOD,NO} The SYMBOL_{YES,MOD,NO} are not really used anymore (they were more used be the cml1 converter), so just remove them. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit c955ccafc38e77312b4c65e5a70960080fb8a3f2 tree f630610edef42b8ed60c455cfdb74d897190f1d3 parent ddc97cacb310ad68483952e67764c4153c138ed2 author Roman Zippel Thu, 08 Jun 2006 22:12:39 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 07:31:30 +0200 kconfig: fix .config dependencies This fixes one of the worst kbuild warts left - the broken dependencies used to check and regenerate the .config file. This was done via an indirect dependency and the .config itself had an empty command, which can cause make not to reread the changed .config file. Instead of this we generate now a new file include/config/auto.conf from .config, which is used for kbuild and has the proper dependencies. It's also the main make target now for all files generated during this step (and thus replaces include/linux/autoconf.h). This also means we can now relax the syntax requirements for the .config file and we don't have to rewrite it all the time, i.e. silentoldconfig only writes .config now when it's necessary to keep it in sync with the Kconfig files and even this can be suppressed by setting the environment variable KCONFIG_NOSILENTUPDATE, so the update can (and must) be done manually. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit ddc97cacb310ad68483952e67764c4153c138ed2 tree e54e75a17460b9852d061f0663a9058d61397c21 parent 909252d279dd5d47e44c125558e87bb44097289f author Roman Zippel Thu, 08 Jun 2006 22:12:38 -0700 committer Sam Ravnborg Fri, 09 Jun 2006 07:31:30 +0200 kconfig: improve config load/save output During loading special case the first common case (.config), be silent about it and otherwise mark it as a change that requires saving. Instead output that the file has been changed. IOW if conf does nothing (special), it's silent. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 932f2c323196c214e645d5a572a1d7b562c0f93f tree 3129798a4b60a90f55165030ec434ec106cd0373 parent b65745205fc00d8c7722ec74e9bd955f3861c7e2 author Nathan Scott Fri, 09 Jun 2006 15:29:58 +1000 committer Nathan Scott Fri, 09 Jun 2006 15:29:58 +1000 [XFS] statvfs component of directory/project quota support, code originally by Glen. SGI-PV: 932952 SGI-Modid: xfs-linux-melb:xfs-kern:26105a Signed-off-by: Nathan Scott commit b65745205fc00d8c7722ec74e9bd955f3861c7e2 tree 524f5bacfcdf54828e97b5368eb35de938651ada parent 9c48876a05b6fbe41f1933fae3529c268d78cad0 author Nathan Scott Fri, 09 Jun 2006 15:29:40 +1000 committer Nathan Scott Fri, 09 Jun 2006 15:29:40 +1000 [XFS] Portability changes: remove prdev, stick to one diagnostic interface. SGI-PV: 953338 SGI-Modid: xfs-linux-melb:xfs-kern:26103a Signed-off-by: Nathan Scott commit 9c48876a05b6fbe41f1933fae3529c268d78cad0 tree becfedbde574228e6fb2a1d96721d78e9b0b4dc7 parent ad723875ac238137207754d2633dd9c261c71558 author Nathan Scott Fri, 09 Jun 2006 15:29:22 +1000 committer Nathan Scott Fri, 09 Jun 2006 15:29:22 +1000 [XFS] Remove dead code from come bulkstat paths. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26102a Signed-off-by: Nathan Scott commit ad723875ac238137207754d2633dd9c261c71558 tree cfb3600e492d872d30350f9dd6e05c4c2e9b4e4a parent 7d4fb40ad7efe4586d1341d4731377fb4530836f author Nathan Scott Fri, 09 Jun 2006 15:29:12 +1000 committer Nathan Scott Fri, 09 Jun 2006 15:29:12 +1000 [XFS] Fix a typo in a header file comment. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26101a Signed-off-by: Nathan Scott commit 7d4fb40ad7efe4586d1341d4731377fb4530836f tree bf802cce6bc60627186b02b71014a683f6cb4a05 parent 59c1b082f5fff8269565039600a2ef18d48649b5 author Nathan Scott Fri, 09 Jun 2006 15:27:16 +1000 committer Nathan Scott Fri, 09 Jun 2006 15:27:16 +1000 [XFS] Start writeout earlier (on last close) in the case where we have a truncate down followed by delayed allocation (buffered writes) - worst case scenario for the notorious NULL files problem. This reduces the window where we are exposed to that problem significantly. SGI-PV: 917976 SGI-Modid: xfs-linux-melb:xfs-kern:26100a Signed-off-by: Nathan Scott commit 59c1b082f5fff8269565039600a2ef18d48649b5 tree 28093cd9a1b61267d76edef992a91e7cecf40b5e parent e109007461cddfc80a908f0b015f4eeb485e1d85 author Nathan Scott Fri, 09 Jun 2006 14:59:13 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:59:13 +1000 [XFS] Make the pflags test/set wrappers more legible for us mere humans. SGI-PV: 953338 SGI-Modid: xfs-linux-melb:xfs-kern:26099a Signed-off-by: Nathan Scott commit e109007461cddfc80a908f0b015f4eeb485e1d85 tree bd3ce386cfce2905dd72182c4dbee2581bb76018 parent 7d04a335b6b2d79e3742ffd28bd651204574e794 author Nathan Scott Fri, 09 Jun 2006 14:58:48 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:58:48 +1000 [XFS] Fix a buffer refcount leak in dir2 code on a forced shutdown. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26097a Signed-off-by: Nathan Scott commit 7d04a335b6b2d79e3742ffd28bd651204574e794 tree 2b687202ae47c5e0c70a2b921b77135066131d8d parent b76963fac4a17b661bad46e5a57b0f918c6f0cd1 author Nathan Scott Fri, 09 Jun 2006 14:58:38 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:58:38 +1000 [XFS] Shutdown the filesystem if all device paths have gone. Made shutdown vop flags consistent with sync vop flags declarations too. SGI-PV: 939911 SGI-Modid: xfs-linux-melb:xfs-kern:26096a Signed-off-by: Nathan Scott commit b76963fac4a17b661bad46e5a57b0f918c6f0cd1 tree d2dc3d6fcc166878f978f7ed531f790b14c02e06 parent 3d80ede4799889ede2aa785c2511aef3e78d5bb1 author Nathan Scott Fri, 09 Jun 2006 14:58:20 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:58:20 +1000 [XFS] getattr can return an error code, so propogate any from lower layers. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26095a Signed-off-by: Nathan Scott commit 3d80ede4799889ede2aa785c2511aef3e78d5bb1 tree a35aeeb3cc34871e65d0368b011831a96b5a9a70 parent 72c93bcc6348a385416603459c2fdb4cf6c43687 author Nathan Scott Fri, 09 Jun 2006 14:57:30 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:57:30 +1000 [XFS] Drop use of m_writeio_blocks when zeroing, its not meaningful anymore here. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26094a Signed-off-by: Nathan Scott commit 72c93bcc6348a385416603459c2fdb4cf6c43687 tree d72b32c62346b476c81b8e22253cfeb39f8b6468 parent 87c199c2a79220ac9e216e72d18a15148f84d9e0 author Ingo Molnar Fri, 09 Jun 2006 14:57:01 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:57:01 +1000 [XFS] lock validator: lockdep: small xfs init_rwsem() cleanup init_rwsem() has no return value. This is not a problem if init_rwsem() is a function, but it's a problem if it's a do { ... } while (0) macro. (which lockdep introduces) SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26082a Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Nathan Scott commit 87c199c2a79220ac9e216e72d18a15148f84d9e0 tree 1c48deb1f3385afa0225ce223da2aa4eaba85724 parent 714250879ea61cdb1a39bb96fe9d934ee0c669a2 author Tim Shimmin Fri, 09 Jun 2006 14:56:16 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:56:16 +1000 [XFS] Over zealous with doing endian conversions. We endian converted the logged version of di_next_unlinked which is actually always stored in the correct ondisk format. This was pointed out to us by Shailendra Tripathi. And is evident in the xfs qa test of 121. SGI-PV: 953263 SGI-Modid: xfs-linux-melb:xfs-kern:26044a Signed-off-by: Tim Shimmin Signed-off-by: Nathan Scott commit 714250879ea61cdb1a39bb96fe9d934ee0c669a2 tree 607f2b06c56d026f04721f99cd8dba884df86b75 parent 6d192a9b82212abf1e0e89da6e3a952afba7e4d6 author David Chinner Fri, 09 Jun 2006 14:55:52 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:55:52 +1000 [XFS] Stop a BUG from occurring in generic_delete_inode by preventing transaction completion from marking the inode dirty while it is being cleaned up on it's way out of the system. SGI-PV: 952967 SGI-Modid: xfs-linux-melb:xfs-kern:26040a Signed-off-by: David Chinner Signed-off-by: Nathan Scott commit 6d192a9b82212abf1e0e89da6e3a952afba7e4d6 tree 608a463ba4fd04f518558ead3567952e757cd2ae parent d210a28cd851082cec9b282443f8cc0e6fc09830 author Tim Shimmin Fri, 09 Jun 2006 14:55:38 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:55:38 +1000 [XFS] inode items and EFI/EFDs have different ondisk format for 32bit and 64bit kernels allow recovery to handle both versions and do the necessary decoding SGI-PV: 952214 SGI-Modid: xfs-linux-melb:xfs-kern:26011a Signed-off-by: Tim Shimmin Signed-off-by: Nathan Scott commit d210a28cd851082cec9b282443f8cc0e6fc09830 tree 77b8c843d4cb7e6095b607570c5fd16702e50592 parent d3446eac3f50dade2f09ed212b112609ee78fb33 author Yingping Lu Fri, 09 Jun 2006 14:55:18 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:55:18 +1000 [XFS] In actual allocation of file system blocks and freeing extents, the transaction within each such operation may involve multiple locking of AGF buffer. While the freeing extent function has sorted the extents based on AGF number before entering into transaction, however, when the file system space is very limited, the allocation of space would try every AGF to get space allocated, this could potentially cause out-of-order locking, thus deadlock could happen. This fix mitigates the scarce space for allocation by setting aside a few blocks without reservation, and avoid deadlock by maintaining ascending order of AGF locking. SGI-PV: 947395 SGI-Modid: xfs-linux-melb:xfs-kern:210801a Signed-off-by: Yingping Lu Signed-off-by: Nathan Scott commit d3446eac3f50dade2f09ed212b112609ee78fb33 tree c3cf3fd0349975ef72e78a1ebbd06725c5b34d2a parent fbc1462bcb421620a04eb390fc79a2615c9d01d0 author Barry Naujok Fri, 09 Jun 2006 14:54:19 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:54:19 +1000 [XFS] Add degframentation exclusion support SGI-PV: 953061 SGI-Modid: xfs-linux-melb:xfs-kern:25986a Signed-off-by: Barry Naujok Signed-off-by: Nathan Scott commit fbc1462bcb421620a04eb390fc79a2615c9d01d0 tree 106e95d7d933241c24b47af10299243a6f289bd4 parent ba0b92d671c36cbebd66a306790c9b66a3224d83 author Nathan Scott Fri, 09 Jun 2006 14:52:13 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:52:13 +1000 [XFS] Fix a noatime regression related to updating inode atime field on mmap only. SGI-PV: 952736 SGI-Modid: xfs-linux-melb:xfs-kern:25922a Signed-off-by: Nathan Scott commit ba0b92d671c36cbebd66a306790c9b66a3224d83 tree a13886281e18979acd9748d4a6773a0675229c2f parent fe6c1e7240e3a7cb600030f9c909273365d52a9d author Nathan Scott Fri, 09 Jun 2006 14:52:00 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:52:00 +1000 [XFS] Fix a comment typo, originally noticed by Ming Zhang. SGI-PV: 907752 SGI-Modid: xfs-linux-melb:xfs-kern:25921a Signed-off-by: Nathan Scott commit fe6c1e7240e3a7cb600030f9c909273365d52a9d tree 26e55aea45e754fae8888ce16d0001544432fd29 parent 3f368a0d58cb8cadab298546286f94ca14220f65 author Mandy Kirkconnell Fri, 09 Jun 2006 14:51:25 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:51:25 +1000 [XFS] Fix size argument in kmem_free(). SGI-PV: 952291 SGI-Modid: xfs-linux-melb:xfs-kern:209807a Signed-off-by: Mandy Kirkconnell Signed-off-by: Nathan Scott commit 3f368a0d58cb8cadab298546286f94ca14220f65 tree 12d93670a1e79a167416f96a147d5ad29e698b9b parent 1d8daf06f67c8920a640eb61b30c3176ecc52405 author Olaf Weber Fri, 09 Jun 2006 14:51:11 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:51:11 +1000 [XFS] Originally the ATTR_DMI flag also had the functionality of the ATTR_NOLOCK flag, but this was split off some time ago, as ATTR_DMI needed to be used separately. Two asserts were added to guard correctness of the code during the transition. These are no longer required. SGI-PV: 952145 SGI-Modid: xfs-linux-melb:xfs-kern:209633a Signed-off-by: Olaf Weber Signed-off-by: Nathan Scott commit 1d8daf06f67c8920a640eb61b30c3176ecc52405 tree b5ee131d524177d05d7f5cacdfd662f65246ca7c parent 8034fff39bb9430d807375ec7a04097efba42cd2 author Christoph Hellwig Fri, 09 Jun 2006 14:50:37 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:50:37 +1000 [XFS] endianess annotations for xfs_dir_leaf_entry_t SGI-PV: 943272 SGI-Modid: xfs-linux-melb:xfs-kern:25808a Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro Signed-off-by: Nathan Scott commit 8034fff39bb9430d807375ec7a04097efba42cd2 tree bcc66e93d114764e4c513e9389cd751143c8102a parent ff9901c1e7c7be06a99c59cfc3133d2316cbc957 author Christoph Hellwig Fri, 09 Jun 2006 14:50:24 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:50:24 +1000 [XFS] endianess annotations for xfs_dir_leaf_hdr_t SGI-PV: 943272 SGI-Modid: xfs-linux-melb:xfs-kern:25807a Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro Signed-off-by: Nathan Scott commit ff9901c1e7c7be06a99c59cfc3133d2316cbc957 tree d9cae983cf713d07ff65566e56beca52c21412d1 parent 3e57ecf640428c01ba1ed8c8fc538447ada1715b author Christoph Hellwig Fri, 09 Jun 2006 14:48:37 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:48:37 +1000 [XFS] endianess annotations for xfs_dir2_data_entry_t SGI-PV: 943272 SGI-Modid: xfs-linux-melb:xfs-kern:25806a Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro Signed-off-by: Nathan Scott commit 3e57ecf640428c01ba1ed8c8fc538447ada1715b tree bcc92b0017b5ec8e106649cd53beffdd6addde07 parent 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 author Olaf Weber Fri, 09 Jun 2006 14:48:12 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:48:12 +1000 [XFS] Add parameters to xfs_bmapi() and xfs_bunmapi() to have them report the range spanned by modifications to the in-core extent map. Add XFS_BUNMAPI() and XFS_SWAP_EXTENTS() macros that call xfs_bunmapi() and xfs_swap_extents() via the ioops vector. Change all calls that may modify the in-core extent map for the data fork to go through the ioops vector. This allows a cache of extent map data to be kept in sync. SGI-PV: 947615 SGI-Modid: xfs-linux-melb:xfs-kern:209226a Signed-off-by: Olaf Weber Signed-off-by: Nathan Scott commit 81c246691535ee3f865fbe6804b3be1b2c159e95 tree bee0ca28e848c223caa68cbf52f36c7045cdd81b parent b07cd5181f3c8de8c28fdac7dbeec9e4220b8037 author Andrew Morton Thu, 01 Jun 2006 20:19:36 -0700 committer Dave Jones Thu, 08 Jun 2006 22:41:17 -0400 [AGPGART] alpha-agp warning fix drivers/char/agp/alpha-agp.c:138: warning: initialization from incompatible pointer type drivers/char/agp/alpha-agp.c:139: warning: initialization from incompatible pointer type Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit b07cd5181f3c8de8c28fdac7dbeec9e4220b8037 tree 480bdcd2ad5129bfd9e1ec216525a48a92eb3e51 parent 01af2fac9ea76513e2fba689ad580f985f32a8c3 author Andrew Morton Thu, 01 Jun 2006 20:19:35 -0700 committer Dave Jones Thu, 08 Jun 2006 22:41:16 -0400 [AGPGART] uninorth-agp warning fixes drivers/char/agp/uninorth-agp.c: In function `agp_uninorth_suspend': drivers/char/agp/uninorth-agp.c:332: warning: cast to pointer from integer of different size drivers/char/agp/uninorth-agp.c: In function `agp_uninorth_resume': drivers/char/agp/uninorth-agp.c:354: warning: cast from pointer to integer of different size Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit cac925a4aab1b7233d3beb591f53498816058a08 tree a800537068aa05fd426ff44b8efd52d66e6d2051 parent bcd618e4eac6fbf82de05d23c15ecb694c62b8af parent 6224e01dccf2543a8f8b4d825baf1510c79c2878 author Jeff Garzik Thu, 08 Jun 2006 15:56:17 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:56:17 -0400 Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp commit bcd618e4eac6fbf82de05d23c15ecb694c62b8af tree e1a85b6a5f10c7ac20ef3b3357e15c5802dca019 parent ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683 parent cb15f81beb1e2ad015d6e7aea2f9b49fdbda9d1a author Jeff Garzik Thu, 08 Jun 2006 15:55:45 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:55:45 -0400 Merge branch 'upstream-fixes' into upstream Conflicts: drivers/net/e1000/e1000_ethtool.c commit ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683 tree d770bd8c536771cb3804abb51ed029d7dd9d30d2 parent 862fc81b62c2d41a7e0b97b90844c80e59c7b0f1 parent 5c601d0c942f5aaf7f3cff7e08f61047d70a964e author Jeff Garzik Thu, 08 Jun 2006 15:48:25 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:48:25 -0400 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream commit 862fc81b62c2d41a7e0b97b90844c80e59c7b0f1 tree 583b0c57ebd0cf99b916f7c32c4a03ea1e3f29a0 parent 987024ca9e11b5ea348e4014ac0e41fdee4f50f1 parent 2e84abe742c42f7b063b141db55e5793ce4c502c author Jeff Garzik Thu, 08 Jun 2006 15:46:38 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:46:38 -0400 Merge branch 'upstream-fixes' into upstream commit 987024ca9e11b5ea348e4014ac0e41fdee4f50f1 tree 4f10b14020029b6a6ba8db7b6a84c53749bf3748 parent 631ae320a4123898927ab1eb32ad81274a713488 author Stephen Hemminger Tue, 06 Jun 2006 10:11:15 -0700 committer Jeff Garzik Thu, 08 Jun 2006 15:44:54 -0400 [PATCH] skge: version 1.6 Update version string. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 631ae320a4123898927ab1eb32ad81274a713488 tree 81c3e089f06a17efbc9f075bc8a875406492c9e2 parent 7c442fa17eabd34301598acbca8ecb99daad6027 author Stephen Hemminger Tue, 06 Jun 2006 10:11:14 -0700 committer Jeff Garzik Thu, 08 Jun 2006 15:44:54 -0400 [PATCH] skge: dont allow bad hardware address from ROM Sometimes boards don't reset properly, and the address read out of the EEPROM is zero. Stop the insanity before the device gets registered. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 7c442fa17eabd34301598acbca8ecb99daad6027 tree c77ff92e3c8e2eefddbc9bab112bdc01939dc020 parent 9db96479b4e682b1bc3796873589db1f8d38a9d5 author Stephen Hemminger Tue, 06 Jun 2006 10:11:13 -0700 committer Jeff Garzik Thu, 08 Jun 2006 15:44:54 -0400 [PATCH] skge: transmit complete via IRQ not NAPI The transmit side code has a number of ring problems that caused some of the Bugzilla reports. Rather than trying to fix the details, it is safer to rewrite the code that handles transmit completion and freeing. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 9db96479b4e682b1bc3796873589db1f8d38a9d5 tree 67e962fc0c1a1a0d7d9eb51fa6d684bb220ba38a parent d85b514fd9aa95d2089fa16dccc25863fb2a766c author Stephen Hemminger Tue, 06 Jun 2006 10:11:12 -0700 committer Jeff Garzik Thu, 08 Jun 2006 15:44:54 -0400 [PATCH] skge: TX low water mark definition Consolidate all usage of ring low water mark to one value. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit d85b514fd9aa95d2089fa16dccc25863fb2a766c tree 7a46eaf6bfa9d745e821cedc51d9deb81b2d7108 parent b10c066823c97c0e40989b2048540e85f5190501 author Stephen Hemminger Tue, 06 Jun 2006 10:11:11 -0700 committer Jeff Garzik Thu, 08 Jun 2006 15:44:54 -0400 [PATCH] skge: use workq for PHY handling Since accessing the PHY can take 100's of usecs, use a work queue to allow spinning in outside of soft/hard irq. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit b10c066823c97c0e40989b2048540e85f5190501 tree 6e1dae7c49b009a21ceb0407188d4432fe009e15 parent d15a88fc21ef225768ce31be16edfc9c6e2e02e3 author Brice Goglin Thu, 08 Jun 2006 10:25:00 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:25:22 -0400 [PATCH] myri10ge update The following patch updates the myri10ge to 1.0.0, with the following changes: * Switch to dma_alloc_coherent API. * Avoid PCI burst when writing the firmware on chipset with unaligned completions. * Use ethtool_op_set_tx_hw_csum instead of ethtool_op_set_tx_csum. * Include linux/dma-mapping.h to bring DMA_32/64BIT_MASK on all architectures (was missing at least on alpha). * Some typo and warning fixes. Signed-off-by: Brice Goglin Signed-off-by: Andrew J. Gallatin drivers/net/myri10ge/myri10ge.c | 57 +++++++++++++++++++----------- 1 file changed, 37 insertions(+), 20 deletions(-) Signed-off-by: Jeff Garzik commit d15a88fc21ef225768ce31be16edfc9c6e2e02e3 tree d4cb0a1bc97973bb947e2667ae56bc4bc2256e9d parent b53471711f21ba0e151075f0e1d6d531eb50f1b1 parent 1def630a6a49dda5bc89dfbd86656293640456f0 author Jeff Garzik Thu, 08 Jun 2006 15:24:46 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:24:46 -0400 Merge branch 'master' into upstream commit 909252d279dd5d47e44c125558e87bb44097289f tree 43a1a5add53e8fca6be8fb78dc6ed5644bdf0a9c parent 35899c57516be6eaa42cc27151767c52d75b2979 author Sam Ravnborg Thu, 08 Jun 2006 20:37:30 +0200 committer Sam Ravnborg Thu, 08 Jun 2006 20:37:30 +0200 kbuild: fix false section mismatch with ARCH=um build Ignoring references to .init.text, .exit.text from the .plt section brought the false positives down to two warnings for a defconfig build of ARCH=um on x86_64. Signed-off-by: Sam Ravnborg commit 35899c57516be6eaa42cc27151767c52d75b2979 tree a21db210c02e9387f93a8015d757a624710652cc parent 1a0f3d422bb9ac959383a5ed1a4127f5900f56a8 author Randy Dunlap Wed, 07 Jun 2006 16:23:26 -0700 committer Sam Ravnborg Thu, 08 Jun 2006 20:20:23 +0200 kbuild: ignore smp_locks section warnings from init/exit code Add ".smp_locks" section to whitelist as being safe from init and exit sections. Signed-off-by: Randy Dunlap Signed-off-by: Sam Ravnborg commit 1a0f3d422bb9ac959383a5ed1a4127f5900f56a8 tree 8a0685e2cfeb61d4eec6b2668bfa95a1437023f9 parent 9870a93d3118239fd7732a0f908e05f67b39a294 author Mike Wolf Fri, 02 Jun 2006 09:53:42 -0500 committer Sam Ravnborg Thu, 08 Jun 2006 20:18:49 +0200 kbuild: fix make rpm for powerpc The default target for most powerpc platforms is zImage. The zImage however is in arch/powerpc/boot and the mkspec script was set up to get the kernel from the top level of the kernel tree. This patch copies vmlinux to arch/powerpc/boot and then copies the kernel to the tmp directory so the rpm can be made. Signed-off-by: Mike Wolf Signed-off-by: Sam Ravnborg commit 9870a93d3118239fd7732a0f908e05f67b39a294 tree 64d39f2ebddcac59d0264497012c4449f521035b parent 1def630a6a49dda5bc89dfbd86656293640456f0 author Pavel Roskin Thu, 01 Jun 2006 21:28:50 -0400 committer Sam Ravnborg Thu, 08 Jun 2006 20:18:05 +0200 kbuild: obj-dirs is calculated incorrectly if hostprogs-y is defined When Makefile.host is included, $(obj-dirs) is subjected to the addprefix operation for the second time. Prefix only needs to be added to the newly added directories, but not to those that came from Makefile.lib. This causes the build system to create unneeded empty directories in the build tree when building in a separate directory. For instance, lib/lib/zlib_inflate is created in the build tree. Signed-off-by: Pavel Roskin Signed-off-by: Sam Ravnborg commit 6224e01dccf2543a8f8b4d825baf1510c79c2878 tree 3d4c7e59b0e1ba7ac0f5eaf211c04049feb9fe1c parent 9026729bfeb4329a4edc01f427f01af7ee0a5273 author Auke Kok Thu, 08 Jun 2006 11:15:35 -0700 committer Auke Kok Thu, 08 Jun 2006 11:15:35 -0700 [DOC] Update bonding documentation with sysfs info Bonding documentation needed an update to include sysfs specific information. This patch adds information on how to change bonding parameters at runtime using the sysfs interface. Signed-off-by: Mitch Williams Signed-off-by: Auke Kok commit 9026729bfeb4329a4edc01f427f01af7ee0a5273 tree 956f921b9511b87da6337a9f169b4b5d14590fc6 parent 2cc304923d87403abc103a741382b9af08b6decc author Auke Kok Thu, 08 Jun 2006 09:30:24 -0700 committer Auke Kok Thu, 08 Jun 2006 09:30:24 -0700 e1000: add PCI Error Recovery Various PCI bus errors can be signaled by newer PCI controllers. This patch adds the PCI error recovery callbacks to the intel gigabit ethernet e1000 device driver. The patch has been tested, and appears to work well. Signed-off-by: Linas Vepstas Acked-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 2cc304923d87403abc103a741382b9af08b6decc tree f14d99c13a1b8960964dcfdb6a3774c628ab7042 parent 983f27d37d4fc72c252835cb2ee3103b360735a6 author Auke Kok Thu, 08 Jun 2006 09:30:18 -0700 committer Auke Kok Thu, 08 Jun 2006 09:30:18 -0700 e100: add PCI Error Recovery Various PCI bus errors can be signaled by newer PCI controllers. This patch adds the PCI error recovery callbacks to the intel ethernet e100 device driver. The patch has been tested, and appears to work well. Signed-off-by: Linas Vepstas Acked-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 1717ffc58850dfa9e08b4977f8d0323cb3336863 tree 6528d6d355b1288fe4831cdff59671f6536b4b2b parent f3ffb6814408f29817fc84d40ecc9c796acaa3ab author Steve French Thu, 08 Jun 2006 05:41:32 +0000 committer Steve French Thu, 08 Jun 2006 05:41:32 +0000 [CIFS] NTLMv2 support part 5 NTLMv2 authentication (stronger authentication than default NTLM) which many servers support now works. There was a problem with the construction of the security blob in the older code. Currently requires /proc/fs/cifs/Experimental to be set to 2 and /proc/fs/cifs/SecurityFlags to be set to 0x4004 (to require using NTLMv2 instead of default of NTLM) Next we will check signing to make sure optional NTLMv2 packet signing also works. Signed-off-by: Steve French commit 72109368de7aaa5d489d9ca4641f4a11a6fc7653 tree 0ea8bd820daf11bea34c45f319c2ea0b848d166b parent 7a532c69c37dbb46bfd0276160e624f06552adfc author Dennis Munsie Wed, 07 Jun 2006 18:53:38 +1000 committer Dave Airlie Wed, 07 Jun 2006 18:53:38 +1000 Removed hard coded EDID buffer size. Signed-off-by: Dennis Munsie Acked-by: Antonino Daplas Signed-off-by: Dave Airlie commit f3ffb6814408f29817fc84d40ecc9c796acaa3ab tree b4702cbdbf2c4517a5986bbaa971495b0f92a877 parent 5bafd76593f060540acbea3b61e3087e009aa269 parent 1def630a6a49dda5bc89dfbd86656293640456f0 author Steve French Wed, 07 Jun 2006 02:40:03 +0000 committer Steve French Wed, 07 Jun 2006 02:40:03 +0000 Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit 5bafd76593f060540acbea3b61e3087e009aa269 tree b5baf62243810b7aa36619a8cf64ab24d82952fb parent a8ee03441f66e0674e641c0cbe1a9534cdee968f author Steve French Wed, 07 Jun 2006 00:18:43 +0000 committer Steve French Wed, 07 Jun 2006 00:18:43 +0000 [CIFS] Add support for readdir to legacy servers Fixes oops to OS/2 on ls and removes redundant NTCreateX calls to servers which do not support NT SMBs. Key operations to OS/2 work. Signed-off-by: Steve French commit 5d5ff44fe6775ccb922fd1f7d478b2ba9ca95068 tree d8569caefe1cb5ecced30929ef98d3e1fe642425 parent e4a082c7c1f9a7b11fece6918e7ee5519b39ac46 author Christoph Hellwig Sat, 03 Jun 2006 13:21:13 +0200 committer James Bottomley Tue, 06 Jun 2006 11:07:25 -0400 [SCSI] fix up request buffer reference in various scsi drivers Various scsi drivers use scsi_cmnd.buffer and scsi_cmnd.bufflen in their queuecommand functions. Those fields are internal storage for the midlayer only and are used to restore the original payload after request_buffer and request_bufflen have been overwritten for EH. Using the buffer and bufflen fields means they do very broken things in error handling. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit e4a082c7c1f9a7b11fece6918e7ee5519b39ac46 tree 8aa1d865b2ddfb9b897e30e97dede3268c00b582 parent f70e9c5f91f1d2d9ce79dc45221540e25b4e4ac0 author Sumant Patro Tue, 30 May 2006 12:03:37 -0700 committer James Bottomley Tue, 06 Jun 2006 10:57:18 -0400 [SCSI] megaraid_sas: switch fw_outstanding to an atomic_t This patch( originally submitted by Christoph Hellwig) removes instance_lock and changes fw_outstanding variable data type to atomic_t. Signed-off-by: Sumant Patro Signed-off-by: James Bottomley commit a8ee03441f66e0674e641c0cbe1a9534cdee968f tree dcc0f590c417cddea20a40efdf82bc5b1b21d155 parent 6d027cfdb19c26df3151a519ed55acfe2c4cb7c3 author Steve French Mon, 05 Jun 2006 23:34:19 +0000 committer Steve French Mon, 05 Jun 2006 23:34:19 +0000 [CIFS] NTLMv2 support part 4 Signed-off-by: Steve French commit f70e9c5f91f1d2d9ce79dc45221540e25b4e4ac0 tree 56a1ad6b1a9d7f4c84141973beca182e80c91aac parent 3219e5294150aee7d389e19029f49b44fb6b5c9f author Mike Christie Tue, 30 May 2006 01:04:51 -0500 committer James Bottomley Mon, 05 Jun 2006 19:13:16 -0400 [SCSI] iscsi: update version to 1.0-595 Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 3219e5294150aee7d389e19029f49b44fb6b5c9f tree 44236fd9f2eb40d5622cadb126e9f2672b129486 parent 040515f53c09047c76ad074dc6a280984dc84b04 author Mike Christie Tue, 30 May 2006 00:37:28 -0500 committer James Bottomley Mon, 05 Jun 2006 19:12:25 -0400 [SCSI] iscsi: fix writepsace race We can race and misset the suspend bit if iscsi_write_space is called then iscsi_send returns with a failure indicating there is no space. To handle this this patch returns a error upwards allowing xmitworker to decide if we need to try and transmit again. For the no write space case xmitworker will not retry, and instead let iscsi_write_space queue it back up if needed (this relies on the work queue code to properly requeue us if needed). Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 040515f53c09047c76ad074dc6a280984dc84b04 tree cf7a3ed3a34b925be4a842e04bbfab34f4a8a17d parent 994442e807782d68bb1d3ae34044f95990411a22 author Mike Christie Tue, 30 May 2006 00:37:25 -0500 committer James Bottomley Mon, 05 Jun 2006 19:11:43 -0400 [SCSI] iscsi: return task found during search from davidw@netapp.com: remove task type should return a task on success. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 994442e807782d68bb1d3ae34044f95990411a22 tree 09535e792aabe72306c44c4eb8a962f1177edbf4 parent 67a611149b2ac5f4af1e36bfffbfe3198cd3712c author Mike Christie Tue, 30 May 2006 00:37:22 -0500 committer James Bottomley Mon, 05 Jun 2006 19:11:18 -0400 [SCSI] iscsi: fix run list corruption from davidw@netapp.com: We must grab the session lock when modifying the running lists. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 67a611149b2ac5f4af1e36bfffbfe3198cd3712c tree f74b70aefc16544901a3a3191bee8be8c467747d parent 9bf0a28c9a24e2cee5deecf89d118254374c75ba author Mike Christie Tue, 30 May 2006 00:37:20 -0500 committer James Bottomley Mon, 05 Jun 2006 19:10:45 -0400 [SCSI] iscsi: don't switch states when just cleaning up If recovery failed or we are in recovery only overwrite the state if we are going to terminate the session or if we logged back in. STOP_CONN_SUSPEND and conn_cnt are not used. We only support a single connection session ATM, so cleanup that code while we are working around it. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 5c601d0c942f5aaf7f3cff7e08f61047d70a964e tree 0144bcb5291d5cd49192270b6ff192e21f661da7 parent ff7562aaec1e68448888572033f072fc21ef2ac8 author Pavel Machek Mon, 05 Jun 2006 16:13:30 -0400 committer John W. Linville Mon, 05 Jun 2006 16:13:30 -0400 [PATCH] wireless: move zd1201 where it belongs zd1201 is wifi adapter, yet it is hiding in drivers/usb/net where noone can find it. This moves Kconfig/Makefile zd1201 to the right place. Signed-off-by: Pavel Machek Signed-off-by: John W. Linville commit ff7562aaec1e68448888572033f072fc21ef2ac8 tree 16a39b85e2099081d9801fa0285a297199041f4d parent c4b3d1bb3206513d7f10cd60bbac97c82624c2d3 author Jason Lunz Sun, 04 Jun 2006 23:05:49 +0200 committer John W. Linville Mon, 05 Jun 2006 15:53:10 -0400 [PATCH] bcm43xx: quiet down log spam from set_security The debug logging in bcm43xx_ieee80211_set_security() is pretty noisy. Make it more silent. Signed-off-by: Jason Lunz Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit c4b3d1bb3206513d7f10cd60bbac97c82624c2d3 tree 33cd40b28136809c4fc462742c9f1519b4b2ed73 parent 6ae15df16ef3dc3f5f043e94bb2cd4aa6c7f2aa8 author Joseph Jezak Thu, 01 Jun 2006 17:12:49 +0100 committer John W. Linville Mon, 05 Jun 2006 15:51:30 -0400 [PATCH] softmac: unified capabilities computation This patch moves the capabilities field computation to a function for clarity and adds some previously unimplemented bits. Signed off by Joseph Jezak Signed-off-by: Daniel Drake Acked-By: Johannes Berg Signed-off-by: John W. Linville commit 6ae15df16ef3dc3f5f043e94bb2cd4aa6c7f2aa8 tree 4aaf3f6dd60df4dd712679e8594796dfd8322194 parent 76ea4c7f4cd319dee35934ecab57745feae58fa5 author Daniel Drake Thu, 01 Jun 2006 15:37:22 +0100 committer John W. Linville Mon, 05 Jun 2006 15:51:30 -0400 [PATCH] softmac: Fix handling of authentication failure My router blew up earlier, but exhibited some interesting behaviour during its dying moments. It was broadcasting beacons but wouldn't respond to any authentication requests. I noticed that softmac wasn't playing nice with this, as I couldn't make it try to connect to other networks after it had timed out authenticating to my ill router. To resolve this, I modified the softmac event/notify API to pass the event code to the callback, so that callbacks being notified from IEEE80211SOFTMAC_EVENT_ANY masks can make some judgement. In this case, the ieee80211softmac_assoc callback needs to make a decision based upon whether the association passed or failed. Signed-off-by: Daniel Drake Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 76ea4c7f4cd319dee35934ecab57745feae58fa5 tree 6151f9d89084a1e96f216a182ed3fc265dffd429 parent 47fbe1bf3980b41d2e18e3774e8e1094f716d2d1 author Daniel Drake Thu, 01 Jun 2006 15:34:26 +0100 committer John W. Linville Mon, 05 Jun 2006 15:51:29 -0400 [PATCH] softmac: complete shared key authentication This patch finishes of the partially-complete shared key authentication implementation in softmac. The complication here is that we need to encrypt a management frame during the authentication process. I don't think there are any other scenarios where this would have to happen. To get around this without causing too many headaches, we decided to just use software encryption for this frame. The softmac config option now selects IEEE80211_CRYPT_WEP so that we can ensure this available. This also involved a modification to some otherwise unused ieee80211 API. Signed-off-by: Daniel Drake Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 47fbe1bf3980b41d2e18e3774e8e1094f716d2d1 tree 6c6b7d7dfacfa9bff197aaa32773996f472d99a9 parent 2a8063403112030f1748e207d97d4f8654754dff author Toralf Förster Mon, 05 Jun 2006 15:48:31 -0400 committer John W. Linville Mon, 05 Jun 2006 15:48:31 -0400 [PATCH] ieee80211softmac_io.c: fix warning "defined but not used" Got this compiler warning and Johannes Berg wrote: Yeah, known 'bug', we have that code there but never use it. Feel free to submit a patch (to John Linville, CC netdev and softmac-dev) to remove it. Signed-off-by: Toralf Foerster Signed-off-by: John W. Linville commit 2a8063403112030f1748e207d97d4f8654754dff tree 5a6d789aaf243d96807a3a8431c4c741a469e318 parent f6882a0688ea83db5fc2f3491ac9fcdce0834cc7 author Pavel Machek Fri, 26 May 2006 22:07:48 +0200 committer John W. Linville Mon, 05 Jun 2006 15:34:18 -0400 [PATCH] usb wifi: zd1201 cleanups Cleanup coding style and other small stuff in zd1201. No real code changes. Signed-off-by: Pavel Machek Signed-off-by: John W. Linville commit f6882a0688ea83db5fc2f3491ac9fcdce0834cc7 tree 19a30d557610787dc0520a2955852b4882056bdb parent dea58b80f2625d3712645fb6ff0af45866cedaae parent ea9a7719597e81a119a155178eabfc941eef11cc author John W. Linville Mon, 05 Jun 2006 15:31:57 -0400 committer John W. Linville Mon, 05 Jun 2006 15:31:57 -0400 Merge branch 'upstream-fixes' into upstream commit 6ccf58ab22499139bacc683493c9fd70af55adbb tree 5fd813e5eab0f24ccf7d908380ae347df0e7123e parent 436fe7b8b4a5016ef1fcb32bff77bde84003e15d author Dave Jones Mon, 05 Jun 2006 15:25:20 -0400 committer Dave Jones Mon, 05 Jun 2006 15:25:20 -0400 [CPUFREQ] sets nforce2 minimum PLL divider to 2. Sets minimum PLL divider to 2. No negative impact when tested with two nForce2 based boards. Alexander Choporov reported (06/01/06) that xdiv = 1 does not work on his Abit NF7S2. Although there shouldn't be much cases that lead to xdiv = 1. (Updates also the (C) year) Signed-off-by: Sebastian Witt Signed-off-by: Dave Jones commit 2f3243aebd8df4d9eecaeca04bbff6c7dbfb2142 tree a5b5e3ec2be7f9497dc991b7c7914df6fde27b98 parent aa783a8f31c79f493bd49ba926b171b79b9839fb author David Woodhouse Mon, 05 Jun 2006 20:19:05 +0100 committer David Woodhouse Mon, 05 Jun 2006 20:19:05 +0100 [RBTREE] Switch rb_colour() et al to en_US spelling of 'color' for consistency Since rb_insert_color() is part of the _public_ API, while the others are purely internal, switch to be consistent with that. Signed-off-by: David Woodhouse commit dea58b80f2625d3712645fb6ff0af45866cedaae tree b9c0d4f7d4fcd90e438b5cc5d05471e52615a62d parent b1141f6d5dead296adcabd4a1e8ea2b994e287cb parent 672c6108a51bf559d19595d9f8193dfd81f0f752 author John W. Linville Mon, 05 Jun 2006 14:42:27 -0400 committer John W. Linville Mon, 05 Jun 2006 14:42:27 -0400 Merge branch 'from-linus' into upstream commit 436fe7b8b4a5016ef1fcb32bff77bde84003e15d tree e9c366a5539fbdc13febc563001e4117353a815b parent b10eec2246690f069febd3aa9578decd5ffb3f5b author Dave Jones Mon, 05 Jun 2006 14:03:50 -0400 committer Dave Jones Mon, 05 Jun 2006 14:03:50 -0400 [CPUFREQ] Make powernow-k7 work on SMP kernels. Even though powernow-k7 doesn't work in SMP environments, it can work on an SMP configured kernel if there's only one CPU present, however recalibrate_cpu_khz was returning -EINVAL on such kernels, so we failed to init the cpufreq driver. Signed-off-by: Dave Jones commit 6d027cfdb19c26df3151a519ed55acfe2c4cb7c3 tree c40004c2518013409bd0f701eca868fd14c74e7f parent f64b23ae4aef9f69d71ea41529a188acd5ab4930 author Steve French Mon, 05 Jun 2006 16:26:05 +0000 committer Steve French Mon, 05 Jun 2006 16:26:05 +0000 [CIFS] NTLMv2 support part 3 Response struct filled in exacty for 16 byte hash which we need to check more to make sure it works. Signed-off-by: Steve French commit f64b23ae4aef9f69d71ea41529a188acd5ab4930 tree 7c8c0b06a98523c4fee98e12e621591a3ab69042 parent 9312f6754d4b2d3ce27c21b16fb92923ce92a411 author Steve French Mon, 05 Jun 2006 05:27:37 +0000 committer Steve French Mon, 05 Jun 2006 05:27:37 +0000 [CIFS] NTLMv2 support part 2 Still need to fill in response structure and check that hash works Signed-off-by: Steve French commit 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce tree 836110c370fc6b87746c77d15a3e09277d3817aa parent fe65b97a5885a84baa103d7213754ff29e8f872f author Anssi Hannula Mon, 05 Jun 2006 00:18:43 -0400 committer Dmitry Torokhov Mon, 05 Jun 2006 00:18:43 -0400 Input: fix accuracy of fixp-arith.h Add the value of cos(90) = 0 to the table. This also moves the results so that sin(x) == sin(180-x) is true as expected. Signed-off-by: Anssi Hannula Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit fe65b97a5885a84baa103d7213754ff29e8f872f tree a393e8d550c4675b6f6c30bdd41285d2c735b837 parent 0f5e560e4523e15f33922de5becd024ccaaff76c author Anssi Hannula Mon, 05 Jun 2006 00:18:21 -0400 committer Dmitry Torokhov Mon, 05 Jun 2006 00:18:21 -0400 Input: iforce - use ENOSPC instead of ENOMEM Use -ENOSPC instead of -ENOMEM when the iforce device doesn't have enough free memory for the new effect. All other drivers are using -ENOSPC, so this makes the behaviour coherent. Signed-off-by: Anssi Hannula Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 0f5e560e4523e15f33922de5becd024ccaaff76c tree d971ef964d249eb670529d2d59a8194a17a8849b parent 47ce56edb8ecdd4ec2bbec4e8683f3ba91de72e3 author Andreas Mohr Mon, 05 Jun 2006 00:18:00 -0400 committer Dmitry Torokhov Mon, 05 Jun 2006 00:18:00 -0400 Input: constify drivers/char/keyboard.c Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit b10eec2246690f069febd3aa9578decd5ffb3f5b tree 789c892dc6c2ec4e1aca1ab52fd068815c7f4692 parent 8c362a5d62c98ee117b229c3555f402e72f5c21e author Jan Beulich Fri, 28 Apr 2006 13:47:13 +0200 committer Dave Jones Sun, 04 Jun 2006 19:47:38 -0400 [CPUFREQ] cpufreq core {d,}printk adjustments Remove KERN_* suffixes from some cpufreq driver's dprintk-s. Signed-off-by: Jan Beulich Signed-off-by: Dave Jones commit 8c362a5d62c98ee117b229c3555f402e72f5c21e tree 14e4795b4eead7fd6cb93c54e0d0a5fa018019ad parent 0fc25dd17eaea64b21612f8e2816a4695b418100 author Jan Beulich Wed, 26 Apr 2006 15:41:22 +0200 committer Dave Jones Sun, 04 Jun 2006 19:47:38 -0400 [CPUFREQ] dprintk adjustments to cpufreq-speedstep-centrino Remove KERN_* suffixes from some Centrino cpufreq driver's dprintk-s. Signed-off-by: Jan Beulich Signed-off-by: Dave Jones commit 0fc25dd17eaea64b21612f8e2816a4695b418100 tree 865a26fe983d26fb93296db6ce2566f1c1c95ca0 parent 1f729e0660f974cec1f0f7f4fba03ea4c2c4b9a9 author Jan Beulich Wed, 26 Apr 2006 15:40:02 +0200 committer Dave Jones Sun, 04 Jun 2006 19:47:38 -0400 [CPUFREQ] dprintk adjustments to cpufreq-nforce2 Remove KERN_* suffixes from some NForce2 cpufreq driver's dprintk-s. Signed-off-by: Jan Beulich Signed-off-by: Dave Jones commit 1f729e0660f974cec1f0f7f4fba03ea4c2c4b9a9 tree 9254031f1f252e5b38c962b3e2ed93a0351ce319 parent 911cb74bb9e77e40749abc2fca6fe74d87d940f3 author Dave Jones Sun, 04 Jun 2006 19:37:58 -0400 committer Dave Jones Sun, 04 Jun 2006 19:37:58 -0400 [CPUFREQ] Prepare powernow-k8 for future CPUs. Forthcoming AMD products will use a different algorithm for transitioning pstates than the current generation Opteron products do. The attached patch allows the powernow-k8 driver to work with those products. Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones commit 9312f6754d4b2d3ce27c21b16fb92923ce92a411 tree 7d4edbc90495ec52bfd568064a4a46e8309b3c7d parent 254e55ed03e2e8d23089b4a468eec2fd2e1ead9b author Steve French Sun, 04 Jun 2006 22:21:07 +0000 committer Steve French Sun, 04 Jun 2006 22:21:07 +0000 [CIFS] Fix mask so can set new cifs security flags properly Signed-off-by: Steve French commit 254e55ed03e2e8d23089b4a468eec2fd2e1ead9b tree af99361609403301ab1c758e2988e79dc155a710 parent bdc4bf6e8ac8cc29c61c2f0dc61d9776ef9a8ed4 author Steve French Sun, 04 Jun 2006 05:53:15 +0000 committer Steve French Sun, 04 Jun 2006 05:53:15 +0000 CIFS] Support for older servers which require plaintext passwords - part 2 Signed-off-by: Steve French commit d27317657ae18cfbc45def8f566e4c3ed1f51d74 tree 6523aa4dc2f3a9b8c788fba931b6cfb7a85135aa parent 7b1c6ca73aa102e9dde5098f58c523bca0f8e2c3 author David Woodhouse Sat, 03 Jun 2006 00:27:53 +0100 committer David Woodhouse Sat, 03 Jun 2006 00:27:53 +0100 Switch to __s32 types in joystick.h instead of C99 types for consistency. The rest of the file uses these types instead of C99 types. Acked-by: Dmitry Torokhov Signed-off-by: David Woodhouse commit 3bcc86f507f5a0b6f5bfa312f37ec33711558acb tree e7070dce2d59618dbf0f58f9701cef2dae6c51d7 parent e9482b4374e2596e6f3f1ab30c4ea469f4ac6311 author David Woodhouse Sat, 03 Jun 2006 00:25:50 +0100 committer David Woodhouse Sat, 03 Jun 2006 00:25:50 +0100 [JFFS2] Remove stray __exit from jffs2_compressors_exit() It's used from the initfunc in case of failure too. We could actually do with an '__initexit' for this kind of thing -- when built in to the kernel, it could do with being dropped with the init text. We _could_ actually just use __init for it, but that would break if/when we start dropping init text from modules. So let's just leave it as it was for now, and mutter a little more about random 'janitorial' fixes from people who aren't paying attention to what they're doing. Signed-off-by: David Woodhouse commit bdc4bf6e8ac8cc29c61c2f0dc61d9776ef9a8ed4 tree 60e8cd01fa1a5a8c5bc00c920db629232191ccf1 parent 43411d699e8cf3293674da558d31a02e0012aa9d author Steve French Fri, 02 Jun 2006 22:57:13 +0000 committer Steve French Fri, 02 Jun 2006 22:57:13 +0000 [CIFS] Support for older servers which require plaintext passwords disabled by default, but can be enabled via proc for servers which require such support. Also includes support for setting security flags for cifs. See fs/cifs/README Signed-off-by: Steve French commit 43411d699e8cf3293674da558d31a02e0012aa9d tree d9fa33e4e37f25a46c17c5587009120d5ede8376 parent 7a0d22317614ee8e2598feafd4812e33be17f421 author Steve French Fri, 02 Jun 2006 18:17:11 +0000 committer Steve French Fri, 02 Jun 2006 18:17:11 +0000 [CIFS] Fix mapping of old SMB return code Invalid Net Name so it is recognized on mount the old mapping of this was to ENODEV (instead of ENXIO) - but ENODEV is what mount returns when the cifs driver will not load so change this to map to ENXIO (which was what the equivalent condition returned for mapping errors from more modern servers) Signed-off-by: Steve French commit 42adb53cb36d19862a02d3087e2e3d9dab39e5fa tree cbf070073a1bedaf8ab2247864ba03269e3e7f26 parent ba8f5baba79da8eb502f8534c3a8ecb64aceb790 author Jeremy Fitzhardinge Thu, 01 Jun 2006 17:41:00 -0400 committer Len Brown Thu, 01 Jun 2006 20:42:32 -0400 ACPI: Allow a WAN module enable/disable on a Thinkpad X60. The WAN (Sierra Wireless EV-DO) module is very similar to the Bluetooth module. It appears on the USB bus when enabled. It can be controlled via hot key, or directly via ACPI. This change enables direct control via ACPI. I have tested it on my Lenovo Thinkpad X60; I guess it will probably work on other Thinkpad models which come with this module installed. Signed-off-by: Jeremy Fitzhardinge Ack'd by: Borislav Deianov Signed-off-by: Len Brown commit 7a0d22317614ee8e2598feafd4812e33be17f421 tree d89e0b5578405528e004e015f2d2de7438be1b6f parent 273d81d6ada951ba99f10b755d6f849dbb352730 author Steve French Thu, 01 Jun 2006 19:44:37 +0000 committer Steve French Thu, 01 Jun 2006 19:44:37 +0000 [CIFS] Missing brace commit 273d81d6ada951ba99f10b755d6f849dbb352730 tree cfb22593741e71b5f311c4180c542d63f7bcc4df parent 3856a9d443ee24248683c415e535f7a2b0fed0f3 author Dave Kleikamp Thu, 01 Jun 2006 19:41:23 +0000 committer Steve French Thu, 01 Jun 2006 19:41:23 +0000 [CIFS] Do not overwrite aops cifs should not be overwriting an element of the aops structure, since the structure is shared by all cifs inodes. Instead define a separate aops structure to suit each purpose. I also took the liberty of replacing a hard-coded 4096 with PAGE_CACHE_SIZE Signed-off-by: Dave Kleikamp Signed-off-by: Steven French Signed-off-by: Andrew Morton commit 3856a9d443ee24248683c415e535f7a2b0fed0f3 tree df609fda7681cc04f1de402861e5048a503f0fbd parent 7c7b25bc8e392aea781324efa771bc191377b876 author Steve French Thu, 01 Jun 2006 19:38:46 +0000 committer Steve French Thu, 01 Jun 2006 19:38:46 +0000 [CIFS] Fix minor build breaks due to cifs kconfig issues Signed-off-by: Steve French commit 7c7b25bc8e392aea781324efa771bc191377b876 tree ddad1a91f948746dbef140994c615253a7f42e65 parent 9c53588ec96d85f82e9bf3fb1af7cca31056e940 author Steve French Thu, 01 Jun 2006 19:20:10 +0000 committer Steve French Thu, 01 Jun 2006 19:20:10 +0000 [CIFS] Support for setting up SMB sessions to legacy lanman servers part 2 commit 911cb74bb9e77e40749abc2fca6fe74d87d940f3 tree 19e5fe6f750315a94abf5057a0ea41947f2c92bb parent 75de7d55f8e148848cadefc92140d8f083d13924 author Dave Jones Thu, 01 Jun 2006 11:38:28 -0400 committer Dave Jones Thu, 01 Jun 2006 11:38:28 -0400 [CPUFREQ] Make acpi-cpufreq 'sticky'. This prevents annoying messages being printed when it gets loaded on a machine that doesn't have support scaling via ACPI. Signed-off-by: Dave Jones commit 7b1c6ca73aa102e9dde5098f58c523bca0f8e2c3 tree af793f1552892d3d017f284843e3d85251fd8e73 parent 66643de455c27973ac31ad6de9f859d399916842 author David Woodhouse Thu, 01 Jun 2006 12:49:30 +0100 committer David Woodhouse Thu, 01 Jun 2006 12:49:30 +0100 Add to headers included for userspace in Signed-off-by: David Woodhouse Signed-off-by: Vojtech Pavlik commit c029cc66cb3d83f70c02e0c182f0eed1419f8020 tree b9ed887a0e6434fedebcbf90b3d2ba1aeff68a01 parent 0a9cb46a73abd6c45e7c986bec984eed60c417b6 parent ba8f5baba79da8eb502f8534c3a8ecb64aceb790 author Paul Mackerras Thu, 01 Jun 2006 19:05:23 +1000 committer Paul Mackerras Thu, 01 Jun 2006 19:05:23 +1000 Merge branch 'merge' commit 9c53588ec96d85f82e9bf3fb1af7cca31056e940 tree 29357cd58a40c571ced0064a54272fa3d3e374a0 parent 3979877e5606ecc58c5a31bd0078c6d80ba9cbe7 author Steve French Thu, 01 Jun 2006 05:09:10 +0000 committer Steve French Thu, 01 Jun 2006 05:09:10 +0000 [CIFS] Missing include shows up on some architectures Signed-off-by: Steve French commit 3979877e5606ecc58c5a31bd0078c6d80ba9cbe7 tree d221455b5176ea8b26e750d6498c3ed822998ba3 parent 26a21b980b1897b11fd7f9ba4bf6060c9e15df10 author Steve French Wed, 31 May 2006 22:40:51 +0000 committer Steve French Wed, 31 May 2006 22:40:51 +0000 [CIFS] Support for setting up SMB sessions to legacy lanman servers commit 75de7d55f8e148848cadefc92140d8f083d13924 tree cd25015b00d398c8274db81e9f49ea7e4570f914 parent 484944a5b002cf87b38a8f073d37afcfb8afff28 author Dave Jones Wed, 31 May 2006 16:13:14 -0400 committer Dave Jones Wed, 31 May 2006 16:13:14 -0400 [CPUFREQ] Remove strange No-op from longrun.c ORing something with zero is meaningless. ACKed-by: Dominik Brodowski Signed-off-by: Dave Jones commit 26a21b980b1897b11fd7f9ba4bf6060c9e15df10 tree c56627f5ced7e016a4a9ec388a479270226cce27 parent e6ed89ac9f5da16fea5111651b6de0ff0a76a5c2 author Steve French Wed, 31 May 2006 18:05:34 +0000 committer Steve French Wed, 31 May 2006 18:05:34 +0000 [CIFS] Cleanup extra whitespace in dmesg logging. Update cifs change log commit 9bf0a28c9a24e2cee5deecf89d118254374c75ba tree 1a422b6e38ab0ad291f00dfb061ae3c0d9e4d1e5 parent 2b89dad0c7e3b03d45d9674ee9a7b49670df098e author Vivek Goyal Thu, 27 Apr 2006 02:33:13 -0700 committer James Bottomley Wed, 31 May 2006 10:33:49 -0500 [SCSI] kdump: mpt fusion driver initialization failure fix MPT fusion driver initialization fails while second kernel is booting, after a system crash (if kdump kernel is configured). Oops message is pasted below. ***************************************************************************** Fusion MPT base driver 3.03.08 Copyright (c) 1999-2005 LSI Logic Corporation Fusion MPT SAS Host driver 3.03.08 ACPI: PCI Interrupt 0000:01:00.0[A] -> Link [LNKA] -> GSI 5 (level, low) -> IRQ 5 mptbase: Initiating ioc0 bringup BUG: unable to handle kernel paging request at virtual address 00002608 printing eip: c11782fd *pde = 00000000 Oops: 0000 [#1] Modules linked in: CPU: 0 EIP: 0060:[] Not tainted VLI EFLAGS: 00010046 (2.6.17-rc1-16M #2) EIP is at mptscsih_io_done+0x27/0x3a3 eax: c4fed000 ebx: c4fed000 ecx: 00002600 edx: 00000298 esi: c11782d6 edi: 00002600 ebp: 00000000 esp: c1332f74 ds: 007b es: 007b ss: 0068 Process swapper (pid: 0, threadinfo=c1332000 task=c128f9c0) Stack: <0>0000006c 00000020 00000298 00002600 c4fed000 c4fed000 c11782d6 0000260 0 00000000 c1172c49 c4fed000 c1305b40 00000005 00000000 c1172d75 c48877e0 c1029687 00000000 c1307fb8 00000000 c1305a00 00000001 00000000 c1307fb8 Call Trace: mptscsih_io_done+0x0/0x3a3 mpt_turbo_reply+0xbb/0xd3 mpt_interrupt+0x22/0x2b misrouted_irq+0x63/0xcb note_interrupt+0x43/0x98 __do_IRQ+0x68/0x8f do_IRQ+0x36/0x4e ======================= common_interrupt+0x1a/0x20 mwait_idle+0x1a/0x2a cpu_idle+0x40/0x5c start_kernel+0x17a/0x17c Code: 5e 5f 5d c3 55 89 cd 57 56 53 83 ec 14 89 54 24 0c 89 44 24 10 8b 90 cc 00 00 00 8b 4c 24 0c 81 c2 98 02 00 00 85 ed 89 54 24 08 <0f> b7 79 08 89 fe 74 04 0f b7 75 08 66 39 f7 75 0d 8b 44 24 0c ******************************************************************************* o Kdump capture kernel boot fails during initialization of MPT fusion driver. (LSI Logic / Symbios Logic SAS1064E PCI-Express Fusion-MPT SAS (rev 01)) o Problem is easily reproducible, if system crashed while some disk activity like cp operation was going on. o After a system crash, devices are not shutdown and capture kernel starts booting while skipping BIOS. Hence underlying device is left in operational state. In this case scsi contoller was left with interrupt line asserted reply FIFO was not empty. When driver starts initializing in the second kernel, it receives the interrupt the moment request_irq() is called. Interrupt handler, reads the message from reply FIFO and tries to access the associated message frame and panics, as in the new kernel's context that message frame is not valid at all. o In this scenario, probably we should delay the request_irq() call. First bring up the IOC, reset it if needed and then should register for irq. o I have tested the patch with SAS1064E and 53c1030 controllers. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Acked-by: "Moore, Eric Dean" Signed-off-by: James Bottomley commit d87fa38e70853a9607dc34a02d15cf5f149f49f2 tree 6afc6f8b9ff9c2c441efd61829d5d6fa6eb5698d parent 52783c5dcc8d317bc8c3e2692d366e8a305abada author Tejun Heo Wed, 31 May 2006 18:28:24 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:24 +0900 [PATCH] libata-hp: move ata_do_reset() to libata-eh.c With ops->probe_init() gone, no user is left in libata-core.c. Move ata_do_reset() to libata-eh.c and make it static. Signed-off-by: Tejun Heo commit 52783c5dcc8d317bc8c3e2692d366e8a305abada tree 328fafa2775f835329b0e9ca64bc173dba4cf2b3 parent 0542925b25676543e8384edf454668f89227e905 author Tejun Heo Wed, 31 May 2006 18:28:22 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:22 +0900 [PATCH] libata-hp: killl ops->probe_reset Now that all drivers implementing new EH are converted to new probing mechanism, ops->probe_reset doesn't have any user. Kill it. Signed-off-by: Tejun Heo commit 0542925b25676543e8384edf454668f89227e905 tree ba9add993cf4c5e0499260126f23782a75a8219d parent 4296971dd36e2c2deae0826305f591480223af88 author Tejun Heo Wed, 31 May 2006 18:28:20 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:20 +0900 [PATCH] sata_sil24: convert to new probing mechanism and add hotplug support Convert to new probing mechanism and add hotplug support by enabling PORT_IRQ_PHYRDY_CHG, marking ehi for hotplug and scheduling EH on PORT_IRQ_PHYRDY_CHG or PORT_IRQ_DEV_XCHG. Sil3124/32 family of controllers don't have any mechanism to wait for the first D2H FIS after hotplug, so ATA_FLAG_SKIP_D2H_BSY is used. Signed-off-by: Tejun Heo commit 4296971dd36e2c2deae0826305f591480223af88 tree bd3cce15c252cea18869b39da231d542a6255e59 parent e573890b00426189e1e223967a2c46fb758bf06e author Tejun Heo Wed, 31 May 2006 18:28:18 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:18 +0900 [PATCH] ahci: convert to new probing mechanism and add hotplug support Convert to new probing mechanism and add hotplug support by enabling PORT_IRQ_PHYRDY, marking ehi for hotplug and scheduling EH on CONNECT/PHYRDY interrupts. Unfortunately, ahci cannot reliably wait for the first D2H FIS after hotplug. It sometimes succeeds but times out more often than not, so ATA_FLAG_SKIP_D2H_BSY is used. This patch also fixes ahci_hardreset() such that D2H Register FIS RX area is cleared before issuing COMRESET. Without this, ata_busy_sleep() after COMRESET might prematually finish if the previous TF contains DRDY && !BSY. Signed-off-by: Tejun Heo commit e573890b00426189e1e223967a2c46fb758bf06e tree 0ab6f7f0c5561a9886cacafbb68ae0fce7e4bee0 parent ccc4672aff1861a9c80ed9e8ec11dc304b31d307 author Tejun Heo Wed, 31 May 2006 18:28:16 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:16 +0900 [PATCH] sata_sil: convert to new probing mechanism and add hotplug support Convert to new probing mechanism and add hotplug support by enabling SATA IRQ for SError.N, marking ehi for hotplug and scheduling EH on SATA IRQs. Sil3112/3512/3114 family of controllers use COMRESET as TF clearing point and can reliably wait for D2H FIS after COMRESET whether the FIS is the first D2H FIS after POR or in response to the COMRESET. Thus, setting ATA_FLAG_HRST_TO_RESUME is enough for device detection after hotplug. Signed-off-by: Tejun Heo commit ccc4672aff1861a9c80ed9e8ec11dc304b31d307 tree d8828f303749444177337b68cfe3d0abe56f78ee parent 720ba12620ee09dce269adf4ad50958adac7bb54 author Tejun Heo Wed, 31 May 2006 18:28:14 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:14 +0900 [PATCH] ata_piix: convert ata_piix to new probing mechanism Convert ata_piix to new probing mechanism. Automatic hotplug is not supported due to hardware limitation (no PHY event interrupt), but warm plugging works. Signed-off-by: Tejun Heo commit 720ba12620ee09dce269adf4ad50958adac7bb54 tree f31a8b3da52195610bd244baf42a5fe2e26b0a36 parent 3e706399b03bd237d087d731d4b1b029e546b33d author Tejun Heo Wed, 31 May 2006 18:28:13 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:13 +0900 [PATCH] libata-hp: update unload-unplug Update unload unplug - driver unloading / PCI removal. This is done by ata_port_detach() which short-circuits EH, disables all devices and freezes the port. With this patch, EH and unloading/unplugging are properly synchronized. Signed-off-by: Tejun Heo commit 3e706399b03bd237d087d731d4b1b029e546b33d tree 51a5de83f8493d1b78cc16b0fa0abcac2b37cebc parent ccf68c3405fca11386004674377d951b9b18e756 author Tejun Heo Wed, 31 May 2006 18:28:11 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:11 +0900 [PATCH] libata-hp: implement bootplug Implement bootplug - boot probing via hotplug path. While loading, ata_host_add() simply schedules probing and invokes EH. After EH completes, ata_host_add() scans and assicates them with SCSI devices. EH path is slightly modified to handle this (e.g. no autopsy during bootplug). The SCSI part is left in ata_host_add() because it's shared with legacy path and to keep probing order as before (ATA scan all ports in host_set then attach all). Signed-off-by: Tejun Heo commit ccf68c3405fca11386004674377d951b9b18e756 tree b42439454c401ab801e3fbd3b4ee872c73956725 parent 83c47bcb3c533180a6dda78152334de50065358a author Tejun Heo Wed, 31 May 2006 18:28:09 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:09 +0900 [PATCH] libata-hp: hook warmplug Hook transportt->user_scan() and hostt->slave_destroy(). Signed-off-by: Tejun Heo commit 83c47bcb3c533180a6dda78152334de50065358a tree 4bc9ac04f8c3797e49284e0b96e2d654769254ff parent 580b2102327ab8444af5bde4e70b50d268a1d558 author Tejun Heo Wed, 31 May 2006 18:28:07 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:07 +0900 [PATCH] libata-hp: implement warmplug Implement warmplug. User-initiated unplug can be detected by hostt->slave_destroy() and plug by transportt->user_scan(). This patch only implements the two callbacks. The next function will hook them. Signed-off-by: Tejun Heo commit 580b2102327ab8444af5bde4e70b50d268a1d558 tree 01389e898e09dbaddb06405b182116b9be0e6d59 parent 084fe639b81c4d418a2cf714acb0475e3713cb73 author Tejun Heo Wed, 31 May 2006 18:28:05 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:05 +0900 [PATCH] libata-hp: implement SCSI part of hotplug Implement SCSI part of hotplug. This must be done in a separate context as SCSI makes use of EH during probing. SCSI scan fails silently if EH is in progress. In such cases, libata pauses briefly and retries until every device is attached. Signed-off-by: Tejun Heo commit 084fe639b81c4d418a2cf714acb0475e3713cb73 tree 55afc26dbb866488b69e49b1742863d1293f6612 parent 0ea035a3d1ad948096e205f08f350c03d5cea453 author Tejun Heo Wed, 31 May 2006 18:28:03 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:03 +0900 [PATCH] libata-hp: implement hotplug Implement ATA part of hotplug. To avoid probing broken devices over and over again, disabled devices are not automatically detached. They are detached only if probing is requested for the device or the associated port is offline. Also, to avoid infinite probing loop, Each device is probed only once per EH run. As SATA PHY status is fragile, devices are detached only after it has used up its recovery chances unless explicitly requested by LLDD or user (LLDD may request direct detach if, for example, it supports cold presence detection). Signed-off-by: Tejun Heo commit 0ea035a3d1ad948096e205f08f350c03d5cea453 tree fd003f929ab079f0852e3709436ca30a18265a39 parent e8e008e7b5ed8c65675cc9b3e778b8bb909f65ab author Tejun Heo Wed, 31 May 2006 18:28:01 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:01 +0900 [PATCH] libata-hp: implement ata_eh_detach_dev() Implement ata_eh_detach_dev(). This function is responsible for detaching an ATA device and offlining the associated SCSI device atomically so that the detached device is not accessed after ATA detach is complete. Signed-off-by: Tejun Heo commit e8e008e7b5ed8c65675cc9b3e778b8bb909f65ab tree 88ab9cff204c3a09630b145835bb0f7576a72791 parent 135da34573f6d3bab2976a75063f7232a4311a74 author Tejun Heo Wed, 31 May 2006 18:27:59 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:59 +0900 [PATCH] sata_sil24: update sil24_hardreset() Use phy debouncing instead of unconditional wait after DEV_RST and make sil24_hardreset() to request followup SRST as that's the only way to wait for !BSY. Note that the original implementation never worked - if the cached status was !BSY, ata_busy_sleep() finished immediately; otherwise, it timed out regardless of the actual device status. Signed-off-by: Tejun Heo commit 135da34573f6d3bab2976a75063f7232a4311a74 tree 7650320dc0136bbd4b2df640f9f8300eb87c4abb parent cbe88fbc72d9e1aa4a6f994cb6e19fa08ae5a0ba author Tejun Heo Wed, 31 May 2006 18:27:57 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:57 +0900 [PATCH] sata_sil24: rename PORT_PRB to PORT_LRAM and add PORT_LRAM_SLOT_SZ PORT_PRB is a misnomer as the area also contains other stuff. Rename it to PORT_LRAM and add PORT_LRAM_SLOT_SZ. Signed-off-by: Tejun Heo commit cbe88fbc72d9e1aa4a6f994cb6e19fa08ae5a0ba tree 117fce53d60b1f08346ee9fa64c6b0c6fe72b4bf parent 20888d83687d5cb374cdb5b0afa746ab79666f4e author Tejun Heo Wed, 31 May 2006 18:27:55 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:55 +0900 [PATCH] sata_sil: new interrupt handler The DMA complete bit of these controllers reflects ATA IRQ status while no DMA command is in progress. So, we can tell whether the controller is raising an interrupt or not in deterministic manner. This patch gives sata_sil its own interrupt handler which behaves much better than the original one in terms of error detection and handling. This change is also necessary for later hotplug support. Further improvements are possible, in both 2 and 4 ports versions, we can get all status with only one readl and using custom bmdma operations can further cut down register accesses. Signed-off-by: Tejun Heo commit 20888d83687d5cb374cdb5b0afa746ab79666f4e tree 7101992452740b728cf54481c8555d5acf49b76a parent 9a1004d0c11be41c83d06a67dfe74567a41ae582 author Tejun Heo Wed, 31 May 2006 18:27:53 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:53 +0900 [PATCH] sata_sil: add new constants in preparation for new interrupt handler sata_sil is about to get a brand new interrupt handler. Add relevant constants. Signed-off-by: Tejun Heo commit 9a1004d0c11be41c83d06a67dfe74567a41ae582 tree 759f686bb1d2999b56b2b91c30c9d62480156965 parent 664faf09a05d74085c0b31e2c621d7647322325b author Tejun Heo Wed, 31 May 2006 18:27:52 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:52 +0900 [PATCH] libata: export ata_hsm_move() ata_hsm_move() will be used by LLDDs which depend on standard PIO HSM but implement their own interrupt handlers. Signed-off-by: Tejun Heo commit 664faf09a05d74085c0b31e2c621d7647322325b tree 6506775bb94e7e99f1730f4fd50eb2f3f7359620 parent f5914a461eb9703773226a0813f6ffcae10c0861 author Tejun Heo Wed, 31 May 2006 18:27:50 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:50 +0900 [PATCH] libata-hp-prep: implement followup softreset handling In some cases, hardreset must be followed by SRST. * some controllers can't classify with hardreset * some controllers can't wait for !BSY after hardreset (LLDD should explicitly request followup softreset by returning -EAGAIN) * (later) PM needs SRST w/ PMP==15 to operate after hardreset To handle above cases, this patch implements follow-up softreset. After a hardreset, ata_eh_reset() checks whether any of above conditions are met and do a follow-up softreset if necessary. Signed-off-by: Tejun Heo commit f5914a461eb9703773226a0813f6ffcae10c0861 tree 3441af53250530c3135a8fa55f06dd7bc62da037 parent d7bb4cc7575929a60b0a718daa1bce87bea9a9cc author Tejun Heo Wed, 31 May 2006 18:27:48 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:48 +0900 [PATCH] libata-hp-prep: add prereset() method and implement ata_std_prereset() With hotplug, every reset might be a probing reset and thus something similar to probe_init() is needed. prereset() method is called before a series of resets to a port and is the counterpart of postreset(). prereset() can tell EH to use different type of reset or skip reset by modifying ehc->i.action. This patch also implements ata_std_prereset(). Most controllers should be able to use this function directly or with some wrapping. After hotplug, different controllers need different actions to resume the PHY and detect the newly attached device. Controllers can be categorized as follows. * Controllers which can wait for the first D2H FIS after hotplug. Note that if the waiting is implemented by polling TF status, there needs to be a way to set BSY on PHY status change. It can be implemented by hardware or with the help of the driver. * Controllers which can wait for the first D2H FIS after sending COMRESET. These controllers need to issue COMRESET to wait for the first FIS. Note that the received D2H FIS could be the first D2H FIS after POR (power-on-reset) or D2H FIS in response to the COMRESET. Some controllers use COMRESET as TF status synchronization point and clear TF automatically (sata_sil). * Controllers which cannot wait for the first D2H FIS reliably. Blindly issuing SRST to spinning-up device often results in command issue failure or timeout, causing extended delay. For these controllers, ata_std_prereset() explicitly waits ATA_SPINUP_WAIT (currently 8s) to give newly attached device time to spin up, then issues reset. Note that failing to getting ready in ATA_SPINUP_WAIT is not critical. libata will retry. So, the timeout needs to be long enough to spin up most devices. LLDDs can tell ata_std_prereset() which of above action is needed with ATA_FLAG_HRST_TO_RESUME and ATA_FLAG_SKIP_D2H_BSY flags. These flags are PHY-specific property and will be moved to ata_link later. While at it, this patch unifies function typedef's such that they all have named arguments. Signed-off-by: Tejun Heo commit d7bb4cc7575929a60b0a718daa1bce87bea9a9cc tree ff4cd9715f5ba608795bc4a1b7b86ffd2cf4f99c parent a9beec95352ff675f27d74c3cb97dc258d022497 author Tejun Heo Wed, 31 May 2006 18:27:46 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:46 +0900 [PATCH] libata-hp-prep: implement sata_phy_debounce() With hotplug, PHY always needs to be debounced before a reset as any reset might find new devices. Extract PHY waiting code from sata_phy_resume() and extend it to include SStatus debouncing. Note that sata_phy_debounce() is superset of what used to be done inside sata_phy_resume(). Three default debounce timing parameters are defined to be used by hot/boot plug. As resume failure during probing will be properly handled as errors, timeout doesn't have to be long as before. probeinit() uses the same timeout to retain the original behavior. Signed-off-by: Tejun Heo commit a9beec95352ff675f27d74c3cb97dc258d022497 tree f301e31e3a9648bd6e2f4050a44b4e89aebe0f18 parent 453b07accb47c5b54aa2f156ebffac63c543027b author Tejun Heo Wed, 31 May 2006 18:27:44 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:44 +0900 [PATCH] libata-hp-prep: make probing related functions global Hotplug will be implemented in libata-eh.c. Make ata_dev_read_id() and ata_dev_configure() global. Signed-off-by: Tejun Heo commit 453b07accb47c5b54aa2f156ebffac63c543027b tree a08ee98bab64b1d92a9856e086c87de53012b6fc parent 3edebac41bab7e146578ad9e723ee7fff71c99c0 author Tejun Heo Wed, 31 May 2006 18:27:42 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:42 +0900 [PATCH] libata-hp-prep: add ata_aux_wq It's best to run ATA hotplug from EH but attaching SCSI devices needs working EH. ata_aux_wq is used to give SCSI hotplug operations a separate context. Signed-off-by: Tejun Heo commit 3edebac41bab7e146578ad9e723ee7fff71c99c0 tree c5f1276f7c0e93b51ad67b12e241b37c05f4f38a parent 5a04bf4befa8bffa012eedc3a0903c158b9131a9 author Tejun Heo Wed, 31 May 2006 18:27:40 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:40 +0900 [PATCH] libata-hp-prep: store attached SCSI device Add device persistent field dev->sdev and store the attached SCSI device. With hotplug, libata needs to know the attached SCSI device to offline and detach it, but scsi_device_lookup() cannot be used because libata will reuse SCSI ID numbers - dead but not gone devices (due to zombie opens, etc...) interfere with the lookup. dev->sdev doesn't hold reference to the SCSI device. It's cleared when the SCSI device goes away. Signed-off-by: Tejun Heo commit 5a04bf4befa8bffa012eedc3a0903c158b9131a9 tree 7145c99e6df311a6d732fc3569d9a048829f92ba parent 315343637b988ac32d730a6a9f7bf5866838bcb0 author Tejun Heo Wed, 31 May 2006 18:27:38 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:38 +0900 [PATCH] libata-hp-prep: implement ap->hw_sata_spd_limit Add ap->hw_sata_spd_limit and initialize it once during the boot initialization (or driver load initialization). ap->sata_spd_limit is reset to ap->hw_sata_spd_limit on hotplug. This prevents spd limits introduced by earlier devices from affecting new devices. Signed-off-by: Tejun Heo commit 315343637b988ac32d730a6a9f7bf5866838bcb0 tree 2e6660fa9d30127cd9fe88149219b75ee2c3ce3f parent ab5b3a5b2d887ce63f8c6a7fcb9f5c07ca4b4d43 author Tejun Heo Wed, 31 May 2006 18:27:36 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:36 +0900 [PATCH] libata-hp-prep: use __ata_scsi_find_dev() Convert direct sdev -> dev lookup to __ata_scsi_find_dev(). Signed-off-by: Tejun Heo commit ab5b3a5b2d887ce63f8c6a7fcb9f5c07ca4b4d43 tree 397504068ad90818ee6e553438e89bc429acd5fb parent 72fa4b742b327bd1b07985d79a61c61dbd9fd4e6 author Tejun Heo Wed, 31 May 2006 18:27:34 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:34 +0900 [PATCH] libata-hp-prep: update ata_scsi_find_dev() and friends Separate out ata_find_dev() and __ata_scsi_find_dev() from ata_scsi_find_dev(). These will be used by later hotplug implementation. Signed-off-by: Tejun Heo commit 72fa4b742b327bd1b07985d79a61c61dbd9fd4e6 tree 50d95fcf58e709b12510151e8e1cae8d8cb2538e parent 3ef3b43d5633d30fa3f033f62094ec2e9c5b8376 author Tejun Heo Wed, 31 May 2006 18:27:32 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:32 +0900 [PATCH] libata-hp-prep: make some ata_device fields persistent Lifetimes of some fields span over device plugging/unplugging. This patch moves such persistent fields to the top of ata_device and separate them with ATA_DEVICE_CLEAR_OFFSET. Fields above the offset are initialized once during host initializatino while all other fields are cleared before hotplugging. Currently ->ap, devno and part of flags are persistent. Note that flags is partially cleared while holding host_set lock. This is to synchronize with later warm plug implementation which will record hotplug request in dev->flags. Signed-off-by: Tejun Heo commit 3ef3b43d5633d30fa3f033f62094ec2e9c5b8376 tree 815ba1afeb202834667e1dff08fa69b63ec0628f parent abdda7331d469fa965167365f011d05e226008fb author Tejun Heo Wed, 31 May 2006 18:27:30 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:30 +0900 [PATCH] libata-hp-prep: implement ata_dev_init() Move initialization of struct ata_device into ata_dev_init() in preparation for hotplug. This patch calls ata_dev_init() from ata_host_init() and thus makes no functional difference. Signed-off-by: Tejun Heo commit abdda7331d469fa965167365f011d05e226008fb tree ce2c66d01eba2b6a383080d6d3812884c6418e6a parent c6cf9e99d1de5ca6a08fb639bb73031ffe50d802 author Tejun Heo Wed, 31 May 2006 18:27:29 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:29 +0900 [PATCH] libata-hp-prep: add flags and eh_info/context fields for hotplug Add hotplug related flags and eh_info/context fields. Signed-off-by: Tejun Heo commit c6cf9e99d1de5ca6a08fb639bb73031ffe50d802 tree 555a47d45b5b80ef14ff53ccb4c6d1439460e251 parent 7395acb2c840fd4d0cacc91d6fb71440057141ab author Tejun Heo Wed, 31 May 2006 18:27:27 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:27 +0900 [PATCH] libata: implement ata_eh_wait() Implement ata_eh_wait(). On return from this function, it's guaranteed that the EH which was pending or in progress when the function was called is complete - including the tailing part of SCSI EH. This will be used by hotplug and others to synchronize with EH. Signed-off-by: Tejun Heo commit 7395acb2c840fd4d0cacc91d6fb71440057141ab tree 29ea31b15be4cbcb44321eda2e607ea984adfd57 parent 20952b699035448d2277c64efc5910a31be66ed1 author Tejun Heo Wed, 31 May 2006 18:27:25 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:25 +0900 [PATCH] libata: shift host flag constants Nudge host flag constants to make a room after ATA_FLAG_EH_PENDING. New EH flag will be added. Signed-off-by: Tejun Heo commit 20952b699035448d2277c64efc5910a31be66ed1 tree a2fab9d516ce200ebc8cf72cda214ec447e0d5d9 parent ef2824073fba9def3cf122e89cc485f66dd71f70 author Tejun Heo Wed, 31 May 2006 18:27:23 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:23 +0900 [PATCH] libata: set PIO-0 after successful EH reset Set ata_device->pio_mode to XFER_PIO_0 after a successful reset. This is to keep EH resets consistent with probe resets as updated by the commit b6079ca409bf88c248992e96510dd6f610f7ed89. Note that, with soon-to-follow hotplug update, EH resets will include probe resets. Signed-off-by: Tejun Heo commit 01af2fac9ea76513e2fba689ad580f985f32a8c3 tree d43148c46bc3fcf25b61813751f253953d7a31ce parent 89197e34ea63d7f619dade525de8e69a15f40405 author Dave Jones Tue, 30 May 2006 18:22:07 -0400 committer Dave Jones Tue, 30 May 2006 18:22:07 -0400 [AGPGART] Remove pointless initialisation in intel-agp Signed-off-by: Dave Jones commit 89197e34ea63d7f619dade525de8e69a15f40405 tree 217fb21dc00b3172e64ebe127f233ebf62e08e31 parent e60a48f5ab35737118e19bc965c640900a842f02 author Dave Jones Tue, 30 May 2006 18:19:39 -0400 committer Dave Jones Tue, 30 May 2006 18:19:39 -0400 [AGPGART] Remove pointless code from agp_generic_create_gatt_table() Signed-off-by: Dave Jones commit 484944a5b002cf87b38a8f073d37afcfb8afff28 tree 40a960d5b4bee4ea5e4bafb2f1017f5d98484b87 parent 5557976ca97c3a3002805f575a45ad354e1050ff author Dave Jones Tue, 30 May 2006 18:09:31 -0400 committer Dave Jones Tue, 30 May 2006 18:09:31 -0400 [CPUFREQ] Remove more freq_table reinitialisations. Signed-off-by: Dave Jones commit 5557976ca97c3a3002805f575a45ad354e1050ff tree 7357b8341c36e7f4448e71cc8ae37a448e81cf4b parent 355eb318018c6f44a335b0e5efb1f3bf2f1685d0 author Dave Jones Tue, 30 May 2006 17:59:48 -0400 committer Dave Jones Tue, 30 May 2006 17:59:48 -0400 [CPUFREQ] Fix another redundant initialisation in freq_table Signed-off-by: Dave Jones commit 355eb318018c6f44a335b0e5efb1f3bf2f1685d0 tree 278afd3f9be8f7ac3c58d1fa4d37d73569bb410c parent 511e9ee17099c6ebe315c0524b8b482d4767ab3d author Dave Jones Tue, 30 May 2006 17:58:41 -0400 committer Dave Jones Tue, 30 May 2006 17:58:41 -0400 [CPUFREQ] Remove duplicate assignment in freq_table Signed-off-by: Dave Jones commit 511e9ee17099c6ebe315c0524b8b482d4767ab3d tree 7eb8bb99ddfbe5dfe4cd96735275405c7efcccc2 parent 851777b7b686c80e417fd811cdea3e5aa5305745 author Dave Jones Tue, 30 May 2006 17:57:14 -0400 committer Dave Jones Tue, 30 May 2006 17:57:14 -0400 [CPUFREQ] CodingStyle nits in cpufreq_stats.c Signed-off-by: Dave Jones commit 851777b7b686c80e417fd811cdea3e5aa5305745 tree f5aef4b3d86b0a2077a998a6ab44d8c67a9c355d parent b6571da9f328999a6bce429b5f614a3d64b926ee author Dave Jones Tue, 30 May 2006 17:55:01 -0400 committer Dave Jones Tue, 30 May 2006 17:55:01 -0400 [CPUFREQ] Remove duplicate assignment from cpufreq-nforce2 Signed-off-by: Dave Jones commit b6571da9f328999a6bce429b5f614a3d64b926ee tree ef017bddd20db6e0363575ed77c1c4fa524edfa2 parent 83844510ec9dc89a676e71d3cc28289905c2caec author Dave Jones Tue, 30 May 2006 17:50:22 -0400 committer Dave Jones Tue, 30 May 2006 17:50:22 -0400 [CPUFREQ] Remove pointless reinitialisations in acpi-cpufreq Signed-off-by: Dave Jones commit 83844510ec9dc89a676e71d3cc28289905c2caec tree a90113ca845785c4f014683f6f85aa8464d01ceb parent 8eebf1a4c3682f71dbda3348abfcdd4d2a751fd3 author Dave Jones Tue, 30 May 2006 17:43:54 -0400 committer Dave Jones Tue, 30 May 2006 17:43:54 -0400 [CPUFREQ] Remove pointless reinitialisation from powernow-k8 This var is already set at entry to the function. Signed-off-by: Dave Jones commit 8eebf1a4c3682f71dbda3348abfcdd4d2a751fd3 tree 49527b033c491cccef897054dfdcbc62baf35aac parent e2aa8732ac11570acddf326874a34ab684752e34 author Dave Jones Tue, 30 May 2006 17:40:16 -0400 committer Dave Jones Tue, 30 May 2006 17:40:16 -0400 [CPUFREQ] Remove redundant initialisation from longhaul. Signed-off-by: Dave Jones commit e2aa8732ac11570acddf326874a34ab684752e34 tree 968a22e50a92b280ada993d5e92c6f2d3d120b57 parent 8cbe0169053ffa185ad349088eb0901946c14a09 author Dave Jones Tue, 30 May 2006 17:37:15 -0400 committer Dave Jones Tue, 30 May 2006 17:37:15 -0400 [CPUFREQ] Clean up longhaul's speed pretty-printer Getting ready to move to core cpufreq. - Use snprintf - Remove unnecessary nesting improving readability. Signed-off-by: Dave Jones commit 8cbe0169053ffa185ad349088eb0901946c14a09 tree efb5c0ab82e411027499a7f133eeecf79dad6f99 parent 2e3f8faaa73f5065ae653a84997b5cd4d5876e1a author Dave Jones Tue, 30 May 2006 17:26:08 -0400 committer Dave Jones Tue, 30 May 2006 17:26:08 -0400 [CPUFREQ] Disambiguate loop indexes in powernow-k7 This shouldn't have actually caused any problems (as we return if we 'corrupt' 'i', but it's still not very pretty. For the sake of adding another local variable, this got cleaner. Signed-off-by: Dave Jones commit 2e3f8faaa73f5065ae653a84997b5cd4d5876e1a tree 76c120be357ec972173df880ac9211914f040bce parent e60a48f5ab35737118e19bc965c640900a842f02 author Dave Jones Tue, 30 May 2006 17:25:14 -0400 committer Dave Jones Tue, 30 May 2006 17:25:14 -0400 [CPUFREQ] Typo in powernow-k8 (Also fix some horked indentation) Signed-off-by: Dave Jones commit e9482b4374e2596e6f3f1ab30c4ea469f4ac6311 tree 526893a35e432f7ae2be6300a134c5c7c79aaba6 parent 73c619ea0e49c9306afa7ea53c3362fbc56ffd70 author Joern Engel Tue, 30 May 2006 14:25:46 +0200 committer Joern Engel Tue, 30 May 2006 14:25:46 +0200 [MTD] Allow alternate JFFS2 mount variant for root filesystem. With this patch, "root=mtd3" and "root=mtd:foo" work for a JFFS2 rootfs. Signed-off-by: Joern Engel commit 73c619ea0e49c9306afa7ea53c3362fbc56ffd70 tree d71189bae015f56bf72e7421d4cf1a307b3c1fb8 parent 92cbfdcc3661d7670b01b92b89811cd3a2412297 author Joern Engel Tue, 30 May 2006 14:25:35 +0200 committer Joern Engel Tue, 30 May 2006 14:25:35 +0200 [MTD] Disconnect struct mtd_info from ABI mtdchar.c direcly copied part of struct mtd_info to userspace, thereby implicitly making it part of the ABI. With this patch, struct mtd_info is independent of the ABI and can have its fields removed, reordered, etc. Signed-off-by: Joern Engel commit 92cbfdcc3661d7670b01b92b89811cd3a2412297 tree 70e4c9a94a121594e58a57c4c454ac854bb10a3a parent e369d62e92d526a7ed641e2f0b2978fb0ce366c5 author Joern Engel Tue, 30 May 2006 14:25:24 +0200 committer Joern Engel Tue, 30 May 2006 14:25:24 +0200 [MTD] replace MTD_RAM with MTD_GENERIC_TYPE Ram devices get the extra capability of MTD_NO_ERASE - not requiring an explicit erase before writing to it. Currently only mtdblock uses this capability. Rest of the patch is a simple text replacement. Signed-off-by: Joern Engel commit e369d62e92d526a7ed641e2f0b2978fb0ce366c5 tree 472a4b65509c725a84ca9ecc61516cc904189029 parent e1219724be193519f20743f5500bd1eff11890d0 author Joern Engel Tue, 30 May 2006 14:25:17 +0200 committer Joern Engel Tue, 30 May 2006 14:25:17 +0200 [MTD] replace MTD_ROM with MTD_GENERIC_TYPE No mtd user should ever check for the device type. Instead, device features should be checked by the flags - if at all. As a first step towards type removal, change MTD_ROM into MTD_GENERIC_TYPE. Signed-off-by: Joern Engel commit e1219724be193519f20743f5500bd1eff11890d0 tree 861e93f4c42000f0de3f348d4941b50a30bbc6e4 parent 7e9a0bb00c4ccb7a05c41b2728758d5bb3dd54fc author Joern Engel Tue, 30 May 2006 14:25:05 +0200 committer Joern Engel Tue, 30 May 2006 14:25:05 +0200 [MTD] remove a forgotten MTD_XIP MTD_XIP definition was removed in an earlier patch. This invocation was left by mistake. Signed-off-by: Joern Engel commit 7e9a0bb00c4ccb7a05c41b2728758d5bb3dd54fc tree 40131aa37bf424530108d4a88f494fc6ba98dff7 parent 098a19811b483f8e047d8292641c88e776452de0 author Andrew Morton Tue, 30 May 2006 09:06:41 +0100 committer David Woodhouse Tue, 30 May 2006 09:06:41 +0100 [MTD] Fix build warnings (and debug build error) in nand_base.c drivers/mtd/nand/nand_base.c: In function 'nand_transfer_oob': drivers/mtd/nand/nand_base.c:909: warning: comparison of distinct pointer types lacks a cast drivers/mtd/nand/nand_base.c: In function 'nand_do_read_oob': drivers/mtd/nand/nand_base.c:1097: error: 'len' undeclared (first use in this function) drivers/mtd/nand/nand_base.c:1097: error: (Each undeclared identifier is reported only once drivers/mtd/nand/nand_base.c:1097: error: for each function it appears in.) drivers/mtd/nand/nand_base.c: In function 'nand_fill_oob': drivers/mtd/nand/nand_base.c:1411: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner Signed-off-by: David Woodhouse commit 098a19811b483f8e047d8292641c88e776452de0 tree fc12a477f7f46aa7339d5e8ae86ed883ce79c90a parent 13ba42df4a385d7b77d7aac32b93bdcd73e6d6e1 author David Woodhouse Tue, 30 May 2006 09:00:14 +0100 committer David Woodhouse Tue, 30 May 2006 09:00:14 +0100 [JFFS2] Preallocate node refs for cleanmarker in summary scan Signed-off-by: David Woodhouse commit 13ba42df4a385d7b77d7aac32b93bdcd73e6d6e1 tree 55aedef4dfd7d29aaf46fe8983f95a7966a00bc4 parent f1a28c02843efcfcc41982149880bac3ac180234 author David Woodhouse Tue, 30 May 2006 08:59:34 +0100 committer David Woodhouse Tue, 30 May 2006 08:59:34 +0100 [JFFS2] Fix calculation of potential summary marker offset on NOR flash. Helps if we look _inside_ the buffer, rather than adding jeb->offset to it. Doh. Signed-off-by: David Woodhouse commit f1a28c02843efcfcc41982149880bac3ac180234 tree b15ca1a140e463ef3cde6b9a8591e7be172ee1f1 parent 9a1fcdfd4bee27c418424cac47abf7c049541297 author Thomas Gleixner Tue, 30 May 2006 00:37:34 +0200 committer Thomas Gleixner Tue, 30 May 2006 00:37:34 +0200 [MTD] NAND Expose the new raw mode function and status info to userspace The raw read/write access to NAND (without ECC) has been changed in the NAND rework. Expose the new way - setting the file mode via ioctl - to userspace. Also allow to read out the ecc statistics information so userspace tools can see that bitflips happened and whether errors where correctable or not. Also expose the number of bad blocks for the partition, so nandwrite can check if the data fits into the parition before writing to it. Signed-off-by: Thomas Gleixner commit 9a1fcdfd4bee27c418424cac47abf7c049541297 tree 5baa5f1e1d1a296a319bf6a5a4b636668c107e00 parent 8593fbc68b0df1168995de76d1af38eb62fd6b62 author Thomas Gleixner Mon, 29 May 2006 14:56:39 +0200 committer Thomas Gleixner Mon, 29 May 2006 15:06:51 +0200 [MTD] NAND Signal that a bitflip was corrected by ECC Return -EUCLEAN on read when a bitflip was detected and corrected, so the clients can react and eventually copy the affected block to a spare one. Make all in kernel users aware of the change. Signed-off-by: Thomas Gleixner commit 8593fbc68b0df1168995de76d1af38eb62fd6b62 tree dd244def53d2be4f1fbff9f74eac404fab8e240f parent f4a43cfcecfcaeeaa40a9dbc1d1378298c22446e author Thomas Gleixner Mon, 29 May 2006 03:26:58 +0200 committer Thomas Gleixner Mon, 29 May 2006 15:06:51 +0200 [MTD] Rework the out of band handling completely Hopefully the last iteration on this! The handling of out of band data on NAND was accompanied by tons of fruitless discussions and halfarsed patches to make it work for a particular problem. Sufficiently annoyed by I all those "I know it better" mails and the resonable amount of discarded "it solves my problem" patches, I finally decided to go for the big rework. After removing the _ecc variants of mtd read/write functions the solution to satisfy the various requirements was to refactor the read/write _oob functions in mtd. The major change is that read/write_oob now takes a pointer to an operation descriptor structure "struct mtd_oob_ops".instead of having a function with at least seven arguments. read/write_oob which should probably renamed to a more descriptive name, can do the following tasks: - read/write out of band data - read/write data content and out of band data - read/write raw data content and out of band data (ecc disabled) struct mtd_oob_ops has a mode field, which determines the oob handling mode. Aside of the MTD_OOB_RAW mode, which is intended to be especially for diagnostic purposes and some internal functions e.g. bad block table creation, the other two modes are for mtd clients: MTD_OOB_PLACE puts/gets the given oob data exactly to/from the place which is described by the ooboffs and ooblen fields of the mtd_oob_ops strcuture. It's up to the caller to make sure that the byte positions are not used by the ECC placement algorithms. MTD_OOB_AUTO puts/gets the given oob data automaticaly to/from the places in the out of band area which are described by the oobfree tuples in the ecclayout data structre which is associated to the devicee. The decision whether data plus oob or oob only handling is done depends on the setting of the datbuf member of the data structure. When datbuf == NULL then the internal read/write_oob functions are selected, otherwise the read/write data routines are invoked. Tested on a few platforms with all variants. Please be aware of possible regressions for your particular device / application scenario Disclaimer: Any whining will be ignored from those who just contributed "hot air blurb" and never sat down to tackle the underlying problem of the mess in the NAND driver grown over time and the big chunk of work to fix up the existing users. The problem was not the holiness of the existing MTD interfaces. The problems was the lack of time to go for the big overhaul. It's easy to add more mess to the existing one, but it takes alot of effort to go for a real solution. Improvements and bugfixes are welcome! Signed-off-by: Thomas Gleixner commit f4a43cfcecfcaeeaa40a9dbc1d1378298c22446e tree 5647ebccb720c9d8ca314c8a3a5f6a660d000019 parent 5bd34c091a044d130601370c370f84b1c59f1627 author Thomas Gleixner Sun, 28 May 2006 11:01:53 +0200 committer Thomas Gleixner Mon, 29 May 2006 15:06:50 +0200 [MTD] Remove silly MTD_WRITE/READ macros Most of those macros are unused and the used ones just obfuscate the code. Remove them and fixup all users. Signed-off-by: Thomas Gleixner commit 5bd34c091a044d130601370c370f84b1c59f1627 tree 8b08012a9a30186a8805d506f8438e2944f5f31b parent ff268fb8791cf18df536113355d7184007c269d9 author Thomas Gleixner Sat, 27 May 2006 22:16:10 +0200 committer Thomas Gleixner Mon, 29 May 2006 15:06:50 +0200 [MTD] NAND Replace oobinfo by ecclayout The nand_oobinfo structure is not fitting the newer error correction demands anymore. Replace it by struct nand_ecclayout and fixup the users all over the place. Keep the nand_oobinfo based ioctl for user space compability reasons. Signed-off-by: Thomas Gleixner commit ff268fb8791cf18df536113355d7184007c269d9 tree 3a7d9fc72b28f5a0f11a2f8b08174b1bee6ea20d parent 8be834f76291fdcc0614cb84926c6910b9f2ecbc author Thomas Gleixner Sat, 27 May 2006 20:36:12 +0200 committer Thomas Gleixner Mon, 29 May 2006 15:06:49 +0200 [MTD] NAND Consolidate oobinfo handling The info structure for out of band data was copied into the mtd structure. Make it a pointer and remove the ability to set it from userspace. The position of ecc bytes is defined by the hardware and should not be changed by software. Signed-off-by: Thomas Gleixner commit 8be834f76291fdcc0614cb84926c6910b9f2ecbc tree c982bac1ebe520e7f6c17291887ff8b1c2219180 parent 19676ff0a64af9d75d48f17cb67bee8110f6ffbf author Thomas Gleixner Sat, 27 May 2006 20:05:26 +0200 committer Thomas Gleixner Mon, 29 May 2006 15:06:49 +0200 [MTD] NAND Fix platform structure and NDFC driver The platform structure was lacking an oobinfo field. The NDFC driver had some remains from another tree. Signed-off-by: Thomas Gleixner commit 19676ff0a64af9d75d48f17cb67bee8110f6ffbf tree 3dffe9a2a0696c084d90501862866fb24a0d5687 parent 33280eac704e3e156eef2fa9ed9ddf427a1c223c author Andrew Morton Mon, 29 May 2006 11:33:33 +0100 committer David Woodhouse Mon, 29 May 2006 11:33:33 +0100 [MTD] Fix debug printk format warning in m25p80 SPI chip driver, again. Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 33280eac704e3e156eef2fa9ed9ddf427a1c223c tree c9bafe50a595e7ea5472b65f7b7cdf44b7b4aa21 parent a6a8bef722875a95bb73e6de7da924a8d417b52c author David Woodhouse Mon, 29 May 2006 11:24:29 +0100 committer David Woodhouse Mon, 29 May 2006 11:24:29 +0100 [MTD] AMD Geode NAND support can depend on X86_32; we won't see it on x86_64 Signed-off-by: David Woodhouse commit 7a532c69c37dbb46bfd0276160e624f06552adfc tree f397e591c22fc727c0784d0754f22f4a09de476b parent 56e004e5435c008728b1444b51d757da2e098976 author Dennis Munsie Mon, 29 May 2006 18:58:09 +1000 committer Dave Airlie Mon, 29 May 2006 18:58:09 +1000 intelfb: use regular modedb table instead of VESA intelfb driver -- use the regular modedb table instead of the VESA modedb table. Ideally, the 9xx stride patch should be applied first, since there are modes in the VESA table that won't work without that patch. Signed-off-by: Dennis Munsie Signed-off-by: Dave Airlie commit 56e004e5435c008728b1444b51d757da2e098976 tree 2c68226e34c739e1802aa07166ae0161ce72eb23 parent 080a416802153dbbb20ab4f4fa1225867096d071 author Antonino A. Daplas Mon, 29 May 2006 18:49:08 +1000 committer Dave Airlie Mon, 29 May 2006 18:49:08 +1000 intelfb: use firmware EDID for mode database Use firmware EDID for the driver's private mode database. Signed-off-by: Antonino Daplas Cc: Sylvain Meyer Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 080a416802153dbbb20ab4f4fa1225867096d071 tree 519f0ae3e845403b237c4a16ed8e3eaa5e3a165a parent 65eb2f97db17f6f6a92cad3aad93b531f991ebf1 author Dave Airlie Mon, 29 May 2006 18:45:19 +1000 committer Dave Airlie Mon, 29 May 2006 18:45:19 +1000 Revert "intelfb driver -- use the regular modedb table instead of the VESA" This reverts 2c47430a03bbcc3c9a623a07eca5baf92c7d20c8 commit. This conflicts with a patch in -mm from Antonino reapply later. Signed-off-by: Dave Airlie commit 65eb2f97db17f6f6a92cad3aad93b531f991ebf1 tree 70e7f3025cd2511fca6bf09a512588fbbbfab5c7 parent f728377f6786bcdf1dbf33394360164e86f40094 author Eric Hustvedt Mon, 29 May 2006 18:38:55 +1000 committer Dave Airlie Mon, 29 May 2006 18:38:55 +1000 intelfb: int option fix Fix integer option parsing in the intelfb driver. The macro wasn't accounting for the equal sign past the option name. As a result, the vram option always returned 0. Signed-off-by: Eric Hustvedt Signed-off-by: Dennis Munsie commit ef2824073fba9def3cf122e89cc485f66dd71f70 tree 4fc56ab1e96d81f8920d111d07640c3ad5a60670 parent 89f8185e9b62f6478c2a39e117606eec70387d1d author Borislav Petkov Mon, 29 May 2006 01:06:23 -0400 committer Jeff Garzik Mon, 29 May 2006 01:06:23 -0400 libata debugging: set initial dbg value This patch sets the prerequisites for the new debugging scheme that more or less resembles Donald Becker's net driver example. This one liner doesn't change any functionality beside setting the appropriate debug level for the msg_enable control in the ata_port struct, which will be later used by the ata_msg_* macros to control the amount of debug information sent to printk. Signed-off-by: Signed-off-by: Jeff Garzik commit 89f8185e9b62f6478c2a39e117606eec70387d1d tree 8344192137c1386ed331df2cd0e4ad4886ee63bb parent e42d7be25cf53548347bff8b8f43410704ea7bb0 parent d9ec5ad24ce80b7ef69a0717363db661d13aada5 author Jeff Garzik Mon, 29 May 2006 01:03:37 -0400 committer Jeff Garzik Mon, 29 May 2006 01:03:37 -0400 Merge branch 'master' into upstream commit a6a8bef722875a95bb73e6de7da924a8d417b52c tree 4bdb7461ad785b8e24e5bb65f4bde9448e4fae25 parent 2ebf09c2491433a499e0ae7723d04e9e810afa84 author David Woodhouse Mon, 29 May 2006 00:41:11 +0100 committer David Woodhouse Mon, 29 May 2006 00:41:11 +0100 [JFFS2] Preallocate raw_node_refs in a couple of missing places in scan Signed-off-by: David Woodhouse commit 2ebf09c2491433a499e0ae7723d04e9e810afa84 tree 82b0c67ceffe6796f4f7c30af3e724c56095dcc2 parent ddc58bd65ebe58c243e9f609384825df9ffd04ad author David Woodhouse Sun, 28 May 2006 22:13:25 +0100 committer David Woodhouse Sun, 28 May 2006 22:13:25 +0100 [JFFS2] Fix oops when marking space dirty in scan, but no previous node exists. Signed-off-by: David Woodhouse commit b53471711f21ba0e151075f0e1d6d531eb50f1b1 tree e912dbe14b6af76b0ebe853a9976c99616bb8a4c parent 983f27d37d4fc72c252835cb2ee3103b360735a6 parent 83055d46e5eddbb3574ef5e9c0d9c021bcb75c0b author Jeff Garzik Sun, 28 May 2006 16:35:13 -0400 committer Jeff Garzik Sun, 28 May 2006 16:35:13 -0400 Merge branch 'velocity' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream commit e42d7be25cf53548347bff8b8f43410704ea7bb0 tree 7afd08ee70f929abec9118960508828e2d07f234 parent 75e995855f45a83afdae34d50c0b3ee14fb23b7a parent 0737ac895afbfbe210557fa5fbafcca932d5fa7c author Jeff Garzik Sun, 28 May 2006 16:32:59 -0400 committer Jeff Garzik Sun, 28 May 2006 16:32:59 -0400 Merge branch 'upstream-fixes' into upstream Conflicts: drivers/scsi/libata-core.c commit 2b89dad0c7e3b03d45d9674ee9a7b49670df098e tree 8f480172c865e9d6cfab9ed4888a043bc75ab4ce parent 091686d3b5569d2ec76b9e6dab7f3608b6f64497 author Hannes Reinecke Tue, 23 May 2006 10:29:28 +0200 committer James Bottomley Sun, 28 May 2006 13:07:41 -0400 [SCSI] audit drivers for incorrect max_id use max_id now means the maximum number of ids on the bus, which means it is one greater than the largest possible id number. Signed-off-by: James Bottomley commit 091686d3b5569d2ec76b9e6dab7f3608b6f64497 tree 8e2e85f774899d72b5419fdfb574dd994c35f8fd parent 93ef588735973e4c35ff3707685678cdebd694a4 author Amit Arora Fri, 19 May 2006 16:14:50 -0700 committer James Bottomley Sun, 28 May 2006 13:01:23 -0400 [SCSI] Return -EINVAL when "id == max_id" in scsi_scan_host_selected() The scsi_scan_host_selected() should return -EINVAL when the id is equal to the max_id. Currently it uses ">" when comparing with max_id, and hence leaves the border case when "id==max_id". The channel and lun have values valid from 0 up to, and including, max_channel or max_lun. But, the valid values for id range from 0 to max_id-1. This patch fixes the problem. Signed-off-by: Amit Arora Signed-off-by: James Bottomley commit 93ef588735973e4c35ff3707685678cdebd694a4 tree ab4c1424fa4a50ae568e4fc4db60e3c031f442af parent 338151e066084d92d89f44311e5521ef847a50b9 author Andreas Herrmann Mon, 22 May 2006 18:27:30 +0200 committer James Bottomley Sun, 28 May 2006 12:50:45 -0400 [SCSI] zfcp: bump up version number Bump up version number, skip "4.6.0" because this might clash with zfcp version in certain distros. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 338151e066084d92d89f44311e5521ef847a50b9 tree 5783d26710203f2c5b309530334f3dd39ca68dfc parent 75bfc2837bbcc329193d51e8b7115184b78beae0 author Andreas Herrmann Mon, 22 May 2006 18:25:56 +0200 committer James Bottomley Sun, 28 May 2006 12:50:17 -0400 [SCSI] zfcp: make use of fc_remote_port_delete when target port is unavailable If zfcp's port erp fails we now call fc_remote_port_delete. This helps to avoid offlined scsi devices if scsi commands time out due to path failures. When an adapter erp fails we call fc_remote_port_delete for all ports on that adapter. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 75bfc2837bbcc329193d51e8b7115184b78beae0 tree 6d1511fce28948bd134f7148a996c04dc04e9d32 parent b7a52fa7fff2309031a2f849bc489206afd2fa4a author Ralph Wuerthner Mon, 22 May 2006 18:24:33 +0200 committer James Bottomley Sun, 28 May 2006 12:45:15 -0400 [SCSI] zfcp: evaluate plogi payload to set maxframe_size, supported_classes of rports Signed-off-by: Ralph Wuerthner Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit b7a52fa7fff2309031a2f849bc489206afd2fa4a tree 0f29db5a3e8fa99f88e621df1c3c91542ed82e89 parent 06506d00ec1a0d7d3b1dff59185af355ce29ac0a author Ralph Wuerthner Mon, 22 May 2006 18:21:28 +0200 committer James Bottomley Sun, 28 May 2006 12:43:59 -0400 [SCSI] zfcp: print bit error threshold data human readable Replace hex dump of bit error threshold data by log message showing bit error threshold data human readable. Signed-off-by: Ralph Wuerthner Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 06506d00ec1a0d7d3b1dff59185af355ce29ac0a tree fef406818d1bccd745913ece2df0dbcee16ec74a parent ec4081c6ba4fba6a8bc12a0e93db8817ba63ce47 author Andreas Herrmann Mon, 22 May 2006 18:18:19 +0200 committer James Bottomley Sun, 28 May 2006 12:43:33 -0400 [SCSI] zfcp: (cleanup) removed superfluous macros, struct members, typedefs Removed some macros, struct members and typedefs which were unused or not necessary. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit ec4081c6ba4fba6a8bc12a0e93db8817ba63ce47 tree 9aa5953a42fac103d216a08688bffe8f57029f8d parent ca3271b40225a1049334766f6fb35b57a0162bd2 author Andreas Herrmann Mon, 22 May 2006 18:17:30 +0200 committer James Bottomley Sun, 28 May 2006 12:42:52 -0400 [SCSI] zfcp: (cleanup) kmalloc/kzalloc replacement Replace kmalloc/memset by kzalloc or kcalloc. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit ca3271b40225a1049334766f6fb35b57a0162bd2 tree a781c265f8cde3ba06a775948a923cb7b5fe896d parent 4a9d2d8bf989c77b54add430932fa5ed8a80dba9 author Andreas Herrmann Mon, 22 May 2006 18:15:49 +0200 committer James Bottomley Sun, 28 May 2006 12:38:15 -0400 [SCSI] zfcp: (cleanup) remove useless comments Removed some useless comments. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 4a9d2d8bf989c77b54add430932fa5ed8a80dba9 tree d57022575739b1331d9c5c4edc6c1c32ca1bfbd9 parent 979dca3826841e5dc9170c28f20bd75ece266a9a author Andreas Herrmann Mon, 22 May 2006 18:14:08 +0200 committer James Bottomley Sun, 28 May 2006 12:36:02 -0400 [SCSI] zfcp: (cleanup) shortened copyright and author information Copyright update, shortened file headers, shortened author information. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 83055d46e5eddbb3574ef5e9c0d9c021bcb75c0b tree 0fbffb32574f00e1326c1aad4832c63b4aaeea70 parent 371858568e02698fe2de8ba4bf771e3f40db69e5 author Jay Cliburn Wed, 24 May 2006 00:02:51 +0200 committer Francois Romieu Sat, 27 May 2006 21:26:13 +0200 via-velocity: allow MTU size less than 1500 bytes Change the minimum allowable MTU size from 1500 bytes to 64 bytes. Signed-off-by: Jay Cliburn commit ddc58bd65ebe58c243e9f609384825df9ffd04ad tree 6a88d6293af01e89daa2dc38e1463c7493c688cb parent ba0251fe87ea560eb377917e06ba0b5b9ab89094 author David Woodhouse Sat, 27 May 2006 13:15:16 +0100 committer David Woodhouse Sat, 27 May 2006 13:15:16 +0100 [JFFS2] Fix wbuf recovery of f->metadata->raw node. A data node might not be in the fraglist; it could be f->metadata. Signed-off-by: David Woodhouse commit f728377f6786bcdf1dbf33394360164e86f40094 tree e1651c2772f53ebe28f135c024b619834ae5eca2 parent c9daa873c3a7c769821ec6c8258adf098bb0435c author Dave Airlie Sat, 27 May 2006 18:56:02 +1000 committer Dave Airlie Sat, 27 May 2006 18:56:02 +1000 sync modesetting code with X.org Signed-off-by: Dave Airlie commit c9daa873c3a7c769821ec6c8258adf098bb0435c tree 4867272494138d1c6a4975caa7e61dc49c8ae26f parent 2c47430a03bbcc3c9a623a07eca5baf92c7d20c8 author Dave Airlie Sat, 27 May 2006 18:44:02 +1000 committer Dave Airlie Sat, 27 May 2006 18:44:02 +1000 intelfb: align with changes from my X driver. This just realigns the PLL calculation routines with the ones from my X.org driver. Signed-off-by: Dave Airlie commit 2c47430a03bbcc3c9a623a07eca5baf92c7d20c8 tree 35eab865ff670a01e638f0584605f14d6ce68cd0 parent 1aecb393091d3c0787f92445420d96ef58c9782a author Dennis Munsie Sat, 27 May 2006 18:33:35 +1000 committer Dave Airlie Sat, 27 May 2006 18:33:35 +1000 intelfb driver -- use the regular modedb table instead of the VESA modedb table. Ideally, the 9xx stride patch should be applied first, since there are modes in the VESA table that won't work without that patch. Signed-off-by: Dennis Munsie Signed-off-by: Dave Airlie commit 1aecb393091d3c0787f92445420d96ef58c9782a tree ad1a929d79f6219b461ab037105f0b52380bc41d parent df7df8ab7b38ca80bbaf5ffafd401d6c739fd45f author Eric Hustvedt Sat, 27 May 2006 18:30:00 +1000 committer Dave Airlie Sat, 27 May 2006 18:30:00 +1000 Adds support for 256MB aperture on 945 chipsets to the intelfb driver and corrects calculation of stolen memory overhead. Signed-off-by: Eric Hustvedt Signed-off-by: Dennis Munsie Signed-off-by: Dave Airlie commit df7df8ab7b38ca80bbaf5ffafd401d6c739fd45f tree 83f7f6768ac730231386fdbf70f30c165d3cb134 parent 51d797474f87b375819d084f7583a2864c5656c4 author Dennis Munsie Sat, 27 May 2006 18:17:52 +1000 committer Dave Airlie Sat, 27 May 2006 18:17:52 +1000 intelfb -- uses stride alignment of 64 on the 9xx chipsets. Signed-off-by: Dennis Munsie Signed-off-by: Dave Airlie commit 92af11cdec410f5de4e8d702d24e1672ce26a1f6 tree 329a87ad837ff445a111dc8455d0d1f3425a9ab6 parent 0645819196b5029936cf07a8ba27860e0d45c8d9 author Al Viro Sat, 27 May 2006 02:24:14 -0400 committer Al Viro Sat, 27 May 2006 02:27:23 -0400 [PATCH] missing readb/readw in rio Signed-off-by: Al Viro commit 0645819196b5029936cf07a8ba27860e0d45c8d9 tree 4691984b5c51c8315af84f2762c39a106216c5bb parent 6bc540e69a6376b9d58d8490f4998da9e45e2746 author Al Viro Sat, 27 May 2006 02:11:12 -0400 committer Al Viro Sat, 27 May 2006 02:27:15 -0400 [PATCH] copy_to_user() from iomem is a bad thing Signed-off-by: Al Viro commit 6bc540e69a6376b9d58d8490f4998da9e45e2746 tree 26abbdf8b4e8ca51c2c5dfa015158119d48bb4f4 parent 1bf087194f01bce5b2d7b39f27d71d5f346fbf08 author Al Viro Sat, 27 May 2006 02:00:00 -0400 committer Al Viro Sat, 27 May 2006 02:27:06 -0400 [PATCH] forgotten swap of copyout() arguments Signed-off-by: Al Viro commit 1bf087194f01bce5b2d7b39f27d71d5f346fbf08 tree da68ababe29fb526d92bd9bf10084921f747bd0d parent ae5b28a5bb1b5f5d53085a044aec69db41fd0336 author Al Viro Sat, 27 May 2006 01:55:52 -0400 committer Al Viro Sat, 27 May 2006 02:26:58 -0400 [PATCH] handling rio MEMDUMP it copies data _from_ iomem, so it should be rio_memcpy_fromio(), not ->Copy(). Signed-off-by: Al Viro commit ae5b28a5bb1b5f5d53085a044aec69db41fd0336 tree 8b618a3ef0efc0c49de551c4c13fd146b38fa746 parent bfa6b7bb35a9c8c8acae3056f2cb3364c52693d4 author Al Viro Sat, 27 May 2006 01:48:08 -0400 committer Al Viro Sat, 27 May 2006 02:26:49 -0400 [PATCH] fix rio_copy_to_card() for OLDPCI case It replaced old rio_pcicopy(). That puppy did _not_ do readb() (unlike rio_memcpy_toio()) and current implementation is simply broken - readb(NULL) is never a valid thing to do. Signed-off-by: Al Viro commit bfa6b7bb35a9c8c8acae3056f2cb3364c52693d4 tree eb6c4b26737a51b09b5acb26dee1546d5f7571d6 parent c7c0d0a10f6e4cea95ed84adcdd37948cac09b85 author Al Viro Sat, 27 May 2006 00:36:10 -0400 committer Al Viro Sat, 27 May 2006 02:26:40 -0400 [PATCH] uses of ->Copy() in rioroute are bogus ... there we are building a command in normal memory; it will be copied to iomem (by ->Copy()) later. Use memcpy()... Signed-off-by: Al Viro commit c7c0d0a10f6e4cea95ed84adcdd37948cac09b85 tree 4af26a97e8561766a9b0da9a29926ae645dc0468 parent 38d0d001b973d8c72c18524cc25ef39db85c66cd author Al Viro Sat, 27 May 2006 00:19:54 -0400 committer Al Viro Sat, 27 May 2006 02:26:32 -0400 [PATCH] bogus order of copy_from_user() arguments ... aka "somebody forgot to swap arguments when converting from copyin()" Signed-off-by: Al Viro commit 38d0d001b973d8c72c18524cc25ef39db85c66cd tree c261b690e3fcdc87bbc4d07b95083d8944503919 parent d886cb586f60a5ccf156392f96a39bc52db925d0 author Al Viro Sat, 27 May 2006 00:15:09 -0400 committer Al Viro Sat, 27 May 2006 02:26:23 -0400 [PATCH] rio ->Copy() expects the sourse as first argument ... so conversion from rio_pcicopy() to rio_copy_to_card() had broken the damn thing. Signed-off-by: Al Viro commit d886cb586f60a5ccf156392f96a39bc52db925d0 tree 5862de796cf8dfd2f38e30d36cc589a07b5f9d88 parent a8bd60705aa17a998516837d9c1e503ad4cbd7fc author Al Viro Sat, 27 May 2006 00:08:25 -0400 committer Al Viro Sat, 27 May 2006 02:26:14 -0400 [PATCH] trivial annotations in rio Signed-off-by: Al Viro commit 75e995855f45a83afdae34d50c0b3ee14fb23b7a tree 9909a5bd5129cfa957baf05d475b0bcac3f45f94 parent 622b20fcb8b42aa4c3c87c0a036f2ad0927b64bc author Alan Cox Wed, 24 May 2006 14:14:41 +0100 committer Jeff Garzik Fri, 26 May 2006 22:02:23 -0400 [PATCH] libata: add pio_data_xfer_noirq Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 622b20fcb8b42aa4c3c87c0a036f2ad0927b64bc tree 082ab2b5891b0bad720d13c020424bfa983da2d6 parent 835d39fcb56cba00b78c60634d6bb0f046ef601c author Alan Cox Wed, 24 May 2006 14:06:11 +0100 committer Jeff Garzik Fri, 26 May 2006 22:02:23 -0400 [PATCH] PCI identifiers for the pata_via update These IDs are also used by the drivers/ide/pci changes submitted by VIA. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 983f27d37d4fc72c252835cb2ee3103b360735a6 tree 8a7d3c3e251db494e285896debeb906473178a3e parent de1e938e54deba5b093a3074dfafd0d11afacbe1 parent e82b0f2cc21be905e504573483fa9542b15df96f author Jeff Garzik Fri, 26 May 2006 22:01:26 -0400 committer Jeff Garzik Fri, 26 May 2006 22:01:26 -0400 Merge branch 'upstream-fixes' into upstream Conflicts: drivers/s390/net/ctctty.c commit de1e938e54deba5b093a3074dfafd0d11afacbe1 tree 2740ac2cc161bb07a408a761afa961c713a37d9d parent f3b197ac26ed0e57989856494c495818dcc7f9ac author Yoichi Yuasa Thu, 25 May 2006 10:24:46 +0900 committer Jeff Garzik Fri, 26 May 2006 21:47:15 -0400 [PATCH] r8169: add new PCI ID Hi, This patch add new PCI ID for r8169 driver. RTL8110SBL has this PCI ID. Please aply. Yoichi Signed-off-by: Yoichi Yuasa Signed-off-by: Jeff Garzik commit f3b197ac26ed0e57989856494c495818dcc7f9ac tree 5451adb0bc6c219d0a794ea32e3c598740c82bdf parent 4c0c2fd486b6598e37c77b5d81a08bc2d948aa7b author Jeff Garzik Fri, 26 May 2006 21:39:03 -0400 committer Jeff Garzik Fri, 26 May 2006 21:39:03 -0400 [netdrvr] trim trailing whitespace: 8139*.c, epic100, forcedeth, tulip/* commit 4c0c2fd486b6598e37c77b5d81a08bc2d948aa7b tree 5275fe083a58dece97502c64a49b99a743e865fd parent eb91f61b2294ccdb914df255164ada70dbbf2d58 author Ayaz Abdulla Thu, 25 May 2006 13:10:38 -0400 committer Jeff Garzik Fri, 26 May 2006 21:37:54 -0400 [PATCH] pci_ids: add new device ids This patch adds new device ids for MCP61 and MCP65 chips. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit eb91f61b2294ccdb914df255164ada70dbbf2d58 tree 7cfe3bb749c26fe02864687301c262acb9211b0c parent 48cf270e45ff6ff076dd6557b38ec1068dd71809 author Ayaz Abdulla Wed, 24 May 2006 18:13:19 -0400 committer Jeff Garzik Fri, 26 May 2006 21:37:54 -0400 [PATCH] forcedeth: add support for flow control This patch adds flow control support for tx and rx pause frames in forcedeth. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 48cf270e45ff6ff076dd6557b38ec1068dd71809 tree 26da9f40dc45385277ea33fb54b93f16e6dc0e89 parent f29cb26c43d7c064421e76540b7654fbba9efc78 author Jens Osterkamp Wed, 24 May 2006 23:33:11 +0200 committer Jeff Garzik Fri, 26 May 2006 21:33:58 -0400 [PATCH] spidernet: replace whitespaces by tabs The original patch was using whitespaces instead of tabs. Signed-off-by: Jens Osterkamp Signed-off-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit f29cb26c43d7c064421e76540b7654fbba9efc78 tree de6a1c292e4e5be0ebedc21cae6130a421c8590f parent 6d0c07cc6eec4636d83dd75c85b3205229f1960a parent a24b163b7c16f9e30e726319115e45ed6e683582 author Jeff Garzik Fri, 26 May 2006 21:33:55 -0400 committer Jeff Garzik Fri, 26 May 2006 21:33:55 -0400 Merge branch 'upstream-fixes' into upstream commit 6d0c07cc6eec4636d83dd75c85b3205229f1960a tree be9f17d81216d3fdf3cbd5ce659c43d523876eb8 parent 6082823632e40737515d03381e1ba59cfb4d4909 parent 80871e63e410c53524ef47eaf475c13e0f164ea6 author Jeff Garzik Fri, 26 May 2006 21:32:31 -0400 committer Jeff Garzik Fri, 26 May 2006 21:32:31 -0400 Merge branch 'upstream-fixes' into upstream commit 835d39fcb56cba00b78c60634d6bb0f046ef601c tree 235cecc646bada5c0b76836d42e44e7a5d93c0f8 parent 89bad5892abca55f56d0ea713c7306d1f845ac8e parent ecd68853b852cdafb138f9c437f3a751fe7dc381 author Jeff Garzik Fri, 26 May 2006 21:30:38 -0400 committer Jeff Garzik Fri, 26 May 2006 21:30:38 -0400 Merge branch 'master' into upstream commit 89bad5892abca55f56d0ea713c7306d1f845ac8e tree 41423cb7f285ff3a87eabf44d414a5b197e10e4a parent 957d2df1801865eb1e63864bc63b970aa9c460ba author Albert Lee Fri, 26 May 2006 13:49:18 +0800 committer Jeff Garzik Fri, 26 May 2006 21:30:12 -0400 [PATCH] libata: add back ->data_xfer to ata_piix.c Add back ->data_xfer and ->mode_filter to ata_piix.c. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 6082823632e40737515d03381e1ba59cfb4d4909 tree be9f17d81216d3fdf3cbd5ce659c43d523876eb8 parent cbc696a5fa3942aa2e6ad52a71d5126ffa84d031 author Alexey Dobriyan Tue, 23 May 2006 14:52:21 -0700 committer Jeff Garzik Fri, 26 May 2006 21:29:09 -0400 [PATCH] e1000: endian fixes Signed-off-by: Alexey Dobriyan Cc: "Ronciak, John" Cc: Jesse Brandeburg Acked-by: Auke Kok Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit cbc696a5fa3942aa2e6ad52a71d5126ffa84d031 tree 98eab655c0e5d0853267557616cb7059f27f7fc9 parent d3f464b5385531c4250a8b1dbd2f9ba6bbfcebb9 parent 8fc29ba65bd669b8f23a46b4760f3ba773e2a635 author Jeff Garzik Fri, 26 May 2006 21:26:34 -0400 committer Jeff Garzik Fri, 26 May 2006 21:26:34 -0400 Merge branch 'upstream-fixes' into upstream commit ba0251fe87ea560eb377917e06ba0b5b9ab89094 tree 9f01452bb883ddcbd2ef1047638f9aeefeb4c89f parent cca3b837bbb4c984165f9f9c7c06846bc0425791 author Thomas Gleixner Sat, 27 May 2006 01:02:13 +0200 committer Thomas Gleixner Sat, 27 May 2006 01:02:13 +0200 [MTD] NAND Consolidate references and add back default name setting We have a type pointer. Make use of it instead of the error prone nand_ids[i] reference. The NAND driver used to set default name settings from the chip ID string for the device. The feature got lost during the rework. Add it back. Signed-off-by: Thomas Gleixner commit cca3b837bbb4c984165f9f9c7c06846bc0425791 tree 4bc0cde8cb73b5a5e74220072de5db8a9d1448aa parent 29da9cea46f65cb9488641354fe554e9ef8a3a85 author Thomas Gleixner Sat, 27 May 2006 00:47:18 +0200 committer Thomas Gleixner Sat, 27 May 2006 00:47:18 +0200 [MTD] NAND simplify nand_chip_select nCE setting can be done when the first command is issued to the device. We keep the deselect functionality as it makes sense to deassert nCE when the device becomes idle. Signed-off-by: Thomas Gleixner commit 29da9cea46f65cb9488641354fe554e9ef8a3a85 tree 1f7f075e554ef2282510b4c6d9a761043cae072b parent 9bfeb691e75b21fdaa80ffae719083200b190381 author David Woodhouse Fri, 26 May 2006 23:05:44 +0100 committer David Woodhouse Fri, 26 May 2006 23:05:44 +0100 [MTD] Fix thinko in nand_write_page_hwecc() Signed-off-by: Thomas Gleixner Signed-off-by: David Woodhouse commit 9bfeb691e75b21fdaa80ffae719083200b190381 tree 3c828820f1385249835f85e5073b4ffd10fcd09c parent f75e5097ef298c5a0aa106faa211d1afdc92dc3d author David Woodhouse Fri, 26 May 2006 21:19:05 +0100 committer David Woodhouse Fri, 26 May 2006 21:19:05 +0100 [JFFS2] Switch to using an array of jffs2_raw_node_refs instead of a list. This allows us to drop another pointer from the struct jffs2_raw_node_ref, shrinking it to 8 bytes on 32-bit machines (if the TEST_TOTLEN) paranoia check is turned off, which will be committed soon). Signed-off-by: David Woodhouse commit b1141f6d5dead296adcabd4a1e8ea2b994e287cb tree d943fdb68114edcf67223659764ef458860eebbd parent f587fb74b26a10354f1eb73e8d054cd15e5a2fe2 parent 4541a5db0ba33d9c692e5b2f8d7805e336fabe7c author John W. Linville Fri, 26 May 2006 16:12:24 -0400 committer John W. Linville Fri, 26 May 2006 16:12:24 -0400 Merge branch 'upstream-fixes' into upstream commit f587fb74b26a10354f1eb73e8d054cd15e5a2fe2 tree a453a270fc86ada85d808487c911387739ce2296 parent df8ccb9bf1ca360581a94c2245efb9fa613fbb29 parent 705af309505681f197f81618440954d10f120dc0 author John W. Linville Fri, 26 May 2006 16:06:58 -0400 committer John W. Linville Fri, 26 May 2006 16:06:58 -0400 Merge branch 'from-linus' into upstream commit f75e5097ef298c5a0aa106faa211d1afdc92dc3d tree 0de4534e9ae54cf5d17ea9ef20acefb931167eee parent e4d222ff18bca6322f032088a21e9c4a4c038b85 author Thomas Gleixner Fri, 26 May 2006 18:52:08 +0200 committer Thomas Gleixner Fri, 26 May 2006 18:52:08 +0200 [MTD] NAND modularize write function Modularize the write function and reorganaize the internal buffer management. Remove obsolete chip options and fixup all affected users. Signed-off-by: Thomas Gleixner commit d3f464b5385531c4250a8b1dbd2f9ba6bbfcebb9 tree 9d2c162e6accb605a14d6307b545439e84de7178 parent 25a9f2f154feaf1c86e46a8fe7b9940d0b0a96f6 author Auke Kok Fri, 26 May 2006 09:38:10 -0700 committer Auke Kok Fri, 26 May 2006 09:38:10 -0700 ixgb: update version, dates increase the year dates to 2006 and bump the version to 1.0.109-k2 Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 25a9f2f154feaf1c86e46a8fe7b9940d0b0a96f6 tree 3a78f7cfff8f4d5bc804f5d26ef2fcdc03926a37 parent 25943071b40580ba24e0a111e86b4869b9f5c07c author Auke Kok Fri, 26 May 2006 09:36:03 -0700 committer Auke Kok Fri, 26 May 2006 09:36:03 -0700 ixgb: remove changelog same as e1000 - remove the changelog from the driver code itself. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 25943071b40580ba24e0a111e86b4869b9f5c07c tree d0a098bec435e4a7db0bc3f043273ae189c324e1 parent 235949d162076832b8b9a6e30ca51876c3fa11e8 author Auke Kok Fri, 26 May 2006 09:35:57 -0700 committer Auke Kok Fri, 26 May 2006 09:35:57 -0700 ixgb: replace netdev->priv with netdev_priv() fix netdev->priv ==> netdev_priv(netdev) Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 235949d162076832b8b9a6e30ca51876c3fa11e8 tree e9f666fa8e4cd6f41287295665a55e7b68d5536d parent 3352a3b20ce880b17f185ad55bf27751f1c8edb9 author Auke Kok Fri, 26 May 2006 09:35:52 -0700 committer Auke Kok Fri, 26 May 2006 09:35:52 -0700 ixgb: remove inlines, allow compiler to choose deinline a few large functions as to allow the compiler to pick. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 3352a3b20ce880b17f185ad55bf27751f1c8edb9 tree 48b968af4adf8fd1bea134c64f888b53c8fe8436 parent 3f3dc0dd2086402b684545d66bb5ece93c76330b author Auke Kok Fri, 26 May 2006 09:35:47 -0700 committer Auke Kok Fri, 26 May 2006 09:35:47 -0700 ixgb: remove lock access in the fast path This mimics a change made in the e1000 driver that imitates a slick tg3 way of avoiding grabbing the lock around restarting the tx queue. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 3f3dc0dd2086402b684545d66bb5ece93c76330b tree 623c09c2cfc13bfe31c15afe22ce3ab223c4763f parent 989316ddfeafd0e8fb51a4d811383769ad62637a author Auke Kok Fri, 26 May 2006 09:35:43 -0700 committer Auke Kok Fri, 26 May 2006 09:35:43 -0700 ixgb: allocate only buffersize needed In order to help correct window size growth, use the MFS register to limit the packet sizes received and allocate only the buffer size necessary Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak index 0905a82..84a8064 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c @@ -574,9 +574,8 @@ ixgb_sw_init(struct ixgb_adapter *adapte hw->subsystem_vendor_id = pdev->subsystem_vendor; hw->subsystem_id = pdev->subsystem_device; - adapter->rx_buffer_len = IXGB_RXBUFFER_2048; - hw->max_frame_size = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH; + adapter->rx_buffer_len = hw->max_frame_size; if((hw->device_id == IXGB_DEVICE_ID_82597EX) || (hw->device_id == IXGB_DEVICE_ID_82597EX_CX4) @@ -820,21 +819,14 @@ ixgb_setup_rctl(struct ixgb_adapter *ada rctl |= IXGB_RCTL_SECRC; - switch (adapter->rx_buffer_len) { - case IXGB_RXBUFFER_2048: - default: + if (adapter->rx_buffer_len <= IXGB_RXBUFFER_2048) rctl |= IXGB_RCTL_BSIZE_2048; - break; - case IXGB_RXBUFFER_4096: + else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_4096) rctl |= IXGB_RCTL_BSIZE_4096; - break; - case IXGB_RXBUFFER_8192: + else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_8192) rctl |= IXGB_RCTL_BSIZE_8192; - break; - case IXGB_RXBUFFER_16384: + else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_16384) rctl |= IXGB_RCTL_BSIZE_16384; - break; - } IXGB_WRITE_REG(&adapter->hw, RCTL, rctl); } @@ -1551,25 +1543,12 @@ ixgb_change_mtu(struct net_device *netde DPRINTK(PROBE, ERR, "Invalid MTU setting %d\n", new_mtu); return -EINVAL; } - - if((max_frame <= IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH) - || (max_frame <= IXGB_RXBUFFER_2048)) { - adapter->rx_buffer_len = IXGB_RXBUFFER_2048; - - } else if(max_frame <= IXGB_RXBUFFER_4096) { - adapter->rx_buffer_len = IXGB_RXBUFFER_4096; - } else if(max_frame <= IXGB_RXBUFFER_8192) { - adapter->rx_buffer_len = IXGB_RXBUFFER_8192; + adapter->rx_buffer_len = max_frame; - } else { - adapter->rx_buffer_len = IXGB_RXBUFFER_16384; - } - netdev->mtu = new_mtu; - - if(old_max_frame != max_frame && netif_running(netdev)) { + if ((old_max_frame != max_frame) && netif_running(netdev)) { ixgb_down(adapter, TRUE); ixgb_up(adapter); } commit 989316ddfeafd0e8fb51a4d811383769ad62637a tree 42ac64d569fcd2690b9db631272abc33cb08604b parent 8556f0d18923495ffd15ce87089312b3d8f2414c author Auke Kok Fri, 26 May 2006 09:35:38 -0700 committer Auke Kok Fri, 26 May 2006 09:35:38 -0700 ixgb: revert an unwanted fix regarding tso/descriptors There seemed to be another bug introduced as well as a performance hit with the addtion of the sentinel descriptor workaround. Removal of this workaround appears to prevent the hang. We'll take a risk and remove it, as we had never seen the originally reported bug under linux. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 8556f0d18923495ffd15ce87089312b3d8f2414c tree dda1069465bffa70e35a293d46ccc9c54064e5d7 parent e59d16965ca38df91c4d9390d8eb5a62d7739589 author Auke Kok Fri, 26 May 2006 09:35:32 -0700 committer Auke Kok Fri, 26 May 2006 09:35:32 -0700 ixgb: fix interface losing macaddr on ifdn/up user contributed fix for LAA across down/up, from tonychung00@users.sf.net. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit e59d16965ca38df91c4d9390d8eb5a62d7739589 tree 430dd5d0174c4a7c566d8f176599b4a1c324c8c7 parent a24e2513c2d03c9a92739ec6fa7e7208f792881e author Auke Kok Fri, 26 May 2006 09:35:28 -0700 committer Auke Kok Fri, 26 May 2006 09:35:28 -0700 ixgb: fix smp polling race condition Moved interrupt masking to before requesting the interrupt from the OS. Moved interrupt enable to after netif_poll_enable. This fixes a racy BUG() where polling would be running on another CPU at the same time that netif_poll_enable would run. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit e4d222ff18bca6322f032088a21e9c4a4c038b85 tree 5c8c2bc4202bfb185746473d27ac9a7ecb69780e parent 89291a9d5b70778e49e2563247c6c7e3efac9b14 author David Woodhouse Fri, 26 May 2006 02:06:27 +0100 committer David Woodhouse Fri, 26 May 2006 02:06:27 +0100 [MTD] Remove PCI dependency for Geode CS553[56] NAND controller. PCI is faked on these devices by SMM traps. Don't depend on that -- check for the chipset directly instead. Signed-off-by: David Woodhouse commit a24e2513c2d03c9a92739ec6fa7e7208f792881e tree 31c7dbbc3fa76087d215924d2143fefa271cfa01 parent 6b900bb4bcb6095339f8d404babd9d779bfa1ea4 author Auke Kok Thu, 25 May 2006 13:24:27 -0700 committer Auke Kok Thu, 25 May 2006 13:24:27 -0700 ixgb: increment version to 1.0.104-k4 Increment the driver version to 1.0.104-k4 Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 6b900bb4bcb6095339f8d404babd9d779bfa1ea4 tree c3c727be5c0b9d99e8c01eae16412d0ad43e9c48 parent 1dfdd7df21309e57867962020a5ccb83d00e5432 author Auke Kok Thu, 25 May 2006 13:24:21 -0700 committer Auke Kok Thu, 25 May 2006 13:24:21 -0700 ixgb: use rx copybreak/skb recycle o use rx copybreak/skb recycle Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 1dfdd7df21309e57867962020a5ccb83d00e5432 tree 6e04f530caa49cbc4957fcad1429fe9bb77fe5d9 parent c9e055ac4fdbb52622437e0dbfdbc1d4897d2775 author Auke Kok Thu, 25 May 2006 13:24:17 -0700 committer Auke Kok Thu, 25 May 2006 13:24:17 -0700 ixgb: add performance enhancements to the buffer_info struct o modify the rx refill logic and tail bump o add counter for failures Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 89291a9d5b70778e49e2563247c6c7e3efac9b14 tree b8fdf0d2e88d47dda7ba70e088dd3c8dd0c90d78 parent c5b553cc2c36f770086a37764f7a06dd615eda8f author David Woodhouse Thu, 25 May 2006 13:30:24 +0100 committer David Woodhouse Thu, 25 May 2006 13:30:24 +0100 [JFFS2] Fix 64-bit size_t problems in XATTR code. Signed-off-by: David Woodhouse commit c5b553cc2c36f770086a37764f7a06dd615eda8f tree a61204320628293b63eacd68cb932354e5883549 parent 8546ac4f84b252fff078fab1a992c70504147914 author David Woodhouse Thu, 25 May 2006 13:25:17 +0100 committer David Woodhouse Thu, 25 May 2006 13:25:17 +0100 [MTD] Fix NAND_VERIFY_WRITE case to build with tglx's recent changes Bad tglx. No biscuit. Signed-off-by: David Woodhouse commit 8546ac4f84b252fff078fab1a992c70504147914 tree 98fd824f18bb045b0a8191ad2735fc1978ea6f91 parent f5bbdacc41939f89d8ccb18dd79cd9b21c0cb75d author Thomas Gleixner Thu, 25 May 2006 13:38:45 +0200 committer David Woodhouse Thu, 25 May 2006 12:53:47 +0100 [MTD] Remove the only useless readv implementation Removing readv from struct mtd_info broke block2mtd. Remove the reference and the useless default implementation. Signed-off-by: Thomas Gleixner commit f5bbdacc41939f89d8ccb18dd79cd9b21c0cb75d tree c9e45db9701c41c842282b0432d915cc9facc013 parent 9577f44a899cf4acb9e381c8946307b72153cd15 author Thomas Gleixner Thu, 25 May 2006 10:07:16 +0200 committer David Woodhouse Thu, 25 May 2006 12:45:27 +0100 [MTD] NAND Modularize read function Split the core of the read function out and implement seperate handling functions for software and hardware ECC. Signed-off-by: Thomas Gleixner commit 9577f44a899cf4acb9e381c8946307b72153cd15 tree 0e3ef3fd6a094da30584c8fc06483f0fff3cda4f parent 7fac464868ec5d80019fa549b8b4516dd1dc9d5c author Thomas Gleixner Thu, 25 May 2006 10:04:31 +0200 committer David Woodhouse Thu, 25 May 2006 12:45:27 +0100 [MTD] NAND Add read/write function pointers to struct nand_ecc_ctrl Add read/write function pointers to struct nand_ecc_ctrl to prepare the modulaization of nand_read/write functions. The current implementation handles every type of ecc mode software/hardware and all kinds of strange ecc placement schemes in one switch/if construct. Thats too complex to maintain and too inflexible to expand. Modularization will also shorten the code pathes of the read/write functions. Signed-off-by: Thomas Gleixner commit 7fac464868ec5d80019fa549b8b4516dd1dc9d5c tree 0b8003852a430e91c31481bf6bb8cec66993199b parent 7314e9e7d57293c58b3e10a25a8a1d9328444187 author Thomas Gleixner Thu, 25 May 2006 09:57:31 +0200 committer David Woodhouse Thu, 25 May 2006 12:45:27 +0100 [MTD] Add ECC statistics to struct mtd_info FLASH - especially NAND FLASH - will become less reliable and bit flips more likely. Add an ECC statistics struct to struct mtd_info to keep track of this. Signed-off-by: Thomas Gleixner commit 7314e9e7d57293c58b3e10a25a8a1d9328444187 tree 024eedaa981089699bec36db78b8b460546df575 parent 7a30601b3ac7b02440ffa629fd3d2cca71c1bcd8 author Thomas Gleixner Thu, 25 May 2006 09:51:54 +0200 committer David Woodhouse Thu, 25 May 2006 12:45:27 +0100 [MTD] NAND Cleanup oob functions Cleanup the code in the oob related functions and make use of the new NO_READRDY flag. Signed-off-by: Thomas Gleixner commit 7a30601b3ac7b02440ffa629fd3d2cca71c1bcd8 tree df5b7d220d4a911d8fadedf123e98955a2a9c3c4 parent 04bbd0eafb0c733c6c7f5d63c5098c615fe0685a author Thomas Gleixner Thu, 25 May 2006 09:50:16 +0200 committer David Woodhouse Thu, 25 May 2006 12:45:26 +0100 [MTD] NAND Introduce NAND_NO_READRDY option The nand driver has a superflous read ready / command delay in the read functions. This was added to handle chips which have an automatic read forward. Newer chips do not have this functionality anymore. Add this option to avoid the delay / I/O operation. Mark all large page chips with the new option flag. Signed-off-by: Thomas Gleixner commit 04bbd0eafb0c733c6c7f5d63c5098c615fe0685a tree e4bf0095d7a46912d13a1508ba9acd6e39fa3733 parent 8b9e9fe8c6ee354aa75dc5a33e1575b21aa52084 author Thomas Gleixner Thu, 25 May 2006 09:45:29 +0200 committer David Woodhouse Thu, 25 May 2006 12:45:26 +0100 [MTD] NAND Initialize controller lock and wq only once The lock simplifying patch did not move the lock and waitqueue initialization into the controller allocation patch. This reinitializes waitqueue and spinlocks also for driver supplied controller stuctures. Move it into the allocation path. Signed-off-by: Thomas Gleixner commit 8b9e9fe8c6ee354aa75dc5a33e1575b21aa52084 tree dd18ecbeeaa6729908c7b14f11600e61578242ee parent 046b8b9808127d63326a33bc6298c90eaee90eeb author David Woodhouse Thu, 25 May 2006 01:53:09 +0100 committer David Woodhouse Thu, 25 May 2006 01:53:09 +0100 [JFFS2] Fix and improve debugging output during scan. Print wasted_size in scanned eraseblocks, print range correctly for summary dirent and inode entries. Signed-off-by: David Woodhouse commit 046b8b9808127d63326a33bc6298c90eaee90eeb tree 93caaabd7ae10969acb4758634b9b1c9448ef951 parent f61579c33736476e41e296a16c0d4ead4b953187 author David Woodhouse Thu, 25 May 2006 01:50:35 +0100 committer David Woodhouse Thu, 25 May 2006 01:50:35 +0100 [JFFS2] Add 'jeb' argument to jffs2_prealloc_raw_node_refs() Preallocation of refs is shortly going to be a per-eraseblock thing, rather than per-filesystem. Add the required argument to the function. Signed-off-by: David Woodhouse commit f61579c33736476e41e296a16c0d4ead4b953187 tree e71114ae2b4afb8bd660c84ad22950cebc1870a5 parent c38c1b613d742b5fa075071568f44dc8ec9f1cb8 author David Woodhouse Thu, 25 May 2006 01:42:40 +0100 committer David Woodhouse Thu, 25 May 2006 01:42:40 +0100 [JFFS2] Correctly handle wasted space before summary node. Signed-off-by: David Woodhouse commit c38c1b613d742b5fa075071568f44dc8ec9f1cb8 tree 73ac1b5e08ed331490d056ac0a27588930d592f5 parent f560928baa605e8faaa3de6cc1b11ebb645e97db author David Woodhouse Thu, 25 May 2006 01:38:27 +0100 committer David Woodhouse Thu, 25 May 2006 01:38:27 +0100 [JFFS2] jffs2_free_all_node_refs() doesn't free them all. Rename it. ... to jffs2_free_jeb_node_refs() since that's what it does. Signed-off-by: David Woodhouse commit f560928baa605e8faaa3de6cc1b11ebb645e97db tree 312b87f1d1fc3164ce246d04cbfcd9daede25f7d parent 12efdde3139c568a59561b69865fd14f37c75603 author David Woodhouse Thu, 25 May 2006 01:37:28 +0100 committer David Woodhouse Thu, 25 May 2006 01:37:28 +0100 [JFFS2] Allocate node_ref for wasted space when skipping to page boundary One more place where we were changing the accounting info without actually allocating a ref for the lost space... Signed-off-by: David Woodhouse commit 12efdde3139c568a59561b69865fd14f37c75603 tree ef5b0b445dd6da3ab61120bee09b3c93fae953a8 parent ace4dfee56fff184e07d7248a759b574321afa8b author Thomas Gleixner Wed, 24 May 2006 22:57:09 +0200 committer David Woodhouse Wed, 24 May 2006 23:45:24 +0100 [MTD] NAND fix cmd_ctrl breakage The cmd_ctrl rework lacks some state transition flags. Signed-off-by: Thomas Gleixner commit ace4dfee56fff184e07d7248a759b574321afa8b tree ee5f3b3d05cb081f073f6f9e9042ae457ba43b12 parent c7c16c8e7604a8974d48562fecf8d9c7e221fced author Thomas Gleixner Wed, 24 May 2006 12:07:37 +0200 committer David Woodhouse Wed, 24 May 2006 23:45:24 +0100 [MTD] NAND coding style and namespace cleanup Cleanup the functions which are not going to change in the next steps. Signed-off-by: Thomas Gleixner commit c7c16c8e7604a8974d48562fecf8d9c7e221fced tree 6dda7ddecd86076bb8d9cdd437bd0b2359a033ba parent 0305c8659ff9cebabf469d5cd0ab8dc384857e10 author David Woodhouse Wed, 24 May 2006 14:24:02 +0100 committer David Woodhouse Wed, 24 May 2006 14:24:02 +0100 [JFFS2] Revert Artem's Bunkage in debug messages. Random unthinking 'cleanup' caused debug messages like this: Obsoleting node at 0x0006daf4 of len 0x3a4: <7>Dirtying If messages are continuation of an existing line, they don't need to be prefixed with KERN_DEBUG. THINK. Or you will be replaced by a small shell script. Signed-off-by: David Woodhouse commit 0305c8659ff9cebabf469d5cd0ab8dc384857e10 tree 1784b2bb078a58e50ca75dfccd1e9fc5f8b211b8 parent 99988f7bbd16b861590dda4631c4db6cb17b5091 parent d470a97c70a43ffafd6e728c913254b6d6fd1219 author David Woodhouse Wed, 24 May 2006 10:01:43 +0100 committer David Woodhouse Wed, 24 May 2006 10:01:43 +0100 Merge branch 'master' of git://git.infradead.org/~gleixner/mtd-nand-2.6.git commit 66643de455c27973ac31ad6de9f859d399916842 tree 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f parent 2c23d62abb820e19c54012520f08a198c2233a85 parent 387e2b0439026aa738a9edca15a57e5c0bcb4dfc author David Woodhouse Wed, 24 May 2006 09:22:21 +0100 committer David Woodhouse Wed, 24 May 2006 09:22:21 +0100 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: include/asm-powerpc/unistd.h include/asm-sparc/unistd.h include/asm-sparc64/unistd.h Signed-off-by: David Woodhouse commit 99988f7bbd16b861590dda4631c4db6cb17b5091 tree 38865d44c905d7f84d7eeb70186482e1e399fe9c parent 2f785402f39b96a077b6e62bf26164bfb8e0c980 author David Woodhouse Wed, 24 May 2006 09:04:17 +0100 committer David Woodhouse Wed, 24 May 2006 09:04:17 +0100 [JFFS2] Introduce ref_next() macro for finding next physical node Another part of the preparation for switching to an array... Signed-off-by: David Woodhouse commit c9e055ac4fdbb52622437e0dbfdbc1d4897d2775 tree 42b5a2fba2fd06d24dda9b6ca7667645940ac5d1 parent d7fbeba60b4021dfaf5d315884fbf7672b4ae87b author Herbert Valerio Riedel Sun, 07 May 2006 23:22:53 +0200 committer Jeff Garzik Wed, 24 May 2006 02:51:33 -0400 [PATCH] phy: new SMSC LAN83C185 PHY driver new SMSC LAN83C185 10BaseT/100BaseTX PHY driver for the PHY subsystem Signed-off-by: Herbert Valerio Riedel Signed-off-by: Jeff Garzik commit 957d2df1801865eb1e63864bc63b970aa9c460ba tree e0281c79adb24a64c712c10bd445f42ccadaf4a8 parent 31a34fe75906ba5f61606eaed01da313f29ca4b1 author Alan Cox Tue, 23 May 2006 13:18:57 +0100 committer Jeff Garzik Wed, 24 May 2006 02:09:56 -0400 [PATCH] libata: Remove obsolete flag ATA_FLAG_IRQ_MASK was added when I did the original data transfer with IRQ masked bits for PIO. It has since been replaced by ->pio_data_xfer methods so should be removed so nobody uses it by mistake thinking it still works. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 31a34fe75906ba5f61606eaed01da313f29ca4b1 tree 31f91e71800208aa1a532c37fedbb850910cde4e parent e14698745dd0de1ddbf5cd0cca4313a90f8c1cc1 author Alan Cox Mon, 22 May 2006 22:58:14 +0100 committer Jeff Garzik Wed, 24 May 2006 02:09:01 -0400 [PATCH] ata_piix formatting if( spacing fix for Garzik compliant formatting Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 0a9cb46a73abd6c45e7c986bec984eed60c417b6 tree e713d9a0d03de947f3727e6fead942024f4c0767 parent 7499bf1a4cabde789e7694b33d01a1913ae1dddf author Jon Mason Fri, 19 May 2006 15:35:32 -0500 committer Paul Mackerras Wed, 24 May 2006 16:08:58 +1000 [PATCH] remove powerpc bitops in favor of existing generic bitops There already exists a big endian safe bitops implementation in lib/find_next_bit.c. The code in it is 90%+ common with the powerpc specific version, so the powerpc version is redundant. This patch makes the necessary changes to use the generic bitops in powerpc, and removes the powerpc specific version. Signed-off-by: Jon Mason Signed-off-by: Paul Mackerras commit 7499bf1a4cabde789e7694b33d01a1913ae1dddf tree 0bcc92093b8782df448b0521e2ebefc5f5634f75 parent 72a14eafb243b1f31118ea55a7e8c2588b5ad468 author Stephen Rothwell Fri, 19 May 2006 17:06:38 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:57 +1000 [PATCH] powerpc: cleanup of iSeries flat device tree Consolidate the vio device node creation. Make some parameters const. Make a few more things __initdata. Get the device_type strings out of the device tree blob. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 72a14eafb243b1f31118ea55a7e8c2588b5ad468 tree 718a1f016ed660e9445d18106ba77c582416f81f parent c4e3ea2553308ba65fea582dc9a42221ef8b49e5 author Stephen Rothwell Fri, 19 May 2006 17:04:12 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:57 +1000 [PATCH] powerpc: make iSeries flattened device tree dynamic - part 2 This actually simplies things as we just figure out how much space we used at the end and adjust klimit then. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit c4e3ea2553308ba65fea582dc9a42221ef8b49e5 tree ae8126834cda2638a3f151a6ce24a98a90dbbab6 parent c81014f603db26e1ed818decebd3b594606e20a6 author Stephen Rothwell Fri, 19 May 2006 17:04:48 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:57 +1000 [PATCH] powerpc: make iSeries flattened device tree dynamic First we capture all the strings from dt.c statically by noting that gcc puts them in a special section of their own. Idea from Michael Ellerman. Then we move the flattened device tree to klimit. Still to come, making the values blob grow as needed. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit c81014f603db26e1ed818decebd3b594606e20a6 tree 8777dbf5e18f062c921a46929af996d953cf443e parent 9ceb19093b5e5f037c6b47df0607dd567283287d author Stephen Rothwell Fri, 19 May 2006 17:00:04 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:57 +1000 [PATCH] powerpc: split device tree stuff out of iseries/setup.c Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 9ceb19093b5e5f037c6b47df0607dd567283287d tree 15db4f5d1eb688b7d67ca01889d0b4835d3c8707 parent 29629b2972467f6cc00427a89008c09d010074c8 author Stephen Rothwell Fri, 19 May 2006 16:58:13 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:57 +1000 [PATCH] powerpc: give iSeries device tree nodes better names Use the PCI class code to choose a name for the PCI device nodes and to guess a device_type. Failing that, base the name on the vendor and device ids as specified in the spec. Mark just about everything __init{data}. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 29629b2972467f6cc00427a89008c09d010074c8 tree 3dd725adc1b186b8520436c5053946715b006bf6 parent 095eed4f8d0be13a7934031434b6e9ceddb87ff6 author Stephen Rothwell Fri, 19 May 2006 16:55:53 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:57 +1000 [PATCH] powerpc: make iSeries flat device tree stuff static Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 095eed4f8d0be13a7934031434b6e9ceddb87ff6 tree 6ae36b38c3cb8ab78e8cc8e019ed226829304ad6 parent efbd386967aaa7fcf7ffbb13e4975df1cdf04cb8 author Stephen Rothwell Fri, 19 May 2006 16:54:42 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:57 +1000 [PATCH] powerpc: clean up iSeries PCI probe Only scan the host bridges and then use the existing pci_devs_phb_init() routine. Also fix typo in setup of reg property. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit efbd386967aaa7fcf7ffbb13e4975df1cdf04cb8 tree 22e60f8e821e5ef616b69dac404003cb70e3cbaf parent 403fac4f83bd8e089a192c542511fbeb2729a6c5 author Stephen Rothwell Fri, 19 May 2006 16:53:11 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:56 +1000 [PATCH] powerpc: iSeries PCI devices can now have a devpsec attribute Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 403fac4f83bd8e089a192c542511fbeb2729a6c5 tree f33cf1d6caee0cb7edaa977ec8cc5d6f340d93b7 parent b02527931672749d404b5f640b7e086afc37f4e0 author Stephen Rothwell Fri, 19 May 2006 16:51:57 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:56 +1000 [PATCH] powerpc: remove LogicalSlot from pci_dn As we now store enough information in the device_node. Also the Flags field was not used either, do remove that. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit b02527931672749d404b5f640b7e086afc37f4e0 tree 7f825ab2706441559a39710f360c1fb4c1073b85 parent 96ff6afaf1c2fdd118139095dea66c0910379780 author Stephen Rothwell Fri, 19 May 2006 16:50:39 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:56 +1000 [PATCH] powerpc: remove Irq from pci_dn As we now store enough information in the device_node to allocate the irq number in pcibios_final_fixup. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 96ff6afaf1c2fdd118139095dea66c0910379780 tree 5364530523d40789b549edc66e02e47b04932c9a parent 0d177df15d12926dc2ef7c814f317f02de52ce17 author Stephen Rothwell Fri, 19 May 2006 16:48:47 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:56 +1000 [PATCH] powerpc: remove iSeries_Global_Device_List We can now scan the list of device nodes instead. This also allows us to remove the Device_list member of struct pci_dn. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 0d177df15d12926dc2ef7c814f317f02de52ce17 tree da10171a931af0ff709016a8ce5111a3c39e83d2 parent 66b3851a6947482987b4c05aa781a33696287648 author Stephen Rothwell Fri, 19 May 2006 16:46:28 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:56 +1000 [PATCH] powerpc: move iSeries PCI devices to the device tree Move the probing of PCI devices to setup.c and put them all into the flattened device tree. The later probing is now done by traversing the device tree. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 66b3851a6947482987b4c05aa781a33696287648 tree eab5dafa3268a35d51ef6cf5fa2659f18ba976ad parent b58b7f98670ab6dd7774b67ff1655a787321209f author Stephen Rothwell Fri, 19 May 2006 16:43:58 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:56 +1000 [PATCH] powerpc: reintroduce HvCallPci_configLoad32 This function was removed during iSeries cleanup but will prove useful in the following patches. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit b58b7f98670ab6dd7774b67ff1655a787321209f tree 3d7b4f3685f8743842e46f599b7c8a304d734014 parent 3c06da5ae5358e9d325d541a053e1059e9654bcc author Stephen Rothwell Fri, 19 May 2006 16:42:49 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:56 +1000 [PATCH] powerpc: tidy up iseries/pci.c Remove some unused counters. No need to allocate iomm_table and iobar_table, which means that iomm_table_initialize is not longer needed. Use kzalloc where sensible. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit e14698745dd0de1ddbf5cd0cca4313a90f8c1cc1 tree 34a7a3c0e0d77e44239ff9a3299f7410d84ae087 parent a6b2c5d4754dc539a560fdf0d3fb78a14174394a author Mark Lord Mon, 22 May 2006 19:02:03 -0400 committer Jeff Garzik Wed, 24 May 2006 02:04:09 -0400 [PATCH] sata_mv: endian annotations Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit a6b2c5d4754dc539a560fdf0d3fb78a14174394a tree c6daf88f97c7ed20becf2bd8666be81190eb4bb4 parent 8190bdb9291758f3b8c436ec1154c9923ddb57ea author Alan Cox Mon, 22 May 2006 16:59:59 +0100 committer Jeff Garzik Wed, 24 May 2006 01:58:54 -0400 [PATCH] PATCH: libata. Add ->data_xfer method We need to pass the device in order to do per device checks such as 32bit I/O enables. With the changes to include dev->ap we now don't have to add parameters however just clean them up. Also add data_xfer methods to the existing drivers except ata_piix (which is in the other block of patches). If you reject the piix one just add a data_xfer to it... Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 8190bdb9291758f3b8c436ec1154c9923ddb57ea tree 19d576f7e3becc935f577329a7694296eaa0287e parent f79d409fae879d135d1aaca6d83451f2787aec07 author Jeff Garzik Wed, 24 May 2006 01:53:39 -0400 committer Jeff Garzik Wed, 24 May 2006 01:53:39 -0400 [libata] libata-scsi, sata_mv: trim trailing whitespace commit f79d409fae879d135d1aaca6d83451f2787aec07 tree ee96566a7472e6953bb1b7993414063b9c9f6f24 parent b6079ca409bf88c248992e96510dd6f610f7ed89 author Alan Cox Mon, 22 May 2006 16:55:11 +0100 committer Jeff Garzik Wed, 24 May 2006 01:53:00 -0400 [PATCH] libata - fix bracketing and DMA oops The upstream tree has the ATA_DFLAG_PIO bug fixed but does not have the pass throuugh bug fix Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit b6079ca409bf88c248992e96510dd6f610f7ed89 tree e4096503f69f12838969133a995878ed81d8d716 parent 1f3461a72619fcd70a0fcb563306c91f753b4620 author Alan Cox Mon, 22 May 2006 16:52:06 +0100 committer Jeff Garzik Wed, 24 May 2006 01:53:00 -0400 [PATCH] libata: PIO 0 Ensure the pio_mode is always setup. Don't do any setup on the controller b just ensure the mode reporting is valid to avoid tons of special cases in PATA driver code when mode switching on the fly. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 1f3461a72619fcd70a0fcb563306c91f753b4620 tree e5695e40b038dcf75ec7fa9b0a3f85279c433b48 parent c81e29b4aca2b2503238276219d97faaac994b4f author Albert Lee Tue, 23 May 2006 18:12:30 +0800 committer Jeff Garzik Wed, 24 May 2006 01:50:04 -0400 [PATCH] libata: minor fix for irq-pio merge Minor fix to put the ATA_FLAG_NO_ATAPI flag back. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit c81e29b4aca2b2503238276219d97faaac994b4f tree 02ec800bd9e2625b89757e2ba59f3b3c0f7c1236 parent d3fb4e8dddebbf7d6c0b02842c619bfd4fa199f5 parent bb31a8faa270beafcc51a65880c5564c6b718bd6 author Jeff Garzik Wed, 24 May 2006 01:49:12 -0400 committer Jeff Garzik Wed, 24 May 2006 01:49:12 -0400 Merge branch 'upstream-fixes' into upstream Conflicts: drivers/scsi/libata-core.c commit d3fb4e8dddebbf7d6c0b02842c619bfd4fa199f5 tree 71fda9bd6527463079f9b936abaa0abe5c90da24 parent 4c5c81613b0eb0dba97a8f312a2f1162f39fd47b author Jeff Garzik Wed, 24 May 2006 01:43:25 -0400 committer Jeff Garzik Wed, 24 May 2006 01:43:25 -0400 [libata sata_promise] Add PATA cable detection. Original patch from Phillip Jordan Cleanups and fixes by me. commit 4c5c81613b0eb0dba97a8f312a2f1162f39fd47b tree 6d2a8b48efe47ea53877b8165e40dedd904a031d parent 26e27cd424554202d36f38ee35421143788da127 author Andrew Chew Thu, 20 Apr 2006 15:54:26 -0700 committer Jeff Garzik Wed, 24 May 2006 01:34:10 -0400 [PATCH] sata_nv: Add MCP61 support Added MCP61 SATA support to sata_nv. Signed-off-by: Jeff Garzik commit 26e27cd424554202d36f38ee35421143788da127 tree 04d068c76af5b636c061173465faa574d4b5e7b0 parent b74ba22f030eb7ab88f7d8954ad18ecc0ac5ce3c parent 387e2b0439026aa738a9edca15a57e5c0bcb4dfc author Jeff Garzik Wed, 24 May 2006 01:32:42 -0400 committer Jeff Garzik Wed, 24 May 2006 01:32:42 -0400 Merge branch 'master' into upstream commit d7fbeba60b4021dfaf5d315884fbf7672b4ae87b tree 1da0475fa710af806a2a83d6ee9f6d16c144a028 parent 860f242eb5340d0b0cfe243cb86b2a98f92e8b91 author Jeff Garzik Wed, 24 May 2006 01:31:14 -0400 committer Jeff Garzik Wed, 24 May 2006 01:31:14 -0400 [netdrvr ibmlana, ibmveth] trim trailing whitespace commit 860f242eb5340d0b0cfe243cb86b2a98f92e8b91 tree 286d64b4acfc392bcb926a6f5f7bfb311b0d3efc parent 7b32a312895c00ff03178e49db8b651ee1e48178 author Santiago Leon Tue, 25 Apr 2006 11:19:59 -0500 committer Jeff Garzik Wed, 24 May 2006 01:30:37 -0400 [PATCH] ibmveth change buffer pools dynamically This patch provides a sysfs interface to change some properties of the ibmveth buffer pools (size of the buffers, number of buffers per pool, and whether a pool is active). Ethernet drivers use ethtool to provide this type of functionality. However, the buffers in the ibmveth driver can have an arbitrary size (not only regular, mini, and jumbo which are the only sizes that ethtool can change), and also ibmveth can have an arbitrary number of buffer pools Under heavy load we have seen dropped packets which obviously kills TCP performance. We have created several fixes that mitigate this issue, but we definitely need a way of changing the number of buffers for an adapter dynamically. Also, changing the size of the buffers allows users to change the MTU to something big (bigger than a jumbo frame) greatly improving performance on partition to partition transfers. The patch creates directories pool1...pool4 in the device directory in sysfs, each with files: num, size, and active (which default to the values in the mainline version). Comments and suggestions are welcome... -- Santiago A. Leon Power Linux Development IBM Linux Technology Center Signed-off-by: Jeff Garzik commit 7b32a312895c00ff03178e49db8b651ee1e48178 tree 4a5b3b4fa62eaee004ea162fa6676a18f142363a parent 75ac6ae8187d1c2205eb9f55c4a154cb7f4a2f45 author Adrian Bunk Tue, 16 May 2006 17:30:50 +0200 committer Jeff Garzik Wed, 24 May 2006 01:28:14 -0400 [PATCH] drivers/net/s2io.c: make bus_speed[] static On Mon, May 15, 2006 at 12:56:37AM -0700, Andrew Morton wrote: >... > Changes since 2.6.17-rc3-mm1: >... > git-netdev-all.patch >... > git trees >... This patch makes the needlessly global bus_speed[] static. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 75ac6ae8187d1c2205eb9f55c4a154cb7f4a2f45 tree f4862aa47af8b5752b0d303a80ab78d6411ec99f parent db21e578e551421d76641d72cb3f8296ed3f9e61 parent a1433ac4ab46fb23ae77804c207a1f710a7b12f1 author Jeff Garzik Wed, 24 May 2006 01:28:05 -0400 committer Jeff Garzik Wed, 24 May 2006 01:28:05 -0400 Merge branch 'upstream-fixes' into upstream commit db21e578e551421d76641d72cb3f8296ed3f9e61 tree 73968aeda7ed0051b5cff6950ad513011a3c7a5f parent 6ed14254cb6e269030ff09bed8673473b7be0283 parent df8ccb9bf1ca360581a94c2245efb9fa613fbb29 author Jeff Garzik Wed, 24 May 2006 00:29:57 -0400 committer Jeff Garzik Wed, 24 May 2006 00:29:57 -0400 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream commit 6ed14254cb6e269030ff09bed8673473b7be0283 tree a5a994f9f1afccfcc8d7b98a32e47d82cc90b5fb parent cf393ebed0abb1186c34b21f3d1d939ac2b5568a author Jeff Garzik Wed, 24 May 2006 00:28:37 -0400 committer Jeff Garzik Wed, 24 May 2006 00:28:37 -0400 [netdrvr pcnet_cs, myri] trim trailing whitespace commit cf393ebed0abb1186c34b21f3d1d939ac2b5568a tree 1a3042dfd0d55fbb36fe86da7f7b7f028e79e895 parent 0da34b6dfe55810ae60db57e08e2af8a808c0a55 author Marcin Juszkiewicz Tue, 23 May 2006 11:15:57 +0200 committer Jeff Garzik Wed, 24 May 2006 00:27:31 -0400 [PATCH] pcnet_cs: Add TRENDnet TE-CF100 ethernet adapter ID Add TRENDnet TE-CF100 ethernet adapter to pcnet_cs list. product info: "Fast Ethernet", "CF Size PC Card", "1.0", "" manfid: 0x0149, 0xc1ab Signed-off-by: Marcin Juszkiewicz drivers/net/pcmcia/pcnet_cs.c | 2 ++ 1 file changed, 2 insertions(+) Signed-off-by: Jeff Garzik commit 0da34b6dfe55810ae60db57e08e2af8a808c0a55 tree 4a62f33ee86aba9245bd1356b64a5e797cfde967 parent 3a720d726a6aa0a7cd9190f694587adf7bafdf4f author Brice Goglin Tue, 23 May 2006 06:10:15 -0400 committer Jeff Garzik Wed, 24 May 2006 00:27:31 -0400 [PATCH] Add Myri-10G Ethernet driver Signed-off-by: Brice Goglin Signed-off-by: Andrew J. Gallatin drivers/net/Kconfig | 17 drivers/net/Makefile | 1 drivers/net/myri10ge/Makefile | 5 drivers/net/myri10ge/myri10ge.c | 2851 +++++++++++++++ drivers/net/myri10ge/myri10ge_mcp.h | 205 + drivers/net/myri10ge/myri10ge_mcp_gen_header.h | 58 include/linux/pci_ids.h | 1 7 files changed, 3138 insertions(+) Signed-off-by: Jeff Garzik commit 3a720d726a6aa0a7cd9190f694587adf7bafdf4f tree 2162cbeb1786c8f7826c7e19850bae52395dacea parent d99ef36ed7e56f816a235f1af115420a81853fb9 author Brice Goglin Tue, 23 May 2006 06:10:01 -0400 committer Jeff Garzik Wed, 24 May 2006 00:27:31 -0400 [PATCH] Revive pci_find_ext_capability This patch revives pci_find_ext_capability (has been disabled a couple month ago since it was not used anywhere. See http://lkml.org/lkml/2006/1/20/247). It will now be used by the myri10ge driver. Signed-off-by: Brice Goglin Signed-off-by: Andrew J. Gallatin drivers/pci/pci.c | 3 +-- include/linux/pci.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) Signed-off-by: Jeff Garzik commit d99ef36ed7e56f816a235f1af115420a81853fb9 tree d752c659a59a3f89f3add7f13ca5b8b5d424a4fe parent bdad69b23c86e41262b85d8affc9a3b34ee2ee74 parent 387e2b0439026aa738a9edca15a57e5c0bcb4dfc author Jeff Garzik Wed, 24 May 2006 00:27:05 -0400 committer Jeff Garzik Wed, 24 May 2006 00:27:05 -0400 Merge branch 'master' into upstream commit 2f785402f39b96a077b6e62bf26164bfb8e0c980 tree 3f3a38b484ef2dabda1599d4d8f08b121bd03a76 parent 4cbb9b80e171107c6c34116283fe38e5a396c68b author David Woodhouse Wed, 24 May 2006 02:04:45 +0100 committer David Woodhouse Wed, 24 May 2006 02:04:45 +0100 [JFFS2] Reduce visibility of raw_node_ref to upper layers of JFFS2 code. As the first step towards eliminating the ref->next_phys member and saving memory by using an _array_ of struct jffs2_raw_node_ref per eraseblock, stop the write functions from allocating their own refs; have them just _reserve_ the appropriate number instead. Then jffs2_link_node_ref() can just fill them in. Use a linked list of pre-allocated refs in the superblock, for now. Once we switch to an array, it'll just be a case of extending that array. Signed-off-by: David Woodhouse commit d470a97c70a43ffafd6e728c913254b6d6fd1219 tree e440261dc50c345126901390b9ffa6e0c5cb7222 parent cad74f2c380411ae7bee997f3ba18834cfe313a2 author Thomas Gleixner Tue, 23 May 2006 23:48:57 +0200 committer Thomas Gleixner Tue, 23 May 2006 23:48:57 +0200 [MTD] NAND LED support cleanup Move the define out of the middle of the code and add an appropriate comment. Signed-off-by: Thomas Gleixner commit cad74f2c380411ae7bee997f3ba18834cfe313a2 tree aec691447dc3ab76688fe9dbe3cc2ae04ad1cbee parent 7abd3ef9875eb2afcdcd4f450680298a2983a55e author Thomas Gleixner Tue, 23 May 2006 23:28:48 +0200 committer Thomas Gleixner Tue, 23 May 2006 23:28:48 +0200 [MTD] NAND remove write_byte/word function from nand_chip The previous change of the command / hardware control allows to remove the write_byte/word functions completely, as their only user were nand_command and nand_command_lp. Signed-off-by: Thomas Gleixner commit 7abd3ef9875eb2afcdcd4f450680298a2983a55e tree 64c19d2e5ecca182938acfcb8a172efb7d907d85 parent 3821720d51b5f304d2c33021a82c8da70f6d6ac9 author Thomas Gleixner Tue, 23 May 2006 23:25:53 +0200 committer Thomas Gleixner Tue, 23 May 2006 23:25:53 +0200 [MTD] Refactor NAND hwcontrol to cmd_ctrl The hwcontrol function enforced a step by step state machine for any kind of hardware chip access. Let the hardware driver know which control bits are set and inform it about a change of the control lines. Let the hardware driver write out the command and address bytes directly. This gives a peformance advantage for address bus controlled chips and simplifies the quirks in the hardware drivers. Signed-off-by: Thomas Gleixner commit bdad69b23c86e41262b85d8affc9a3b34ee2ee74 tree 1998fc609e8c614247db8b617e194a746e2bcc03 parent 9528454f9c02fb9c359c4c42c69eed4d47407e39 parent 440c052d6f717495806fe2c65f3f5677c92397c7 author Jeff Garzik Tue, 23 May 2006 17:21:33 -0400 committer Jeff Garzik Tue, 23 May 2006 17:21:33 -0400 Merge branch 'e1000-7.0.38-k4' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream commit 9528454f9c02fb9c359c4c42c69eed4d47407e39 tree 40e8c7f829b528073d2b216c3b8e6be205c76245 parent 777e1d4a0f3387933f668e7adc81384827975189 parent 1faadface9c5d000bb16e42c89f24859337cf2db author Jeff Garzik Tue, 23 May 2006 17:20:58 -0400 committer Jeff Garzik Tue, 23 May 2006 17:20:58 -0400 Merge branch 'master' into upstream commit 440c052d6f717495806fe2c65f3f5677c92397c7 tree 92e8eed3ddc36ca171b4223de3d11d1be84931f2 parent fdf35d3c49be0ad99e2fd5f5f27c6c0c336a3f11 author Auke Kok Tue, 23 May 2006 13:36:19 -0700 committer Auke Kok Tue, 23 May 2006 13:36:19 -0700 e1000: bump version to 7.0.38-k4 Signed-off-by: Auke Kok commit fdf35d3c49be0ad99e2fd5f5f27c6c0c336a3f11 tree 91983404ceea7b3cb9a30f954a9537fe8fc697fb parent a1943b5a796a11ee516f5c085453d653a87ee8fe author Auke Kok Tue, 23 May 2006 13:36:14 -0700 committer Auke Kok Tue, 23 May 2006 13:36:14 -0700 e1000: remove changelog in driver This honours the request to remove the changelog in the driver code. Signed-off-by: Auke Kok commit a1943b5a796a11ee516f5c085453d653a87ee8fe tree de709f1f48387f06b44f5eb4d82f85c76c48a6ad parent 76c224bc9fdf108ae6e97553322122f53bdbe75c author Auke Kok Tue, 23 May 2006 13:36:10 -0700 committer Auke Kok Tue, 23 May 2006 13:36:10 -0700 e1000: Fix date string in Makefile I forgot to update the date string in the Makefile last time. Signed-off-by: Auke Kok commit 76c224bc9fdf108ae6e97553322122f53bdbe75c tree 3901c34cf3ed64b7cf907917500a5317cf5467a6 parent a42a507cd3af14a2696b7c020996e48c10bf7742 author Auke Kok Tue, 23 May 2006 13:36:06 -0700 committer Auke Kok Tue, 23 May 2006 13:36:06 -0700 e1000: remove leading and trailing whitespace. Some leading and trailing whitespace made it into the driver code here. Signed-off-by: Auke Kok commit a42a507cd3af14a2696b7c020996e48c10bf7742 tree 3e3be1c902ea510d6c84da9c083dccfadfa36c59 parent c653e6351e371b33b29871e5eedf610ffb3be037 author Auke Kok Tue, 23 May 2006 13:36:01 -0700 committer Auke Kok Tue, 23 May 2006 13:36:01 -0700 e1000: remove backslash r debug printfs This removes unwanted characters in the debug output that should have never been there. Signed-off-by: Auke Kok commit c653e6351e371b33b29871e5eedf610ffb3be037 tree 401b966e60317c09c6f2b2d5cd81bfbc0d9e3aeb parent 4e3ceac609cce39cb96e0eb8604934592371ed8c author Auke Kok Tue, 23 May 2006 13:35:57 -0700 committer Auke Kok Tue, 23 May 2006 13:35:57 -0700 e1000: add shutdown handler back to fix WOL Someone was waaay too aggressive and removed e1000's reboot notifier instead of porting it to the new way of the shutdown handler. This change broke wake on lan. Add the shutdown handler back in using the same method as e100 uses. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 3821720d51b5f304d2c33021a82c8da70f6d6ac9 tree 191b408d5b3c7ee40e24bdb49353ac613cbd311a parent 85b85fee0cbb9d22b619a4981f046ca49adbc5cd author Thomas Gleixner Tue, 23 May 2006 22:33:52 +0200 committer Thomas Gleixner Tue, 23 May 2006 22:33:52 +0200 [MTD] Export nand_write_raw The previous _ecc removal / cleanup broke (i)nftl module usage. Export the missing symbol. Signed-off-by: Thomas Gleixner commit 85b85fee0cbb9d22b619a4981f046ca49adbc5cd tree c582cc0078f6aa3581514e892bf12908298cb046 parent 9223a456da8ed357bf7e0b128c853e2c8bd54614 author Thomas Gleixner Tue, 23 May 2006 22:03:39 +0200 committer Thomas Gleixner Tue, 23 May 2006 22:03:39 +0200 [MTD] Mark NAND drivers TOTO and PPChameleon broken Both drivers can not be fixed and compiled due to missing header files. Signed-off-by: Thomas Gleixner commit 777e1d4a0f3387933f668e7adc81384827975189 tree 306580b0d6975cb54a74971aa2f4eb20cec1c8e5 parent 9b8118df486ffec2f42d43dadaceebd0561dd564 author Auke Kok Tue, 23 May 2006 10:35:08 -0700 committer Auke Kok Tue, 23 May 2006 10:35:08 -0700 ixgb: increment version to 1.0.104-k2 Increment the driver version to 1.0.104-k2 Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 9b8118df486ffec2f42d43dadaceebd0561dd564 tree c50db295920c2e71b9a3de58029315336b2a2103 parent ec9c3f5d3b8c4dd7340800f02eed87bdf0233e3b author Auke Kok Tue, 23 May 2006 10:35:04 -0700 committer Auke Kok Tue, 23 May 2006 10:35:04 -0700 ixgb: add tx timeout counter This adds a TX timeout counter to the ethtool stats, a tx timeout debug message, and sets the timer to 5 seconds. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit ec9c3f5d3b8c4dd7340800f02eed87bdf0233e3b tree 5397e9b952cf06246b8360bab0e27f91eb329ae4 parent c85fd6f0dedcec411438768bb5ebd133b1ae3347 author Auke Kok Tue, 23 May 2006 10:34:59 -0700 committer Auke Kok Tue, 23 May 2006 10:34:59 -0700 ixgb: use DPRINTK and msglvl, and ethtool to control it Use DPRINTK and msglvl, and ethtool to control it. Add proper names to netdev structs and mappings. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit c85fd6f0dedcec411438768bb5ebd133b1ae3347 tree 868cde6c975b2505658faedf24f99a637f41bd1b parent 940829e2f9d89d3caddc852bca9018cf503ea719 author Auke Kok Tue, 23 May 2006 10:30:02 -0700 committer Auke Kok Tue, 23 May 2006 10:30:02 -0700 ixgb: remove hardcoded number This adds a define for an awkward and uncommented value. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 940829e2f9d89d3caddc852bca9018cf503ea719 tree aae6a6f8c3bcc80a54fae135634958e2f4b6c6cb parent f017f14b3f18b38f2388e7d6e83a7f6997ee9dd6 author Auke Kok Tue, 23 May 2006 10:29:58 -0700 committer Auke Kok Tue, 23 May 2006 10:29:58 -0700 ixgb: add copper 10gig driver id Add support for Copper 10GbE device ID 109E Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit f017f14b3f18b38f2388e7d6e83a7f6997ee9dd6 tree f4afafd176b7b8a1635e58dfa2f24f859dce9ed4 parent 953784d66d8f621a8684d007e526ca26b12d54a1 author Auke Kok Tue, 23 May 2006 10:29:53 -0700 committer Auke Kok Tue, 23 May 2006 10:29:53 -0700 ixgb: add NETIF_F_LLTX analogous to e1000 add NETIF_F_LLTX code like e1000 has Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 953784d66d8f621a8684d007e526ca26b12d54a1 tree 2bc2564e76b842e37d2a7d87e001fba6c38ecb4f parent 4de17c8c7295d32d4e112e214aa90d8f7006972f author Auke Kok Tue, 23 May 2006 10:29:50 -0700 committer Auke Kok Tue, 23 May 2006 10:29:50 -0700 ixgb: fix flow control Make default flow control only have *sending* of flow control packets enabled, and fix to disable / enable flow control correctly. Set flow control defaults to disable receiving flow control from the link partner, to fix the transmit fifo overlow errata Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 4de17c8c7295d32d4e112e214aa90d8f7006972f tree a484ef4d60c9efc274dcfbcae573aecc16e53fa5 parent 96f9c2e277768099479fbed7c3b69c294b1fadef author Auke Kok Tue, 23 May 2006 10:29:46 -0700 committer Auke Kok Tue, 23 May 2006 10:29:46 -0700 ixgb: remove duplicate code setting duplex and speed Removed duplicate code. Create ixgb_set_speed_duplex function to contain duplicate code. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 96f9c2e277768099479fbed7c3b69c294b1fadef tree 468b06ab34bb6184e6561c1849dbffef06ffc7eb parent 4e3ceac609cce39cb96e0eb8604934592371ed8c author Auke Kok Tue, 23 May 2006 10:29:41 -0700 committer Auke Kok Tue, 23 May 2006 10:29:41 -0700 ixgb: fix rare early tso completion Fix rare early completion when using TSO. This essentially is the e1000 fix, with code that was mostly already written. Another skb frag was also needed. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 9223a456da8ed357bf7e0b128c853e2c8bd54614 tree 50cb225c4ba9c610ae4cb67231b319e78e935ac4 parent 2528e8cdf376d7da24647c442ec1e88c360d76ca author Thomas Gleixner Tue, 23 May 2006 17:21:03 +0200 committer Thomas Gleixner Tue, 23 May 2006 17:21:03 +0200 [MTD] Remove read/write _ecc variants MTD clients are agnostic of FLASH which needs ECC suppport. Remove the functions and fixup the callers. Signed-off-by: Thomas Gleixner commit 2528e8cdf376d7da24647c442ec1e88c360d76ca tree 09df5f524085f4d12117fc81791bca10fa8a5f0e parent 9d8522df37f91621a70c5c0dbbf5bf2220b16798 author Thomas Gleixner Tue, 23 May 2006 16:10:00 +0200 committer Thomas Gleixner Tue, 23 May 2006 16:10:00 +0200 [MTD] Remove readv/readv_ecc These functions were never implemented and added only bloat to partition and concat code. Signed-off-by: Thomas Gleixner commit 9d8522df37f91621a70c5c0dbbf5bf2220b16798 tree 30f51aaccb18b1d4a97b7a5c8a64c63633a2fb7b parent 0cddd6c258b2ed3798d12619c28ed0d2b5a669bc author Thomas Gleixner Tue, 23 May 2006 16:06:03 +0200 committer Thomas Gleixner Tue, 23 May 2006 16:06:03 +0200 [MTD] Remove nand writev support NAND writev(_ecc) support is not longer necessary. Remove it. Signed-off-by: Thomas Gleixner commit 0cddd6c258b2ed3798d12619c28ed0d2b5a669bc tree 83c6e0e55cd05a7a651701121f78140c21c22ce8 parent 9a57d470fd4a77b9732fee97bed29c565c730af0 author Thomas Gleixner Tue, 23 May 2006 15:59:58 +0200 committer Thomas Gleixner Tue, 23 May 2006 15:59:58 +0200 [MTD] ECC rework broke diskonchip Fix the diskonchip ecc setup. Signed-off-by: Thomas Gleixner commit 9a57d470fd4a77b9732fee97bed29c565c730af0 tree 1fa237ba77cbb94049254c27ca9536e2aecd8f5b parent 4cbb9b80e171107c6c34116283fe38e5a396c68b author Thomas Gleixner Tue, 23 May 2006 15:58:23 +0200 committer Thomas Gleixner Tue, 23 May 2006 15:58:23 +0200 [MTD] NAND ECC hwctl function has no return value Fix the broken prototype Signed-off-by: Thomas Gleixner commit 4cbb9b80e171107c6c34116283fe38e5a396c68b tree 9463f2e4774f14752cf4bb52431e14e569256f72 parent 6dfc6d250d0b7ebaa6423c44dcd09fcfe68deabd parent 9fe4854cd1f60273f9a3ece053f4789605f58a5e author Thomas Gleixner Tue, 23 May 2006 12:37:31 +0200 committer Thomas Gleixner Tue, 23 May 2006 12:37:31 +0200 Merge branch 'master' of /home/tglx/work/kernel/git/mtd-2.6/ Signed-off-by: Thomas Gleixner commit 6dfc6d250d0b7ebaa6423c44dcd09fcfe68deabd tree 2be25b1e302eca5984a8ad5ed3e5bde77bafaabb parent 7aa65bfd6793a56cc3bbce8436abbfea3a7bdd1f author Thomas Gleixner Tue, 23 May 2006 12:00:46 +0200 committer Thomas Gleixner Tue, 23 May 2006 12:00:46 +0200 [MTD] NAND modularize ECC First step of modularizing ECC support. - Move ECC related functionality into a seperate embedded data structure - Get rid of the hardware dependend constants to simplify new ECC models Signed-off-by: Thomas Gleixner commit 7aa65bfd6793a56cc3bbce8436abbfea3a7bdd1f tree 1f87d2645b888a838c0fac90da148170d4c8cd63 parent 58dd8f2bfdcad1b219a4a92a2aadd8ea8c819f79 author Thomas Gleixner Tue, 23 May 2006 11:54:38 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:54:38 +0200 [MTD] NAND cleanup nand_scan Seperate functionality out of nand_scan so the code is more readable. No functional change. First step of simplifying the nand driver. Signed-off-by: Thomas Gleixner commit 58dd8f2bfdcad1b219a4a92a2aadd8ea8c819f79 tree 8f98c9128a9e49ef181e06d6edda52f03210dc16 parent 2c0a2bed9276ebbec5794edc07f66e21e9a1735c author Thomas Gleixner Tue, 23 May 2006 11:52:35 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:52:35 +0200 [MTD] NAND consolidate data types The NAND driver used a mix of unsigned char, u_char amd uint8_t data types. Consolidate to uint8_t usage Signed-off-by: Thomas Gleixner commit 2c0a2bed9276ebbec5794edc07f66e21e9a1735c tree ad0fb96624fd92f270d9e5d1cbbff14ffd7921f0 parent dcb0932884b801290efd80fbc37630297b98181f author Thomas Gleixner Tue, 23 May 2006 11:50:56 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:50:56 +0200 [MTD] NAND whitespace and formatting cleanup Signed-off-by: Thomas Gleixner commit dcb0932884b801290efd80fbc37630297b98181f tree c6519feda290a963087958f1e196abec11866d49 parent ce4c61f184864991881ec789f7524f4b332eaafc author Thomas Gleixner Tue, 23 May 2006 11:49:14 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:49:14 +0200 [JFFS2] Simplify writebuffer handling The writev based write buffer implementation was far to complex as in most use cases the write buffer had to be handled anyway. Simplify the write buffer handling and use mtd->write instead. From extensive testing no performance impact has been noted. Signed-off-by: Thomas Gleixner commit ce4c61f184864991881ec789f7524f4b332eaafc tree 405bc1011d919c3b83f252c49a51f40e7d5de536 parent 41796c2ea9b74cdf3bc2c368193d15b8ae8950ca author Thomas Gleixner Tue, 23 May 2006 11:43:28 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:43:28 +0200 [MTD] Add support for NDFC NAND controller NDFC NAND Flash controller is embedded in PPC EP44x SoCs. Add platform driver based support. Signed-off-by: Thomas Gleixner commit 41796c2ea9b74cdf3bc2c368193d15b8ae8950ca tree d7a21961f93103536656b255f717d54989f9b144 parent a36ed2995c56d4f858ecb524a78837473e7115ae author Thomas Gleixner Tue, 23 May 2006 11:38:59 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:38:59 +0200 [MTD] Add platform support for NAND Add the data structures necessary to provide platform device support for NAND Signed-off-by: Thomas Gleixner commit a36ed2995c56d4f858ecb524a78837473e7115ae tree 510f31485713ae5be63a20fe29b3809f0fafbbb8 parent 819d6a32c397534c819d3c72a3947b7e7e4bec4b author Thomas Gleixner Tue, 23 May 2006 11:37:03 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:37:03 +0200 [MTD] Simplify NAND locking Replace the chip lock by a the controller lock. For simple drivers a dummy controller structure is created by the scan code. This simplifies the locking algorithm in nand_get/release_chip(). Signed-off-by: Thomas Gleixner commit 819d6a32c397534c819d3c72a3947b7e7e4bec4b tree e5c25ca9545014a4512102629d09b42438cb378d parent a1b563d652b54647ffacb2d6edf7859d3e97a723 author Thomas Gleixner Tue, 23 May 2006 11:32:45 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:32:45 +0200 [MTD] Improve software ECC calculation Unrolling the loops produces denser and much faster code. Add a config switch which allows to select the byte order of the resulting ecc code. The current Linux implementation has a byte swap versus the SmartMedia specification Signed-off-by: Thomas Gleixner commit 9fe4854cd1f60273f9a3ece053f4789605f58a5e tree 277ac17807a1596f78464641500ed35f3d47a32a parent 5fa433942ba4e399f7e28764c9db4ade89e91d40 author David Woodhouse Tue, 23 May 2006 00:38:06 +0100 committer David Woodhouse Tue, 23 May 2006 00:38:06 +0100 [JFFS2] Remove flash offset argument from various functions. We don't need the upper layers to deal with the physical offset. It's _always_ c->nextblock->offset + c->sector_size - c->nextblock->free_size so we might as well just let the actual write functions deal with that. Signed-off-by: David Woodhouse commit 5fa433942ba4e399f7e28764c9db4ade89e91d40 tree 29a2691729645bf27fd2d7d8d61a5c720c6569c1 parent c8b229de2b05c2b3e8d282ce260935a88ac030ca author Joern Engel Mon, 22 May 2006 23:18:29 +0200 committer Joern Engel Mon, 22 May 2006 23:18:29 +0200 [MTD] Introduce MTD_BIT_WRITEABLE o Add a flag MTD_BIT_WRITEABLE for devices that allow single bits to be cleared. o Replace MTD_PROGRAM_REGIONS with a cleared MTD_BIT_WRITEABLE flag for STMicro and Intel Sibley flashes with internal ECC. Those flashes disallow clearing of single bits, unlike regular NOR flashes, so the new flag models their behaviour better. o Remove MTD_ECC. After the STMicro/Sibley merge, this flag is only set and never checked. Signed-off-by: Joern Engel commit c8b229de2b05c2b3e8d282ce260935a88ac030ca tree 09391866a6a9740df2a178c7894557025c9dc2c8 parent 28318776a80bc3261f9af91ef79e6e38bb9f5bec author Joern Engel Mon, 22 May 2006 23:18:12 +0200 committer Joern Engel Mon, 22 May 2006 23:18:12 +0200 [MTD] Merge STMicro NOR_ECC code with Intel Sibley code In 2002, STMicro started producing NOR flashes with internal ECC protection for small blocks (8 or 16 bytes). Support for those flashes was added by me. In 2005, Intel Sibley flashes copied this strategy and Nico added support for those. Merge the code for both. Signed-off-by: Joern Engel commit 28318776a80bc3261f9af91ef79e6e38bb9f5bec tree 36ef9144accf19db9d51019aa479807e80aeb8fd parent 8ca9ed5db3aea8d27989c239e8a2f79b839f1e99 author Joern Engel Mon, 22 May 2006 23:18:05 +0200 committer Joern Engel Mon, 22 May 2006 23:18:05 +0200 [MTD] Introduce writesize At least two flashes exists that have the concept of a minimum write unit, similar to NAND pages, but no other NAND characteristics. Therefore, rename the minimum write unit to "writesize" for all flashes, including NAND. Signed-off-by: Joern Engel commit 8ca9ed5db3aea8d27989c239e8a2f79b839f1e99 tree 496ed4b78875ed19db0fad3bac8afaedae9d79d0 parent 987d47b71a85bd83dc40c870abee3b64f2002163 author Joern Engel Mon, 22 May 2006 23:17:23 +0200 committer Joern Engel Mon, 22 May 2006 23:17:23 +0200 [MTD] Use single flag to mark writeable devices. Two flags exist to decide whether a device is writeable or not. None of those two flags is checked for independently, so they are clearly redundant, if not an invitation to bugs. This patch removed both of them, replacing them with a single new flag. Signed-off-by: Joern Engel commit df8ccb9bf1ca360581a94c2245efb9fa613fbb29 tree 7b8649190804451fe8e13316d5aaa949afb513b6 parent 01d654d25d23fb73deb7904ce1c0b3a0f5fc2908 author Marcin Juszkiewicz Mon, 22 May 2006 10:56:55 +0200 committer John W. Linville Mon, 22 May 2006 14:51:33 -0400 [PATCH] hostap: new pcmcia IDs Add two Prism cards to hostap_cs driver. product info: "Pretec", "CompactWLAN Card 802.11b", "2.5" manfid: 0x0156, 0x0002 product info: "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02", "" manfid: 0x0156, 0x0002 Signed-off-by: Marcin Juszkiewicz Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 01d654d25d23fb73deb7904ce1c0b3a0f5fc2908 tree 625280bf6eae0141fe91844334168d51d7d89fca parent 3b38f317e529d8396377dafc7d95a1451a151df5 parent 82464e63a0653a4d8e5c684fcb41b163e6357c6d author John W. Linville Mon, 22 May 2006 14:45:29 -0400 committer John W. Linville Mon, 22 May 2006 14:45:29 -0400 Merge branch 'upstream-fixes' into upstream commit 82464e63a0653a4d8e5c684fcb41b163e6357c6d tree 6e6862df039c1118caecc5c669a53ffded38381e parent 353b28bafd1b962359a866ff263a7fad833d29a1 author Florin Malita Sun, 21 May 2006 14:04:44 -0700 committer John W. Linville Mon, 22 May 2006 14:39:04 -0400 [PATCH] orinoco: possible null pointer dereference in orinoco_rx_monitor() If the skb allocation fails, the current error path calls dev_kfree_skb_irq() with a NULL argument. Also, 'err' is not being used. Coverity CID: 275. Signed-off-by: Florin Malita Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 3b38f317e529d8396377dafc7d95a1451a151df5 tree 65e80799417c456bdd907b7d80182732be02e5f4 parent 5d25ea7c0c77cbdba1b5f092d60d624e24dfa938 parent 353b28bafd1b962359a866ff263a7fad833d29a1 author John W. Linville Mon, 22 May 2006 14:26:25 -0400 committer John W. Linville Mon, 22 May 2006 14:26:25 -0400 Merge branch 'from-linus' into upstream commit 987d47b71a85bd83dc40c870abee3b64f2002163 tree ecb840640cb1f7309b26d2c9a332bee5d0db6df9 parent 0eac940b8a087576c66ecf8e0f294f2ceb3b607b author David Woodhouse Mon, 22 May 2006 16:32:05 +0100 committer David Woodhouse Mon, 22 May 2006 16:32:05 +0100 [JFFS2] Put list of nodes in common part of ic/x_ref/x_datum structure We'll be using a proper list of nodes in the jffs2_xattr_datum and jffs2_xattr_ref structures, because the existing code to overwrite them is just broken. Put it in the common part at the front of the structure which is shared with the jffs2_inode_cache, so that the jffs2_link_node_ref() function can do the right thing. Signed-off-by: David Woodhouse commit 0eac940b8a087576c66ecf8e0f294f2ceb3b607b tree a21f5376f5fec2c21fe23e90e3317f1a1c48cc3e parent fcb7578719529898aef9edce8e409e457a1c2d15 author David Woodhouse Mon, 22 May 2006 16:29:23 +0100 committer David Woodhouse Mon, 22 May 2006 16:29:23 +0100 [JFFS2] Add some preemptive BUG checks for XATTR code In a couple of places, we assume that what's at the end of the ->next_in_ino list is a struct jffs2_inode_cache. Let's check for that, since we expect it to change soon. Signed-off-by: David Woodhouse commit fcb7578719529898aef9edce8e409e457a1c2d15 tree 58022b22d175b69e4b267f2f19ab26d93f7d4910 parent a1b563d652b54647ffacb2d6edf7859d3e97a723 author David Woodhouse Mon, 22 May 2006 15:23:10 +0100 committer David Woodhouse Mon, 22 May 2006 15:23:10 +0100 [JFFS2] Extend jffs2_link_node_ref() to link into per-inode list too. Let's avoid the potential for forgetting to set ref->next_in_ino, by doing it within jffs2_link_node_ref() instead. This highlights the ugliness of what we're currently doing with xattr_datum and xattr_ref structures -- we should find a nicer way of dealing with that. Signed-off-by: David Woodhouse commit a1b563d652b54647ffacb2d6edf7859d3e97a723 tree 94f706c3070acee9d5b246846b8d748dfcb4cc06 parent 3b79673cfae93d0ed63eceb058bb26aba602a278 author David Woodhouse Mon, 22 May 2006 13:55:46 +0100 committer David Woodhouse Mon, 22 May 2006 13:55:46 +0100 [JFFS2] Initialise ref->next_in_ino when marking dirty space in wbuf flush Signed-off-by: David Woodhouse commit 3b79673cfae93d0ed63eceb058bb26aba602a278 tree 2639f8783e4f3023f883e00de16f62a1a39a8c90 parent 06c6764b5830798c39617b24497cade90451592f author David Woodhouse Mon, 22 May 2006 12:15:47 +0100 committer David Woodhouse Mon, 22 May 2006 12:15:47 +0100 [JFFS2] Fix accounting error in jffs2_link_node_ref() When filing REF_OBSOLETE nodes, we'd add their size to the global 'dirty_size' count, but then to the eraseblock's 'used_size' count. That's not clever. Signed-off-by: David Woodhouse commit 06c6764b5830798c39617b24497cade90451592f tree 802411eb1bf64d600aa5b63ca3cb8cd9c969cf7a parent 0d25971d7c969debf76f9fab6d6b37cb62408f55 author David Woodhouse Mon, 22 May 2006 11:27:14 +0100 committer David Woodhouse Mon, 22 May 2006 11:27:14 +0100 [JFFS2] Fix dummy jffs2_sum_scan_sumnode() macro for !SUMMARY case. I added an argument to the real function... Signed-off-by: David Woodhouse commit 2c23d62abb820e19c54012520f08a198c2233a85 tree 1b7646fe81694041f7e364d2a15644ad56b7063b parent 3ac6c7b44560fdf2ea8865536bd52d4ff038107e author David Woodhouse Sun, 21 May 2006 22:51:13 +0100 committer David Woodhouse Sun, 21 May 2006 22:51:13 +0100 Move inclusion of out of user scope in asm-x86_64/mtrr.h Signed-off-by: David Woodhouse commit 0d25971d7c969debf76f9fab6d6b37cb62408f55 tree 89e6b432d4e8c84d59b4738e5bc1c47a2402adf2 parent 615191bb1dfc6980e7c7a85225444d860d74b343 parent ca89a517fa577e6f26621463d3aa4f3c3d530b1e author David Woodhouse Sun, 21 May 2006 19:05:55 +0100 committer David Woodhouse Sun, 21 May 2006 19:05:55 +0100 Merge git://git.infradead.org/jffs2-devel-2.6 commit 615191bb1dfc6980e7c7a85225444d860d74b343 tree b1cd002e1bd6818cf1f9aac290084e0462ca6376 parent ecde26313076e5055dcd54d6537632275346203f author David Woodhouse Sun, 21 May 2006 19:03:21 +0100 committer David Woodhouse Sun, 21 May 2006 19:03:21 +0100 [MTD] Account for MODULE_SYMBOL_PREFIX when requesting NOR chip driver Signed-off-by: David Woodhouse commit ecde26313076e5055dcd54d6537632275346203f tree c6b0f54717bd50efaf984ec88156b94af859a366 parent 3d12c0c75db0cd85beb11c4e2d86a49cabe3cfff author David Woodhouse Sun, 21 May 2006 18:38:51 +0100 committer David Woodhouse Sun, 21 May 2006 18:38:51 +0100 [MTD] Use symbol_request() in old DiskOnChip probe code to find actual driver The previous code wouldn't work correctly on architectures which have a non-empty MODULE_SYMBOL_PREFIX, and this version is neater if slightly less optimal in the built-in case. Signed-off-by: David Woodhouse commit 3d12c0c75db0cd85beb11c4e2d86a49cabe3cfff tree 5ca5abdf22e5b9887ea3665fd14c9a91c7c77d0b parent 6c8b44abc86a3e23dd1a22c0ee187f06bd7c7f5d author Jonathan McDowell Sun, 21 May 2006 18:11:55 +0100 committer David Woodhouse Sun, 21 May 2006 18:11:55 +0100 [MTD] Add Amstrad Delta NAND support The patch below adds support for the NAND device on the Amstrad Delta. This is a 32MiB 8bit Toshiba device, with the data bus connected to the OMAP MPUIO pins and ALE, CLE, NCE, NRE, NWE and NWP all connected to the Delta's latch2 16bit latch. Signed-Off-By: Jonathan McDowell Signed-off-by: David Woodhouse commit ca89a517fa577e6f26621463d3aa4f3c3d530b1e tree e277f31d6629c5dcc358adfa80190fc247d43f65 parent 010b06d6d07d9fa5ea6070aa72bb3e0de1761ab7 author David Woodhouse Sun, 21 May 2006 13:29:11 +0100 committer David Woodhouse Sun, 21 May 2006 13:29:11 +0100 [JFFS2] Finally eliminate __totlen field from struct jffs2_raw_node_ref Well, almost. We'll actually keep a 'TEST_TOTLEN' macro set for now, and keep doing some paranoia checks to make sure it's all working correctly. But if TEST_TOTLEN is unset, the size of struct jffs2_raw_node_ref drops from 16 bytes to 12 on 32-bit machines. That's a saving of about half a megabyte of memory on the OLPC prototype board, with 125K or so nodes in its 512MiB of flash. Signed-off-by: David Woodhouse commit 010b06d6d07d9fa5ea6070aa72bb3e0de1761ab7 tree 96c6ceddfec1aa6ddcdd0efcb39f903b284203c2 parent 9167e0f811cbe28564c44a99c2f07b0ce5b368cf author David Woodhouse Sun, 21 May 2006 13:15:59 +0100 committer David Woodhouse Sun, 21 May 2006 13:15:59 +0100 [JFFS2] Locking issues in summary write code. We can't use jffs2_scan_dirty_space() because it doesn't do any locking; it's only for use at scan time -- hence the 'scan' in the name. Also, don't allocate refs while we have c->erase_completion_lock held. Signed-off-by: David Woodhouse commit 9167e0f811cbe28564c44a99c2f07b0ce5b368cf tree ed98ccdf3b268bc577d6eefb0a76a87da8aa2496 parent 0bcc099d6d1a7b9fa2adf7c19812e4e816915e10 author David Woodhouse Sun, 21 May 2006 13:13:45 +0100 committer David Woodhouse Sun, 21 May 2006 13:13:45 +0100 [JFFS2] Remove stray kfree of summary info in XATTR code. We don't allocate this locally any more -- it's given to us and owner by our caller. Also improve the debug messages a little. Signed-off-by: David Woodhouse commit 0bcc099d6d1a7b9fa2adf7c19812e4e816915e10 tree 36f4c8c9c50369577b0b65823c04fcfb85502d98 parent b64335f2b740d6f5dbf5d3b04af30d407bf599f5 author David Woodhouse Sun, 21 May 2006 13:00:54 +0100 committer David Woodhouse Sun, 21 May 2006 13:00:54 +0100 [JFFS2] File node reference for wasted space when flushing wbuf Next step in ongoing campaign to file a struct jffs2_raw_node_ref for every piece of dirty space in the system, so that __totlen can be killed off.... Signed-off-by: David Woodhouse commit b64335f2b740d6f5dbf5d3b04af30d407bf599f5 tree 442e85ebc977f8d01bf9c1fe6dfbe898788422c5 parent 49f11d40751b974f3b829f208eefa6f97a10cac8 author David Woodhouse Sun, 21 May 2006 04:36:45 +0100 committer David Woodhouse Sun, 21 May 2006 04:36:45 +0100 [JFFS2] Add length argument to jffs2_add_physical_node_ref() If __totlen is going away, we need to pass the length in separately. Also stop callers from needlessly setting ref->next_phys to NULL, since that's done for them... and since that'll also be going away soon. Signed-off-by: David Woodhouse commit 49f11d40751b974f3b829f208eefa6f97a10cac8 tree 3a08ec1f7f94e6fc81754a40ef4dfcaf0c489d11 parent 25090a6b23906552cf3d204aa421f811327e1b15 author David Woodhouse Sun, 21 May 2006 04:00:01 +0100 committer David Woodhouse Sun, 21 May 2006 04:00:01 +0100 [JFFS2] Mark gaps in summary list as dirty space Make sure we allocate a ref for any dirty space which exists between nodes which we find in an eraseblock summary. Signed-off-by: David Woodhouse commit 25090a6b23906552cf3d204aa421f811327e1b15 tree fba39a988d6d5048b5ca445364b5f13ea415078d parent 68270995f29f1a82b3eaab01df63ea7e721e2fa6 author David Woodhouse Sun, 21 May 2006 03:57:56 +0100 committer David Woodhouse Sun, 21 May 2006 03:57:56 +0100 [JFFS2] Discard remaining free space when filing a dirty block in scan. The incoming ref_totlen() calculation is going to rely on the existence of nodes which cover all dirty space. We can't just tweak the accounting data any more; we have to call jffs2_scan_dirty_space() to do it. Signed-off-by: David Woodhouse commit 68270995f29f1a82b3eaab01df63ea7e721e2fa6 tree 44388152f209c9f8f0df8eec33efaaca7817ec6d parent 7807ef7ba2a41c05f6197381f572dd38baa6c1ce author David Woodhouse Sun, 21 May 2006 03:46:05 +0100 committer David Woodhouse Sun, 21 May 2006 03:46:05 +0100 [JFFS2] Introduce jffs2_scan_dirty_space() function. To eliminate the __totlen field from struct jffs2_raw_node_ref, we need to allocate nodes for dirty space instead of just tweaking the accounting data. Introduce jffs2_scan_dirty_space() in preparation for that. Signed-off-by: David Woodhouse commit 7807ef7ba2a41c05f6197381f572dd38baa6c1ce tree 73d06f8b60b3e007b49fec33983365938135d2d1 parent 3560160aa26ebced1944aaa2e7e436d2a1b1bf70 author David Woodhouse Sun, 21 May 2006 03:45:27 +0100 committer David Woodhouse Sun, 21 May 2006 03:45:27 +0100 [JFFS2] Fix summary handling of unknown but compatible nodes. For RWCOMPAT and ROCOMPAT nodes, we should still allow the mount to succeed. Just abandon the summary and fall through to the full scan. Signed-off-by: David Woodhouse commit 3560160aa26ebced1944aaa2e7e436d2a1b1bf70 tree ee0bb33931cef644b1e5f6794e6bed833f33d42c parent 6171586a7ae5198988774e8480631e8d15f65dfe author David Woodhouse Sun, 21 May 2006 01:28:05 +0100 committer David Woodhouse Sun, 21 May 2006 01:28:05 +0100 [JFFS2] Fix memory leak in scan code; improve comments. If we had to allocate extra space for the summary node, we weren't correctly freeing it when jffs2_sum_scan_sumnode() returned nonzero -- which is both the success and the failure case. Only when it returned zero, which means fall through to the full scan, were we correctly freeing the buffer. Document the meaning of those return codes while we're at it. Signed-off-by: David Woodhouse commit 6171586a7ae5198988774e8480631e8d15f65dfe tree eef74bde60005c4e39c0c213030b27cb07a5c236 parent fb9fbbcc9389edabb172ac1b6419c01e32046787 author David Woodhouse Sun, 21 May 2006 00:02:06 +0100 committer David Woodhouse Sun, 21 May 2006 00:02:06 +0100 [JFFS2] Correct handling of JFFS2_FEATURE_RWCOMPAT_COPY nodes. We should preserve these when we come to garbage collect them, not let them get erased. Use jffs2_garbage_collect_pristine() for this, and make sure the summary code copes -- just refrain from writing a summary for any block which contains a node we don't understand. Signed-off-by: David Woodhouse commit fb9fbbcc9389edabb172ac1b6419c01e32046787 tree 9e5dd2385010324a00edbf6d5c8c8a8565970a9d parent f1f9671bd8f7d2ac6a918bad806ab5bdc0daaf4e author David Woodhouse Sat, 20 May 2006 20:08:42 +0100 committer David Woodhouse Sat, 20 May 2006 20:08:42 +0100 [JFFS2] Correct accounting of erroneous cleanmarkers and failed summaries. It should all be counted as dirty space, not wasted and _definitely_ not unchecked. Signed-off-by: David Woodhouse commit f1f9671bd8f7d2ac6a918bad806ab5bdc0daaf4e tree f1fb5992fbd299375c911eb4c36d7fc8774f9208 parent 0cfc7da3ff4b39a3aac261ab3f6b1329e2485653 author David Woodhouse Sat, 20 May 2006 19:45:26 +0100 committer David Woodhouse Sat, 20 May 2006 19:45:26 +0100 [JFFS2] Introduce jffs2_link_node_ref() function to reduce code duplication The same sequence of code was repeated in many places, to add a new struct jffs2_raw_node_ref to an eraseblock and adjust the space accounting accordingly. Move it out-of-line. Signed-off-by: David Woodhouse commit 0cfc7da3ff4b39a3aac261ab3f6b1329e2485653 tree 447073fe757b42e6da63b96a26cbbc6b4c705946 parent 1417fc44ee923418df3adadeb4846c891bba1ba5 parent 20a92fc74c5c91c7bc5693d51acc2b99aceb0465 author David Woodhouse Sat, 20 May 2006 17:27:32 +0100 committer David Woodhouse Sat, 20 May 2006 17:27:32 +0100 Merge git://git.infradead.org/jffs2-xattr-2.6 Signed-off-by: David Woodhouse commit 1417fc44ee923418df3adadeb4846c891bba1ba5 tree 07e58ced7665ec94dad951175795ed3cbf11513c parent 9641b784ff82cf0a48a6c70ef9867f5fd728de67 author David Woodhouse Sat, 20 May 2006 16:20:19 +0100 committer David Woodhouse Sat, 20 May 2006 16:20:19 +0100 [JFFS2] Reduce calls to ref_totlen() in jffs2_mark_node_obsolete() We were calling ref_totlen() 18 times. Even before that becomes a real function rather than just a dereference, apparently some compilers still suck anyway. It'll _certainly_ suck after ref_totlen() becomes more complicated, so calculate it once and don't rely on CSE. Signed-off-by: David Woodhouse commit 9641b784ff82cf0a48a6c70ef9867f5fd728de67 tree 40d7bbc06ee5e54560ea7e7dabe75ac01a72e00c parent 6c8b44abc86a3e23dd1a22c0ee187f06bd7c7f5d author David Woodhouse Sat, 20 May 2006 16:13:34 +0100 committer David Woodhouse Sat, 20 May 2006 16:13:34 +0100 [JFFS2] Optimise reading of eraseblock summary nodes This improves the time to mount 512MiB of NAND flash on my OLPC prototype by about 4%. We used to read the last page of the eraseblock twice -- once to find the offset of the summary node, and again to actually _read_ the summary node. Now we read the last page only once, and read more only if we need to. We also don't allocate a new buffer just for the summary code -- we use the buffer which was already allocated for the scan. Better still, if the 'buffer' for the scan is actually just a pointer directly into NOR flash, we use that too, avoiding the memcpy() which we used to do. Signed-off-by: David Woodhouse commit 979dca3826841e5dc9170c28f20bd75ece266a9a tree 1cfeb1d2b47314a50d2e2e567e89cdbfa69f8162 parent 818bf493525d2a0ce3ddaefb2b78db1635596666 author Randy Dunlap Fri, 19 May 2006 11:55:58 -0700 committer James Bottomley Sat, 20 May 2006 09:56:15 -0500 [SCSI] imm: no need for unchecked_isa_dma Relax the lowmem bounce buffer requirement for imm so that any low memory page will do -- they don't need to be below the ISA 16 MB limit, just need to be mapped in low memory. Signed-off-by: Randy Dunlap Signed-off-by: James Bottomley commit 818bf493525d2a0ce3ddaefb2b78db1635596666 tree fa722a10a1cd358205fd6313b75830e2df24b59e parent 21333b481159a78b5379b8ddb400efafd5857d55 author Andrew Vasquez Wed, 17 May 2006 15:10:01 -0700 committer James Bottomley Sat, 20 May 2006 09:50:47 -0500 [SCSI] qla2xxx: Update version number to 8.01.05-k2. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 21333b481159a78b5379b8ddb400efafd5857d55 tree 5d92f1f7b363f62f9b469fb1ba0764d3c72f13ea parent d4e3e04d789ba23027c66e176b10ac7477906948 author Andrew Vasquez Wed, 17 May 2006 15:09:56 -0700 committer James Bottomley Sat, 20 May 2006 09:50:29 -0500 [SCSI] qla2xxx: Correct issue where driver improperly issued SNS commands in N2N topologies. Semantic changes in ISP24xx firmware behaviour inadvertently caused the driver to believe an F-port topology was present in an N_port-to-N_port configuration. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit d4e3e04d789ba23027c66e176b10ac7477906948 tree e98c514c2b3505af6f0c0a2e48f697899735ff15 parent cb63067a772c0149184309a1f232d62c81a93673 author Andrew Vasquez Wed, 17 May 2006 15:09:50 -0700 committer James Bottomley Sat, 20 May 2006 09:50:11 -0500 [SCSI] qla2xxx: Consolidate firmware-dump handling across ISPs. Simplify and centralise buffer allocation/deallocation, as there's no point in having two memory request methods. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit cb63067a772c0149184309a1f232d62c81a93673 tree a42a6561416022e0d5275369c52f7fba10103552 parent 47f5e069e4d03dda36e3a13f3e20147efd710340 author Andrew Vasquez Wed, 17 May 2006 15:09:45 -0700 committer James Bottomley Sat, 20 May 2006 09:49:53 -0500 [SCSI] qla2xxx: Consolidate "qla2xxx" string usage to a #define. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 47f5e069e4d03dda36e3a13f3e20147efd710340 tree a9816facb46a919754751edb675c73089e2ff2b5 parent 441d1072040823feb4950a21094860bfddd310c0 author Andrew Vasquez Wed, 17 May 2006 15:09:39 -0700 committer James Bottomley Sat, 20 May 2006 09:49:37 -0500 [SCSI] qla2xxx: Use PCI_DEVICE() for pci_device_id definition. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 441d1072040823feb4950a21094860bfddd310c0 tree 590e90b78af52ab69530cec945f980d7290b844e parent 4971cd221ad3f1266b87aa0e996d082d91bac2a6 author Andrew Vasquez Wed, 17 May 2006 15:09:34 -0700 committer James Bottomley Sat, 20 May 2006 09:49:13 -0500 [SCSI] qla2xxx: Remove obsolete firmware-loader-module support. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 4971cd221ad3f1266b87aa0e996d082d91bac2a6 tree d4fc40793c825ecdb788533efc2d1376fa51b03f parent 75bc4190701d3c6bdffdc21c8a9e17751de9f77a author Andrew Vasquez Wed, 17 May 2006 15:09:27 -0700 committer James Bottomley Sat, 20 May 2006 09:43:44 -0500 [SCSI] qla2xxx: Remove unused port-type RSCN handling code. Expandind on the previous commit: commit 79f89a4296ff22f09baf538d4ff2a6d0c3097a73 Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:05:58 2006 -0800 [SCSI] qla2xxx: Disable port-type RSCN handling via driver state-machine. and given: - the process-context requirements of the FC transport rport-APIs. - lack of port-type RSCN processing logic for ISP24xx and newer chips. it's time now to remove the state-machine logic from mainline. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 75bc4190701d3c6bdffdc21c8a9e17751de9f77a tree 3d0567fcf95bab224f8a75759f593619a0a2f28a parent 5341e868fb2e98090a68860a35bf4c11d7f8e5da author Andrew Vasquez Wed, 17 May 2006 15:09:22 -0700 committer James Bottomley Sat, 20 May 2006 09:43:22 -0500 [SCSI] qla2xxx: Drop unused driver cruft. - structure definitions. - structure members. - #define's. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 5341e868fb2e98090a68860a35bf4c11d7f8e5da tree db31c8e430368bb7198c6c673c2c7c89e3b862bc parent fd0e7e4dd507cd21d714d34a1cc1a620d01e9772 author Andrew Vasquez Wed, 17 May 2006 15:09:16 -0700 committer James Bottomley Sat, 20 May 2006 09:42:43 -0500 [SCSI] qla2xxx: Add support for alternate WWN NVRAM setting. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit fd0e7e4dd507cd21d714d34a1cc1a620d01e9772 tree 3f405e581dda39cfa8b4ca87a8e5795e4312c378 parent ffb39f0324b56bacaabac26133143cf861d0e9f9 author Andrew Vasquez Wed, 17 May 2006 15:09:11 -0700 committer James Bottomley Sat, 20 May 2006 09:42:18 -0500 [SCSI] qla2xxx: Correct endianess comparisons during ISP24xx NVRAM configuration. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit ffb39f0324b56bacaabac26133143cf861d0e9f9 tree 3c4f1fd64e5199565637ff40b01228d3ec82a2fd parent d1c61909c05ead100f855e640fba53925d0665ac author Andrew Vasquez Wed, 17 May 2006 15:09:06 -0700 committer James Bottomley Sat, 20 May 2006 09:41:56 -0500 [SCSI] qla2xxx: ABBA lock ordering fix. In qla2x00_reset_chip the driver first takes the hardware lock, and then later on takes the mbx lock. In the mailbox_command code.. it goes the other way around. Discovered with the lock validator. Cc: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit d1c61909c05ead100f855e640fba53925d0665ac tree 2fc533e6e77a7bf2814bff98edb66990fc97a211 parent ed17c71b5d11327efd40666fd621486f964fae4f author Andrew Vasquez Wed, 17 May 2006 15:09:00 -0700 committer James Bottomley Sat, 20 May 2006 09:41:31 -0500 [SCSI] qla2xxx: Update ISP24xx firwmare loading heuristics. If firmware image is unavailable via request_firwmare(), then attempt to load the image (likely out-of-date) stored in flash memory. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit ed17c71b5d11327efd40666fd621486f964fae4f tree 63fa5ae594acb8a66361ead95f43001fd0630945 parent 45aeaf1e8e4552ef82d3ff7a06e526e6d635f767 author Ravi Anand Wed, 17 May 2006 15:08:55 -0700 committer James Bottomley Sat, 20 May 2006 09:41:02 -0500 [SCSI] qla2xxx: Use FW calculated residual count for underrun handling. With ISP24XX and ISP54XX parts. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 45aeaf1e8e4552ef82d3ff7a06e526e6d635f767 tree 10001713a5e9ae01cccbad02ad61d55307a97acd parent 57680080baf3a8e289fad7f9e3c43ed58309e1eb author Ravi Anand Wed, 17 May 2006 15:08:49 -0700 committer James Bottomley Sat, 20 May 2006 09:40:41 -0500 [SCSI] qla2xxx: Add support for new flash part. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 57680080baf3a8e289fad7f9e3c43ed58309e1eb tree 6c94db89570d765cdbbc86b453a005c70b98082d parent e0ecae8da26d94dd878ff1d939c5aa4224df18a4 author Ravi Anand Wed, 17 May 2006 15:08:44 -0700 committer James Bottomley Sat, 20 May 2006 09:40:21 -0500 [SCSI] qla2xxx: Don't wait for loop transition to complete if LOOP_DEAD state is attained. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit e0ecae8da26d94dd878ff1d939c5aa4224df18a4 tree e03fe5b9319ccac73a94ce23fe5d6f005e618495 parent 656cffc95f0cb8211aa75eaca249e6ff4f59ec83 author Mike Christie Thu, 18 May 2006 20:31:43 -0500 committer James Bottomley Sat, 20 May 2006 09:36:38 -0500 [SCSI] iscsi: update version update version Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 656cffc95f0cb8211aa75eaca249e6ff4f59ec83 tree 7b10e224ef3ac140570101ed98c918949863995b parent 790f39a2d5f03623b027f340b945f135d006ceba author Mike Christie Thu, 18 May 2006 20:31:42 -0500 committer James Bottomley Sat, 20 May 2006 09:36:17 -0500 [SCSI] iscsi: fix command requeues during iscsi recovery Do not flush queues then block session. This will cause commands to needlessly swing around on us and remove goofy recovery_failed field and replace with state value. And do not start recovery from within the host reset function. This causeis too many problems becuase open-iscsi was desinged to call out to userspace then have userpscae decide if we should go into recovery or kill the session. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 790f39a2d5f03623b027f340b945f135d006ceba tree 5a591a6c7952d758d0f9a8d7874020cc3d4f8571 parent ffbfe92533810bf1bb76fd275400825ef8898ed9 author Mike Christie Thu, 18 May 2006 20:31:39 -0500 committer James Bottomley Sat, 20 May 2006 09:35:51 -0500 [SCSI] iscsi: support mutiple daemons Patch from david.somayajulu@qlogic.com and cleaned up by Tomo. qla4xxx is going to have a different daemon so this patch just routes the events to the right daemon. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit ffbfe92533810bf1bb76fd275400825ef8898ed9 tree dbb251eaf0196df7b69d8af76a03cba0e1d9ad18 parent d36ab6f3212053b260214bc915687765e2fd1178 author Mike Christie Thu, 18 May 2006 20:31:36 -0500 committer James Bottomley Sat, 20 May 2006 09:35:20 -0500 [SCSI] iscsi: kill dtask mempools Discovered by steven@hayter.me.uk and patch by michaelc@cs.wisc.edu The dtask mempool is reserving 261120 items per session! Since we are now sending headers with sendmsg there is no reason for the mempool and that was causing us to us carzy amounts of mem. We can preallicate a header in the r2t and task struct and reuse them Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit d36ab6f3212053b260214bc915687765e2fd1178 tree b06957a99c8094ba45de16498b623d2eae5db543 parent 6e458cc943dd494ac68b570418f187883e555362 author Mike Christie Thu, 18 May 2006 20:31:34 -0500 committer James Bottomley Sat, 20 May 2006 09:34:54 -0500 [SCSI] iscsi: only preallocate login buffer We only use the mtask data buffer for login tasks so we do not need to preallocate a buffer for every mtask. This saves 8 * 31 KB. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 6e458cc943dd494ac68b570418f187883e555362 tree 11519c1b451bfb54a1dcf0a003dfe183c9c34fd7 parent 07fb75a50600c0c480b40c6d11dbc993f21bc2bc author Mike Christie Thu, 18 May 2006 20:31:31 -0500 committer James Bottomley Sat, 20 May 2006 09:34:21 -0500 [SCSI] iscsi: dont use sendpage for iscsi headers From Zhen and ported by Mike: Don't use sendpage for the headers. sendpage for the pdu headers does not seem to have a performance impact, makes life harder for mutiple data pdus to be in flight and still trips up some network cards when it is from slab mem. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 07fb75a50600c0c480b40c6d11dbc993f21bc2bc tree 9012c689500d33f576c99f00235f44901c86a6cc parent 5b9851b5511833a96fea2196971b5709ef019136 author Jesper Juhl Sun, 14 May 2006 00:39:38 +0200 committer James Bottomley Sat, 20 May 2006 09:23:23 -0500 [SCSI] fix (unlikely) memory leak in DAC960 driver The Coverity checker found a memory leak (bug nr. 1245) in drivers/block/DAC960.c::DAC960_V2_ProcessCompletedCommand() The leak is pretty unlikely since it requires that the first of two successive kmalloc() calls fail while the second one succeeds. But it can still happen even if it's unlikely. If the first call that allocates 'PhysicalDeviceInfo' fails but the one that allocates 'InquiryUnitSerialNumber' succeeds, then we will leak the memory allocated to 'InquiryUnitSerialNumber' when the variable goes out of scope. A simple fix for this is to change the existing code that frees 'PhysicalDeviceInfo' if that one was allocated but 'InquiryUnitSerialNumber' was not, into a check for either pointer being NULL and if so just free both. This is safe since kfree() can deal with being passed a NULL pointer and it avoids the leak. While I was there I also removed the casts of the kmalloc() return value since it's pointless. I also updated the driver version since this patch changes the workings of the code (however slightly). This issue could probably be fixed a lot more elegantly, but the code is a big mess IMHO and I just took the least intrusive route to a fix that I could find instead of starting on a cleanup as well (that can come later). Please consider for inclusion. Signed-off-by: Jesper Juhl Signed-off-by: James Bottomley commit 5b9851b5511833a96fea2196971b5709ef019136 tree fd87212b1f9efb9db1f8bea67e6b3c204e1ac955 parent df3b7668715f9acfe6ff37dd886f68e46ccd677e author Mark Haverkamp Wed, 10 May 2006 09:13:37 -0700 committer James Bottomley Sat, 20 May 2006 09:23:02 -0500 [SCSI] aacraid: remove unneeded list Received From Mark Salyzyn The queue tracking is just not being used, not even for debugging. Information about outstanding commands can be acquired from the scsi structures. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit df3b7668715f9acfe6ff37dd886f68e46ccd677e tree e789432027f8b11775f9f55e9f1f6d64df1fe2c1 parent 404d9a900b5bc83a3780ec337ca6fdcb04b766c0 author Mark Haverkamp Wed, 10 May 2006 09:13:11 -0700 committer James Bottomley Sat, 20 May 2006 09:22:44 -0500 [SCSI] aacraid: sa race condition fix Received From Mark Salyzyn A race condition existed that could result in a lost completion of a command to the ppc based cards. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 404d9a900b5bc83a3780ec337ca6fdcb04b766c0 tree cb43521e7ddd2e20cae26ed8b70ea77dab9bae79 parent 3c1e0cca9469bd19590ade25f6d9f94da2710d5b author Mark Haverkamp Wed, 10 May 2006 09:12:48 -0700 committer James Bottomley Sat, 20 May 2006 09:22:25 -0500 [SCSI] aacraid: adjustable timeouts Received From Mark Salyzyn Add the ability to adjust for unusual corner case failures. Both of these additional module parameters deal with embedded, non-intel or complicated system scenarios. Aif_timeout can be increased past the default 2 minute timeout to drop application registrations when a system has an unusually high event load resulting from continuing management requests, or simultaneous builds, or sluggish user space as a result of system load. Startup_timeout can be increased past the default 3 minute timeout to drop an adapter initialization for systems that have a very large number of targets, or slow to spin-up targets, or a complicated set of array configurations that extend the time for the firmware to declare that it is operational. This timeout would only have an affect on non-intel based systems, as the (more patient) BIOS would generally be where the startup delay would be dealt with. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 3c1e0cca9469bd19590ade25f6d9f94da2710d5b tree bdfab89960048e1df4a2b6978cf1cd1a188dc5a2 parent edb527ce35b0c86e72ed518af255f02e1cecb3b7 author Mark Haverkamp Wed, 10 May 2006 09:12:05 -0700 committer James Bottomley Sat, 20 May 2006 09:21:57 -0500 [SCSI] aacraid: optimize sg alloc Received From Mark Salyzyn Slight space and speed efficiency improvement. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit edb527ce35b0c86e72ed518af255f02e1cecb3b7 tree c53500fe591727d5f2f81c7c38a47c389472ec83 parent 2ca48a132167f9f12efba179382979aafde0ab36 author Mark Haverkamp Wed, 10 May 2006 09:11:38 -0700 committer James Bottomley Sat, 20 May 2006 09:21:36 -0500 [SCSI] aacraid: remove unneeded locking Received From Mark Salyzyn Since new commands to the card are quiesced, respect the changes in the SCSI error path which dropped locking around the hba reset handler and similarly drop the lock requirement in the driver's path. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 6c8b44abc86a3e23dd1a22c0ee187f06bd7c7f5d tree 8b40f20e9c0dda7a52a39a14d131684d3549a3d3 parent 5fc3dbc418e01345e25e96b3192a1c46051c3fdc author Andrew Morton Sat, 20 May 2006 10:17:21 +0100 committer David Woodhouse Sat, 20 May 2006 10:17:21 +0100 [MTD] Avoid 64-bit division in mtdconcat WARNING: "__moddi3" [drivers/mtd/mtdconcat.ko] undefined! Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit b74ba22f030eb7ab88f7d8954ad18ecc0ac5ce3c tree 7d707a8352a678491ae45b88e86fa25e5b24f9f1 parent f8bbfc247efb0e5fa69094614380768ce79afe17 author Thomas Glanzmann Fri, 12 May 2006 10:00:41 +0200 committer Jeff Garzik Sat, 20 May 2006 00:43:03 -0400 [PATCH] Add PCI ID for the Intel IDE Controller which is in the Intel Mac Minis shipped in first quarter 2006 Signed-off-by: Thomas Glanzmann Signed-off-by: Jeff Garzik commit f8bbfc247efb0e5fa69094614380768ce79afe17 tree 726b8eb9d41b5f7036c987b80282b90440a295ed parent a20f33ffde8ba5fb27666aa1e228a45b7e3b8dcb author Tejun Heo Fri, 19 May 2006 21:07:05 +0900 committer Jeff Garzik Sat, 20 May 2006 00:39:08 -0400 [PATCH] SCSI: make scsi_implement_eh() generic API for SCSI transports libata implemented a feature to schedule EH without an associated EH by manipulating shost->host_eh_scheduled in ata_scsi_schedule_eh() directly. Move this function to scsi_error.c and rename it to scsi_schedule_eh(). It is now an exported API for SCSI transports and exported via new header file drivers/scsi/scsi_transport_api.h This patch also de-export scsi_eh_wakeup() which was exported specifically for ata_scsi_schedule_eh(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit a20f33ffde8ba5fb27666aa1e228a45b7e3b8dcb tree 850a2717f3861470a0020272f98416e17d36e5bf parent eec4c3f317991dc85c786ffccd9c1a8620c41b18 author Tejun Heo Tue, 16 May 2006 12:58:24 +0900 committer Jeff Garzik Sat, 20 May 2006 00:39:08 -0400 [PATCH] libata: enforce default EH actions LLDDs rely on libata that certain EH actions are automatically taken on some errors. If the port is frozen or one or more qc's have failed with HSM violation or timeout, softreset is enforced (LLDD can ask for storonger EH action at will). If any other error condition exists, libata EH always revalidates. This behavior existed in earlier revisions of new EH but lost during development process. This patch restores it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit eec4c3f317991dc85c786ffccd9c1a8620c41b18 tree 0ba309ca3e7df22295c43181715f7b0c445a92b1 parent 3655d1d323386e001c786af10f0a3f39f438f03b author Albert Lee Thu, 18 May 2006 17:51:10 +0800 committer Jeff Garzik Sat, 20 May 2006 00:37:01 -0400 [PATCH] libata: use qc->result_tf for temp taskfile storage Use qc->result_tf for temp taskfile storage. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 3655d1d323386e001c786af10f0a3f39f438f03b tree 16fd30cc6d255e5aaad4a5372cb8ec140c5b9736 parent 3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb author Albert Lee Fri, 19 May 2006 11:43:04 +0800 committer Jeff Garzik Sat, 20 May 2006 00:37:01 -0400 [PATCH] libata: Fix the HSM error_mask mapping (was: Re: libata-tj and SMART) Fix the HSM error_mask mapping. Changes: - Better mapping in ac_err_mask() - In HSM_ST_FIRST ans HSM_ST state, check ATA_ERR|ATA_DF and map it to AC_ERR_DEV instead of AC_ERR_HSM. - In HSM_ST_FIRST and HSM_ST state, map DRQ=1 ERR=1 to AC_ERR_HSM. - For PIO data in and DRQ=1 ERR=1, add check after the junk data block is read. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb tree addbc37a278a126a19e03edd8270e577c75a8829 parent 8d4ee71ff6de5255ebfdf44fb83419d27bd06368 parent e2a7f77a7b4ab298a38c8d1f624628456069bdb0 author Jeff Garzik Sat, 20 May 2006 00:36:08 -0400 committer Jeff Garzik Sat, 20 May 2006 00:36:08 -0400 Merge branch 'upstream-fixes' into upstream Conflicts: drivers/scsi/libata-core.c commit 4e3ceac609cce39cb96e0eb8604934592371ed8c tree 019b674bf79489128b4f1985ea99c5deca2cb15b parent badc48e6605ddeeb2484afae5993c859494decaa parent bb02aacc02c6002143a1cfc313d144a413eec8d0 author Jeff Garzik Sat, 20 May 2006 00:26:26 -0400 committer Jeff Garzik Sat, 20 May 2006 00:26:26 -0400 Merge branch 'upstream-fixes' into upstream commit badc48e6605ddeeb2484afae5993c859494decaa tree 7da638f9bb53b1812b71e40ad6deca91d59ad301 parent 753a6c4ff4c371a3e4e3408aaba4d03f3cfde73a parent 2f880b65fdbc2d4915bddc59d75a176329570fdd author Jeff Garzik Sat, 20 May 2006 00:03:38 -0400 committer Jeff Garzik Sat, 20 May 2006 00:03:38 -0400 Merge branch 'master' into upstream commit 5fc3dbc418e01345e25e96b3192a1c46051c3fdc tree 09691055b24900aceb5a1a021ce64ab8d907f694 parent dcb6592d72923123e3e479134f9381e0133d7d9d author David Woodhouse Sat, 20 May 2006 02:41:34 +0100 committer David Woodhouse Sat, 20 May 2006 02:41:34 +0100 [MTD] Use __symbol_get() instead of symbol_get() in NOR chip probe Signed-off-by: David Woodhouse commit dcb6592d72923123e3e479134f9381e0133d7d9d tree 6e95205db30cb81aae87b052acc6f5de0e6e1f91 parent 8e4482fba21d15da99f39a13396d3361e810d199 author Andrew Morton Fri, 19 May 2006 18:06:34 -0700 committer David Woodhouse Sat, 20 May 2006 02:39:43 +0100 git-mtd: symbol_get() fix drivers/mtd/devices/docprobe.c: In function `DoC_Probe': drivers/mtd/devices/docprobe.c:338: warning: assignment from incompatible pointer type drivers/mtd/devices/docprobe.c:341: warning: assignment from incompatible pointer type Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 8e4482fba21d15da99f39a13396d3361e810d199 tree 8dbfaedd9c0326040e8ac7e98b4d2c297b9151a0 parent aef9ab47841af45888d950baa6448072cc70bdd5 author Ferenc Havasi Fri, 19 May 2006 21:00:36 +0100 committer David Woodhouse Fri, 19 May 2006 21:00:36 +0100 [JFFS2] Remove forgotten summary code Remove forgotten lines from jffs2_scan_eraseblock() which were unnecessary and may cause problem in some environments. Thanks to Alexander Belyakov . Signed-off-by: Ferenc Havasi Signed-off-by: David Woodhouse commit 3c06da5ae5358e9d325d541a053e1059e9654bcc tree 04c953cc82fe57cff248ac523095cd4f0d9611a7 parent 4d1f3f25d9c303d1ce63b42cc94c54ac0ab2e950 parent a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e author Paul Mackerras Fri, 19 May 2006 15:02:42 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:42 +1000 Merge ../linux-2.6 commit 4d1f3f25d9c303d1ce63b42cc94c54ac0ab2e950 tree ab418b136a78442fc4f0f8d3575da74b82df4bda parent 1dc461f0b03fab309eb9214df1c9b586aeaf3b22 author Jimi Xenidis Thu, 18 May 2006 17:03:05 -0500 committer Paul Mackerras Fri, 19 May 2006 15:02:26 +1000 [PATCH] powerpc: Auto reserve of device tree blob A devtree compiler (dtc) generated devtree blob is "relocatable" and so does not contain a reserved_map entry for the blob itself. This means that if passed to Linux, Linux will not get lmb_reserve() the blob and it could be over. The following patch will explicitly reserve the "blob" as it was given to us and stops prom_init.c from creating a reserved mapping for the blob. NOTE: that the dtc/kexec should not generate the blob reservation entry. Although if they do, LMB reserver handles overlaps. Signed-off-by: Acked-by: Michael Neuling Signed-off-by: Paul Mackerras commit 1dc461f0b03fab309eb9214df1c9b586aeaf3b22 tree a56220353855a2339367a0b3acf011d9dede33fd parent 4c76e0bcdeac27b45d55955f073a97ff8452a42f author Stephen Rothwell Thu, 18 May 2006 17:21:26 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:24 +1000 [PATCH] powerpc: the iSeries vio lan driver changed device type So the IOMMU table building code needs to match. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 4c76e0bcdeac27b45d55955f073a97ff8452a42f tree 9a274ffdfb1159012c10b7367e8d09207fbd28d0 parent d4ad66faecc4dd9f3db14e0b013741a6f867b089 author Jeremy Kerr Thu, 18 May 2006 18:06:37 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:23 +1000 [PATCH] powerpc: pseries: Use generic dma-window parsing function Change the pseries iommu init code to use the new of_parse_dma_window() to parse the ibm,dma-window and ibm,my-dma-window properties of pci and virtual device nodes. Also, clean up vio_build_iommu_table() a little. Tested on pseries, with both vio and pci devices. Signed-off-by: Jeremy Kerr Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit d4ad66faecc4dd9f3db14e0b013741a6f867b089 tree 002f68be37820100103202270f07e5d6a6fb840f parent 8ae5b2801a0beb10a55a7ebd5140482e2f84c3fa author Jeremy Kerr Thu, 18 May 2006 18:05:15 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:21 +1000 [PATCH] powerpc: Add of_parse_dma_window() Add a function for generic parsing of dma-window properties (ie, ibm,dma-window and ibm,my-dma-window) of pci and virtual device nodes. This function will also be used by cell. Signed-off-by: Jeremy Kerr Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 8ae5b2801a0beb10a55a7ebd5140482e2f84c3fa tree e392faf5cc57559564da909f2bb2b65fcc18b516 parent 35dd54326e857f1648c7cc1028e8d5e1dbe04992 author jimix@watson.ibm.com Wed, 17 May 2006 12:00:35 -0400 committer Paul Mackerras Fri, 19 May 2006 15:02:19 +1000 [PATCH] powerpc: udbg_printf() formatting attribute This patch allows the compiler to catch any printf-like mismatches for udbg_printf(). After some brute force building I've only found issues with my own code and lparcfg.c It could break some developers, but IMHO that would be goodness. Signed-off-by: Jimi Xenidis Signed-off-by: Paul Mackerras commit 35dd54326e857f1648c7cc1028e8d5e1dbe04992 tree dea05effa25bc751d1b777a0b80f0f46d3ff0b8e parent 473104134b35ce1c3ca77b738c561d6c215adc1b author Michael Ellerman Thu, 18 May 2006 11:16:11 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:18 +1000 [PATCH] powerpc: Move crashkernel= handling into the kernel. This was missing a quilt ref. Signed-off-by: Paul Mackerras commit 473104134b35ce1c3ca77b738c561d6c215adc1b tree 979ccd57fe0695a66287d5f09fd3781e16cd1faa parent 2babf5c2ec2f2d5de3e38d20f7df7fd815fd10c9 author Michael Ellerman Wed, 17 May 2006 18:00:49 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:16 +1000 [PATCH] powerpc: Kdump header cleanup We need to know the base address of the kdump kernel even when we're not a kdump kernel, so add a #define for it. Move the logic that sets the kdump kernelbase into kdump.h instead of page.h. Rename kdump_setup() to setup_kdump_trampoline() to make it clearer what it's doing, and add an empty definition for the !CRASH_DUMP case to avoid a Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 2babf5c2ec2f2d5de3e38d20f7df7fd815fd10c9 tree 9ecda21067fe36f36fbefae87141150b62c39acd parent 846f77b08c8301682ded5ce127c56397327a60d0 author Michael Ellerman Wed, 17 May 2006 18:00:46 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:15 +1000 [PATCH] powerpc: Unify mem= handling We currently do mem= handling in three seperate places. And as benh pointed out I wrote two of them. Now that we parse command line parameters earlier we can clean this mess up. Moving the parsing out of prom_init means the device tree might be allocated above the memory limit. If that happens we'd have to move it. As it happens we already have logic to do that for kdump, so just genericise it. This also means we might have reserved regions above the memory limit, if we do the bootmem allocator will blow up, so we have to modify lmb_enforce_memory_limit() to truncate the reserves as well. Tested on P5 LPAR, iSeries, F50, 44p. Tested moving device tree on P5 and 44p and F50. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 846f77b08c8301682ded5ce127c56397327a60d0 tree c155737af3eceab34c621cc6930145062323eef8 parent 480f6f35a149802a94ad5c1a2673ed6ec8d2c158 author Michael Ellerman Wed, 17 May 2006 18:00:45 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:13 +1000 [PATCH] powerpc: Parse early parameters earlier Currently we have call parse_early_param() earliyish, but not really very early. In particular, it's not early enough to do things like mem=x or crashkernel=blah, which is annoying. So do it earlier. I've checked all the early param handlers, and none of them look like they should have any trouble with this. I haven't tested the booke_wdt ones though. On 32-bit we were doing the CONFIG_CMDLINE logic twice, so don't. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 480f6f35a149802a94ad5c1a2673ed6ec8d2c158 tree b0cded201abfbc7c6a1c5bfa316e6fecc1e2b507 parent 9dabbfbab312909782b26580d71e3977622fab6e author Michael Ellerman Wed, 17 May 2006 18:00:41 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:12 +1000 [PATCH] powerpc: Make early xmon logic immune to location of early parsing Currently early_xmon() calls directly into debugger() if xmon=early is passed. This ties the invocation of early xmon to the location of parse_early_param(), which might change. Tested on P5 LPAR and F50. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit f9a6ee1afb84fd767508428ec5d1df4fb60a03ad tree 5180efc6208c58676001b637fec8bba7ba542f33 parent a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e author Rich Townsend Mon, 19 Dec 2005 23:07:00 -0500 committer Len Brown Fri, 19 May 2006 00:49:52 -0400 ACPI: replace spin_lock_irq with mutex for ec poll mode http://bugzilla.kernel.org/show_bug.cgi?id=5764 Signed-off-by: Luming Yu Signed-off-by: Len Brown commit 9dabbfbab312909782b26580d71e3977622fab6e tree 2a691ca642995241224f087b3a53e815b8d67455 parent de0fe3b83f4bb47a0a6b47897bb3800862194016 author mostrows@watson.ibm.com Mon, 15 May 2006 08:51:07 -0400 committer Paul Mackerras Fri, 19 May 2006 14:35:32 +1000 [PATCH] powerpc: Create /proc/rtas, /proc/ppc64/rtas if RTAS exists. Use the existence of RTAS device tree node to determine if /proc/rtas. /proc/ppc64/rtas are to be created. Using machine type is not reliable (i.e. Maple-like machines may have RTAS). Signed-off-by: Michal Ostrowski Signed-off-by: Paul Mackerras commit de0fe3b83f4bb47a0a6b47897bb3800862194016 tree 4187a5035042eddc3010e91f6c2a8eabf5e24859 parent dc3c9b8ca2ec15cf56d071b85f3734a07bf5f808 author Stephen Rothwell Mon, 15 May 2006 13:44:01 +1000 committer Paul Mackerras Fri, 19 May 2006 14:35:31 +1000 [PATCH] powerpc: update iSeries viocd and viotape device-tree Make their device_type entries more generic and their compatible entries more specific. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit dc3c9b8ca2ec15cf56d071b85f3734a07bf5f808 tree 494e26fdf3736048ce0e9d1582ca1bf07f753ff8 parent fbabeb60ba783bf7a43858ecefc5066ac1f07162 author Stephen Rothwell Mon, 15 May 2006 13:42:29 +1000 committer Paul Mackerras Fri, 19 May 2006 14:35:29 +1000 [PATCH] powerpc: update iSeries vdevice Make it look more like the pSeries vdevice tree. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit fbabeb60ba783bf7a43858ecefc5066ac1f07162 tree 53e319022fa39f3fd44ee12214708f2e4036b920 parent 07fb3f454cc9e0f656e378a6feb5bdd6cac4bd41 author Stephen Rothwell Mon, 15 May 2006 13:41:22 +1000 committer Paul Mackerras Fri, 19 May 2006 14:35:28 +1000 [PATCH] powerpc: update iSeries viodasd device-tree entries These devices should have device_type block and a unique compatible entry. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 07fb3f454cc9e0f656e378a6feb5bdd6cac4bd41 tree 5a754125950cb7ccb4029fc61748e1b171a7920a parent d6b89a196dfb03fdfbe3d574ab6773fe14a1d2c6 author Stephen Rothwell Mon, 15 May 2006 13:39:47 +1000 committer Paul Mackerras Fri, 19 May 2006 14:35:26 +1000 [PATCH] powerpc: update iseries_veth device-tree information Make the device-tree information more generic and more like the pSeries virtual lan device. Also use the MAC address from the device tree. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit d6b89a196dfb03fdfbe3d574ab6773fe14a1d2c6 tree e2434d227933e425af867f37ed822fafcd76ef80 parent 485a2d54dbc7cf939bd0c22daad74e2cf6f001d7 author Michael Neuling Tue, 09 May 2006 11:33:38 -0500 committer Paul Mackerras Fri, 19 May 2006 14:35:25 +1000 [PATCH] powerpc: whitespace cleanup in reg.h In reg.h we mostly have #define but there are a few #define around. Clean these up so we use space exclusively. Signed-off-by: Michael Neuling Signed-off-by: Paul Mackerras commit 485a2d54dbc7cf939bd0c22daad74e2cf6f001d7 tree 4939a7b849faf8e0fc3f5069b7f696475845eaa9 parent b26f100d89c87060b561c3108582b7cb81521df8 author Michael Ellerman Tue, 09 May 2006 16:03:51 +1000 committer Paul Mackerras Fri, 19 May 2006 14:35:23 +1000 [PATCH] powerpc: Make early debugging options behave with oldconfig If you undefine all the early debugging options and then run make oldconfig, you don't get prompted to see if you want to enable any of them. This is annoying. AFAICT we can't do this just with a choice, because the choice is either optional, in which case we don't get prompted, or not in which case we _must_ select early debugging. So add a bool which controls whether we have early debugging at all, and then if that's enabled provide the choice. The extra bool will actually be useful in another patch I have lying around, so this is a win-win. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit b26f100d89c87060b561c3108582b7cb81521df8 tree 57e566bb4f1411e059e59b0f43bc9544e15616e8 parent 4240545661fc0ac25122f166e96633527150300c author Geoff Levand Fri, 19 May 2006 14:24:18 +1000 committer Paul Mackerras Fri, 19 May 2006 14:24:18 +1000 [PATCH] powerpc: remove do-nothing cpu setup routines Removed the do-nothing routines __setup_cpu_power3 and __setup_cpu_power4 and replaced them with a null pointer check in the caller. Also removed the Cell processor specific routine __setup_cpu_be which improperly accessed the hypervisor page size configuration at SPR HID6. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit 4240545661fc0ac25122f166e96633527150300c tree 9be44f79aa0a37d49744ce5a685ec41d057c60f3 parent 877fbae3d51ba792639535bfc0f428154b8da605 author Linas Vepstas Fri, 28 Apr 2006 17:39:38 -0500 committer Paul Mackerras Fri, 19 May 2006 13:51:12 +1000 [PATCH] powerpc/pseries: Increment fail counter in PCI recovery When a PCI device driver does not support PCI error recovery, the powerpc/pseries code takes a walk through a branch of code that resets the failure counter. Because of this, if a broken PCI card is present, the kernel will attempt to reset it an infinite number of times. (This is annoying but mostly harmless: each reset takes about 10-20 seconds, and uses almost no CPU time). This patch preserves the failure count across resets. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit aef9ab47841af45888d950baa6448072cc70bdd5 tree 79545ddc225f64bc38fa04525ac4125c86202cb8 parent f6a673b3f4f93c1c50e1b18f29254b0531b722a8 author David Woodhouse Fri, 19 May 2006 00:28:49 +0100 committer David Woodhouse Fri, 19 May 2006 00:28:49 +0100 [JFFS2] Support new device nodes Device node major/minor numbers are just stored in the payload of a single data node. Just extend that to 4 bytes and use new_encode_dev() for it. We only use the 4-byte format if we _need_ to, if !old_valid_dev(foo). This preserves backwards compatibility with older code as much as possible. If we do make devices with major or minor numbers above 255, and then mount the file system with the old code, it'll just read the first two bytes and get the numbers wrong. If it comes to garbage-collect it, it'll then write back those wrong numbers. But that's about the best we can expect. Signed-off-by: David Woodhouse commit 877fbae3d51ba792639535bfc0f428154b8da605 tree a9cb1827e31a5e82c5473c0357eb6b3a7084f201 parent f18fc729cd2d67b76e24206ee3567c1f6983c358 parent 7e990266c845d7f712c96013891aaf74baef198f author Paul Mackerras Fri, 19 May 2006 09:23:47 +1000 committer Paul Mackerras Fri, 19 May 2006 09:23:47 +1000 Merge branch 'for_paulus' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc commit 20a92fc74c5c91c7bc5693d51acc2b99aceb0465 tree 41bf535f38ff1a29c560bcf622e9b4ef03c2c106 parent 21b9879bf2817aca343cdda11ade6a87f5373e74 parent f6a673b3f4f93c1c50e1b18f29254b0531b722a8 author KaiGai Kohei Fri, 19 May 2006 00:43:53 +0900 committer KaiGai Kohei Fri, 19 May 2006 00:43:53 +0900 Merge git://git.infradead.org/mtd-2.6 commit f6a673b3f4f93c1c50e1b18f29254b0531b722a8 tree 3b5bb0dd88456bad514bdcd65abaebdef6d41102 parent fd0e5187458041c82fea616575104698397d68d3 author David Woodhouse Wed, 17 May 2006 22:03:10 +0100 committer David Woodhouse Wed, 17 May 2006 22:03:10 +0100 [MTD] Fix printk format error in gen_probe.c Signed-off-by: David Woodhouse commit fd0e5187458041c82fea616575104698397d68d3 tree 9ca58b78007cf1f917d83e1e0291f34893c3de69 parent e8d32937d9f2022c31871ef357a4883f78da1b7f author David Woodhouse Wed, 17 May 2006 21:53:58 +0100 committer David Woodhouse Wed, 17 May 2006 21:53:58 +0100 [MTD] Fix mtdconcat build. We didn't introduce mtd->writesize yet. Signed-off-by: David Woodhouse commit 5d25ea7c0c77cbdba1b5f092d60d624e24dfa938 tree dfae1dfe50155f0ab85d057acf1b94cf7072eafe parent 59d4b684fbe74b25ac8593f39d2aaa86aa485b1f author Arjan van de Ven Tue, 02 May 2006 18:01:41 +0200 committer John W. Linville Wed, 17 May 2006 14:58:55 -0400 [PATCH] unused exports in wireless drivers There's a bunch of unused exports in the wireless drivers; that's bad since unused exports take up quite a bit of space in total; the patch below removes them. Signed-off-by: Arjan van de Ven Signed-off-by: John W. Linville commit 59d4b684fbe74b25ac8593f39d2aaa86aa485b1f tree fb9b7de045e39313509c370dfa1c0ffa827f41be parent 5dd8816aeb1f068ade0349a22009ff7a66f25413 parent bc519f30eb039f023c15167663d5a8a14fed7dcb author John W. Linville Wed, 17 May 2006 14:54:09 -0400 committer John W. Linville Wed, 17 May 2006 14:54:09 -0400 Merge branch 'upstream-fixes' into upstream commit 5dd8816aeb1f068ade0349a22009ff7a66f25413 tree c56ff327b1dfa8868b4208aea9ac4158e3bfe308 parent f03cc4fd927357bd4b3cea1a053b9f9d8f1731cc parent 0c056c50a6218e0e577817c16ba8851af593d742 author John W. Linville Wed, 17 May 2006 14:51:24 -0400 committer John W. Linville Wed, 17 May 2006 14:51:24 -0400 Merge branch 'from-linus' into upstream commit e8d32937d9f2022c31871ef357a4883f78da1b7f tree c1cbf0718343d2faa1354570949217055763122c parent ceb31db11f78935c666c50fe9c99d4560d592fde author Alexander Belyakov Wed, 17 May 2006 19:11:16 +0400 committer David Woodhouse Wed, 17 May 2006 16:31:31 +0100 MTD: mtdconcat NAND/Sibley support (rev.2) There is a second revision of "mtdconcat NAND/Sibley" patch. I hope the patch will not get damaged as I'm posting it from gmail account, thanks to Jorn. The patch adds previously missing concat_writev(), concat_writev_ecc(), concat_block_isbad(), concat_block_markbad() functions to make concatenation layer compatible with Sibley and NAND chips. Patch has been cleared from whitespaces, fixed some lines of code as requested. Also I have added code for alignment check that should support Jorn's "writesize" patch. Signed-off-by: Alexander Belyakov Signed-off-by: David Woodhouse commit ceb31db11f78935c666c50fe9c99d4560d592fde tree cbe81df911ebd9ba1c840d1203e7835e7b583504 parent be21ce119716f821c595552917ce7c05a3997b6b author Martin Michlmayr Mon, 20 Mar 2006 04:40:46 +0000 committer David Woodhouse Wed, 17 May 2006 16:20:57 +0100 LASAT depends on MTD_CFI The following difference was found between the mainline and linux-mips kernel. LASAT depends on MTD_CFI. Signed-off-by: Martin Michlmayr Signed-off-by: David Woodhouse commit be21ce119716f821c595552917ce7c05a3997b6b tree 8cfe4ce1dc840ed150f3e072c341dc8f356551ac parent 683b30c8e78ab363dc8d8c94bdb61b64d1f6f5e2 author Martin Michlmayr Mon, 20 Mar 2006 04:40:26 +0000 committer David Woodhouse Wed, 17 May 2006 16:20:37 +0100 Re-add module description for ms02-nv to Kconfig In an unrelated MTD commit, a description about the ms02-nv module got removed from Kconfig. While I personally agree with this removal, the module maintainer (Maciej W. Rozycki) would like to see it added back. In the absense of any consistency regarding Kconfig descriptions his wish should be followed. Signed-off-by: Martin Michlmayr Acked-by: Maciej W. Rozycki Signed-off-by: David Woodhouse commit 683b30c8e78ab363dc8d8c94bdb61b64d1f6f5e2 tree 85ec4bf9ee63e8531c338c82c0609c48c7618d09 parent ae282d497d5631ce31539717131c760e3872c539 author Sean Young Wed, 17 May 2006 12:45:34 +0100 committer David Woodhouse Wed, 17 May 2006 12:45:34 +0100 [MTD] RFD FTL: Be noisier, and don't assume block without RFD magic are erased Signed-off-by: Sean Young Signed-off-by: David Woodhouse commit ae282d497d5631ce31539717131c760e3872c539 tree a3067a25401d0fa0d8cf409827d4d7031523095f parent 599fb3298b70d75c12dbdc4dd30f52c5cf04ea2f author Vitaly Wool Wed, 17 May 2006 12:34:27 +0100 committer David Woodhouse Wed, 17 May 2006 12:34:27 +0100 [MTD] generic: propagate oobavail to MTD partitions 'oobavail' parameter of mtd_info structure is now propagated to the MTD partitions Signed-off-by: Vitaly Wool Signed-off-by: David Woodhouse commit 599fb3298b70d75c12dbdc4dd30f52c5cf04ea2f tree d968c97f084f3788dd7c781532523eca667e7842 parent c172471b78255a5cf6d05383d9ebbf0c6683167a author Sean Young Wed, 17 May 2006 11:47:48 +0100 committer David Woodhouse Wed, 17 May 2006 11:47:48 +0100 [PCMCIA MTD] Fix leak and crash on reboot Signed-off-by: Sean Young Signed-off-by: David Woodhouse commit c172471b78255a5cf6d05383d9ebbf0c6683167a tree ecb18d8ef5686eeb11f14a8b9d6e12df03ba7520 parent 6e7a6809c555aeb7cb98544df4d446fbd6f123ec author Nicolas Pitre Thu, 30 Mar 2006 15:52:41 +0100 committer David Woodhouse Wed, 17 May 2006 01:25:37 +0100 cfi_cmdset_0001: factorize code to wait for flash status This allows for much better abstraction and separation of the XIP and non-XIP cases with their own specific implementations. This fixes the case where a timeout was tripped on in the XIP case by the code that was meant for the non-XIP case only. This also makes for a nice code reduction. Signed-off-by: Nicolas Pitre CC: "Alexey, Korolev" Signed-off-by: David Woodhouse commit 6e7a6809c555aeb7cb98544df4d446fbd6f123ec tree 15b9d84d7350396fc08541f54ec42842fd2187ef parent df54b52c411befdcf1d0989f939a49163570ad29 author Nicolas Pitre Wed, 29 Mar 2006 23:31:42 +0100 committer David Woodhouse Wed, 17 May 2006 01:22:23 +0100 cfi-cmdset-0001: always update the chip status ... otherwise xip_enable() won't do the right thing. Signed-off-by: Nicolas Pitre Signed-off-by: David Woodhouse commit df54b52c411befdcf1d0989f939a49163570ad29 tree e51dbc7a88da164ed1ab6b29273ae01d2faf4025 parent ba9627b85fcb5ed67285ca0711f0f4d1e965746e author Josh Boyer Tue, 06 Dec 2005 17:28:19 +0000 committer David Woodhouse Wed, 17 May 2006 01:11:17 +0100 CHIPS: Fix potential starvation in cfi_cmdset_0001 The patch below fixes a potential starvation issue that can arise when there is contention on a chip during a period when a process is currently writing to it. The starvation is avoided by conditionally rescheduling when the chip is left in a state usable by other processes. Signed-off-by: Josh Boyer Signed-off-by: Tom Gall Signed-off-by: David Woodhouse commit 3ac6c7b44560fdf2ea8865536bd52d4ff038107e tree e206d3e8f5eefcad32a9d8ea8dbe43113ac86efc parent 80b9192ee032f919da1b6e8b305c7cc9881b0907 author David Woodhouse Tue, 16 May 2006 23:25:37 +0100 committer David Woodhouse Tue, 16 May 2006 23:25:37 +0100 Remove struct fddi_statistics from user view in Signed-off-by: David Woodhouse commit ba9627b85fcb5ed67285ca0711f0f4d1e965746e tree 4a21707583c0cbbcc63cc23f416b3fa2f609e1e0 parent 35af68b53a62c98bf551aaae7be179bde248eb34 author David Woodhouse Tue, 16 May 2006 23:03:08 +0100 committer David Woodhouse Tue, 16 May 2006 23:03:08 +0100 [JFFS2] Repack some on-medium structures. ARM is weirder than I thought. We have to pack at least the jint16_t structure, because otherwise it'll be four bytes in size. Thankfully, we can do that and _not_ pack the actual node structures, and the compiler still doesn't emit stupid code. Signed-off-by: David Woodhouse commit 35af68b53a62c98bf551aaae7be179bde248eb34 tree a5e3b4d694674af5db6c705ef016738b680f73f4 parent b020bb7d3b3a8e3568a16eaf98c033bb9ee474eb author Sergei Shtylyov Tue, 16 May 2006 20:52:06 +0400 committer David Woodhouse Tue, 16 May 2006 18:03:18 +0100 NAND: Fix NAND ECC errors on AMD Au1550 On AMD Au1550 the static bus controller fails to keep -CE asserted during chip ready delay on read commands and the NAND chip being used requires this. So, the current driver allows nand_base.c to drive -CE manually during the entire sector read. When the PCMCIA driver is enabled however, occasionally the ECC errors occur on NAND reads. This happens because the PCMCIA driver polls sockets periodically and reads one of the board's control/status regs (BCSRs) which are on the same static bus as the NAND flash, and just use another chip select (and the NOR flash also resides on that bus), so as the NAND driver forces NAND chip select asserted and the -RE signal is shared, a contention occurs on the static bus when BCSR or NOR flash is read while we're reading from NAND. So, we either can't keep interrupts enabled during the whole NAND sector read (which is hardly acceptable), or have to implement some interlocking scheme between multiple drivers (which is painful, and makes me shudder :-). There's a third way which has proven to work: to force -CE asserted only while we're waiting for a NAND chip to become ready after a read command, disabling interrupts for a maximum of 25 microseconds (according to Toshiba TC58DVM92A1FT00 datasheet -- this chip is mentioned in the board schematics); for Samsung NAND chip which seems to be actually used this delay is even less, 12 us. Signed-off-by: Konstantin Baydarov Signed-off-by: Sergei Shtylyov Signed-off-by: David Woodhouse commit b020bb7d3b3a8e3568a16eaf98c033bb9ee474eb tree 97b621406f5ee19059d14afa1b2cfb76f2efb4eb parent 155285c4775b7027b01a5b744c721ae43cced798 author Ben Dooks Tue, 16 May 2006 17:31:15 +0100 committer David Woodhouse Tue, 16 May 2006 17:31:15 +0100 [MTD] Fix build warnings in RedBoot MTD partition parser. Fix build warnings from drivers/mtd/redboot.c due to use of `unsigned long` in `struct fis_image_desc` for fields being passed to swab32s() which expects __u32 * Change the entries to uint32_t to make them compatible with the swab32s() function Signed-off-by: Ben Dooks Signed-off-by: David Woodhouse commit 155285c4775b7027b01a5b744c721ae43cced798 tree 4bbfba4b281c3368c2544eafa1e93b63b517c509 parent c41ff6e5f38b02ff927d0d510e28dc1392bb4690 author Sergei Shtylyov Tue, 16 May 2006 20:16:41 +0400 committer David Woodhouse Tue, 16 May 2006 17:25:19 +0100 NAND: AMD Au1550 driver reads write-only register During the last cleanup of the AMD Au1550 NAND driver the old buglet was reintroduced: as the MEM_STNDCTL register is write-only and seem to always read as 0x31, read-modify-write to it done in au1xxx_nand_init() will have the side effect of enabling -RCS0/1 pin override (via bits 4/5 of this reg.), thus possibly causing a contention on the static bus when the NOR flash (using -RCS0) or board control status registers (using -RCS2) are read. Luckily, this goes away with a first NAND access, since au1550_hwcontrol() doesn't try to read this register before writing anymore. Signed-off-by: Sergei Shtylyov Signed-off-by: David Woodhouse commit c41ff6e5f38b02ff927d0d510e28dc1392bb4690 tree 338255986d719d68d18851416100f305548123b7 parent 7d2beb135986477f53da77303356bd04329f8d0e author David Woodhouse Tue, 16 May 2006 17:05:33 +0100 committer David Woodhouse Tue, 16 May 2006 17:05:33 +0100 [JFFS2] Fix printk format in jffs2_sum_write_data() error message. fs/jffs2/summary.c: In function ‘jffs2_sum_write_data’: fs/jffs2/summary.c:658: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 4 has type ‘uint32_t’ Signed-off-by: David Woodhouse commit 7d2beb135986477f53da77303356bd04329f8d0e tree 686bb65bf6e6f2f7da5b4efe427d7ba56d1469e7 parent cead4dbc03ba6eb2e35bac04439b76a0cc2286ce author David Brownell Tue, 16 May 2006 16:08:10 +0100 committer David Woodhouse Tue, 16 May 2006 16:08:10 +0100 [JFFS2] Fix section mismatch warnings in JFFS2. Mark certain functions with __init and __exit appropriately. Signed-off-by: David Brownell Signed-off-by: David Woodhouse commit cead4dbc03ba6eb2e35bac04439b76a0cc2286ce tree 7563bdedb51b496ee57f5f1b7141305d59dcddf1 parent ce589a0328866228412ea0df2c834688da8f4700 author David Woodhouse Tue, 16 May 2006 13:54:50 +0100 committer David Woodhouse Tue, 16 May 2006 13:54:50 +0100 [MTD NAND] Make various initfuncs static, remove #ifdef MODULE from exitfuncs We all inherited the same error from the original NAND board driver which got copied and changed. Fix them all at once... Signed-off-by: David Woodhouse commit ce589a0328866228412ea0df2c834688da8f4700 tree 548c843d4750223a3ebef78de0b88d67c2b5f319 parent f41a5f804a5862e9b87cf2d4cca1d6a7db7a9e82 author Adrian Bunk Tue, 16 May 2006 13:46:44 +0200 committer David Woodhouse Tue, 16 May 2006 13:12:12 +0100 drivers/mtd/devices/docprobe.c: correct #if's On Mon, May 15, 2006 at 12:56:37AM -0700, Andrew Morton wrote: >... > Changes since 2.6.17-rc3-mm1: >... > git-mtd.patch >... > git trees >... If we correct the names of the config options, the code might actually work as intended... Signed-off-by: Adrian Bunk Signed-off-by: David Woodhouse commit f41a5f804a5862e9b87cf2d4cca1d6a7db7a9e82 tree b436a0a85faca15179eb7b666424fc9a15654127 parent 18594822fcb01d4b35e05b9018f770a0b4156d1a author David Woodhouse Tue, 16 May 2006 13:11:47 +0100 committer David Woodhouse Tue, 16 May 2006 13:11:47 +0100 [MTD] Add help text for MTD_NAND_CS553X option. Signed-off-by: David Woodhouse commit 18594822fcb01d4b35e05b9018f770a0b4156d1a tree 38d35c38086a564beaac215f8e52694cdbfab1c3 parent 5b5ffbc1e6d62d89747f3f59c09b2e488a7d7fce parent c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 author David Woodhouse Tue, 16 May 2006 01:19:52 +0100 committer David Woodhouse Tue, 16 May 2006 01:19:52 +0100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Signed-off-by: David Woodhouse commit 5b5ffbc1e6d62d89747f3f59c09b2e488a7d7fce tree c2330fcf5e5c2e64d4b1bf3c7dce3ed19e164af1 parent 184f565210c6c8a852c53ffc070f9add61e0f331 author Florin Malita Mon, 15 May 2006 23:42:31 +0100 committer David Woodhouse Mon, 15 May 2006 23:42:31 +0100 [PATCH] jffs2: memory leak in jffs2_scan_medium() If jffs2_scan_eraseblock() fails and the exit path is taken, 's' is not being deallocated. Reported by Coverity, CID: 1258. Signed-off-by: Florin Malita Signed-off-by: David Woodhouse commit 8d4ee71ff6de5255ebfdf44fb83419d27bd06368 tree ae03881d6d86b528e075f7b6af8af74f4dbbf9ec parent efa6e7e9d40fe01406d889a5bed62f2e0da49bff parent 9a375e93f88269bb770fb2eaa57554c975449c88 author Jeff Garzik Mon, 15 May 2006 11:27:47 -0400 committer Jeff Garzik Mon, 15 May 2006 11:27:47 -0400 Merge branch 'max-sect' into upstream commit efa6e7e9d40fe01406d889a5bed62f2e0da49bff tree 7f856e4c4264a2e51768610f4b883ef023152f27 parent 5006ecc2d5073d4e52f54381fd0fee1575d4ce22 parent aee10a03eb3e240bfd1a6f91e06ce82df47c5c58 author Jeff Garzik Mon, 15 May 2006 11:26:53 -0400 committer Jeff Garzik Mon, 15 May 2006 11:26:53 -0400 Merge branch 'for-jeff' of git://htj.dyndns.org/libata-tj into tejun-merge commit 5006ecc2d5073d4e52f54381fd0fee1575d4ce22 tree bedfff6f96118771b809de30e559cc370f94c7be parent acc696d93dcf993dec123d69d599979e1456ffec parent 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3 author Jeff Garzik Mon, 15 May 2006 11:26:03 -0400 committer Jeff Garzik Mon, 15 May 2006 11:26:03 -0400 Merge branch 'master' into upstream commit 184f565210c6c8a852c53ffc070f9add61e0f331 tree 194f8076b973f5404746ecf523114af4ce943ca3 parent 3e68fbb59b3d4e6b47b65e9928b5929e02179759 author Andrew Morton Mon, 15 May 2006 13:45:58 +0100 committer David Woodhouse Mon, 15 May 2006 13:45:58 +0100 [JFFS2] Fix printk format in some error messages. fs/jffs2/nodelist.c: In function `check_node_data': fs/jffs2/nodelist.c:441: warning: unsigned int format, different type arg (arg 4) fs/jffs2/nodelist.c:464: warning: int format, different type arg (arg 5) Modified from Andrew's original fix because while his terminal may indeed only have eighty columns, mine only has _TWENTYFOUR_ lines. So the cosmetic fluff is perfectly OK out past column 80 where it was -- the casual reader doesn't _care_ about anything more than the fact that it goes 'if (foo) JFFS2_WARNING...', and there's no point wasting a whole line to display the tail end of the printk which nobody actually cares about. Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit aee10a03eb3e240bfd1a6f91e06ce82df47c5c58 tree 103a12557c6dc042bc555781ce8eece045fccae2 parent 12fad3f965830d71f6454f02b2af002a64cec4d3 author Tejun Heo Mon, 15 May 2006 21:03:56 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:56 +0900 [PATCH] sata_sil24: implement NCQ support Implement NCQ support. Sil24 has 31 command slots and all of them are used for NCQ command queueing. libata guarantees that no other command is in progress when it issues an internal command, so always use tag 0 for internal commands. Signed-off-by: Tejun Heo commit 12fad3f965830d71f6454f02b2af002a64cec4d3 tree 124b6f283a1432b8a2f334fadc8b8be2757fa73e parent a9764c2bb5b6d3c9df91f2977a2a640f55de0dc2 author Tejun Heo Mon, 15 May 2006 21:03:55 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:55 +0900 [PATCH] ahci: implement NCQ suppport Implement NCQ support. Original implementation is from Jens Axboe. Signed-off-by: Tejun Heo commit a9764c2bb5b6d3c9df91f2977a2a640f55de0dc2 tree aafd47e6257d9d5e22f69c5639612e6b540093e5 parent 979db803b8fd120d4ed5216520e9d1815e18bc38 author Tejun Heo Mon, 15 May 2006 21:03:53 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:53 +0900 [PATCH] ahci: kill pp->cmd_tbl_sg With NCQ, there are multiple sg tables, so pp->cmd_tbl_sg doesn't cut it. Directly calculate sg table address from pp->cmd_tbl. Signed-off-by: Tejun Heo commit 979db803b8fd120d4ed5216520e9d1815e18bc38 tree e334de1ca174f6d211a26d396955d8e2e6ad4d12 parent dd410ff12925fc49df3174b18e43598b2b2b621f author Tejun Heo Mon, 15 May 2006 21:03:52 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:52 +0900 [PATCH] ahci: add HOST_CAP_NCQ constant Add HOST_CAP_NCQ. Signed-off-by: Tejun Heo commit dd410ff12925fc49df3174b18e43598b2b2b621f tree 782f1127a074fbb70e90ac46b5e97e42aceddc9d parent a6e6ce8e8dc907a2cf2b994b0ea4099423f046bf author Tejun Heo Mon, 15 May 2006 21:03:50 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:50 +0900 [PATCH] ahci: clean up AHCI constants in preparation for NCQ * Rename CMD_TBL_HDR to CMD_TBL_HDR_SZ as it's size not offset. * Define MAX_CMDS and CMD_SZ and use them in calculation of other constants. * Define CMD_TBL_AR_SZ as product of CMD_TBL_SZ and MAX_CMDS, and use it when calculating PRIV_DMA_SZ. * CMD_SLOT_SZ is also dependent on MAX_CMDS but hasn't been changed because I didn't want to change the value used by the original code (32 commands). Later NCQ change will bump MAX_CMDS to 32 anyway and the hard coded 32 can be changed to MAX_CMDS then. * Reorder HOST_CAP_* flags. Signed-off-by: Tejun Heo commit a6e6ce8e8dc907a2cf2b994b0ea4099423f046bf tree cc308c45c0d2df9e52be69959b9fd189371ad5d7 parent e8ee84518c159a663c07bf691ace187527380f61 author Tejun Heo Mon, 15 May 2006 21:03:48 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:48 +0900 [PATCH] libata-ncq: implement NCQ device configuration Now that all NCQ related stuff are in place, implement NCQ device configuration and bump ATA_MAX_QUEUE to 32 thus activating NCQ support. Original implementation is from Jens Axboe. Signed-off-by: Tejun Heo commit e8ee84518c159a663c07bf691ace187527380f61 tree ffd6d89b4e38ff2a70463125a3022771f69b2286 parent 3dc1d88193b9c65b01b64fb2dc730e486306649f author Tejun Heo Mon, 15 May 2006 21:03:46 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:46 +0900 [PATCH] libata-ncq: update EH to handle NCQ Update EH to handle NCQ. ata_eh_autopsy() is updated to call ata_eh_analyze_ncq_error() which reads log page 10h on NCQ device error and updates eh_context accordingly. ata_eh_report() is updated to report SActive. Signed-off-by: Tejun Heo commit 3dc1d88193b9c65b01b64fb2dc730e486306649f tree 1ffba999eadfe0e5b704d8ee9163483ef31e0591 parent dedaf2b0365ccec50714fbde0b3215e7e94fa47c author Tejun Heo Mon, 15 May 2006 21:03:45 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:45 +0900 [PATCH] libata-ncq: implement NCQ command translation and exclusion This patch implements NCQ command translation and exclusion. Note that NCQ commands don't use ata_rwcmd_protocol() to choose ATA command. This is because, unlike non-NCQ RW commands, NCQ commands can only be used for NCQ protocol and FUA handling is done with a flag rather than separate command. NCQ enabled device will have queue depth larger than one but no two non-NCQ commands can be issued simultaneously, neither can a non-NCQ command and NCQ commands. This patch makes ata_scsi_translate() return SCSI_MLQUEUE_DEVICE_BUSY if such exclusion is necessary. SCSI midlayer will retry the command later. As SCSI midlayer always retries once a command completes, this doesn't incur unnecessary delays and as most commands will be NCQ ones for NCQ device, so the overhead should be negligible. Initial implementation is from Jens Axboe and using SCSI_MLQUEUE_DEVICE_BUSY for exclusion is suggested by Jeff Garzik. Signed-off-by: Tejun Heo commit dedaf2b0365ccec50714fbde0b3215e7e94fa47c tree d98e2a928793e6072d4ff65b0e2ceedaa600e25d parent 6cec4a3943bdfe46e2952bc246f17670f747be8d author Tejun Heo Mon, 15 May 2006 21:03:43 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:43 +0900 [PATCH] libata-ncq: implement ap->qc_active, ap->sactive and complete helper Add ap->qc_active and ap->sactive, mask of all active qcs and libata's view of the SActive register, respectively. Also, implement ata_qc_complete_multiple() which takes new qc_active mask and complete multiple qcs according to the mask. These will be used to track NCQ commands and complete them. The distinction between ap->qc_active and ap->sactive is also useful for later PM implementation. Signed-off-by: Tejun Heo commit 6cec4a3943bdfe46e2952bc246f17670f747be8d tree 46fa642814683174b6da21c992ef6f672cec3ab5 parent 2115ea94a2d11fbd228b049e667ec2d3e91ca371 author Tejun Heo Mon, 15 May 2006 21:03:41 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:41 +0900 [PATCH] libata-ncq: rename ap->qactive to ap->qc_allocated Rename ap->qactive to ap->qc_allocated. This is to accomodate addition of ap->qc_active, mask of active qcs. Signed-off-by: Tejun Heo commit 2115ea94a2d11fbd228b049e667ec2d3e91ca371 tree 0584347308aa40af982f5f01d654a8186599b48c parent 88e490340ea4c3a2ebc0187a4339912e2fc1a081 author Tejun Heo Mon, 15 May 2006 21:03:39 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:39 +0900 [PATCH] libata-ncq: pass ata_scsi_translate() return value to SCSI midlayer ata_scsi_translate() will need to return SCSI_ML_QUEUE_DEVICE_BUSY to achieve exlusion between NCQ and non-NCQ commands or among non-NCQ commands. Pass its return value upward to SCSI midlayer. Signed-off-by: Tejun Heo commit 88e490340ea4c3a2ebc0187a4339912e2fc1a081 tree ab2604a796754a0fba301b4362dc649136b180c3 parent c17ea20d9a689d7335e97e09354865cdd9f873e1 author Tejun Heo Mon, 15 May 2006 21:03:38 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:38 +0900 [PATCH] libata-ncq: add NCQ related ATA/libata constants and macros Add NCQ related ATA/libata constants and macros. Signed-off-by: Tejun Heo commit c17ea20d9a689d7335e97e09354865cdd9f873e1 tree 74b04b022513b66b5a84977b15296c1d8df97674 parent 12436c30f4808e00fa008c6787c609bc6ae216ba author Tejun Heo Mon, 15 May 2006 20:59:29 +0900 committer Tejun Heo Mon, 15 May 2006 20:59:29 +0900 [PATCH] libata: fix irq-pio merge * kill ata_poll_qc_complete() and implement/use ata_hsm_qc_complete() which completes qcs in new EH compliant manner from HSM * don't print error message from ata_hsm_move(). it's responsibility of EH. * kill ATA_FLAG_NOINTR usage in bmdma EH Signed-off-by: Tejun Heo commit 12436c30f4808e00fa008c6787c609bc6ae216ba tree 22ddaad8def4f4a77637a3da62a8d8f422a95c29 parent 88ce7550c38f46c8697f53727a571bf838bee398 parent 7894eaf291238a62a565e9e9777483beeb00eeae author Tejun Heo Mon, 15 May 2006 20:59:15 +0900 committer Tejun Heo Mon, 15 May 2006 20:59:15 +0900 Merge branch 'irq-pio' Conflicts: drivers/scsi/libata-core.c include/linux/libata.h commit 88ce7550c38f46c8697f53727a571bf838bee398 tree 58df8b1898eb2077a8fdb8c8a8ab8d00294ccbe8 parent 2a3917a8bb40a2cb75b458da9c356e8557e8fbed author Tejun Heo Mon, 15 May 2006 20:58:32 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:32 +0900 [PATCH] sata_sil24: convert to new EH Convert sata_sil24 to new EH. * When port is frozen, IRQ for the port is masked. * sil24_softreset() doesn't need to mangle with IRQ mask anymore. libata ensures that the port is frozen during reset. * Only turn on interrupts which are handled by interrupt handler and EH. As we don't handle SDB notify yet, turn it off. DEV_XCHG and UNK_FIS are handled by EH and thus turned on. * sil24_softreset() usually fails to recover the port after DEV_XCHG. ATA_PORT_HARDRESET is used as recovery action for DEV_XCHG. * sil24 may be invoked without any active command. e.g. DEV_XCHG irq occuring while no qc in progress still triggers EH and will reset the port and revalidate attached device. Signed-off-by: Tejun Heo commit 2a3917a8bb40a2cb75b458da9c356e8557e8fbed tree 8899c9447b35c5fb00ce272837fd733df7c5aa35 parent 78cd52d02fa0735949a9fa30a6b79bf02c94c250 author Tejun Heo Mon, 15 May 2006 20:58:30 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:30 +0900 [PATCH] ahci: add PIOS interim interrupt handling During multiblock PIO, multiple PIOS interrupts are generated before qc compltion. Current code prints unnecessary message for such cases. This is exposed when new EH slows down attached device into PIO mode. Signed-off-by: Tejun Heo commit 78cd52d02fa0735949a9fa30a6b79bf02c94c250 tree f52d2053c5fd930357130c9bf6a00743920bf19c parent f6aae27ed002ba9c0a98aff811dbde32ce749d28 author Tejun Heo Mon, 15 May 2006 20:58:29 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:29 +0900 [PATCH] ahci: convert to new EH Convert AHCI to new EH. Unfortunately, ICH7 AHCI reacts badly if IRQ mask is diddled during operation. So, freezing is implemented by unconditionally clearing interrupt conditions while frozen. * Interrupts are categorized according to required action. e.g. Connection status or unknown FIS error requires freezing the port while TF or HBUS_DATA don't. * Only CONNECT (reflects SErr.X) interrupt is taken into account not PHYRDY (SErr.N), as CONNECT is better cue for starting EH. * AHCI may be invoked without any active command. e.g. CONNECT irq occuring while no qc in progress still triggers EH and will reset the port and revalidate attached device. Signed-off-by: Tejun Heo commit f6aae27ed002ba9c0a98aff811dbde32ce749d28 tree 8c3326657bb0917536d02d81c3d52f13590af7a8 parent 3f037db0ba043022e43e8e7266e698d4af264851 author Tejun Heo Mon, 15 May 2006 20:58:27 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:27 +0900 [PATCH] sata_sil: convert to new EH Convert sata_sil to new EH. As these controllers have hardware interrupt mask and are known to have screaming interrupts issues, use hardware IRQ masking for freezing. sil_freeze() masks interrupts for the port and sil_thaw() unmasks them. As ports are automatically frozen before probing reset, there is no need to initialize interrupt masks sil_init_onde(). Remove related code. Other than freezing, sata_sil uses stock BMDMA EH routines. Signed-off-by: Tejun Heo commit 3f037db0ba043022e43e8e7266e698d4af264851 tree 53b7222a08b60b028d91db3dd0689984abfb18b5 parent 6d97dbd72da31a0e334f251fa9df4be9fab6fde2 author Tejun Heo Mon, 15 May 2006 20:58:25 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:25 +0900 [PATCH] ata_piix: convert to new EH ata_piix can use stock BMDMA EH routines. Convert to new EH. Signed-off-by: Tejun Heo commit 6d97dbd72da31a0e334f251fa9df4be9fab6fde2 tree f31e023080474ba91529d7e1b1468cc999e32c73 parent 022bdb075b9e1f224088a0b268de56268d7bc5b6 author Tejun Heo Mon, 15 May 2006 20:58:24 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:24 +0900 [PATCH] libata-eh: implement BMDMA EH Implement stock BMDMA error handling methods. Signed-off-by: Tejun Heo commit 022bdb075b9e1f224088a0b268de56268d7bc5b6 tree 05878e28202f0a86bdcc32ae5d995db9f15042da parent f3e81b19aac23c0e8c55d5961324ef7de44c23bb author Tejun Heo Mon, 15 May 2006 20:58:22 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:22 +0900 [PATCH] libata-eh: implement new EH Implement new EH. The exported interface is ata_do_eh() which is to be called from ->error_handler and performs the following steps to recover the failed port. ata_eh_autopsy() : analyze SError/TF, determine the cause of failure and required recovery actions and record it in ap->eh_context ata_eh_report() : report the failure to user ata_eh_recover() : perform recovery actions described in ap->eh_context ata_eh_finish() : finish failed qcs LLDDs can customize error handling by modifying eh_context before calling ata_do_eh() or, if necessary, doing so inbetween each major steps by calling each step explicitly. Signed-off-by: Tejun Heo commit f3e81b19aac23c0e8c55d5961324ef7de44c23bb tree 9ea0bf3c5ecabb855a78623236d07e7bc2976ca3 parent 0c247c559cd70f85ba9f0764ce13ae00e20fcad8 author Tejun Heo Mon, 15 May 2006 20:58:21 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:21 +0900 [PATCH] libata-eh: implement ata_eh_info and ata_eh_context struct ata_eh_info serves as the communication channel between execution path and EH. Execution path describes detected error condition in ap->eh_info and EH recovers the port using it. To avoid missing error conditions detected during EH, EH makes its own copy of eh_info and clears it on entry allowing error info to accumulate during EH. Most EH states including EH's copy of eh_info are stored in ap->eh_context (struct ata_eh_context) which is owned by EH and thus doesn't require any synchronization to access and alter. This standardized context makes it easy to integrate various parts of EH and extend EH to handle multiple links (for PM). Signed-off-by: Tejun Heo commit 0c247c559cd70f85ba9f0764ce13ae00e20fcad8 tree 9b0d00b300ad9178438b9c7feba95ed62f540c1a parent 9be1e979f2e1e57a091a658fa88dac266f9fd6fe author Tejun Heo Mon, 15 May 2006 20:58:19 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:19 +0900 [PATCH] libata-eh: implement dev->ering This patch implements ata_ering and uses it to define dev->ering. ata_ering is a ring buffer which records libata errors - whether a command was for normar IO request, err_mask and timestamp. Errors are recorded per-device in dev->ering. This will be used by EH to determine recovery actions. Signed-off-by: Tejun Heo commit 9be1e979f2e1e57a091a658fa88dac266f9fd6fe tree 781b216ce5a2b39c711ee32d285f4455feba7d34 parent 246619da308c6910a3ae30e7e5fbf46139619efe author Tejun Heo Mon, 15 May 2006 20:58:17 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:17 +0900 [PATCH] libata-eh: add ATA and libata flags for new EH Add ATA and libata flags to be used by new EH. Signed-off-by: Tejun Heo commit 246619da308c6910a3ae30e7e5fbf46139619efe tree 65e408c907d3e6e80f71faa33313d0eb28313411 parent d95a717f579e81061830a308125c89f5858f740a author Tejun Heo Mon, 15 May 2006 20:58:16 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:16 +0900 [PATCH] libata-eh-fw: update SCSI command completion path for new EH SCSI command completion path used to do some part of EH including printing messages and obtaining sense data. With new EH, all these are responsibilities of the EH, update SCSI command completion path to reflect this. Signed-off-by: Tejun Heo commit d95a717f579e81061830a308125c89f5858f740a tree efa4b35ffcd1f8f3eabe5cb27ffc128313378064 parent ad9e27624479bd167dd7eac0cea4bb3ad13bc926 author Tejun Heo Mon, 15 May 2006 20:58:14 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:14 +0900 [PATCH] libata-eh-fw: update ata_exec_internal() for new EH Update ata_exec_internal() such that it uses new EH framework. ->post_internal_cmd() is always invoked regardless of completion status. Also, when ata_exec_internal() detects a timeout condition and new EH is in place, it freezes the port as timeout for normal commands would do. Note that ata_port_flush_task() is called regardless of wait_for_completion status. This is necessary as exceptions unrelated to the qc can abort the qc, in which case PIO task could still be running after the wait for completion returns. Signed-off-by: Tejun Heo commit ad9e27624479bd167dd7eac0cea4bb3ad13bc926 tree 47b863c91509a29c9b0f760faa52d60a95272ba6 parent dafadcde8d4dc5ea8c742faa7ff4403336b542b8 author Tejun Heo Mon, 15 May 2006 20:58:12 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:12 +0900 [PATCH] libata-eh-fw: update ata_scsi_error() for new EH Update ata_scsi_error() for new EH. ata_scsi_error() is responsible for claiming timed out qcs and invoking ->error_handler in safe and synchronized manner. As the state of the controller is unknown if a qc has timed out, the port is frozen in such cases. Note that ata_scsi_timed_out() isn't used for new EH. This is because a timed out qc cannot be claimed by EH without freezing the port and freezing the port in ata_scsi_timed_out() results in unnecessary abortion of other active qcs. ata_scsi_timed_out() can be removed once all drivers are converted to new EH. While at it, add 'TODO: kill' comments to old EH functions. Signed-off-by: Tejun Heo commit dafadcde8d4dc5ea8c742faa7ff4403336b542b8 tree 0d24a079ece4b481fcd680c7056aa4e06974f41f parent e318049949b07152d851dbfebbd93e560af45ebe author Tejun Heo Mon, 15 May 2006 20:58:11 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:11 +0900 [PATCH] libata-eh-fw: implement new EH scheduling from PIO PIO executes without holding host_set lock, so it cannot be synchronized using the same mechanism as interrupt driven execution. port_task framework makes sure that EH is not entered until PIO task is flushed, so PIO task can be sure the qc in progress won't go away underneath it. One thing it cannot be sure of is whether the qc has already been scheduled for EH by another exception condition while host_set lock was released. This patch makes ata_poll_qc-complete() handle such conditions properly and make it freeze the port if HSM violation is detected during PIO execution. Signed-off-by: Tejun Heo commit e318049949b07152d851dbfebbd93e560af45ebe tree cbc322c94717c9ac5d7e2c48a9f690a2e0145b81 parent 7b70fc039824bc7303e4007a5f758f832de56611 author Tejun Heo Mon, 15 May 2006 20:58:09 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:09 +0900 [PATCH] libata-eh-fw: implement freeze/thaw Freezing is performed atomic w.r.t. host_set->lock and once frozen LLDD is not allowed to access the port or any qc on it. Also, libata makes sure that no new qc gets issued to a frozen port. A frozen port is thawed after a reset operation completes successfully, so reset methods must do its job while the port is frozen. During initialization all ports get frozen before requesting IRQ, so reset methods are always invoked on a frozen port. Optional ->freeze and ->thaw operations notify LLDD that the port is being frozen and thawed, respectively. LLDD can disable/enable hardware interrupt in these callbacks if the controller's IRQ mask can be changed dynamically. If the controller doesn't allow such operation, LLDD can check for frozen state in the interrupt handler and ack/clear interrupts unconditionally while frozen. Signed-off-by: Tejun Heo commit 7b70fc039824bc7303e4007a5f758f832de56611 tree d973a40055dec97fedc5ae87852667ed2d30ea71 parent f686bcb8078ac7505ec88818886c2c72639f4fc5 author Tejun Heo Mon, 15 May 2006 20:58:07 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:07 +0900 [PATCH] libata-eh-fw: implement ata_port_schedule_eh() and ata_port_abort() ata_port_schedule_eh() directly schedules EH for @ap without associated qc. Once EH scheduled, no further qc is allowed and EH kicks in as soon as all currently active qc's are drained. ata_port_abort() schedules all currently active commands for EH by qc_completing them with ATA_QCFLAG_FAILED set. If ata_port_abort() doesn't find any qc to abort, it directly schedule EH using ata_port_schedule_eh(). These two functions provide ways to invoke EH for conditions which aren't directly related to any specfic qc. Signed-off-by: Tejun Heo commit f686bcb8078ac7505ec88818886c2c72639f4fc5 tree 7c563e0032b2d85b631b617b8bb2a7a648607468 parent f69499f42caf74194df678c9c293f2ee0fe90bc3 author Tejun Heo Mon, 15 May 2006 20:58:05 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:05 +0900 [PATCH] libata-eh-fw: implement new EH scheduling via error completion There are several ways a qc can get schedule for EH in new EH. This patch implements one of them - completing a qc with ATA_QCFLAG_FAILED set or with non-zero qc->err_mask. ALL such qc's are examined by EH. New EH schedules a qc for EH from completion iff ->error_handler is implemented, qc is marked as failed or qc->err_mask is non-zero and the command is not an internal command (internal cmd is handled via ->post_internal_cmd). The EH scheduling itself is performed by asking SCSI midlayer to schedule EH for the specified scmd. For drivers implementing old-EH, nothing changes. As this change makes ata_qc_complete() rather large, it's not inlined anymore and __ata_qc_complete() is exported to other parts of libata for later use. Signed-off-by: Tejun Heo commit f69499f42caf74194df678c9c293f2ee0fe90bc3 tree 642f3d5792eb6561fd01116f6a247d26f9e3e304 parent 2ab7db1ff1d64a2ba389d0692d532f42a15f1f72 author Tejun Heo Mon, 15 May 2006 20:58:03 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:03 +0900 [PATCH] libata-eh-fw: update ata_qc_from_tag() to enforce normal/EH qc ownership New EH framework has clear distinction about who owns a qc. Every qc starts owned by normal execution path - PIO, interrupt or whatever. When an exception condition occurs which affects the qc, the qc gets scheduled for EH. Note that some events (say, link lost and regained, command timeout) may schedule qc's which are not directly related but could have been affected for EH too. Scheduling for EH is atomic w.r.t. ap->host_set->lock and once schedule for EH, normal execution path is not allowed to access the qc in whatever way. (PIO synchronization acts a bit different and will be dealt with later) This patch make ata_qc_from_tag() check whether a qc is active and owned by normal path before returning it. If conditions don't match, NULL is returned and thus access to the qc is denied. __ata_qc_from_tag() is the original ata_qc_from_tag() and is used by libata core/EH layers to access inactive/failed qc's. This change is applied only if the associated LLDD implements new EH as indicated by non-NULL ->error_handler Signed-off-by: Tejun Heo commit 2ab7db1ff1d64a2ba389d0692d532f42a15f1f72 tree c676e2796896e6856fda6cc6598d5670d06b5c1c parent dc2b3515868a254b3d653d77844bff93c5d4c095 author Tejun Heo Mon, 15 May 2006 20:58:02 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:02 +0900 [PATCH] libata-eh-fw: use special reserved tag and qc for internal commands New EH may issue internal commands to recover from error while failed qc's are still hanging around. To allow such usage, reserve tag ATA_MAX_QUEUE-1 for internal command. This also makes it easy to tell whether a qc is for internal command or not. ata_tag_internal() test implements this test. To avoid breaking existing drivers, ata_exec_internal() uses ATA_TAG_INTERNAL only for drivers which implement ->error_handler. For drivers using old EH, tag 0 is used. Note that this makes ata_tag_internal() test valid only when ->error_handler is implemented. This is okay as drivers on old EH should not and does not have any reason to use ata_tag_internal(). Signed-off-by: Tejun Heo commit dc2b3515868a254b3d653d77844bff93c5d4c095 tree 9593b32b85cce3cc03802ed00d928f3b7ea65aa9 parent 9ec957f2002bd2994be659bbc0ec28397fa251ee author Tejun Heo Mon, 15 May 2006 20:58:00 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:00 +0900 [PATCH] libata-eh-fw: clear SError in ata_std_postreset() Clear SError in ata_std_postreset(). This is to clear SError bits which get set during reset. Signed-off-by: Tejun Heo commit 9ec957f2002bd2994be659bbc0ec28397fa251ee tree 26c920d57260ebd397f19dd597ab845b68d04d18 parent f15a1dafed22d5037e0feea7528e1eeb28a1a7a3 author Tejun Heo Mon, 15 May 2006 20:57:58 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:58 +0900 [PATCH] libata-eh-fw: add flags and operations for new EH Add ATA_FLAG_EH_{PENDING|FROZEN}, ATA_ATA_QCFLAG_{FAILED|SENSE_VALID} and ops->freeze, thaw, error_handler, post_internal_cmd() for new EH. Signed-off-by: Tejun Heo commit f15a1dafed22d5037e0feea7528e1eeb28a1a7a3 tree 5bf5c98332036d62bd4cca3a104844faa318c712 parent 61440db61fe4945ad9f7b32b4d6a22b17174aa1f author Tejun Heo Mon, 15 May 2006 20:57:56 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:56 +0900 [PATCH] libata: use ATA printk helpers Use ATA printk helpers. Signed-off-by: Tejun Heo commit 61440db61fe4945ad9f7b32b4d6a22b17174aa1f tree 4c093d6c72facf6bc77fcedce7d8c1cb85415f5b parent 3373efd89dead4ce7818d685729e0431448357c9 author Tejun Heo Mon, 15 May 2006 20:57:55 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:55 +0900 [PATCH] libata: implement ATA printk helpers Implement ata_{port|dev}_printk() which prefixes the message with proper identification string. This change is necessary for later PM support because devices and links should be identified differently depending on how they are attached. This also helps unifying device id strings. Currently, there are two forms in use (P is the port number D device number) - 'ataP(D):', and 'ataP: dev D '. These macros also make it harder to forget proper ID string (e.g. printing only port number when a device is in question). Debug message handling can be integrated into these printk macros by passing debug type and level via @lv. Signed-off-by: Tejun Heo commit 3373efd89dead4ce7818d685729e0431448357c9 tree d7e7a1afd83e269c3c0978f924cd8c54d9be7f5a parent 38d87234d6c47ca487fc6344100323d5adc6f32c author Tejun Heo Mon, 15 May 2006 20:57:53 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:53 +0900 [PATCH] libata: use dev->ap Use dev->ap where possible and eliminate superflous @ap from functions and structures. Signed-off-by: Tejun Heo commit 38d87234d6c47ca487fc6344100323d5adc6f32c tree 5136dc203543954ab8340988c3a18fcec39bf533 parent a0ab51cefc95cb7756c4914603fea2b1a0f813c5 author Tejun Heo Mon, 15 May 2006 20:57:51 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:51 +0900 [PATCH] libata: add dev->ap Add dev->ap which points back to the port the device belongs to. This makes it unnecessary to pass @ap for silly reasons (e.g. printks). Also, this change is necessary to accomodate later PM support which will introduce ATA link inbetween port and device. Signed-off-by: Tejun Heo commit a0ab51cefc95cb7756c4914603fea2b1a0f813c5 tree 8ad4be1bd8df959db434f83d33ced04dab211145 parent 81952c5497b40ae56835bd0d6537f8c6bdea07e7 author Tejun Heo Mon, 15 May 2006 20:57:49 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:49 +0900 [PATCH] libata: kill old SCR functions and sata_dev_present() Kill now unused scr_{read|write|write_flush}() and sata_dev_present(). Signed-off-by: Tejun Heo commit 81952c5497b40ae56835bd0d6537f8c6bdea07e7 tree fa2db695c56e481c271c7249197ad3b4a98b6087 parent 34bf21704c848fe00c516d1c8f163db08b70b137 author Tejun Heo Mon, 15 May 2006 20:57:47 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:47 +0900 [PATCH] libata: use new SCR and on/offline functions Use new SCR and on/offline functions. Note that for LLDD which know it implements SCR callbacks, SCR functions are guaranteed to succeed and ata_port_online() == !ata_port_offline(). Signed-off-by: Tejun Heo commit 34bf21704c848fe00c516d1c8f163db08b70b137 tree 8482de3ddf6ff1b02ff9ddfd027d2478c7ecd7ac parent 838df6284c54447efae956fb9c243d8ba4ab0f47 author Tejun Heo Mon, 15 May 2006 20:57:46 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:46 +0900 [PATCH] libata: implement new SCR handling and port on/offline functions Implement ata_scr_{valid|read|write|write_flush}() and ata_port_{online|offline}(). These functions replace scr_{read|write}() and sata_dev_present(). Major difference between between the new SCR functions and the old ones is that the new ones have a way to signal error to the caller. This makes handling SCR-available and SCR-unavailable cases in the same path easier. Also, it eases later PM implementation where SCR access can fail due to various reasons. ata_port_{online|offline}() functions return 1 only when they are affirmitive of the condition. e.g. if SCR is unaccessible or presence cannot be determined for other reasons, these functions return 0. So, ata_port_online() != !ata_port_offline(). This distinction is useful in many exception handling cases. Signed-off-by: Tejun Heo commit 838df6284c54447efae956fb9c243d8ba4ab0f47 tree 1bba23b1bf77f80facfc5c6046f357e237176d48 parent ce5f7f3d0cab82d6c16fcb64def8bfc0a3a85dd6 author Tejun Heo Mon, 15 May 2006 20:57:44 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:44 +0900 [PATCH] libata: init ap->cbl to ATA_CBL_SATA early Init ap->cbl to ATA_CBL_SATA in ata_host_init(). This is necessary for soon-to-follow SCR handling function changes. LLDDs are free to change ap->cbl during probing. Signed-off-by: Tejun Heo commit ce5f7f3d0cab82d6c16fcb64def8bfc0a3a85dd6 tree 35a8af3090fef05001f931fee0c5e374433f5458 parent e61e067227bc76b4d9411a50d735c9d87f27b0e2 author Tejun Heo Mon, 15 May 2006 20:57:42 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:42 +0900 [PATCH] sata_sil24: update TF image only when necessary Update TF image (pp->tf) only when necessary. Signed-off-by: Tejun Heo commit e61e067227bc76b4d9411a50d735c9d87f27b0e2 tree 007d22539b24aa6ae8e258af6e22a4187490a4c1 parent 96bd39ec295e49443c8b0c25a6b69fdace18780f author Tejun Heo Mon, 15 May 2006 20:57:40 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:40 +0900 [PATCH] libata: implement qc->result_tf Add qc->result_tf and ATA_QCFLAG_RESULT_TF. This moves the responsibility of loading result TF from post-compltion path to qc execution path. qc->result_tf is loaded if explicitly requested or the qc failsa. This allows more efficient completion implementation and correct handling of result TF for controllers which don't have global TF representation such as sil3124/32. Signed-off-by: Tejun Heo commit 96bd39ec295e49443c8b0c25a6b69fdace18780f tree 02b80f3a37f3b75b68f41e6243fab513aed30b32 parent 3adcebb2b59d590d572844815c906ca30477b14a author Tejun Heo Mon, 15 May 2006 20:57:38 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:38 +0900 [PATCH] libata: remove postreset handling from ata_do_reset() Make ata_do_reset() deal only with reset. postreset is now the responsibility of the caller. This is simpler and eases later prereset addition. Signed-off-by: Tejun Heo commit 3adcebb2b59d590d572844815c906ca30477b14a tree e3103126556b5363ae7a30fc967d1ea4645de5a6 parent fe635c7e91036282e4fd0cc5b4eebc712e43270d author Tejun Heo Mon, 15 May 2006 20:57:37 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:37 +0900 [PATCH] libata: move ->set_mode() handling into ata_set_mode() Move ->set_mode() handlng into ata_set_mode(). Signed-off-by: Tejun Heo commit fe635c7e91036282e4fd0cc5b4eebc712e43270d tree 22054d039df52c19e729f30ceee836936a730ce6 parent 158693031d7c58a355ec1852052a4fca75fd3bda author Tejun Heo Mon, 15 May 2006 20:57:35 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:35 +0900 [PATCH] libata: use preallocated buffers It's not a very good idea to allocate memory during EH. Use statically allocated buffer for dev->id[] and add 512byte buffer ap->sector_buf. This buffer is owned by EH (or probing) and to be used as temporary buffer for various purposes (IDENTIFY, NCQ log page 10h, PM GSCR block). Signed-off-by: Tejun Heo commit 158693031d7c58a355ec1852052a4fca75fd3bda tree 2afbc7cb635746b2b6f2a6b6b5c64e9c62777168 parent 7401abf2f44695ef44eef47d5deba1c20214a063 author Tejun Heo Mon, 15 May 2006 20:57:33 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:33 +0900 [PATCH] libata: hold host_set lock while finishing internal qc Hold host_set lock while finishing internal qc. Signed-off-by: Tejun Heo commit 7401abf2f44695ef44eef47d5deba1c20214a063 tree 582a02c76d1d975846bd779923d715cb617efef9 parent f8c2c4202d86e14ca03b7adc7ebcb30fc74b24e1 author Tejun Heo Mon, 15 May 2006 20:57:32 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:32 +0900 [PATCH] libata: clear ap->active_tag atomically w.r.t. command completion ap->active_tag was cleared in ata_qc_free(). This left ap->active_tag dangling after ata_qc_complete(). Spurious interrupts inbetween could incorrectly access the qc. Clear active_tag in ata_qc_complete(). This change is necessary for later EH changes. Signed-off-by: Tejun Heo commit f8c2c4202d86e14ca03b7adc7ebcb30fc74b24e1 tree acd1428c4cf8f6b2370db54f368309143774e72a parent 6cd727b14f1a6cdcb088d1067c1ba0ba124806a7 author Tejun Heo Mon, 15 May 2006 20:57:30 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:30 +0900 [PATCH] libata: fix ->phy_reset class code handling in ata_bus_probe() ata_bus_probe() doesn't clear dev->class after ->phy_reset(). This can result in falsely enabled devices if probing fails. Clear dev->class to ATA_DEV_UNKNOWN after fetching it. Signed-off-by: Tejun Heo commit 6cd727b14f1a6cdcb088d1067c1ba0ba124806a7 tree 21ad0764c0f511b029e2f4548a5035a983d978e2 parent e23befe9018319dc218e2e51c20ce480e6b45eeb author Tejun Heo Mon, 15 May 2006 20:57:28 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:28 +0900 [PATCH] libata: kill duplicate prototypes Kill duplicate prototypes for ata_eh_qc_complete/retry() in libata.h. Signed-off-by: Tejun Heo commit e23befe9018319dc218e2e51c20ce480e6b45eeb tree 2b0ca8ab4454ca5ecff93448699236e7687af133 parent e4fac92ae744cd5d5c3c1774825788e6b91a5965 author Tejun Heo Mon, 15 May 2006 20:57:27 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:27 +0900 [PATCH] libata: unexport ata_scsi_error() While moving ata_scsi_error() from LLDD sht to libata transportt, EXPORT_SYMBOL_GPL() entry was left out. Kill it. Signed-off-by: Tejun Heo commit e4fac92ae744cd5d5c3c1774825788e6b91a5965 tree 26af28126d5051f6bd49763ff99a9e6945c87920 parent 3c567b7d1137633f3ff67cd1df94abc5fd497a85 author Tejun Heo Mon, 15 May 2006 20:57:25 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:25 +0900 [PATCH] ahci: hardreset classification fix AHCI calls ata_dev_classify() even when no device is attached which results in false class code. Fix it. Signed-off-by: Tejun Heo commit 3c567b7d1137633f3ff67cd1df94abc5fd497a85 tree 085d98f696a0b8a2440bac4686929731769a6760 parent c44078c03f018c8cc9d7463b0db4c6c7fb316792 author Tejun Heo Mon, 15 May 2006 20:57:23 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:23 +0900 [PATCH] libata: rename ata_down_sata_spd_limit() and friends Rename ata_down_sata_spd_limit() and friends to sata_down_spd_limit() and likewise for simplicity & consistency. Signed-off-by: Tejun Heo commit c44078c03f018c8cc9d7463b0db4c6c7fb316792 tree 3f638ee85d7e1eb8e0951b581b51fdcec43ff9d6 parent ee7863bc68fa6ad6fe7cfcc0e5ebe9efe0c0664e author Tejun Heo Mon, 15 May 2006 20:57:21 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:21 +0900 [PATCH] libata: silly fix in ata_scsi_start_stop_xlat() Don't directly access &qc->tf when tf == &qc->tf. Signed-off-by: Tejun Heo commit ee7863bc68fa6ad6fe7cfcc0e5ebe9efe0c0664e tree 2ca442445403be0101abf0592df3c625633dd49d parent 89f48c4d67dd875cf2216d4402bf77eda41fbdd9 author Tejun Heo Mon, 15 May 2006 20:57:20 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:20 +0900 [PATCH] SCSI: implement shost->host_eh_scheduled libata needs to invoke EH without scmd. This patch adds shost->host_eh_scheduled to implement such behavior. Currently the only user of this feature is libata and no general interface is defined. This patch simply adds handling for host_eh_scheduled where needed and exports scsi_eh_wakeup() to modules. The rest is upto libata. This is the result of the following discussion. http://thread.gmane.org/gmane.linux.scsi/23853/focus=9760 In short, SCSI host is not supposed to know about exceptions unrelated to specific device or command. Such exceptions should be handled by transport layer proper. However, the distinction is not essential to ATA and libata is planning to depart from SCSI, so, for the time being, libata will be using SCSI EH to handle such exceptions. Signed-off-by: Tejun Heo commit 89f48c4d67dd875cf2216d4402bf77eda41fbdd9 tree 72f8664d7029f0190557b1b9f437b35e047cfd95 parent acc696d93dcf993dec123d69d599979e1456ffec author Luben Tuikov Mon, 15 May 2006 20:57:18 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:18 +0900 [PATCH] SCSI: Introduce scsi_req_abort_cmd (REPOST) Introduce scsi_req_abort_cmd(struct scsi_cmnd *). This function requests that SCSI Core start recovery for the command by deleting the timer and adding the command to the eh queue. It can be called by either LLDDs or SCSI Core. LLDDs who implement their own error recovery MAY ignore the timeout event if they generated scsi_req_abort_cmd. First post: http://marc.theaimsgroup.com/?l=linux-scsi&m=113833937421677&w=2 Signed-off-by: Luben Tuikov Signed-off-by: Tejun Heo commit 74ce1468128e299fe6a85e7e78e528e45e72d6d9 tree bea67551393eec8ce05bbf9ad01c11ae67415d3f parent 0feabb01d93e5801d1127416a66cfc3963280bca author Konstantin Karasyov Mon, 08 May 2006 08:32:00 -0400 committer Len Brown Mon, 15 May 2006 03:27:32 -0400 ACPI: create acpi_thermal_resume() http://bugzilla.kernel.org/show_bug.cgi?id=4364 Signed-off-by: Konstantin Karasyov Signed-off-by: Len Brown commit 0feabb01d93e5801d1127416a66cfc3963280bca tree 8f8a813abfbc82e9c9e6c0d58de0868be163fa67 parent 531881d665ca011326bb466b97b07c95dee8d0a1 author Konstantin Karasyov Mon, 08 May 2006 00:00:00 -0400 committer Len Brown Mon, 15 May 2006 03:16:45 -0400 ACPI: create acpi_fan_suspend()/acpi_fan_resume() http://bugzilla.kernel.org/show_bug.cgi?id=5000 Signed-off-by: Len Brown commit 531881d665ca011326bb466b97b07c95dee8d0a1 tree 20f5e15751ff07bc9124dde4a3e6387a03b75933 parent 5b3272655a8e8a9a6e2503bc5a88fc9d9c8292a4 author Len Brown Mon, 15 May 2006 03:06:41 -0400 committer Len Brown Mon, 15 May 2006 03:06:41 -0400 ACPI: pass pm_message_t from acpi_device_suspend() to root_suspend() in case we want to decode it for future use in acpi_op_suspend(..., state) also, inline new 1-liner static function http://bugzilla.kernel.org/show_bug.cgi?id=5000 Signed-off-by: Len Brown commit 5b3272655a8e8a9a6e2503bc5a88fc9d9c8292a4 tree a292396e87e1bdafdca199ab1c1843302ccf00f6 parent d8c3291c73b958243b33f8509d4507e76dafd055 author Patrick Mochel Wed, 10 May 2006 10:33:00 -0400 committer Len Brown Mon, 15 May 2006 02:44:47 -0400 ACPI: create acpi_device_suspend()/acpi_device_resume() updated and tested by Konstantin Karasyov http://bugzilla.kernel.org/show_bug.cgi?id=5000 Signed-off-by: Patrick Mochel Signed-off-by: Konstantin Karasyov Signed-off-by: Len Brown commit 9c576ff1bc9ab42d06457e68e39c121481138562 tree 8082e3ccad2ea162eee9889a681b87267e42f6f6 parent ebd5f2ca811b75f7145fa487748f26430c584a72 author KAMEZAWA Hiroyuki Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Mon, 15 May 2006 02:23:35 -0400 ACPI add ia64 exports to build acpi_memhotplug as a module Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 973bf491a55b825740f0d8d300b50bcd3d6fb8de tree c01d8e5ff13020dfffe6d99248820f0a737eba4c parent d8c3291c73b958243b33f8509d4507e76dafd055 author Yu, Luming Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Mon, 15 May 2006 02:05:48 -0400 ACPI: fix potential memory leaks in driver/acpi/video.c acpi_video_bus_get_one_device() and other functions in driver/acpi/video.c do not release allocated memory on remove and on the error path. Signed-off-by: "Yu, Luming" Signed-off-by: Vasily Averin Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit ebd5f2ca811b75f7145fa487748f26430c584a72 tree bbe03f3fe9b68cbb05b7e8d9b8135dffa1fbc20e parent b6835052a6aa00536343b6d2127fc65cd814a040 author Andrew Morton Sat, 13 May 2006 22:56:00 -0400 committer Len Brown Mon, 15 May 2006 01:26:20 -0400 ACPI: asus_acpi_init(): propagate correct return value Cc: Bjorn Helgaas Acked-by: Francois Romieu Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 3e68fbb59b3d4e6b47b65e9928b5929e02179759 tree 6ff2574161328a89f81f637ac42ce639e8ba31d3 parent 52239da1b06ff445bf71d35e04d8ce74e4c6fe7b author David Woodhouse Mon, 15 May 2006 00:49:43 +0100 committer David Woodhouse Mon, 15 May 2006 00:49:43 +0100 [JFFS2] Don't pack on-medium structures, because GCC emits crappy code If we use __attribute__((packed)), GCC will _also_ assume that the structures aren't sensibly aligned, and it'll emit code to cope with that instead of straight word load/save. This can be _very_ suboptimal on architectures like ARM. Ideally, we want an attribute which just tells GCC not to do any padding, without the alignment side-effects. In the absense of that, we'll just drop the 'packed' attribute and hope that everything stays as it was (which to be fair is fairly much what we expect). And add some paranoia checks in the initialisation code, which should be optimised away completely in the normal case. Signed-off-by: David Woodhouse commit 52239da1b06ff445bf71d35e04d8ce74e4c6fe7b tree b33fe34d8a641600fbddb8dda7f4706c70026346 parent 0d4e30d26a279f1b6a008a233a6835ad2af571e4 author David Woodhouse Sun, 14 May 2006 16:54:39 +0100 committer David Woodhouse Sun, 14 May 2006 16:54:39 +0100 [MTD NAND] Modify check for modules registering NAND devices without ->owner Make it work even with compilers which lack the wit to notice that THIS_MODULE is always non-NULL. Use #ifdef MODULE instead. It's only a temporary debugging check anyway. Signed-off-by: David Woodhouse commit 0d4e30d26a279f1b6a008a233a6835ad2af571e4 tree c1e239af9f94e37565f876db90245ce999228658 parent 2f206701ae9b5c13719c2be26121b9461f05f87c author David Woodhouse Sun, 14 May 2006 12:25:19 +0100 committer David Woodhouse Sun, 14 May 2006 12:25:19 +0100 [MTD] Clean up to fix modular build ... and also fix the multiple inclusion guard so it actually _works_ Signed-off-by: David Woodhouse commit 2f206701ae9b5c13719c2be26121b9461f05f87c tree 574037d71f805a50062f5752f6e70f688b33620e parent cf5eba53346fbfdf1b80e05ca3fd7fe2ec841077 author David Woodhouse Sun, 14 May 2006 11:59:20 +0100 committer David Woodhouse Sun, 14 May 2006 11:59:20 +0100 [MTD] Remove gratuitous inclusion of ARM-only header from physmap.c The physmap platform driver conversion added to physmap.c an include of asm/mach/flash.h which is 1) ARM-specific; and 2) isn't actually necessary. Remove it. Signed-off-by: Lennert Buytenhek Signed-off-by: David Woodhouse commit b6835052a6aa00536343b6d2127fc65cd814a040 tree b5ea66977f0963c6d9e0668e55c60592957da6b8 parent 09047e75f69428dcfa977b326256085154068b65 author Andreas Mohr Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Sun, 14 May 2006 00:03:48 -0400 ACPI: apply "__read_mostly" to processor_idle.c loop module parameters and friends make pm_idle_save, nocst and bm_history __read_mostly remove initializer from static 'first_run'. Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 09047e75f69428dcfa977b326256085154068b65 tree d04433b26231bc7932676873f5b40bd4c78ab0e9 parent 64385f2fd8bc9d8803c8d10dcd391871cb126b77 author Vasily Averin Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Sat, 13 May 2006 23:43:39 -0400 ACPI: fix memory leak in acpi_thermal_add() error path Signed-off-by: Vasily Averin Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 64385f2fd8bc9d8803c8d10dcd391871cb126b77 tree bc18ddbf256b959a10386cee2d9cf44c208eec03 parent 5810452d00ae5fed7f720185d02d79ec9d15b91e author Vasily Averin Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Sat, 13 May 2006 23:38:24 -0400 ACPI: fix potential memory leak in acpi_evaluate_integer() error path Signed-off-by: Vasily Averin Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 06ea8e08ae7e7e450b6a78e7ce5e10b3c5f954ea tree 23497be5428324a3d9e8cdd504e1f37f9213c8bd parent e4513a57ef719d3d6d1cee0ca4d9f4016aa452bb author Bjorn Helgaas Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Sat, 13 May 2006 23:23:57 -0400 ACPI: acpi_bus_unregister_driver() returns void Nobody looks at the return value, and this brings it into line with pci_unregister_driver(), etc. Also removed validation of the driver pointer passed in to register and unregister. More consistent, and we'll find bugs faster if we fault rather than returning an error that's ignored. Also makes internal functions acpi_device_unregister() and acpi_driver_detach() void, since nobody uses their returns either. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 193de0c79da580eb33a66113b62e2378fc1fb629 tree 62e278011d758b57105af7d00d1b0b9977d0f2e3 parent 9011bff4bdc0fef1f9a782d7415c306ee61826c9 author KAMEZAWA Hiroyuki Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Sat, 13 May 2006 23:11:29 -0400 ACPI: use for_each_possible_cpu() instead of for_each_cpu() for_each_cpu() actually iterates across all possible CPUs. We've had mistakes in the past where people were using for_each_cpu() where they should have been iterating across only online or present CPUs. This is inefficient and possibly buggy. We're renaming for_each_cpu() to for_each_possible_cpu() to avoid this in the future. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit cf5eba53346fbfdf1b80e05ca3fd7fe2ec841077 tree 22e24ce02de0ddd1c7a1113a59f0cac157aa9dab parent 151e76590f66f5406eb2e1f4270c5323f385d2e8 author David Woodhouse Sun, 14 May 2006 04:06:24 +0100 committer David Woodhouse Sun, 14 May 2006 04:06:24 +0100 [JFFS2] Reduce excessive node count for syslog files. We currently get fairly poor behaviour with files which get many short writes, such as system logs. This is because we end up with many tiny data nodes, and the rbtree gets massive. None of these nodes are actually obsolete, so they are counted as 'clean' space. Eraseblocks can be entirely full of these nodes (which are REF_NORMAL instead of REF_PRISTINE), and still they count entirely towards 'used_size' and the eraseblocks can sit on the clean_list for a long time without being picked for GC. One way to alleviate this in the long term is to account REF_NORMAL space separately from REF_PRISTINE space, rather than counting them both towards used_size. Then these eraseblocks can be picked for GC and the offending nodes will be garbage collected. The short-term fix, though -- which probably makes sense even if we do eventually implement the above -- is to merge these nodes as they're written. When we write the last byte in a page, write the _whole_ page. This obsoletes the earlier nodes in the page _immediately_ and we don't even need to wait for the garbage collection to do it. Original implementation from Ferenc Havasi Signed-off-by: David Woodhouse commit 36e430951af0b0d1bdfd50ce22e70079d02646df tree 6743bd4ea66e74e2318e1c694fe4941334322605 parent 415d320a2384bb80d2be98b1dfa41594e085012d author Ingo Molnar Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Sat, 13 May 2006 21:48:21 -0400 sem2mutex: acpi, acpi_link_lock Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 415d320a2384bb80d2be98b1dfa41594e085012d tree b4a7676536edb3550c41d3ae7e1ba8fd34e2cb7e parent 65c19bbd28cba587d9bd24feccf7272da18481a7 author Len Brown Sat, 13 May 2006 21:35:56 -0400 committer Len Brown Sat, 13 May 2006 21:35:56 -0400 ACPI: delete unused acpi_bus_drivers_lock acpi_bus_drivers is protected by acpi_device_lock Signed-off-by: Len Brown commit 65c19bbd28cba587d9bd24feccf7272da18481a7 tree 62467a7d5a1c5e1b918add2ff0d55982843318ea parent d8c3291c73b958243b33f8509d4507e76dafd055 author Arjan van de Ven Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Sat, 13 May 2006 21:33:52 -0400 sem2mutex: drivers/acpi/processor_perflib.c Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 151e76590f66f5406eb2e1f4270c5323f385d2e8 tree 307920af4883b7466eb303f4045865429e4d0711 parent 0f5ae3d2e9f49af55eb2a9b7cb54b4c0c2373017 author David Woodhouse Sun, 14 May 2006 01:51:54 +0100 committer David Woodhouse Sun, 14 May 2006 01:51:54 +0100 [MTD] Fix legacy character sets throughout drivers/mtd, include/linux/mtd Signed-off-by: David Woodhouse commit 0f5ae3d2e9f49af55eb2a9b7cb54b4c0c2373017 tree c06f26d34bff12e4324e901a6406835894010da3 parent a6550e57f9d074511cf420bdb802ab5e56edc3bb author David Woodhouse Sun, 14 May 2006 01:40:50 +0100 committer David Woodhouse Sun, 14 May 2006 01:40:50 +0100 [MTD] Deal correctly with NOR chips which are smaller than the map window We used to calculate the number of chips to be zero, allocate an array of that size, then nasty things would happen when we attempt to access the first object in that zero-sized array. Now, if the number of _full_ chips that would fit into the map is zero, we allocate an array of one anyway, and then artificially reduce the total size of the resulting MTD device to fit in the map. Signed-off-by: David Woodhouse commit a6550e57f9d074511cf420bdb802ab5e56edc3bb tree 56010126c6a1660b6fbd97765c73f8808214f98c parent 552d9205186428a1e2a49ed577bcbba9f777af37 author Jesper Juhl Sun, 14 May 2006 01:42:25 +0200 committer David Woodhouse Sun, 14 May 2006 01:21:31 +0100 mtd: fix memory leak in block2mtd_setup() There's a mem leak in drivers/mtd/devices/block2mtd.c::block2mtd_setup() We can leak 'name' allocated with kmalloc in 'parse_name' if leave via the 'parse_err' macro since it contains a return but doesn't do any freeing. Spotted by coverity checker as bug 615. Signed-off-by: Jesper Juhl Signed-off-by: David Woodhouse commit 552d9205186428a1e2a49ed577bcbba9f777af37 tree d61e09abae0ad18a3beef281384e576d8a54c145 parent 4f678a58d335291ce9213c049bbe16e6d24487ed author David Woodhouse Sun, 14 May 2006 01:20:46 +0100 committer David Woodhouse Sun, 14 May 2006 01:20:46 +0100 [MTD] Fix module refcounting in NAND board drivers. The _board_ driver needs to be mtd->owner, and it in turn pins the nand.ko module. Fix them all to actually do that, and fix nand.ko not to overwrite it -- and also to check that the caller sets it, if the caller is a module. Signed-off-by: David Woodhouse commit 4f678a58d335291ce9213c049bbe16e6d24487ed tree 136a3406bf5b0e80b3d45cd4d3c6ca40bb9961fd parent e0c7d7675331140e5186d2d1a0efce1d3877d379 author Jesper Juhl Sun, 14 May 2006 01:07:18 +0200 committer David Woodhouse Sun, 14 May 2006 00:13:30 +0100 mtd: fix memory leaks in phram_setup There are two code paths in drivers/mtd/devices/phram.c::phram_setup() that will leak memory. Memory is allocated to the variable 'name' with kmalloc() by the parse_name() function, but if we leave by way of the parse_err() macro, then that memory is never kfree()'d, nor is it ever used with register_device() so it won't be freed later either - leak. Found by the Coverity checker as #593 - simple fix below. Signed-off-by: Jesper Juhl Signed-off-by: David Woodhouse commit e0c7d7675331140e5186d2d1a0efce1d3877d379 tree 45247eb5029382c64392aa641e8b0e5506ed152f parent 6943f8af7d6583be57d67bba8b2644371f6a10ca author David Woodhouse Sat, 13 May 2006 18:07:53 +0100 committer David Woodhouse Sat, 13 May 2006 18:07:53 +0100 [MTD NAND] Indent all of drivers/mtd/nand/*.c. It was just too painful to deal with. Signed-off-by: David Woodhouse commit 6943f8af7d6583be57d67bba8b2644371f6a10ca tree b6c3842b6616b4878677c9bded3a12a6e99dda3d parent 9d75414b4fa7390975ef0e2b56ff40425657fe52 author David Woodhouse Sat, 13 May 2006 16:14:26 +0100 committer David Woodhouse Sat, 13 May 2006 16:14:26 +0100 [MTD NAND] Reduce paranoia level when scanning for bad blocks on virgin chips We were scanning for 0xFF through the entire chip -- which takes a while when it's a 512MiB device as I have on my current toy. The specs only say we need to check certain bytes -- so do only that. Signed-off-by: David Woodhouse commit 21b9879bf2817aca343cdda11ade6a87f5373e74 tree 1282485660b9faaac206c2b445e3b6081c2ba89f parent c8708a9275928cc8e77bd443cd12565dda0a3ded author KaiGai Kohei Sat, 13 May 2006 15:22:29 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:22:29 +0900 [JFFS2][XATTR] Fix obvious typo [2/2] jffs2-xattr-v5.2-02-fix_obvious_typo.patch Signed-off-by: KaiGai Kohei commit c8708a9275928cc8e77bd443cd12565dda0a3ded tree 8a3eb502f0f0474eff19ec6a083cffea240ec9e3 parent dea80134dc4d54df52c0c59b0ba2bb5aa999bf30 author KaiGai Kohei Sat, 13 May 2006 15:21:38 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:21:38 +0900 [JFFS2][XATTR] Handling the duplicate JFFS2_NODETYPE_XATTR node cases. When jffs2_sum_process_sum_data() found a JFFS2_NODETYPE_XATTR which has duplicate xid and older version, an error was returned without appropriate process. In the result, mounting filesystem is failed. This patch fix this problem. If jffs2_setup_xattr_datum() returned -EEXIST, the caller marks this node as DIRTY_SPACE(). [1/2] jffs2-xattr-v5.2-01-fix-duplicate-xdatum.patch Signed-off-by: KaiGai Kohei commit dea80134dc4d54df52c0c59b0ba2bb5aa999bf30 tree 37bfacafa5f5ad58b211c483497218d0ec82443b parent 5a14959c0700cd389d9e7ba312e15c8e85255e1f author KaiGai Kohei Sat, 13 May 2006 15:20:24 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:20:24 +0900 [JFFS2][XATTR] remove redundant pointer cast in acl.c remove redundant pointer cast in acl.c. [10/10] jffs2-xattr-v5.1-10-remove_pointer_cast.patch Signed-off-by: KaiGai Kohei commit 5a14959c0700cd389d9e7ba312e15c8e85255e1f tree f243be5a7a8b33b7d85a066efe22a338b6f8e32e parent ee886b5df17f9791a72cf0afe7f6c0c079231ef8 author KaiGai Kohei Sat, 13 May 2006 15:19:36 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:19:36 +0900 [JFFS2][XATTR] remove '__KERNEL__' from acl.h [9/10] jffs2-xattr-v5.1-09-remove__KERNEL__.patch Signed-off-by: KaiGai Kohei commit ee886b5df17f9791a72cf0afe7f6c0c079231ef8 tree 38bd27b4a465dc439fca2de3fb5c1c0efe8b40ca parent 652ecc20d1f5b4fd745c185c940e5b3afb2a0711 author KaiGai Kohei Sat, 13 May 2006 15:19:03 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:19:03 +0900 [JFFS2][XATTR] remove senseless comment remove senseless comment. [8/10] jffs2-xattr-v5.1-08-remove_senseless_comment.patch Signed-off-by: KaiGai Kohei commit 652ecc20d1f5b4fd745c185c940e5b3afb2a0711 tree 5ab059d451b0ee203cd9c6f7e1e934314b87ee1d parent 4470d0409bfe093abbf965dcc97e5c1450c80afb author KaiGai Kohei Sat, 13 May 2006 15:18:27 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:18:27 +0900 [JFFS2][XATTR] Unify each file header part with any jffs2 file. Unify each file header part with any jffs2 file. [7/10] jffs2-xattr-v5.1-07-unify_file_header.patch Signed-off-by: KaiGai Kohei commit 4470d0409bfe093abbf965dcc97e5c1450c80afb tree 7dba696c0e7ab8e03a9bef023933b532459651fc parent 084702e00111eb9ffb6d8a5c1938b8e5423e40a8 author KaiGai Kohei Sat, 13 May 2006 15:17:11 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:17:11 +0900 [JFFS2][XATTR] '#include ' was added into xattr.h. '#include ' was added into xattr.h. because 'struct list_head' is used in this header file. [6/10] jffs2-xattr-v5.1-06-add_list.h.patch Signed-off-by: KaiGai Kohei commit 084702e00111eb9ffb6d8a5c1938b8e5423e40a8 tree 42f5842eb6f5373b04c4f4d254fde0bdcea2a4d5 parent 8f2b6f49c656dd4597904f8c20661d6b73cdbbeb author KaiGai Kohei Sat, 13 May 2006 15:16:13 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:16:13 +0900 [JFFS2][XATTR] Remove jffs2_garbage_collect_xattr(c, ic) Remove jffs2_garbage_collect_xattr(c, ic). jffs2_garbage_collect_xattr_datum/ref() are called from gc.c directly. In original implementation, jffs2_garbage_collect_xattr(c, ic) returns with holding a spinlock if 'ic' is inode_cache. But it returns after releasing a spinlock if 'ic' is xattr_datum/ref. It looks so confusable behavior. Thus, this patch makes caller manage locking/unlocking. [5/10] jffs2-xattr-v5.1-05-update_xattr_gc.patch Signed-off-by: KaiGai Kohei commit 8f2b6f49c656dd4597904f8c20661d6b73cdbbeb tree 7452e7d2fb9070181a943c104c409cac79abc991 parent 8b0b339d46ca0105a9936e3caa3bac80b72de7a3 author KaiGai Kohei Sat, 13 May 2006 15:15:07 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:15:07 +0900 [JFFS2][XATTR] Remove 'struct list_head ilist' from jffs2_inode_cache. This patch can reduce 4-byte of memory usage per inode_cache. [4/10] jffs2-xattr-v5.1-04-remove_ilist_from_ic.patch Signed-off-by: KaiGai Kohei commit 8b0b339d46ca0105a9936e3caa3bac80b72de7a3 tree 3849c24ba41edad67a610f4e584e41f803df23c5 parent de1f72fab35d2b6215017690c6dc27b8f4aa14bc author KaiGai Kohei Sat, 13 May 2006 15:14:14 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:14:14 +0900 [JFFS2][XATTR] Add a description about c->xattr_sem Add a description about the c->xattr_sem read/write semaphore into README.Locking. [3/10] jffs2-xattr-v5.1-03-append_README.Locking.patch Signed-off-by: KaiGai Kohei commit de1f72fab35d2b6215017690c6dc27b8f4aa14bc tree 7ed7688335b1f5a5b5ac86420f48810a94a5d4ce parent aa98d7cf59b5b0764d3502662053489585faf2fe author KaiGai Kohei Sat, 13 May 2006 15:13:27 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:13:27 +0900 [JFFS2][XATTR] remove typedef from posix_acl related definition. jffs2_acl_header, jffs2_acl_entry and jffs2_acl_entry_short were redefined with using 'struct' instead of 'typedef' in kernel implementation. [1/10] jffs2-xattr-v5.1-01-remove_typedef_kernel.patch Signed-off-by: KaiGai Kohei commit aa98d7cf59b5b0764d3502662053489585faf2fe tree e98e83f3e69ebe3a1112394a19d440419e899749 parent 4992a9e88886b0c5ebc3d27eb74d0344c873eeea author KaiGai Kohei Sat, 13 May 2006 15:09:47 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:09:47 +0900 [JFFS2][XATTR] XATTR support on JFFS2 (version. 5) This attached patches provide xattr support including POSIX-ACL and SELinux support on JFFS2 (version.5). There are some significant differences from previous version posted at last December. The biggest change is addition of EBS(Erase Block Summary) support. Currently, both kernel and usermode utility (sumtool) can recognize xattr nodes which have JFFS2_NODETYPE_XATTR/_XREF nodetype. In addition, some bugs are fixed. - A potential race condition was fixed. - Unexpected fail when updating a xattr by same name/value pair was fixed. - A bug when removing xattr name/value pair was fixed. The fundamental structures (such as using two new nodetypes and exclusion mechanism by rwsem) are unchanged. But most of implementation were reviewed and updated if necessary. Espacially, we had to change several internal implementations related to load_xattr_datum() to avoid a potential race condition. [1/2] xattr_on_jffs2.kernel.version-5.patch [2/2] xattr_on_jffs2.utils.version-5.patch Signed-off-by: KaiGai Kohei Signed-off-by: David Woodhouse commit 5810452d00ae5fed7f720185d02d79ec9d15b91e tree a7921eb6bd46df160712bdd031703c45f4a8155b parent d8c3291c73b958243b33f8509d4507e76dafd055 author Len Brown Sat, 13 May 2006 01:12:15 -0400 committer Len Brown Sat, 13 May 2006 01:12:15 -0400 ACPI: silence ia64 build warning When building sim_defconfig, which does not define CONFIG_ACPI arch/ia64/kernel/acpi.c:71: warning: 'acpi_madt_rev' defined but not used really acpi.c should not be built when CONFIG_ACPI=n... Signed-off-by: Len Brown commit 9d75414b4fa7390975ef0e2b56ff40425657fe52 tree ff21b8e752f83f285c0452c45b3f0c54ccb30550 parent c3f8abf481c2d2b221b028f7369bc6dd39a9590e author David Woodhouse Sat, 13 May 2006 04:12:40 +0100 committer David Woodhouse Sat, 13 May 2006 04:12:40 +0100 [MTD NAND] Update CS553x NAND driver: Hardware ECC support, optimisations. - Implement HW ECC support, - Provide read_buf() and write_buf() routines using memcpy - Use on-flash bad block table - Fix module refcounting - Avoid read/modify/write in hwcontrol() - Minor cosmetic fixes Partly based on code and ideas from Tom Sylla Signed-off-by: David Woodhouse commit c3f8abf481c2d2b221b028f7369bc6dd39a9590e tree 58a8fbb73f736da8b4d0529e0e182ec41f30b6d5 parent 4992a9e88886b0c5ebc3d27eb74d0344c873eeea author David Woodhouse Sat, 13 May 2006 04:03:42 +0100 committer David Woodhouse Sat, 13 May 2006 04:03:42 +0100 [MTD NAND] Use vmalloc for buffer when scanning for bad blocks. These new chips have 128KiB blocks. Don't try to kmalloc that. Signed-off-by: David Woodhouse commit 4992a9e88886b0c5ebc3d27eb74d0344c873eeea tree 23befdd7ccd4ed95b271144f98a6a27749ff3f68 parent 752870707f2818b5f0d94ca05e46cb0ffee6cbf9 author Egry Gábor Fri, 12 May 2006 17:35:02 +0100 committer David Woodhouse Fri, 12 May 2006 17:35:02 +0100 Trivial typo fixes in Kconfig files (MTD). Signed-off-by: Egry Gábor Signed-off-by: David Woodhouse commit 752870707f2818b5f0d94ca05e46cb0ffee6cbf9 tree 4daef328761c5bc00fe891718010ed5cbab81202 parent 493c646077ef0b8668ed71b8057f81cb7454af87 author Kyungmin Park Fri, 12 May 2006 17:03:23 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:51 +0100 OneNAND: fix block command typo We need to check block cmd only instead with comparing with cmd Signed-off-by: Kyungmin Park commit 493c646077ef0b8668ed71b8057f81cb7454af87 tree e05992a8d8c9ba911e5a9809dc0678ca50e96c76 parent 3cecf69ecde22199699c4f0e609dfed2a487b674 author Kyungmin Park Fri, 12 May 2006 17:03:07 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:50 +0100 OneNAND: One-Time Programmable (OTP) support One Block of the NAND Flash Array memory is reserved as a One-Time Programmable Block memory area. Also, 1st Block of NAND Flash Array can be used as OTP. The OTP block can be read, programmed and locked using the same operations as any other NAND Flash Array memory block. OTP block cannot be erased. OTP block is fully-guaranteed to be a valid block. Signed-off-by: Kyungmin Park commit 3cecf69ecde22199699c4f0e609dfed2a487b674 tree dda3a1cdd96b211a747cd0967a1c231daf2d0a47 parent 34c1060959b61a5bb2e97a88411446028cebfa7c author Kyungmin Park Fri, 12 May 2006 17:02:51 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:48 +0100 OneNAND: Handle erase correctly in Double Density Package (DDP) There's erase bug in DDP. We need to add DDP select in erase Signed-off-by: Kyungmin Park commit 34c1060959b61a5bb2e97a88411446028cebfa7c tree 74a58f5e63a2ee4d91d3cae4985ed55141c70aa0 parent 8e6ec69059ba0eecbb2226d3d9e45c6efe6fb82b author Kyungmin Park Fri, 12 May 2006 17:02:46 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:47 +0100 OneNAND: Write oob area with aligned size, mtd->oobsize There's some problem with write oob in serveral platform. So we write oob with oobsize aligned (16bytes) instead of 3 bytes (from {2, 3}) Signed-off-by: Kyungmin Park commit 8e6ec69059ba0eecbb2226d3d9e45c6efe6fb82b tree a44175779ce9ffc379f333709d0903b463fb5c47 parent d9777f1c42bffff0d21cd029a2415776aa874e96 author Kyungmin Park Fri, 12 May 2006 17:02:41 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:47 +0100 OneNAND: Add write_oob verify function Signed-off-by: Jarkko Lavinen commit d9777f1c42bffff0d21cd029a2415776aa874e96 tree c759ccb395e3b97ef15b1af0e9bd9bf3d85f0528 parent 9c01f87db183403a4f603fe5180c57b82b54b4a1 author Jarkko Lavinen Fri, 12 May 2006 17:02:35 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:46 +0100 OneNand: Fix free byte positions. Some free byte positions at onenand_oob_64 were wrong. This was also reported by Christian Lehne. 3 byte slots are at 2+16*i and 2 byte slots at 14+16*i. Signed-off-by: Jarkko Lavinen commit 9c01f87db183403a4f603fe5180c57b82b54b4a1 tree 74da95f8e772be1130296a1bfb31302f89737769 parent 628bee6593107c466e28462f58c5fd5cd4163c7c author Kyungmin Park Fri, 12 May 2006 17:02:31 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:45 +0100 OneNAND: handle byte access on BufferRAM Signed-off-by: Kyungmin Park commit 628bee6593107c466e28462f58c5fd5cd4163c7c tree 5487fecea1e5220ff7448f68d1b26d375b11f1e8 parent 20ffdcb00a792073f6e620dc2c644b3c8fbab528 author Kyungmin Park Fri, 12 May 2006 17:02:24 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:45 +0100 OneNAND: Add touch_softlock_watchdog() Signed-off-by: Kyungmin Park commit 20ffdcb00a792073f6e620dc2c644b3c8fbab528 tree 73983f99c0f2e3f46cf69ef1f14585937782f1c3 parent 1867b7e3f85dc69695735ea4a4cd12027c565d89 author Jesper Juhl Fri, 12 May 2006 11:55:51 +0100 committer David Woodhouse Fri, 12 May 2006 11:55:51 +0100 [JFFS2] Remove number of pointer dereferences in fs/jffs2/summary.c Reduce the nr. of pointer dereferences in fs/jffs2/summary.c Benefits: - micro speed optimization due to fewer pointer derefs - generated code is slightly smaller - better readability (The first two sound like a compiler problem but I'll go with the third. dwmw2). Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 1867b7e3f85dc69695735ea4a4cd12027c565d89 tree dea474351c048fd0507dd2dcc71f754f683625e2 parent 7e59f2ccd7fc2424b2e70132ac613d16acae37da author Jean-Luc Leger Fri, 12 May 2006 11:53:40 +0100 committer David Woodhouse Fri, 12 May 2006 11:53:40 +0100 [MTD] Fix invalid default value of CONFIG_MTD_PCMCIA_ANONYMOUS in Kconfig Default values for boolean and tristate options can only be 'y', 'm' or 'n'. This patch removes wrong default for MTD_PCMCIA_ANONYMOUS. Signed-off-by: Jean-Luc Leger Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 7e59f2ccd7fc2424b2e70132ac613d16acae37da tree 21636370bfcec0895a77420d20522b1ff5f60be0 parent f0ad11d060c7acf727ead8339432bdd2bfd7f868 author Domen Puncer Fri, 12 May 2006 11:51:46 +0100 committer David Woodhouse Fri, 12 May 2006 11:51:46 +0100 [JFFS2] Remove obsolete histo.h This file hasn't actually been used since the very early days of JFFS2 when Arjan was playing with compression methods. It can go now. Signed-off-by: Domen Puncer Signed-off-by: Alexey Dobriyan Acked-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit f0ad11d060c7acf727ead8339432bdd2bfd7f868 tree a9136db2309cfa33ae2389f2ad8e0487e8132acf parent 179fdc3f8dec5757ddbebd95a1b493d65fa08671 author David Woodhouse Fri, 12 May 2006 11:40:13 +0100 committer David Woodhouse Fri, 12 May 2006 11:40:13 +0100 [MTD] Fix capitalisation in export of old doc2001.c initfunc Oops. Stupid StudlyCaps. Again. This driver is doubly-deprecated because is was subsumed into doc2000.c and _also_ we want people to start using the new NAND wrapper for these devices anyway. But ISTR there was still one person using it because something didn't work for them. Must chase that up and then I can kill this. Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 179fdc3f8dec5757ddbebd95a1b493d65fa08671 tree 422f229859e847b5987ec7f0d757eecbdac2f6df parent b04ecae3d62edea2af49fd40ab12435b5ad8a492 author David Woodhouse Thu, 11 May 2006 22:35:28 +0100 committer David Woodhouse Thu, 11 May 2006 22:35:28 +0100 [MTD] Basic NAND driver for AMD/NatSemi CS5535/CS5536 Geode companion chip This lacks hardware ECC support and a few optimisations we're going to want fairly soon, but it works well enough to mount and use JFFS2. Signed-off-by: David Woodhouse commit 9011bff4bdc0fef1f9a782d7415c306ee61826c9 tree 6214e32b2148951416708ee6da0c862da67fa3f8 parent 7e1f19e50371e1d148226b64c8edc77fec47fa5b author Len Brown Thu, 11 May 2006 00:28:12 -0400 committer Len Brown Thu, 11 May 2006 00:28:12 -0400 ACPI: delete newly added debugging macros in processor_perflib.c Signed-off-by: Len Brown commit 2ca48a132167f9f12efba179382979aafde0ab36 tree 4eb3bbce62ac02590d6b49e5529ff90c0253b0fd parent 665b44aee34e9f2c64558df4ec01d40576e45651 author James Bottomley Thu, 27 Apr 2006 14:07:49 -0500 committer James Bottomley Wed, 10 May 2006 10:22:30 -0500 [SCSI] fix proc_scsi_write to return "length" on success with remove-single-device case Problem spotted by: Suzuki K P A zero return on success isn't correct for filesystem write functions. They should either return negative error or the length of bytes consumed. Add code to convert our zero on success error return to return the length of bytes passed in. This fixes the following: $ echo "scsi remove-single-device 0 0 3 0" > /proc/scsi/scsi bash: echo: write error: No such device or address" Signed-off-by: James Bottomley commit b04ecae3d62edea2af49fd40ab12435b5ad8a492 tree 19c6589239372df3445c5944c7c7ea6899088a19 parent 83ea4ef213628683e5a63f2987a91044ab868051 author David Woodhouse Wed, 10 May 2006 16:16:13 +0100 committer David Woodhouse Wed, 10 May 2006 16:16:13 +0100 [MTD] Fix capitalisation in export of DiskOnChip Millennium initfunc Stupid StudlyCaps. Who did that? Signed-off-by: David Woodhouse commit 665b44aee34e9f2c64558df4ec01d40576e45651 tree 2ac5ff4b706f45c0259bdd9ecbe18d792255f109 parent 8d2860b3c3e933304f49171770658c00ed26fd79 author Mike Christie Tue, 02 May 2006 19:46:49 -0500 committer James Bottomley Wed, 10 May 2006 10:13:44 -0500 [SCSI] iscsi: dequeue all buffers from queue debugged by wrwhitehead@novell.com patch and analysis by fujita.tomonori@lab.ntt.co.jp Only tcp_read_sock and recv_actor (iscsi_tcp_data_recv for us) see desc.count. It is is used just for permitting tcp_read_sock to read the portion of data in the socket. When iscsi_tcp_data_recv sees a partial header, it sets desc.count. However, it is possible that the next skb (containing the rest of the header) still does not come. So I'm not sure that this scheme is completely correct. Ideally, we should use the exact length of the data in the socket for desc.count. However, it is not so simple (see SIOCINQ in tcp_ioctl). So I think that iscsi_tcp_data_recv can just stop playing with desc.count and tell tcp_read_sock to read the all skbs. As proposed already, if iscsi_tcp_data_ready sets desc.count to non-zero, tcp_read_sock does that. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 8d2860b3c3e933304f49171770658c00ed26fd79 tree 979395449d53d41bd22732a4be1387f9af73a994 parent be2df72e7ec5fa5e6e1ccccab6cef97ecbb9c191 author Mike Christie Tue, 02 May 2006 19:46:47 -0500 committer James Bottomley Wed, 10 May 2006 10:13:21 -0500 [SCSI] iscsi: increment expstatsn during login debugged by Ming and Rohan: The problem Ming and Rohan debugged was that during a normal session login, open-iscsi is not incrementing the exp_statsn counter. It was stuck at zero. From the RFC, it looks like if the login response PDU has a successful status then we should be incrementing that value. Also from the RFC, it looks like if when we drop a connection then reconnect, we should be using the exp_statsn from the old connection in the next relogin attempt. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit be2df72e7ec5fa5e6e1ccccab6cef97ecbb9c191 tree f4a78a36be0fac5304960e615ad46cc127cf6306 parent ed2abc7ff19dc99c6242a70f8578a17b2ff0d0ce author Or Gerlitz Tue, 02 May 2006 19:46:43 -0500 committer James Bottomley Wed, 10 May 2006 10:12:52 -0500 [SCSI] iscsi: align printks align printk output Signed-off-by: Or Gerlitz Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit ed2abc7ff19dc99c6242a70f8578a17b2ff0d0ce tree 3bf226387f002ee6c67619afd1a950e1d0bde30f parent 264faaaa12544e7914928ad57ccba21907cad56b author Mike Christie Tue, 02 May 2006 19:46:40 -0500 committer James Bottomley Wed, 10 May 2006 10:12:04 -0500 [SCSI] iscsi: fix manamgement task oops from patmans@us.ibm.com and michaelc@cs.wisc.edu Fix bugs when forcing a mgmt task to fail and allow session recovery to cleanup the session/connection of any running mgmt tasks. When called during the in login state. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 264faaaa12544e7914928ad57ccba21907cad56b tree eb8a6993e43f3802b203b371b81fcfb89fc4f754 parent 169e1a2a8a789fa84254695ec6a56fc410bb19a9 author Or Gerlitz Tue, 02 May 2006 19:46:36 -0500 committer James Bottomley Wed, 10 May 2006 10:11:38 -0500 [SCSI] iscsi: add transport end point callbacks add transport end point callbacks so iscsi drivers that cannot connect from userspace, like iscsi tcp, using sockets do not have to implement their own socket infrastructure. Signed-off-by: Or Gerlitz Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 32e62c636a728cb39c0b3bd191286f2ca65d4028 tree 656454a01e720819103c172daae15b5f2fd85d68 parent 6810b548b25114607e0814612d84125abccc0a4f author Bjorn Helgaas Fri, 05 May 2006 17:19:50 -0600 committer Tony Luck Mon, 08 May 2006 16:32:05 -0700 [IA64] rework memory attribute aliasing This closes a couple holes in our attribute aliasing avoidance scheme: - The current kernel fails mmaps of some /dev/mem MMIO regions because they don't appear in the EFI memory map. This keeps X from working on the Intel Tiger box. - The current kernel allows UC mmap of the 0-1MB region of /sys/.../legacy_mem even when the chipset doesn't support UC access. This causes an MCA when starting X on HP rx7620 and rx8620 boxes in the default configuration. There's more detail in the Documentation/ia64/aliasing.txt file this adds, but the general idea is that if a region might be covered by a granule-sized kernel identity mapping, any access via /dev/mem or mmap must use the same attribute as the identity mapping. Otherwise, we fall back to using an attribute that is supported according to the EFI memory map, or to using UC if the EFI memory map doesn't mention the region. Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck commit 83ea4ef213628683e5a63f2987a91044ab868051 tree 7667c3eec45bee9a24128a93da373ca838e7807c parent 6f18a022fb311f07f3b32f2c0e1b5c9477dc4439 author David Woodhouse Mon, 08 May 2006 22:58:25 +0100 committer David Woodhouse Mon, 08 May 2006 22:58:25 +0100 Export cfi_cmdset_0020 and cfi_cmdset_0002 with EXPORT_SYMBOL_GPL Signed-off-by: David Woodhouse commit 6f18a022fb311f07f3b32f2c0e1b5c9477dc4439 tree 5c0e66f14e02f53555bfc365098cc7e5eb85c343 parent a15bdeef108d282e540e202fc3c3e4bdf9692074 author David Woodhouse Mon, 08 May 2006 22:40:05 +0100 committer David Woodhouse Mon, 08 May 2006 22:40:05 +0100 Finally remove the obnoxious inter_module_xxx() This was already a bad plan when I argued against adding it in the first place. Good riddance. Signed-off-by: David Woodhouse commit a15bdeef108d282e540e202fc3c3e4bdf9692074 tree 1bc767c9013713a4d62d1bc5dffef631583e6ee7 parent 396674e58fb9d01b7768ccb8db181aea8ebead0e author David Woodhouse Mon, 08 May 2006 22:35:05 +0100 committer David Woodhouse Mon, 08 May 2006 22:35:05 +0100 Remove use of inter_module_crap in NOR flash chip drivers. Signed-off-by: David Woodhouse commit 396674e58fb9d01b7768ccb8db181aea8ebead0e tree 827b925d0fa37c19fd78a4e2a981c93a575066d5 parent 5e535429a9117b8b6219da0e0cb087f52c0c9597 author David Woodhouse Mon, 08 May 2006 17:10:11 +0100 committer David Woodhouse Mon, 08 May 2006 17:10:11 +0100 Fix non-modular case for DiskOnChip probe Signed-off-by: David Woodhouse commit 80b9192ee032f919da1b6e8b305c7cc9881b0907 tree 996465552d71f11bfba2d26a075d8a4d99048fa4 parent 5047f09b56d0bc3c21aec9cb16de60283da645c6 author David Woodhouse Mon, 08 May 2006 15:51:57 +0100 committer David Woodhouse Mon, 08 May 2006 15:51:57 +0100 Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390 Also remove Bob Burroughs' email address, since it's no longer valid. Acked-by: Eric D Rossman Signed-off-by: David Woodhouse commit 5e535429a9117b8b6219da0e0cb087f52c0c9597 tree b20a402b5696e2b5aabdc7a4720eaf33e306bd71 parent 73566edf9b91dd085ddb12033d0ea7288979dd10 author David Woodhouse Mon, 08 May 2006 14:05:05 +0100 committer David Woodhouse Mon, 08 May 2006 14:05:05 +0100 Remove inter_module_xxx() from DiskOnChip drivers. Finally putting it back how it was before Keith got at it -- yay :) Signed-off-by: David Woodhouse commit 73566edf9b91dd085ddb12033d0ea7288979dd10 tree ec3810665792713ae97b6bb566f530f77e367586 parent 422138dd68202fbd8ca9fb0df65e92d733249374 author Lennert Buytenhek Sun, 07 May 2006 17:16:36 +0100 committer David Woodhouse Sun, 07 May 2006 17:16:36 +0100 [MTD] Convert physmap to platform driver After dwmw2 let me know it ought to be done, I rewrote the physmap map driver to be a platform driver. I know zilch about the driver model, so I probably botched it in some way, but I've done some tests on an ixp23xx board which uses physmap, and it all seems to work. In order to not break existing physmap users, I've added some compat code that will instantiate a platform device iff CONFIG_MTD_PHYSMAP_LEN is defined and != 0. Also, I've changed the default value for CONFIG_MTD_PHYSMAP_LEN to zero, so that people who inadvertently compile in physmap (or new, platform-style, users of physmap) don't get burned. This works pretty well -- the new physmap driver is a drop-in replacement for the old one, and works on said ixp23xx board without any code changes needed. (This should hold as long as users don't touch 'physmap_map' directly.) Once all physmap users have been converted to instantiate their own platform devices, the compat code can go. (Or we decide that we can change all the in-tree users at the same time, and never merge the compat code.) Signed-off-by: Lennert Buytenhek Signed-off-by: David Woodhouse commit 5047f09b56d0bc3c21aec9cb16de60283da645c6 tree 09a07554b933c3bb912ce3bfc0ea7c7e1f16041c parent c0f1fe00c3923135b2c2f443448585482da8a53e parent 5528e568a760442e0ec8fd2dea1f0791875a066b author David Woodhouse Sat, 06 May 2006 19:59:18 +0100 committer David Woodhouse Sat, 06 May 2006 19:59:18 +0100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Signed-off-by: David Woodhouse commit c0f1fe00c3923135b2c2f443448585482da8a53e tree 325ab2d2b36553b6319a3a995c6c0cc5cb3a110c parent 05f75fd3bb92d9f5eaa8620195ff77a89431f2d2 author David Woodhouse Sat, 06 May 2006 19:47:57 +0100 committer David Woodhouse Sat, 06 May 2006 19:47:57 +0100 Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) Reverts commit eba7f3bdb6344adee8a3d044f405ed38f5c66c6b Signed-off-by: David Woodhouse commit 422138dd68202fbd8ca9fb0df65e92d733249374 tree 6991cf489ef3fa040309c2e715e02d61632fa7d4 parent edc4ff7c08e9885c40e60c4fb39fa42cc91a0602 author Dmitry Bazhenov Fri, 05 May 2006 22:46:49 +0100 committer David Woodhouse Fri, 05 May 2006 22:46:49 +0100 [JFFS2] Fix race in setting file attributes It seems like there is a potential race in the function jffs2_do_setattr() in the case when attributes of a symlink are updated. The symlink metadata is read without having f->sem locked. The following patch should fix the race. Signed-off-by: Dmitry Bazhenov Signed-off-by: David Woodhouse commit f03cc4fd927357bd4b3cea1a053b9f9d8f1731cc tree 461bccf4b2ff9ad57a19800f02670be818a9c0b2 parent ec000ca9d4b23dfb67b70bdf72950e76728c74d9 author Stefano Brivio Fri, 05 May 2006 03:02:25 +0200 committer John W. Linville Fri, 05 May 2006 17:10:41 -0400 [PATCH] bcm43xx: add PCI ID for bcm4319 Add PCI ID for bcm4319. Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville commit ec000ca9d4b23dfb67b70bdf72950e76728c74d9 tree e8d062818ce0f4293c3a37850f51ed96a2bd455e parent 8462fe3cd9ec8951871a20a4dfe36321ab075964 author Stefano Brivio Fri, 05 May 2006 02:58:29 +0200 committer John W. Linville Fri, 05 May 2006 17:10:41 -0400 [PATCH] bcm43xx: fix whitespace Fix whitespace. Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville commit 8462fe3cd9ec8951871a20a4dfe36321ab075964 tree 8b3c6db6091ee99b4791a911734229181ef6f473 parent 461c078c9cdfc1d24a436a87daed90f18c3b0d0d author Daniel Drake Mon, 01 May 2006 22:45:50 +0100 committer John W. Linville Fri, 05 May 2006 17:10:41 -0400 [PATCH] softmac: suggest per-frame-type TX rate This patch is the first step towards rate control inside softmac. The txrates substructure has been extended to provide different fields for different types of packets (management/data, unicast/multicast). These fields are updated on association to values compatible with the access point we are associating to. Drivers can then use the new ieee80211softmac_suggest_txrate() function call when deciding which rate to transmit each frame at. This is immensely useful for ZD1211, and bcm can use it too. The user can still specify a rate through iwconfig, which is matched for all transmissions (assuming the rate they have specified is in the rate set required by the AP). At a later date, we can incorporate automatic rate management into the ieee80211softmac_recalc_txrates() function. This patch also removes the mcast_fallback field. Sam Leffler pointed out that this field is meaningless, because no driver will ever be retransmitting mcast frames (they are not acked). Signed-off-by: Daniel Drake Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 461c078c9cdfc1d24a436a87daed90f18c3b0d0d tree 90b08022254282c74cba106e0d94431ad31dc598 parent 95047dd6d00ad00e7f1f632db6b8ecaa704cfc7e author Pavel Roskin Mon, 01 May 2006 02:13:33 -0400 committer John W. Linville Fri, 05 May 2006 17:10:41 -0400 [PATCH] orinoco: don't put PCI resource data to the network device The resource data in the network device is intended for ISA and other older busses, but not for PCI. Don't put PCI data there. Don't (ab)use the network device for keeping the IRQ number. Retire orinoco_pci_setup_netdev(), and print some minimal information to the kernel log instead, identifying the network device and the driver mostly to identify problems at startup. Scripts should rely on sysfs. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 95047dd6d00ad00e7f1f632db6b8ecaa704cfc7e tree 7def22b19bd1e844df935c0d2ec3929adc76930d parent 6cbaa330f1022abfc7419aaa11ee1a9291f0beb0 author Pavel Roskin Mon, 01 May 2006 02:13:30 -0400 committer John W. Linville Fri, 05 May 2006 17:10:40 -0400 [PATCH] orinoco: eliminate the suspend/resume functions if CONFIG_PM is unset Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 6cbaa330f1022abfc7419aaa11ee1a9291f0beb0 tree da9de71c1eef54be38880ef5ddc63e5622cae516 parent 9a568da2097ad3701ca575cb6d360d56ffeee446 author Pavel Roskin Mon, 01 May 2006 02:13:28 -0400 committer John W. Linville Fri, 05 May 2006 17:10:40 -0400 [PATCH] orinoco: simplify locking, fix error handling in PCMCIA resume Don't use flags in the spinlocks - the PCMCIA resume functions may not be called under lock. Don't ignore any errors. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 9a568da2097ad3701ca575cb6d360d56ffeee446 tree 063cf2e349753d83d6306baf06ccf0d84a4c7abb parent e4f4f98efdb4619ab95eb724fd5e0c4675307cc1 author Pavel Roskin Mon, 01 May 2006 02:13:26 -0400 committer John W. Linville Fri, 05 May 2006 17:10:40 -0400 [PATCH] orinoco: report more relevant data on startup Report only the first I/O window and IRQ, and also add the driver name. The second I/O window, Vpp and configuration index are not interesting to most users. They can be found by PCMCIA debug tools if needed. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit e4f4f98efdb4619ab95eb724fd5e0c4675307cc1 tree 1ba191d656aaf340bf35788e2f90ad613b9e384e parent 6274115ce9f0c87068761b2ba5b0b2f7d13c17cf author Pavel Roskin Mon, 01 May 2006 02:13:24 -0400 committer John W. Linville Fri, 05 May 2006 17:10:40 -0400 [PATCH] orinoco: unregister network device before releasing PCMCIA resources Hardware resources should not be made available to other devices while the network device is still registered. Also remove the related debug statements. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 6274115ce9f0c87068761b2ba5b0b2f7d13c17cf tree aa91c45eb089e087d74903e5483487b97cbd863c parent 6d92f83ffafe8e2ce105c3ec5696c62d6fcebcee author Adrian Bunk Thu, 27 Apr 2006 02:33:42 -0700 committer John W. Linville Fri, 05 May 2006 17:10:40 -0400 [PATCH] ieee80211_wx.c: remove dead code Since sec->key_sizes[] is an u8, len can't be < 0. Spotted by the Coverity checker. Signed-off-by: Adrian Bunk Cc: "John W. Linville" Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 6d92f83ffafe8e2ce105c3ec5696c62d6fcebcee tree 7d82f1380f10ac3b4f042f4953c65e5e284e5acf parent 0c6157a371f72b91bd9d2f72c2e65e2bde4cdf39 author Daniel Drake Mon, 01 May 2006 22:23:27 +0100 committer John W. Linville Fri, 05 May 2006 17:10:39 -0400 [PATCH] softmac: deauthentication implies deassociation The 802.11 specs state that deauthenticating also implies disassociating. This patch implements that, which improve the behaviour of SIOCSIWMLME. Signed-off-by: Daniel Drake Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 0c6157a371f72b91bd9d2f72c2e65e2bde4cdf39 tree 0db5ac2e35e29738a17a1f7bbe3a19c5f1b85a84 parent fd5226a72694d1c0abe1cc39711a86f1754e637d author Michal Schmidt Tue, 02 May 2006 23:29:55 +0200 committer John W. Linville Fri, 05 May 2006 17:10:39 -0400 [PATCH] wireless/airo: minimal WPA awareness Running Linux 2.6.17-rc3-mm1 which has this patch included I get this interesting message: airo(eth0): WPA unsupported (only firmware versions 5.30.17 and greater support WPA. Detected 5.30.17) airo_test_wpa_capable assumes that the softSubVer part of the firmware version number is coded in BCD. Apparently, that's not true. I have firmware version 5.30.17 and cap_rid.softSubVer is 0x11==17. Signed-off-by: Michal Schmidt Signed-off-by: John W. Linville commit fd5226a72694d1c0abe1cc39711a86f1754e637d tree 1d90b27c392fb2ef9859f2652dee7640916ed806 parent aad61439e6a00bdb72cb649e11f6e166590c5f66 parent 178e0cc5ff249965c6cfbd78b1af6a5e614d837c author John W. Linville Fri, 05 May 2006 16:56:24 -0400 committer John W. Linville Fri, 05 May 2006 16:56:24 -0400 Merge branch 'upstream-fixes' into upstream commit aad61439e6a00bdb72cb649e11f6e166590c5f66 tree 2279f3c2a15f81526d14182c6acb358cafd0b359 parent 3c304956755fa63ee80ca51ce38078fe1c4e8818 parent d98550e334715b2d9e45f8f0f4e1608720108640 author John W. Linville Fri, 05 May 2006 16:50:23 -0400 committer John W. Linville Fri, 05 May 2006 16:50:23 -0400 Merge branch 'from-linus' into upstream commit f18fc729cd2d67b76e24206ee3567c1f6983c358 tree 9dbf177222d94213d9dd82d67de6d905e1a2b278 parent 5a43ee65620d628ba04deecf241b63b2410b97f2 parent d98550e334715b2d9e45f8f0f4e1608720108640 author Paul Mackerras Fri, 05 May 2006 15:45:48 +1000 committer Paul Mackerras Fri, 05 May 2006 15:45:48 +1000 Merge ../linux-2.6 commit 7e990266c845d7f712c96013891aaf74baef198f tree 92bc569003abdfd53b53f1081132469d92497ded parent 5a43ee65620d628ba04deecf241b63b2410b97f2 author Kumar Gala Fri, 05 May 2006 00:02:08 -0500 committer Kumar Gala Fri, 05 May 2006 00:02:08 -0500 powerpc: provide ppc_md.panic() for both ppc32 & ppc64 Allow boards to provide a panic callback on ppc32. Moved the code to sets this up into setup-common.c so its shared between ppc32 & ppc64. Also moved do_init_bootmem prototype into setup.h. Signed-off-by: Kumar Gala commit 05f75fd3bb92d9f5eaa8620195ff77a89431f2d2 tree 808d4b7812c025cafde7ca69cfbf5c8624904d03 parent cb8c1fdc0cf703e3297499dcd1a4b20b27570a7a author David Woodhouse Thu, 04 May 2006 17:50:04 +0100 committer David Woodhouse Thu, 04 May 2006 17:50:04 +0100 Include and use __uXX types in Signed-off-by: David Woodhouse commit cb8c1fdc0cf703e3297499dcd1a4b20b27570a7a tree 02f3706aaa519ec22b0b0260410973d323eadda0 parent de654c97861c314fd0fc0b6a6dd1bc4202e00e42 author David Woodhouse Thu, 04 May 2006 17:32:44 +0100 committer David Woodhouse Thu, 04 May 2006 17:32:44 +0100 Use __uXX types in , include too Signed-off-by: David Woodhouse commit de654c97861c314fd0fc0b6a6dd1bc4202e00e42 tree db922e0c667e86c816eb7a0bb87f11787b581216 parent 7ee7d0e3186e2ad2a872436b5a272a814ea5cb0f author David Woodhouse Thu, 04 May 2006 17:28:26 +0100 committer David Woodhouse Thu, 04 May 2006 17:28:26 +0100 Remove private struct dx_hash_info from public view in Signed-off-by: David Woodhouse commit 7ee7d0e3186e2ad2a872436b5a272a814ea5cb0f tree 0e2b22cf33b2632d7446cbf5bbf7db8939bd7812 parent 5da0458900bb5f56eb5e7a7c5ed275b5eaf51762 author David Woodhouse Thu, 04 May 2006 15:49:24 +0100 committer David Woodhouse Thu, 04 May 2006 15:49:24 +0100 Include and use __uXX types in Signed-off-by: David Woodhouse commit 5da0458900bb5f56eb5e7a7c5ed275b5eaf51762 tree f18d6efa3832d8d0c62053670e689e6f4e9c02d4 parent 5ee882f153a49098a12f6b26f153ba12a33d767a author David Woodhouse Thu, 04 May 2006 15:07:59 +0100 committer David Woodhouse Thu, 04 May 2006 15:07:59 +0100 Use __uXX types in for struct divert_blk et al. Signed-off-by: David Woodhouse commit 5ee882f153a49098a12f6b26f153ba12a33d767a tree 0e30f008608f8c7ba9622512643d0c4a8b0e8116 parent 2c88f4a8bc4276013f7eee7824056d9cecccadb1 author David Woodhouse Thu, 04 May 2006 12:39:12 +0100 committer David Woodhouse Thu, 04 May 2006 12:39:12 +0100 Use __u32 for elf_addr_t in , not u32. It's user-visible. Signed-off-by: David Woodhouse commit 2c88f4a8bc4276013f7eee7824056d9cecccadb1 tree 0a6711528c7e6aa65cd0e8a4a49b2ad75809aadf parent 90abbae2d35b3dc55fd39f8ab04acaf3da5cdc0a author David Woodhouse Thu, 04 May 2006 12:07:37 +0100 committer David Woodhouse Thu, 04 May 2006 12:07:37 +0100 Remove PPP_FCS from user view in , remove __P mess entirely Signed-off-by: David Woodhouse commit 90abbae2d35b3dc55fd39f8ab04acaf3da5cdc0a tree fff2d1966e8ac1bbf328fa156769722041a513a1 parent 8e1515df578e4665b77d1e0eec3c8b041d159b23 author David Woodhouse Thu, 04 May 2006 02:55:50 +0100 committer David Woodhouse Thu, 04 May 2006 02:55:50 +0100 Use __uXX types in user-visible structures in Signed-off-by: David Woodhouse commit 8e1515df578e4665b77d1e0eec3c8b041d159b23 tree cd106ed847d542886206f47958678e00f2be7355 parent 56b192c337ddad05dee83c9bea079f41df775990 author David Woodhouse Thu, 04 May 2006 01:42:36 +0100 committer David Woodhouse Thu, 04 May 2006 01:42:36 +0100 Don't use 'u32' in user-visible struct ip_conntrack_old_tuple. Signed-off-by: David Woodhouse commit 56b192c337ddad05dee83c9bea079f41df775990 tree b132fdf2ee4067d7f309328cd694c2e286ca7477 parent 9a798c076fcc26f29bf9e9d350a17cdeff0a314f author David Woodhouse Thu, 04 May 2006 01:18:33 +0100 committer David Woodhouse Thu, 04 May 2006 01:18:33 +0100 Use __uXX types for S390 DASD volume label definitions which are user-visible Signed-off-by: David Woodhouse commit 9a798c076fcc26f29bf9e9d350a17cdeff0a314f tree 98f5c773f214614fe7ebcf3256326d3793bddbea parent ac12c0fc8c08a14bfa263c3a478ee82ad3e346d2 author David Woodhouse Thu, 04 May 2006 01:17:41 +0100 committer David Woodhouse Thu, 04 May 2006 01:17:41 +0100 S390 BIODASDREADCMB ioctl should use __u64 not u64 type. Signed-off-by: David Woodhouse commit ac12c0fc8c08a14bfa263c3a478ee82ad3e346d2 tree fe5258e1ed41273ed3a73efcbc7dea8d25490f64 parent eba7f3bdb6344adee8a3d044f405ed38f5c66c6b author David Woodhouse Thu, 04 May 2006 00:59:14 +0100 committer David Woodhouse Thu, 04 May 2006 00:59:14 +0100 Remove unneeded inclusion of from Signed-off-by: David Woodhouse commit eba7f3bdb6344adee8a3d044f405ed38f5c66c6b tree 93f811f318da092f2ebfa2071b116b603fccb060 parent 888855dc00c302c88663ec256bb422f4b27046f2 author David Woodhouse Thu, 04 May 2006 00:44:14 +0100 committer David Woodhouse Thu, 04 May 2006 00:44:14 +0100 Fix private integer types used in V4L2 ioctls. Signed-off-by: David Woodhouse commit 888855dc00c302c88663ec256bb422f4b27046f2 tree 1a2a52d028f265b3792c2678959befee34c3ab74 parent 423bc7b22bdeb73efeabfcf91d8a459ac33088f1 author David Woodhouse Thu, 04 May 2006 00:42:42 +0100 committer David Woodhouse Thu, 04 May 2006 00:42:42 +0100 Fix integer types in SNDRV_HDSP_IOCTL_GET_PEAK_RMS ioctl We should be using __u32 et al, not the kernel-private types. Signed-off-by: David Woodhouse commit 423bc7b22bdeb73efeabfcf91d8a459ac33088f1 tree 511017422848fd9b6164379b10c44f020d5a51a2 parent 4f79c3ffc6e04623711e86cf9a0e09e4aad8cb36 author David Woodhouse Thu, 04 May 2006 00:41:02 +0100 committer David Woodhouse Thu, 04 May 2006 00:41:02 +0100 Restore __attribute_const__ to user-visibility in linux/compiler.h...for now Signed-off-by: David Woodhouse commit edc4ff7c08e9885c40e60c4fb39fa42cc91a0602 tree f375d28043dd4457428a841167dc93d760ba9a46 parent cbb9a56177b16294ed347ba7fcb1c66c8adb5dc4 parent e17df688f7064dae1417ce425dd1e4b71d24d63b author David Woodhouse Wed, 03 May 2006 13:30:35 +0100 committer David Woodhouse Wed, 03 May 2006 13:30:35 +0100 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit cbb9a56177b16294ed347ba7fcb1c66c8adb5dc4 tree d14ca0758cb0bbdd2f4afddef3b0a721a1ed9da4 parent 7d532dd50de1c0cd7d15ba06ad7261e13474fef2 author David Woodhouse Wed, 03 May 2006 13:07:27 +0100 committer David Woodhouse Wed, 03 May 2006 13:07:27 +0100 Move jffs2_fs_i.h and jffs2_fs_sb.h from include/linux/ to fs/jffs2/ Signed-off-by: David Woodhouse commit 753a6c4ff4c371a3e4e3408aaba4d03f3cfde73a tree b55e9d7a5d4ef746f38a10614bf01c2ab2dacd42 parent 5d3213cc8f4d6244b76ee0c4ab73a97d5d2ee956 parent ebf34c9b6fcd22338ef764b039b3ac55ed0e297b author Jeff Garzik Tue, 02 May 2006 15:26:21 -0400 committer Jeff Garzik Tue, 02 May 2006 15:26:21 -0400 Merge branch 'upstream-fixes' into upstream commit 5d3213cc8f4d6244b76ee0c4ab73a97d5d2ee956 tree 94c34884194215e427538a6bc14c239ad8b5c09c parent bd1034f035f3679fbc753a1368559c0b4b89f8f6 author Ananda Raju Fri, 21 Apr 2006 19:23:26 -0400 committer Jeff Garzik Tue, 02 May 2006 15:16:36 -0400 [PATCH] s2io: init/shutdown fixes Hi, The following patch contains fix related to init and shutdown of adapter as per user guide. The list of changes include 1. shutdown gracefully. 2. Need to mask/unmask interrupts in ISR required fro Xframe-E 3. Tx FIFO should be enabled after WRR calender programming Signed-off-by: Ananda Raju Signed-off-by: Jeff Garzik commit bd1034f035f3679fbc753a1368559c0b4b89f8f6 tree b4c51f217c4067a0dfbebe20cc5a19dc7817cd3c parent c92ca04b2a21852fbc6842e8a7c6fff3ae255b30 author Ananda Raju Fri, 21 Apr 2006 19:20:22 -0400 committer Jeff Garzik Tue, 02 May 2006 15:16:36 -0400 [PATCH] s2io: additional stats Hi, This patch contains additional statistics counters added to s2io driver these statistics are very much usefull in debugging the driver. Signed-off-by: Ananda Raju Signed-off-by: Jeff Garzik commit c92ca04b2a21852fbc6842e8a7c6fff3ae255b30 tree 9c161719d811a693d1ee3b202494e5a6d446c42e parent 9dc737a77353920a67337aa627f7d9dae8dade05 author Ananda Raju Fri, 21 Apr 2006 19:18:03 -0400 committer Jeff Garzik Tue, 02 May 2006 15:16:36 -0400 [PATCH] s2io: fixes Hi, This patch contains some of the bug fixes done for S2io driver. Following are the brief description of changes 1. Continuing with initialization if we get minimum required MSI-X vectors 2. fix for ethtool online link test fails 3. make wait_for_cmd_complete generic for all command status registers 4. Print "Device is on PCI-E bus" for Xframe-E card 5. CX4 requires additional delay after sw_reset, and requires higher value for igp 6. Fixed panic due to non-TCP and/or LLC/SNAP traffic in case of lro 7. remove legacy code for old transponder 8. SPECIAL_REG_WRITE made to use 32-bit writes irrespective of system type 9. handle link interrupt as per user guide for Xframe II 10. Wait till all interrupts hndled Signed-off-by: Ananda Raju Signed-off-by: Jeff Garzik commit 9dc737a77353920a67337aa627f7d9dae8dade05 tree b87c69eb07c905791c68b7b976b72b31712ac621 parent 863c11a91e4507c3ff44783a75a5433c8cf7700e author Ananda Raju Fri, 21 Apr 2006 19:05:41 -0400 committer Jeff Garzik Tue, 02 May 2006 15:16:36 -0400 [PATCH] s2io: input parms, output messages update hi, This patch contains the modification and bug fixes with respect to input parameters and outupt dmesages. following is brief description of the changes. 1. Set default values for rx_ring_sz[0..7] and tx_fifo_len[0..7] 2. verify few basic load parameters 3. read product description from VPD 4. clean up of dmesg when driver is loaded Signed-off-by: Ananda Raju Signed-off-by: Jeff Garzik commit 863c11a91e4507c3ff44783a75a5433c8cf7700e tree f1a3e065ed6787c693b8b56418c571dc950bdb88 parent 1fb5fef9b80d9a3b5368e22031627afd1585487b author Ananda Raju Fri, 21 Apr 2006 19:03:13 -0400 committer Jeff Garzik Tue, 02 May 2006 15:16:35 -0400 [PATCH] s2io: performance improvements hi, This patch contains all the changes that were done to improve performance of s2io driver. one line description of the changes are 1. For Non NAPI case the rx interrupt handler is being called unconditionally 2. code optimization and adding prefetch skb->data 3. Remove modulo operations in fast path 4. Enable Group Reads and set backoff interval to 0x1000 5. correct PIC_CNTL_SHARED_SPLITS macro definition, and reduce pause parameter 6. Corrected logic of identifying rx buffer level in rx_buffer_level() 7. fix DMA map and unmap done with different sizes in 1-buf mode 8. Removed forcible disabling of ERO 9. Send up the packets with transfer code = 0x5 Signed-off-by: Ananda Raju Signed-off-by: Jeff Garzik commit 1fb5fef9b80d9a3b5368e22031627afd1585487b tree 54f07a532b5b2622b8642156bbcaeca637fcdb8f parent 1a2e8a6f8ec0a068911a882a19e0912a0c89be6e parent 330ab71619bacc4d4494227a6cfc9b7f5500403d author Jeff Garzik Tue, 02 May 2006 14:33:57 -0400 committer Jeff Garzik Tue, 02 May 2006 14:33:57 -0400 Merge branch 'master' into upstream commit 4f79c3ffc6e04623711e86cf9a0e09e4aad8cb36 tree cbb828ab47b9350ea57726b7be8d98fe21f23de7 parent 2683e88413977a7f382106f8e8b3b684a597c761 author David Woodhouse Tue, 02 May 2006 10:41:25 +0100 committer David Woodhouse Tue, 02 May 2006 10:41:25 +0100 Guard some of linux/compiler.h with #ifdef __KERNEL__ Signed-off-by: David Woodhouse commit 2683e88413977a7f382106f8e8b3b684a597c761 tree 96f56121c3afed843fb705cbc75aa85cf9038fd0 parent b07019f29328ebb1b48d3faf952b84f07ec9b973 parent 9f29333dae3488542b1344871e8ecb84084ad80e author David Woodhouse Mon, 01 May 2006 16:24:37 +0100 committer David Woodhouse Mon, 01 May 2006 16:24:37 +0100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Reverting c7afb48eb5147be9eb9789b4161462d246451ac2 since a better (but more intrusive) fix is now merged upstream. Signed-off-by: David Woodhouse commit aa783a8f31c79f493bd49ba926b171b79b9839fb tree ffe2694f91da0edad897df1e03d0014104fcf6df parent ed198cb49750fd9ec564e9f1df66c10efea605f1 author Andrew Morton Mon, 01 May 2006 09:41:47 +0100 committer David Woodhouse Mon, 01 May 2006 09:41:47 +0100 Update UML kernel/physmem.c to use rb_parent() accessor macro Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 7d532dd50de1c0cd7d15ba06ad7261e13474fef2 tree 8cdf0c7b882524dcda1ae08e10275817b33af364 parent fbbc21c6a491503e55e08e3f7c4629c1337ea1cc author Lennert Buytenhek Sun, 30 Apr 2006 10:36:38 +0200 committer David Woodhouse Sun, 30 Apr 2006 21:19:44 +0100 ts72xx NAND driver The TS-72xx is a series of embedded single board computers from Technologic Systems based on the Cirrus ep93xx (arm920t based) CPU. The TS-7200 uses NOR flash, while all the other models in the series (TS-7250, TS-7260) use NAND flash -- included is a driver for the NAND flash on those boards. Signed-off-by: Lennert Buytenhek Signed-off-by: David Woodhouse commit b07019f29328ebb1b48d3faf952b84f07ec9b973 tree 99fbd8379fb9fe17c5b06c74871f71207ebb072e parent c3ce7e203af5d8eab7c3390fc991a1fcb152f741 parent e0a515bc6a2188f02916e976f419a8640312e32a author David Woodhouse Sun, 30 Apr 2006 20:34:39 +0100 committer David Woodhouse Sun, 30 Apr 2006 20:34:39 +0100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Signed-off-by: David Woodhouse commit fbbc21c6a491503e55e08e3f7c4629c1337ea1cc tree 12edcb1cfb2d687655819fb85b3035dfee5e375d parent 954c24227318c166ec1925e1229db442e1f56f51 author Daniel Drake Sat, 29 Apr 2006 11:41:44 +0100 committer Josh Boyer Sat, 29 Apr 2006 08:48:55 -0500 mtd: SC520CDP should depend on MTD_CONCAT Toralf Förster found a compile error when CONFIG_MTD_SC520CDP=y and CONFIG_MTD_CONCAT=n: drivers/built-in.o: In function `init_sc520cdp': sc520cdp.c:(.init.text+0xb4de): undefined reference to `mtd_concat_create' drivers/built-in.o: In function `cleanup_sc520cdp': sc520cdp.c:(.exit.text+0x14bc): undefined reference to `mtd_concat_destroy' This patch fixes it. Signed-off-by: Daniel Drake Signed-off-by: Josh Boyer commit 5a43ee65620d628ba04deecf241b63b2410b97f2 tree c91452c9c06a1d592bb45ddf44498e28d6a28cea parent c5c4591375a10f6bc1bc55d86af7764033b10367 author Will Schmidt Wed, 26 Apr 2006 11:09:46 -0500 committer Paul Mackerras Sat, 29 Apr 2006 18:08:05 +1000 [PATCH] nvram_print_partitions cosmetic fixup This is a cosmetic fixup. When printing the nvram partition table, the first couple entries have a shorter 'index' value than the others, so table is a bit askew. This change makes the table look pretty. Tested on pseries and g5. Footnote: yes, this table is normally hidden behind a DEBUG_NVRAM #define. Signed-off-by: Will Schmidt Signed-off-by: Paul Mackerras commit c5c4591375a10f6bc1bc55d86af7764033b10367 tree caf9e8dcc98d04a4338f8f17d99c37cb3d0d7817 parent a74e5e5facb854ab4be9e0320e0f65074012df9b author Jeremy Kerr Fri, 28 Apr 2006 16:37:47 +0800 committer Paul Mackerras Sat, 29 Apr 2006 18:08:03 +1000 [PATCH] powerpc: cell: use kzalloc in alloc_spu_context() Use kzalloc when allocating a new spu context, rather than kmalloc + zeroing. Booted & tested on cell. Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit a74e5e5facb854ab4be9e0320e0f65074012df9b tree ae2c8b1462ca659d8b306a530a855d203a303e9f parent bc97ce951cfb697eaac9d5b6a2fbe4544fdf1a7c author Olof Johansson Fri, 28 Apr 2006 08:57:09 -0500 committer Paul Mackerras Sat, 29 Apr 2006 18:08:01 +1000 [PATCH] powerpc iommu: minor cleanup A couple of minor renames: * The iommu_table is no longer a part of the device node structure, so devnode_table is misleading * Rename struct device *-variables to hwdev Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit bc97ce951cfb697eaac9d5b6a2fbe4544fdf1a7c tree ae880181c00f47a28e805f5328ab7e9a15620ee9 parent c7f0e8cb5654a50986c6097b3c0cca972e406899 author Olof Johansson Fri, 28 Apr 2006 22:51:59 -0500 committer Paul Mackerras Sat, 29 Apr 2006 18:07:54 +1000 [PATCH] powerpc: kill union tce_entry It's been long overdue to kill the union tce_entry in the pSeries/iSeries TCE code, especially since I asked the Summit guys to do it on the code they copied from us. Also, while I was at it, I cleaned up some whitespace. Built and booted on pSeries, built on iSeries. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit c7f0e8cb5654a50986c6097b3c0cca972e406899 tree dc8a8e590c5cf97d8b7cae2f1e93bdbef178f89f parent dd721ffd95d5e1516380da0b254ef737582a258f author Stephen Rothwell Thu, 27 Apr 2006 17:23:32 +1000 committer Paul Mackerras Sat, 29 Apr 2006 18:02:02 +1000 [PATCH] powerpc: merge the rest of the vio code Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit dd721ffd95d5e1516380da0b254ef737582a258f tree fc31c2124b0de8b301622d755e444e4d5acb95b1 parent e10fa77368dff31140451fac04d78d9f51f0f3ac author Stephen Rothwell Thu, 27 Apr 2006 17:21:46 +1000 committer Paul Mackerras Sat, 29 Apr 2006 18:02:01 +1000 [PATCH] powerpc: use a common vio_match_device routine This requires the compatible properties having vaules that are empty strings instead of just being empty properties. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit e10fa77368dff31140451fac04d78d9f51f0f3ac tree 20f3645859dbd995ded831f5a40b78e823e4fc6e parent 95a1ca6cd8e702a19ee56efae522a5816a56a205 author Stephen Rothwell Thu, 27 Apr 2006 17:18:21 +1000 committer Paul Mackerras Sat, 29 Apr 2006 18:02:00 +1000 [PATCH] powerpc: use the device tree for the iSeries vio bus probe As an added bonus, since every vio_dev now has a device_node associated with it, hotplug now works. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 95a1ca6cd8e702a19ee56efae522a5816a56a205 tree b641fb9888afa4b7e51a337a78f0824f729b3881 parent 29f147d746326e4db5fe350c70373081d61a2965 author Stephen Rothwell Thu, 27 Apr 2006 17:09:02 +1000 committer Paul Mackerras Sat, 29 Apr 2006 18:01:58 +1000 [PATCH] powerpc: add all the iSeries virtual devices to the device tree We do this by putting them in the flattened device tree at setup time. This required the flattened device tree blob to be made bigger. Currenly we don't do anything with these. Also make a function static. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 29f147d746326e4db5fe350c70373081d61a2965 tree 04c065ace8c62953441bc22079b93449b996f283 parent 916a3d5729c8b710d56acf579f3fdb4de7c03e77 parent 6fb8f3acbe833586eb32598d1f844eb9f77c4fba author Paul Mackerras Sat, 29 Apr 2006 16:15:57 +1000 committer Paul Mackerras Sat, 29 Apr 2006 16:15:57 +1000 Merge branch 'merge' commit c3ce7e203af5d8eab7c3390fc991a1fcb152f741 tree 43b0837c42a1deb5b0f87800bf6a5ed8eea2eafe parent 56142536868a2be34f261ed8fdca1610f8a73fbd author David Woodhouse Sat, 29 Apr 2006 01:53:47 +0100 committer David Woodhouse Sat, 29 Apr 2006 01:53:47 +0100 Sanitise ethtool.h and mii.h for userspace. They shouldn't be using 'u32' et al in structures which are used for communication with userspace. Switch to the proper types (__u32 etc). Signed-off-by: David Woodhouse commit 56142536868a2be34f261ed8fdca1610f8a73fbd tree 0bd66166b318d8403b1881285f6813ece2acced1 parent 34c278d3913a15b64943e8c40a16b4f732cc7c59 author David Woodhouse Sat, 29 Apr 2006 01:51:47 +0100 committer David Woodhouse Sat, 29 Apr 2006 01:51:47 +0100 Remove unneeded _syscallX macros from user view in asm-*/unistd.h These aren't needed by glibc or klibc, and they're broken in some cases anyway. The uClibc folks are apparently switching over to stop using them too (now that we agreed that they should be dropped, at least). Signed-off-by: David Woodhouse commit 34c278d3913a15b64943e8c40a16b4f732cc7c59 tree 25857091378e3062b101076aef7cc9ef397efdea parent c7afb48eb5147be9eb9789b4161462d246451ac2 author David Woodhouse Sat, 29 Apr 2006 01:49:06 +0100 committer David Woodhouse Sat, 29 Apr 2006 01:49:06 +0100 Remove 'extern int errno;' from public view in linux/unistd.h Signed-off-by: David Woodhouse commit c7afb48eb5147be9eb9789b4161462d246451ac2 tree 1313cde51b5bfe91464bd944e3512a6d83cd7d3a parent 778382e08cce51b6268ca49449e5bd70c8413799 author David Woodhouse Sat, 29 Apr 2006 01:48:16 +0100 committer David Woodhouse Sat, 29 Apr 2006 01:48:16 +0100 Remove struct input_device_id from public view in linux/input.h It uses kernel_ulong_t but can't be wrapped in __KERNEL__ because it's used from scripts/mod/file2alias.c -- but we _can_ hide it inside header manually too (and it doesn't generally exist for userspace). Signed-off-by: David Woodhouse commit 778382e08cce51b6268ca49449e5bd70c8413799 tree 14a2ed2295c31890499306e007523d6aa74c313e parent d6754b401a15eaa16492ea5dbaa4826361d3f411 author David Woodhouse Sat, 29 Apr 2006 01:46:02 +0100 committer David Woodhouse Sat, 29 Apr 2006 01:46:02 +0100 Don't include in public part of linux/pci.h Signed-off-by: David Woodhouse commit d6754b401a15eaa16492ea5dbaa4826361d3f411 tree 032f067d3af458527d903a7653885404ed82431e parent acc429a517bd11fdcac9bea97d082d26231beb92 parent 693f7d362055261882659475d2ef022e32edbff1 author David Woodhouse Sat, 29 Apr 2006 01:42:26 +0100 committer David Woodhouse Sat, 29 Apr 2006 01:42:26 +0100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit acc429a517bd11fdcac9bea97d082d26231beb92 tree e6e0f2c58fab3f1ce8d614ac08c21a3379123a4b parent cd469e0cc67b74ba41daec335ea72baedb750b80 author David Woodhouse Thu, 27 Apr 2006 16:46:56 +0100 committer David Woodhouse Thu, 27 Apr 2006 16:46:56 +0100 linux/blkpg.h needs for __user Signed-off-by: David Woodhouse commit cd469e0cc67b74ba41daec335ea72baedb750b80 tree 8054cc6b13f48785165af1485a873dd3e33d4ca6 parent ad1588798620901c12ba86c71865150a4eb727bf author David Woodhouse Thu, 27 Apr 2006 15:48:08 +0100 committer David Woodhouse Thu, 27 Apr 2006 15:48:08 +0100 Exclude asm-generic/{page,memory_model}.h from user bits of i386/x86_64 page.h Signed-off-by: David Woodhouse commit 7894eaf291238a62a565e9e9777483beeb00eeae tree 43c08830d2030d39d719f3f3d54a0e9b36554770 parent 9e73972cef1c0961c78b0e0b61c4ecc275b29f04 parent acc696d93dcf993dec123d69d599979e1456ffec author Jeff Garzik Thu, 27 Apr 2006 04:55:53 -0400 committer Jeff Garzik Thu, 27 Apr 2006 04:55:53 -0400 Merge branch 'upstream' into irq-pio commit 9a375e93f88269bb770fb2eaa57554c975449c88 tree 4c8f6d77f0aa94fc69c5b9e75d51db1451bdf66f parent b2b4b9a7c09ad66e095b13c97946a96f2dc8284e parent acc696d93dcf993dec123d69d599979e1456ffec author Jeff Garzik Thu, 27 Apr 2006 04:55:26 -0400 committer Jeff Garzik Thu, 27 Apr 2006 04:55:26 -0400 Merge branch 'upstream' into max-sect commit acc696d93dcf993dec123d69d599979e1456ffec tree b860b80bb96bb5e3ea1f0347b92fbb1e8b15af36 parent bf2af2a2027e52b653882fbca840620e896ae081 parent 2be4d50295e2b6f62c07b614e1b103e280dddb84 author Jeff Garzik Thu, 27 Apr 2006 04:53:34 -0400 committer Jeff Garzik Thu, 27 Apr 2006 04:53:34 -0400 Merge branch 'master' into upstream commit 1a2e8a6f8ec0a068911a882a19e0912a0c89be6e tree e0e70aa880b8c8f2c1a979438a523241f6193742 parent 9f1da23b631f92393f58f664348ffc5faeaddeb3 parent 2be4d50295e2b6f62c07b614e1b103e280dddb84 author Jeff Garzik Thu, 27 Apr 2006 04:52:44 -0400 committer Jeff Garzik Thu, 27 Apr 2006 04:52:44 -0400 Merge branch 'master' into upstream commit ad1588798620901c12ba86c71865150a4eb727bf tree dcc148c8007e649e549cc44dd0b2a02bae832af5 parent 274f5946dcb7c970455067be9e13a22174787592 author David Woodhouse Thu, 27 Apr 2006 06:57:23 +0100 committer David Woodhouse Thu, 27 Apr 2006 06:57:23 +0100 Add standard include guard to asm-generic/signal and use compiler.h Signed-off-by: David Woodhouse commit 274f5946dcb7c970455067be9e13a22174787592 tree 6f6929a35540273c90730f77c07eed827ae89728 parent b7b3c76a0a21c5a98124e90c47c488f7e4166f87 author David Woodhouse Thu, 27 Apr 2006 04:47:10 +0100 committer David Woodhouse Thu, 27 Apr 2006 04:47:10 +0100 Don't include implementation details from asm-s390/ptrace.h and page.h Signed-off-by: David Woodhouse commit b7b3c76a0a21c5a98124e90c47c488f7e4166f87 tree 475b13a18a81b3ac6377a6c2701e78268f543e5c parent f001e47f83db18a9f202f25c0255b4d11ebe468b author David Woodhouse Thu, 27 Apr 2006 00:12:56 +0100 committer David Woodhouse Thu, 27 Apr 2006 00:12:56 +0100 Sanitise linux/sched.h for userspace consumption There was a whole load of crap exposed which should have been inside the existing #ifdef __KERNEL__ part. Also hide struct sched_param for now, since glibc has its own and doesn't like being given ours (yet). Signed-off-by: David Woodhouse commit f001e47f83db18a9f202f25c0255b4d11ebe468b tree 0d459fdb2dce2d21f5739619210bcd4b679a49f2 parent 62c4f0a2d5a188f73a94f2cb8ea0dba3e7cf0a7f author David Woodhouse Thu, 27 Apr 2006 00:11:01 +0100 committer David Woodhouse Thu, 27 Apr 2006 00:11:01 +0100 Sanitise linux/audit.h for userspace consumption, split elf-em.h from elf.h Don't include outside __KERNEL__, and split the EM_xxx definitions out of elf.h into elf-em.h so that audit.h can include just that and not pollute the namespace any further than it needs to. Signed-off-by: David Woodhouse commit 62c4f0a2d5a188f73a94f2cb8ea0dba3e7cf0a7f tree e85ca2d0dd43f90dccf758338764c3caa55f333f parent 089f26d5e31b7bf42a9a8fefec08b30cd27f4b0e author David Woodhouse Wed, 26 Apr 2006 12:56:16 +0100 committer David Woodhouse Wed, 26 Apr 2006 12:56:16 +0100 Don't include linux/config.h from anywhere else in include/ Signed-off-by: David Woodhouse commit 9f1da23b631f92393f58f664348ffc5faeaddeb3 tree 68c7bf9c0f4b11117cf6b3cde5fa5c4f2929088a parent 00355cd938bac2a6006efa140352958784431f1f parent 86a0f04387bfa814618bf0c2c8b203899c4fa5d2 author Jeff Garzik Wed, 26 Apr 2006 06:21:31 -0400 committer Jeff Garzik Wed, 26 Apr 2006 06:21:31 -0400 Merge branch 'upstream-fixes' into upstream commit 00355cd938bac2a6006efa140352958784431f1f tree 4f8bd8f9117a5ea180da97fd889b5305738b3be2 parent 45de6fd958d7f407bdb5fdc6914b3262519d891c parent 3c304956755fa63ee80ca51ce38078fe1c4e8818 author Jeff Garzik Wed, 26 Apr 2006 06:18:15 -0400 committer Jeff Garzik Wed, 26 Apr 2006 06:18:15 -0400 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream commit 45de6fd958d7f407bdb5fdc6914b3262519d891c tree c1b9f9023e93d0f28f773ca4be41d107f79cd600 parent 1f5d5dbf0372dd933d8325054889ba09d996e50b parent 3b908870b8332dfd40be0e919e187aa4991536fb author Jeff Garzik Wed, 26 Apr 2006 06:18:00 -0400 committer Jeff Garzik Wed, 26 Apr 2006 06:18:00 -0400 Merge branch 'upstream-fixes' into upstream commit 089f26d5e31b7bf42a9a8fefec08b30cd27f4b0e tree 5e15cfd59d2056ea3e796ebcb60270bb125416f6 parent d85004eb15a635b3937e91d1dbadb1d37541983c author David Woodhouse Tue, 25 Apr 2006 15:29:01 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:29:01 +0100 Don't include and from linux/socket.h Signed-off-by: David Woodhouse commit d85004eb15a635b3937e91d1dbadb1d37541983c tree 0ac080c0b83feae466a436a73fab3f0efedcafa3 parent 52a78c1cae382ff5684f3970848676de12449745 author David Woodhouse Tue, 25 Apr 2006 15:18:46 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:18:46 +0100 Don't include private headers from user-visible part of linux/ext3_fs.h Signed-off-by: David Woodhouse commit 52a78c1cae382ff5684f3970848676de12449745 tree ea5377cb74058418a03dae9c855c7acb200a4f2f parent 19b3bd667b6a4fc4c164c743492cec08d91d74a5 author David Woodhouse Tue, 25 Apr 2006 15:18:31 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:18:31 +0100 Don't include private headers from user-visible part of linux/ext2_fs.h Signed-off-by: David Woodhouse commit 19b3bd667b6a4fc4c164c743492cec08d91d74a5 tree 33b3a7cc733f64ca284f7a617ef1e4504dffa9d3 parent 1af042271f9bf7601f7ecf4d328ccde3a44d2c72 author David Woodhouse Tue, 25 Apr 2006 15:18:05 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:18:05 +0100 Don't include private headers from user-visible part of linux/smb_fs.h Signed-off-by: David Woodhouse commit 1af042271f9bf7601f7ecf4d328ccde3a44d2c72 tree 9c1dea25088aed63a29b2f759edfb6fbca2a186c parent eae19a762de975e109394b1edcba6587323c7d1a author David Woodhouse Tue, 25 Apr 2006 15:16:44 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:16:44 +0100 Sanitise linux/sunrpc/debug.h for userspace consumption Move some inclusion of private header files and the definition of RPC_DEBUG inside the existing #ifdef __KERNEL__ Signed-off-by: David Woodhouse commit eae19a762de975e109394b1edcba6587323c7d1a tree e53c2fb47f3d574eaf6d29c33bf46a57fa4d3e8d parent 468db83658f776ec87a953778f18611301668148 author David Woodhouse Tue, 25 Apr 2006 15:14:50 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:14:50 +0100 Don't export CONFIG_COMPAT stuff in linux/usbdevice_fs.h to userspace Signed-off-by: David Woodhouse commit 468db83658f776ec87a953778f18611301668148 tree d494c1b4f8d5b635ae9eb827a83ad11a40966abf parent c6e82e72361db12759fdcdbfd3b598acb6b34b07 author David Woodhouse Tue, 25 Apr 2006 15:00:56 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:00:56 +0100 Don't include from user-visible part of linux/wanrouter.h Signed-off-by: David Woodhouse commit c6e82e72361db12759fdcdbfd3b598acb6b34b07 tree 50ffec76ba950855b4ed388afee2ead6214e08e2 parent 7ab2febd4d3c6f50545cee11a116536a09748d59 author David Woodhouse Tue, 25 Apr 2006 15:00:06 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:00:06 +0100 Move comment in mtd-abi.h to stop confusing unifdef Currently, unifdef removes the comment which starts on the same line as the #ifdef __KERNEL__, but leaves the second line of the comment in place. Move the comment onto a separate line. Signed-off-by: David Woodhouse commit 7ab2febd4d3c6f50545cee11a116536a09748d59 tree fe6acab1ca8130081d5dcf056bdfc7c0a8f62cba parent 8ffbc759a5b655feb69435c4dfa857c391f9dcc8 author David Woodhouse Tue, 25 Apr 2006 14:55:46 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:55:46 +0100 Don't include private headers from user-visible part of linux/signal.h Signed-off-by: David Woodhouse commit 8ffbc759a5b655feb69435c4dfa857c391f9dcc8 tree 1fca46b69677e8e482498b9de143b9db915b3ebf parent a3b6714e1744a5e841753d74aca1de5972f24e6d author David Woodhouse Tue, 25 Apr 2006 14:55:13 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:55:13 +0100 Don't include from user-visible part of linux/sem.h Signed-off-by: David Woodhouse commit a3b6714e1744a5e841753d74aca1de5972f24e6d tree 2a463aa2d4fd93f754fb819e5e2ec56482844c99 parent 98ca79d52bc34b8dfff729bc8559dbb918c9d02a author David Woodhouse Tue, 25 Apr 2006 14:54:40 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:54:40 +0100 Partially sanitise linux/sched.h for userspace consumption For now, just make sure all inclusion of private header files is done within #ifdef __KERNEL__. There'll be more to clean up later. Signed-off-by: David Woodhouse commit 98ca79d52bc34b8dfff729bc8559dbb918c9d02a tree 3a7dc458e50c6950b7ca1b31380851f37a081af5 parent 0409d3a332fc4347efba535a5003943f2a4aa1ca author David Woodhouse Tue, 25 Apr 2006 14:52:51 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:52:51 +0100 Don't include from user-visible part of reiserfs_xattr.h Signed-off-by: David Woodhouse commit 0409d3a332fc4347efba535a5003943f2a4aa1ca tree 40452f9514818eb255923cc1e3055078085d1991 parent 997b7af2fe0810ca82a2f801a295218b51426e5a author David Woodhouse Tue, 25 Apr 2006 14:52:13 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:52:13 +0100 Don't include private headers from user-visible parts of linux/quota.h Signed-off-by: David Woodhouse commit 997b7af2fe0810ca82a2f801a295218b51426e5a tree 06803bb0fcf2b910c4a222f0ce0b575cf23b90f7 parent eacf17bdbc8e6f24fe46cd7e10fb9a657f060d08 author David Woodhouse Tue, 25 Apr 2006 14:51:45 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:51:45 +0100 Don't include private headers from user-visible parts of include/linux/nfs*.h Signed-off-by: David Woodhouse commit eacf17bdbc8e6f24fe46cd7e10fb9a657f060d08 tree 5452c85230cf326c313773ddfd2ee6dc306331ed parent 77597ad663f9e2d40a89c6e27824701bb5fabb83 author David Woodhouse Tue, 25 Apr 2006 14:46:09 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:46:09 +0100 Don't include from user-visible part of linux/net.h Signed-off-by: David Woodhouse commit 77597ad663f9e2d40a89c6e27824701bb5fabb83 tree 83e9a96117e87138c524bba303364aa4e62c25bf parent 58908d093e77224973b3f7bf54470d51949ff110 author David Woodhouse Tue, 25 Apr 2006 14:26:46 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:26:46 +0100 Don't include from user-visible part of linux/msg.h Signed-off-by: David Woodhouse commit 58908d093e77224973b3f7bf54470d51949ff110 tree 9caa92036c29c0fab210750a2a80149bc07e089a parent 9cdcb56636717ccb935dc66c5d56681eaa5941c1 author David Woodhouse Tue, 25 Apr 2006 14:26:26 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:26:26 +0100 Don't include private files from user-visible part of linux/ncp_fs.h Signed-off-by: David Woodhouse commit 9cdcb56636717ccb935dc66c5d56681eaa5941c1 tree 290ac168d09b892641fd2f2f023b88f212976587 parent 8e442735ae6e2e1c857fb0c746027da8d8e40a81 author David Woodhouse Tue, 25 Apr 2006 14:18:07 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:18:07 +0100 Sanitise linux/mman.h for userspace consumption It only really needs to define a few constants and include when it's used by userspace. Move the rest within #ifdef __KERNEL__ Signed-off-by: David Woodhouse commit 8e442735ae6e2e1c857fb0c746027da8d8e40a81 tree 4f50a887c9ba593cd69a164df9c16ee61a07cfaa parent 2e0e1f9f1c478ee14fb60524024f7b730df76912 author David Woodhouse Tue, 25 Apr 2006 14:16:14 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:16:14 +0100 Remove gratuitous inclusion of from linux/isdn/tpam.h Signed-off-by: David Woodhouse commit 2e0e1f9f1c478ee14fb60524024f7b730df76912 tree 12b050c8c40bbe61d9c001556ca7547e12a19a9b parent a1b9298e55d2395be4ac25de3340b6eee01c6f67 author David Woodhouse Tue, 25 Apr 2006 14:15:44 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:15:44 +0100 Don't include from user-visible part of linux/ipmi.h Signed-off-by: David Woodhouse commit a1b9298e55d2395be4ac25de3340b6eee01c6f67 tree 23a80fc7105a3d58db7af410eec0fbab692fe758 parent 5a570cc0a41bd316afc91ba2c7151fed70d10b31 author David Woodhouse Tue, 25 Apr 2006 14:14:52 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:14:52 +0100 Sanitise linux/i2c.h for userspace consumption It was unconditionally including a whole bunch of headers which aren't user-visible, and also exposing a lot of private internal stuff of its own. Also fix some legacy character set to UTF-8 while we're at it. Signed-off-by: David Woodhouse commit 5a570cc0a41bd316afc91ba2c7151fed70d10b31 tree 89fa6a2098f772dad535ddba9294e6ed7ed55f89 parent 34186efc17025520a53a48468338003d238a77d7 author David Woodhouse Tue, 25 Apr 2006 14:10:40 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:10:40 +0100 Sanitise linux/i2c-algo-ite.h for userspace consumption It doesn't need to include i2c.h, because a forward declaration of struct i2c_adapter is perfectly sufficient. And it can be inside #ifdef __KERNEL__ along with the kernel-internal structure definition. Signed-off-by: David Woodhouse commit 34186efc17025520a53a48468338003d238a77d7 tree f887ed9f90f3a817cfb239c343f08dd380cfa15d parent f2999e4ea41d6ec6252d3b6d275b40d468a3c07e author David Woodhouse Tue, 25 Apr 2006 14:07:57 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:07:57 +0100 Include various private files only from within __KERNEL__ in genhd.h Signed-off-by: David Woodhouse commit f2999e4ea41d6ec6252d3b6d275b40d468a3c07e tree 376e4053b8472e9cf307920154463fdf4f28ed7d parent 25478bb26f2be1504112b764047105811a52c3cb author David Woodhouse Tue, 25 Apr 2006 14:07:02 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:07:02 +0100 Export only the appropriate GS_xxx flags to userspace from generic_serial.h Signed-off-by: David Woodhouse commit 25478bb26f2be1504112b764047105811a52c3cb tree aa8a47b93ba07e1950b84a0b3538031697f7fcc9 parent 72b9760b65cbe0d24e668c34c8fefb2ba417f14b author David Woodhouse Tue, 25 Apr 2006 13:59:30 +0100 committer David Woodhouse Tue, 25 Apr 2006 13:59:30 +0100 Use __KERNEL__ to hide kernel-private bits of linux/gameport.h Signed-off-by: David Woodhouse commit 72b9760b65cbe0d24e668c34c8fefb2ba417f14b tree 9feae872f60e08f604369ca4e4a7f9f2564f7229 parent a1ff0eafce81a58861534926722a70f211b04faa author David Woodhouse Tue, 25 Apr 2006 13:58:23 +0100 committer David Woodhouse Tue, 25 Apr 2006 13:58:23 +0100 Don't include agp_backend.h in user-visible part of agpgart.h Signed-off-by: David Woodhouse commit a1ff0eafce81a58861534926722a70f211b04faa tree b805851abebd142b8cef766f593bd45c8482af62 parent dd02ec3ac25828d0918f5b389defe2238d015fe6 author David Woodhouse Tue, 25 Apr 2006 13:57:44 +0100 committer David Woodhouse Tue, 25 Apr 2006 13:57:44 +0100 Include from linux/acct.h only in kernel-private part. Signed-off-by: David Woodhouse commit dd02ec3ac25828d0918f5b389defe2238d015fe6 tree 67cff36d121dc0f06561c8142fbabb72fef4105e parent 454ac778459bc70f0a9818a6a8fd974ced11de66 author David Woodhouse Tue, 25 Apr 2006 13:51:52 +0100 committer David Woodhouse Tue, 25 Apr 2006 13:51:52 +0100 Remove user-visible references to PAGE_SIZE in include/asm-powerpc/elf.h Signed-off-by: David Woodhouse commit 3c304956755fa63ee80ca51ce38078fe1c4e8818 tree 4225b87cdf197139e47f931b28fa897dc21f56d5 parent 921a91ef6adffe066ce80823350b982c647033e7 author Dan Williams Sat, 15 Apr 2006 12:26:18 -0400 committer John W. Linville Mon, 24 Apr 2006 16:26:14 -0400 [PATCH] wireless/airo: minimal WPA awareness airo cards with firmware versions of 5.30.17 and higher support WPA. This patch recognizes WPA-capable firmware versions and adds support for retrieving the WPA and RSN information elements from the card's scan results. The JOB and FLAG fields are now independent, since there was no space left in the FLAG field for FLAG_WPA_CAPABLE. Signed-off-by: matthieu castet Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 921a91ef6adffe066ce80823350b982c647033e7 tree b950c18419413d860a8caa7ac0819d0159beed79 parent 9a1771e86756212041b32d80b850cc4c8063360a author Johannes Berg Thu, 20 Apr 2006 20:02:04 +0200 committer John W. Linville Mon, 24 Apr 2006 16:15:58 -0400 [PATCH] softmac: clean up event handling code This patch cleans up the event handling code in ieee80211softmac_event.c and makes the module slightly smaller by removing some strings that are not used any more and consolidating some code. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 9a1771e86756212041b32d80b850cc4c8063360a tree 798f75306930072d8d97f95ef1a6846a27f003f5 parent e3c5a64e7075dd066316f1685caadabcbc649427 author Johannes Berg Thu, 20 Apr 2006 20:02:02 +0200 committer John W. Linville Mon, 24 Apr 2006 16:15:58 -0400 [PATCH] softmac: add SIOCSIWMLME This patch adds the SIOCSIWMLME wext to softmac, this functionality appears to be used by wpa_supplicant and is softmac-specific. Signed-off-by: Johannes Berg Cc: Jouni Malinen Signed-off-by: John W. Linville commit e3c5a64e7075dd066316f1685caadabcbc649427 tree b7ebbc4e7867755f2f30df73523f55f4655788be parent 127119d50ff6e226c602ae920722897f8a0c81e2 author Zhu Yi Thu, 13 Apr 2006 17:21:13 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:57 -0400 [PATCH] ipw2200: Fix wpa_supplicant association problem The new ipw2200 scan completion event feature will cause a potential event race condition in wpa_supplicant. The patch fixes this problem by move the ipw_disassociate() to the IW_AUTH_WPA_ENABLED event handling code. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 127119d50ff6e226c602ae920722897f8a0c81e2 tree c750aeb5340e3bfae329876b85bef5b0555848ef parent 459d408768fecfd1c2d170ab073e8cfd48326b1f author Zhu Yi Thu, 13 Apr 2006 17:21:06 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:57 -0400 [PATCH] ipw2200: remove priv->last_noise reference priv->last_noise is not used with the exponential averaging algorithm Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 459d408768fecfd1c2d170ab073e8cfd48326b1f tree e7eb822be216be303e7a1bff4882696e387da1ac parent 34f8ae467b066ab4cf90bdf85efd10e7d43f2ff0 author Zhu Yi Thu, 13 Apr 2006 17:21:00 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:57 -0400 [PATCH] ipw2200: rename CONFIG_IEEE80211_RADIOTAP to CONFIG_IPW2200_RADIOTAP Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 34f8ae467b066ab4cf90bdf85efd10e7d43f2ff0 tree be89041e69e3bceaf9b86503849f17f6b951b330 parent e43e3c1e900ec5b6662cf1901b27975c111289bf author Zhu Yi Thu, 13 Apr 2006 17:20:54 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:57 -0400 [PATCH] wireless Kconfig add IPW2200_RADIOTAP Makefile both IPW2200_RADIOTAP and IPW2200_PROMISCUOUS depend on IPW2200_MONITOR. Let IPW2200_PROMISCUOUS select IPW2200_RADIOTAP. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit e43e3c1e900ec5b6662cf1901b27975c111289bf tree 7b926393a0fc33d69693705e26f4d62a02559cb3 parent 555fd91852880f927f131520889e1fe674ed7e7a author Zhu Yi Thu, 13 Apr 2006 17:20:45 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:57 -0400 [PATCH] ipw2200: rename CONFIG_IPW_QOS to CONFIG_IPW2200_QOS Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 555fd91852880f927f131520889e1fe674ed7e7a tree 6a26f6324e2f777adc3135a5f10e6500e2f66fd5 parent ae4af61f6d9909f3c3ab74694c06865f27c9b054 author Zhu Yi Thu, 13 Apr 2006 17:20:40 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:56 -0400 [PATCH] ipw2200: update version stamp to 1.1.2 Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit ae4af61f6d9909f3c3ab74694c06865f27c9b054 tree 10ff60e450e43389484a99cceeffd3578a89d3af parent d685b8c226727bf5db907c7241f55461e7f1f008 author Zhu Yi Thu, 13 Apr 2006 17:20:34 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:56 -0400 [PATCH] ipw2200: version string rework Added version string fields so the version string indicates what is configured (ie, you'll see 1.1.1kpmd if you are using a GIT snapshot (Kernel.. previously -git), promiscuous (p), monitor (m), debug (d) build. Signed-off-by: James Ketrenos Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d685b8c226727bf5db907c7241f55461e7f1f008 tree 698e2194daef4c065ccbfd22802e7214caf6ea93 parent c6c33a779dfe7aa8254be4da08c217914f1390a0 author Zhu Yi Thu, 13 Apr 2006 17:20:27 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:56 -0400 [PATCH] ipw2200: Enable rtap interface for RF promiscuous mode while associated With this patch, a new promiscuous mode is enabled. If the module is loaded with the rtap_iface=1 module parameter, two interfaces will be created (instead of just one). The second interface is prefixed 'rtap' and provides received 802.11 frames on the current channel to user space in a radiotap header format. Example usage: % modprobe ipw2200 rtap_iface=1 % iwconfig eth1 essid MyNetwork % dhcpcd eth1 % tcpdump -i rtap0 If you do not specify 'rtap_iface=1' then the rtap interface will not be created and you will need to turn it on via: % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface You can filter out what type of information is passed to user space via the rtap_filter sysfs entry. Currently you can tell the driver to transmit just the headers (which will provide the RADIOTAP and IEEE 802.11 header but not the payload), to filter based on frame control type (Management, Control, or Data), and whether to report transmitted frames, received frames, or both. The transmit frame reporting is based on a patch by Stefan Rompf. Filters can be get and set via a sysfs interface. For example, set the filter to only send headers (0x7), don't report Tx'd frames (0x10), and don't report data frames (0x100): % echo 0x117 > /sys/bus/pci/drivers/ipw2200/*/rtap_filter All your packets are belong to us: % tethereal -n -i rtap0 Signed-off-by: James Ketrenos Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit c6c33a779dfe7aa8254be4da08c217914f1390a0 tree cca4c65451d90489d458a14501c26f2155723784 parent 0070f8c738f757c2dda521d6bc310dc2dfdbf643 author Zhu Yi Thu, 13 Apr 2006 17:20:21 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:56 -0400 [PATCH] README.ipw2200: rename CONFIG_IPW_DEBUG to CONFIG_IPW2200_DEBUG Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 0070f8c738f757c2dda521d6bc310dc2dfdbf643 tree 229a423cc8ec6f11d9f7094546350eef76928376 parent 455936c73337c1c9abeac8c4da1c109a0250ab68 author Zhu Yi Thu, 13 Apr 2006 17:20:12 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:56 -0400 [PATCH] ipw2200: Fix endian issues with v3.0 fw image format This patch corrects endian issues with the v3.0 fw image format. Signed-off-by: James Ketrenos Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 455936c73337c1c9abeac8c4da1c109a0250ab68 tree e2f5c6bfa7aa58387fa3544c7d1705b6363d58b2 parent 61fb9ed99dc8876cb118bd9ab46b535ca8c820e8 author Zhu Yi Thu, 13 Apr 2006 17:20:05 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:55 -0400 [PATCH] ipw2200: Set the 'fixed' flags in wext get_rate Signed-off-by: Jean Tourrilhes Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 61fb9ed99dc8876cb118bd9ab46b535ca8c820e8 tree 0542c4df6ea30f9fd8b87dc61de7bffc284c5e5f parent d0b526b71569446aaa848cdf4cf3dd8948f0931a author Zhu Yi Thu, 13 Apr 2006 17:19:55 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:55 -0400 [PATCH] ipw2200: turn off signal debug log Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d0b526b71569446aaa848cdf4cf3dd8948f0931a tree a21580d1a8c7b43aeae621935e979751ab7f93d2 parent 5dc81c3071d015a6afb4a04c1bcb6a35ec29df37 author Zhu Yi Thu, 13 Apr 2006 17:19:50 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:55 -0400 [PATCH] ipw2200: Do not continue loading the firmware if kmalloc fails Signed-off-by: Ingo Molnar Cc: "Zhu, Yi" Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 5dc81c3071d015a6afb4a04c1bcb6a35ec29df37 tree 741a1e4d1d4cb1e82832e68f25582117ed82e99d parent d2b83e1214a8395ee18e028d4526cffe9d2eb4ad author Zhu Yi Thu, 13 Apr 2006 17:19:44 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:55 -0400 [PATCH] ipw2200: fix compile warning when !CONFIG_IPW2200_DEBUG Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d2b83e1214a8395ee18e028d4526cffe9d2eb4ad tree 883bb1cfe11a76e92dfcc6b6dc40a4a3ba5420f7 parent 07f02e4625e6d7ca5d4f3835aea9807fe1e0f9c5 author Zhu Yi Thu, 13 Apr 2006 17:19:36 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:55 -0400 [PATCH] ipw2200: add module_param support for antenna selection Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 07f02e4625e6d7ca5d4f3835aea9807fe1e0f9c5 tree 99ab4f99a0025155ff3a62410c40ba38aeaf8b91 parent a5cf4fe65144ff2f35de37c7b58e7ab8ffd84d19 author Zhu Yi Thu, 13 Apr 2006 17:19:25 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:54 -0400 [PATCH] ipw2200: generates a scan event after a scan has completed The patch make ipw2200 generate the scan event every time a scan has completed, so that user space know when to get fresh results. Dan Williams would like to go towards this model in Network Manager rather than having to poll. Signed-off-by: Jean Tourrilhes Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit a5cf4fe65144ff2f35de37c7b58e7ab8ffd84d19 tree 405454d2816152c41e0e40d7846c9de18ae927d2 parent 00d21de5c685ab450ef376acdd1b733badb6b50d author Zhu Yi Thu, 13 Apr 2006 17:19:11 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:54 -0400 [PATCH] ipw2200: Fix TX QoS enabled frames problem This patch works with the ieee80211 stack to set the correct QoS bit to the ipw2200 card. It fixed the TX failure problem for using WPA with QoS. Signed-off-by: Hong Liu Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 00d21de5c685ab450ef376acdd1b733badb6b50d tree cafb8af00344d068943666f893a84260eaa84bed parent 45a62ab3d6f9d5963cb7c01fa76c950e42d037c2 author Zhu Yi Thu, 13 Apr 2006 17:19:02 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:54 -0400 [PATCH] ipw2200: Exponential averaging for signal and noise Level This patch replaces sliding averaging by exponential averaging for reporting the wireless statistics for signal and noise level for ipw2200. See details from: http://www.ces.clemson.edu/linux/ipw2200_averages.shtml Signed-off-by: Bill Moss Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 45a62ab3d6f9d5963cb7c01fa76c950e42d037c2 tree 203fb320997e967d47edcc699a2c5facacd3d65d parent 7736b5bd93765fc1db5b3b6e25200d7c4292d14b author Zhu Yi Thu, 13 Apr 2006 17:17:54 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:54 -0400 [PATCH] ieee80211: update version stamp to 1.1.13 Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 7736b5bd93765fc1db5b3b6e25200d7c4292d14b tree 458d68ad73890f4847ef50831bcae3a2b8e0637e parent 35c14b855f52c49e4f3d078b9532b056005ed321 author Zhu Yi Thu, 13 Apr 2006 17:17:47 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:54 -0400 [PATCH] ieee80211: replace debug IEEE80211_WARNING with each own debug macro Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 35c14b855f52c49e4f3d078b9532b056005ed321 tree 4fea40fcc0c6a29038a0c5f3a0927affe20110b3 parent 09593047d8210ca017a0b4aa0a7fb10abf12615f author Zhu Yi Thu, 13 Apr 2006 17:17:35 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:53 -0400 [PATCH] ieee80211: remove unnecessary CONFIG_WIRELESS_EXT checking Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 09593047d8210ca017a0b4aa0a7fb10abf12615f tree cde17a6145434c799dfa6b82427068cefb3953cd parent 73858062b66c07d71bce47a0e4798dd3ce604590 author Zhu Yi Thu, 13 Apr 2006 17:17:26 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:53 -0400 [PATCH] ieee80211: export list of bit rates with standard WEXT procddures The patch replace the way to export the list of bit rates in scan results from IWEVCUSTOM to SIOCGIWRATE. It also removes the max_rate item exported with SIOCGIWRATE since this should be done by userspace. Signed-off-by: Jean Tourrilhes Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 73858062b66c07d71bce47a0e4798dd3ce604590 tree ab97d0268e29c237cbc397bd254ca75c00e9c1be parent ea2841521a7e061b772d6cee03f5b23c58a58284 author Zhu Yi Thu, 13 Apr 2006 17:17:17 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:53 -0400 [PATCH] ieee80211: Fix TX code doesn't enable QoS when using WPA + QoS Fix ieee80211 TX code when using WPA+QOS. TKIP/CCMP will use the TID field of qos_ctl in 802.11 frame header to do encryption. We cannot ignore this field when doing host encryption and add the qos_ctl field later. Signed-off-by: Hong Liu Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit ea2841521a7e061b772d6cee03f5b23c58a58284 tree 6333c04cd21360477fa37cd6a4556d92d6067da4 parent cc9357104b19b2b0377713c33d87d78518912c3d author Zhu Yi Thu, 13 Apr 2006 17:17:06 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:53 -0400 [PATCH] ieee80211: Fix TKIP MIC calculation for QoS frames Fix TKIP MIC verification failure when receiving QoS frames from AP. Signed-off-by: Hong Liu Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit cc9357104b19b2b0377713c33d87d78518912c3d tree e53b117c4d01ef0f4d567d6f7e0891f24fc89fb3 parent f298a2ec62e51cc81b85a120d8fa5b9f8f5a94b1 author Michael Buesch Mon, 10 Apr 2006 02:08:33 +0200 committer John W. Linville Mon, 24 Apr 2006 16:15:53 -0400 [PATCH] bcm43xx: use pci_iomap() for convenience. This reduces codesize. Signed-off-by: John W. Linville commit f298a2ec62e51cc81b85a120d8fa5b9f8f5a94b1 tree 1f3d2824c3ece2ac94ac45bd8f7c6de4b17ffdab parent dc3437d205dcd1a195ebf795f1c54ceb638337fb author Pavel Roskin Fri, 07 Apr 2006 04:11:02 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco: bump version to 0.15 Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit dc3437d205dcd1a195ebf795f1c54ceb638337fb tree 0537c6ad05795a090a908d10e418f213817a4ee1 parent b884c872fa1917614b42a39020ffcca7fa9302b1 author Pavel Roskin Fri, 07 Apr 2006 04:11:00 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco: further comment cleanup in the PCI drivers Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit b884c872fa1917614b42a39020ffcca7fa9302b1 tree 82f5ba67f6b38c96804fb449e018d83fbdce65a1 parent c6fb2e9abef894efc4870e4c1e3aa4365b830a11 author Pavel Roskin Fri, 07 Apr 2006 04:10:57 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco: reduce differences between PCI drivers, create orinoco_pci.h Make all Orinoco PCI drivers (orinoco_pci, orinoco_plx, orinoco_tmd and orinoco_nortel) as similar as possible. Use the best implementation of error handling, the best error messages, the best comments. Put common code to orinoco_pci.h. For now, it's suspend and resume functions and function for registering the network device. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit c6fb2e9abef894efc4870e4c1e3aa4365b830a11 tree ab262b6f480665fa6ea5b9bdc2a6d6383b0dc2f2 parent 3d529962217c3fec36f53f270a37e132b9763c65 author Pavel Roskin Fri, 07 Apr 2006 04:10:55 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco: support PCI suspend/resume for Nortel, PLX and TMD adaptors Copy PCI suspend/resume functions from orinoco_pci.c. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 3d529962217c3fec36f53f270a37e132b9763c65 tree e327ba184a666f4ad2e706912c4eba1c6a4a0947 parent d62274b374ce41dd3a90820b124d28fec292a5b7 author Pavel Roskin Fri, 07 Apr 2006 04:10:53 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco_pci: use pci_iomap() for resources Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit d62274b374ce41dd3a90820b124d28fec292a5b7 tree d8b7973d10c1e4013608301d678029ddb97aac81 parent 37a6c6117db3f10e1923c14dffa089b10600c4b8 author Pavel Roskin Fri, 07 Apr 2006 04:10:51 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco_pci: disable device and free IRQ when suspending Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 37a6c6117db3f10e1923c14dffa089b10600c4b8 tree 88e84f1635b2e24744061fdbac7c1e2b7ead38d9 parent 2c1bd26035491cd0ba7e49be6ed610fc4912fef9 author Pavel Roskin Fri, 07 Apr 2006 04:10:49 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:51 -0400 [PATCH] orinoco: delay FID allocation after firmware initialization This is needed to identify the card before possible allocation problems, so that the user at least can report the firmware version that fails. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 2c1bd26035491cd0ba7e49be6ed610fc4912fef9 tree a49cb8466cccfd065419d017c4f6aba023d183d6 parent a28dc81dcd9ca9a451bfcab0a2351b0b07146759 author Jiri Benc Fri, 07 Apr 2006 04:10:47 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:51 -0400 [PATCH] orinoco: fix BAP0 offset error after several days of operation After several days of operation of Netgear MA311 card, the card becomes to seek improperly and needs reset. This patch tries to reset the card when this situation occurs. Mar 9 06:45:16 berkeley kernel: wlan0: Error -5 writing packet to BAP Mar 9 06:45:16 berkeley kernel: hermes @ f992a000: BAP0 offset error: reg=0x4044 id=0x128 offset=0x44 Mar 9 06:45:16 berkeley kernel: wlan0: Error -5 writing packet to BAP Mar 9 06:45:16 berkeley kernel: hermes @ f992a000: BAP0 offset error: reg=0x4044 id=0x128 offset=0x44 (etc.) A more detailed description of the problem can be found at https://bugzilla.novell.com/show_bug.cgi?id=154773 The same problem with different card is reported at http://sourceforge.net/mailarchive/message.php?msg_id=14597046 Signed-off-by: Jiri Benc Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit a28dc81dcd9ca9a451bfcab0a2351b0b07146759 tree 6f9e4b754807e3c81c99879dabd13a422a785327 parent 470e2aa6dbdd2c7eb6562ae365a17a627f7070e8 author Pavel Roskin Fri, 07 Apr 2006 04:10:45 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:51 -0400 [PATCH] orinoco: simplify 802.3 encapsulation code Use skb_pull() to strip the addresses from the original packet. Don't strip protocol bytes. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 470e2aa6dbdd2c7eb6562ae365a17a627f7070e8 tree d6ecbf82b73c6cb1700c635704dacbda8baa4b7c parent 8d5be088263b0d3dbb7e7959b7c403b3d026a5d3 author Pavel Roskin Fri, 07 Apr 2006 04:10:43 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:51 -0400 [PATCH] orinoco: refactor and clean up Tx error handling The result of orinoco_xmit() can be OK, dropped packet and busy transmitter. Rename labels accordingly. Increment stats->tx_errors in one place. Increment stats->tx_dropped - nobody is doing it for us. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 8d5be088263b0d3dbb7e7959b7c403b3d026a5d3 tree 912fd8275e7f96a22f3c4935ffba86a520e97b63 parent 6b61626290900f12b7f3978f57f329da6811fb59 author Pavel Roskin Fri, 07 Apr 2006 04:10:41 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:51 -0400 [PATCH] orinoco: don't use any padding for Tx frames hermes_bap_pwrite() supports odd-sized packets now. There is no minimal packet size for 802.11. Also, hermes_bap_pwrite() supports odd-sized packets now. This removes all reasons to pad the Tx data. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 6b61626290900f12b7f3978f57f329da6811fb59 tree 2e1d9518d786bbca0e87ffec3f42a6f5794fe384 parent b34b867e944628418d587367276c9a82e03aba8c author Pavel Roskin Fri, 07 Apr 2006 04:10:39 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:50 -0400 [PATCH] orinoco replace hermes_write_words() with hermes_write_bytes() The new function can write an odd number of bytes, thus making padding unnecessary. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit b34b867e944628418d587367276c9a82e03aba8c tree 5e2222980d25a95ab478cbe42bd8b84244cbfccf parent 30c2d3b48176279b1381b00ae86f3d01147d0915 author Pavel Roskin Fri, 07 Apr 2006 04:10:36 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:50 -0400 [PATCH] orinoco: orinoco_xmit() should only return valid symbolic constants Don't ever return -errno from orinoco_xmit() - the network layer doesn't expect it. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 30c2d3b48176279b1381b00ae86f3d01147d0915 tree db25219cc9fc44a2e5590b1fb01c2923a20078a3 parent 4ebe2eb0b388445d18dae34849cc6a9e7c55315f author Pavel Roskin Fri, 07 Apr 2006 04:10:34 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:50 -0400 [PATCH] orinoco: optimize Tx exception handling in orinoco When processing Tx exception, only read data until addr1. Rename hermes_tx_descriptor_802_11 to hermes_txexc_data since it's only used to Tx exceptions. Reuse existing hermes_tx_descriptor structure. Remove fields after addr1 - they are not read from the card. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 4ebe2eb0b388445d18dae34849cc6a9e7c55315f tree d16c3c0eac315cb62518483f8d78e61c01deb7f5 parent 754b1364e78db796bb3a541f6ea8dec2821c745a author Pavel Roskin Fri, 07 Apr 2006 04:10:32 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:50 -0400 [PATCH] orinoco: Symbol card supported by spectrum_cs is LA4137, not LA4100 Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 754b1364e78db796bb3a541f6ea8dec2821c745a tree 4a522edc2293f202a53ef4ad3220d39b32a45e05 parent 65b1fe7df71e7ad09e9203b6c3875781c30557e0 author Pavel Roskin Fri, 07 Apr 2006 04:10:30 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:50 -0400 [PATCH] orinoco: remove debug buffer code and userspace include support Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 65b1fe7df71e7ad09e9203b6c3875781c30557e0 tree cfec3c86e899d6148a75b7f21782374e3b9c044f parent 7eeae2ffadf170f954205733f511ca40df91f0b7 author Pavel Roskin Fri, 07 Apr 2006 04:10:28 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:49 -0400 [PATCH] orinoco: remove tracing code, it's unused Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 7eeae2ffadf170f954205733f511ca40df91f0b7 tree 82b76648d108291dc15c4cd664b5392cd80da092 parent b018779cbda646c37346433167145b4624c8979b author Pavel Roskin Fri, 07 Apr 2006 04:10:24 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:49 -0400 [PATCH] orinoco: remove underscores from little-endian field names Sparse is much better at finding endianess issues than such visual cues. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit b018779cbda646c37346433167145b4624c8979b tree de052210e58a6e694192e20eafb543ca6f9fd231 parent a6e26e8ddbe8717103556ecd8ecd383de32671e4 author Pavel Roskin Fri, 07 Apr 2006 04:10:21 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:49 -0400 [PATCH] orinoco: remove PCMCIA audio support, it's useless for wireless cards Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit a6e26e8ddbe8717103556ecd8ecd383de32671e4 tree 3a6d4954784e68cd97871b33d76e28849abf294b parent 7c241d37fe0e6442c5cf3b5d73f7f58f2dc66352 author Pavel Roskin Fri, 07 Apr 2006 04:10:19 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:49 -0400 [PATCH] orinoco: Remove useless CIS validation The PCMCIA drivers would never be loaded if the CIS were wrong. No other PCMCIA drivers validate CIS. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 916a3d5729c8b710d56acf579f3fdb4de7c03e77 tree 3c063664f777cfd345a2c9d557fdef12f73d773c parent 55308c3712f56279d5547ef6e97d365ac3ab9e6d parent d0e15bed84db7a9b0ea85d2ad9707b5e6d2e38da author Paul Mackerras Sun, 23 Apr 2006 10:55:56 +1000 committer Paul Mackerras Sun, 23 Apr 2006 10:55:56 +1000 Merge branch 'merge' commit 55308c3712f56279d5547ef6e97d365ac3ab9e6d tree efa60b533b83ab55baf90791cb3bf19bfe325d08 parent 8833843c877cca459ab7b9fee661523bf25b98d1 parent c18bcf45c46f72f630cbbddc79a765336b79ab4f author Paul Mackerras Sat, 22 Apr 2006 19:47:47 +1000 committer Paul Mackerras Sat, 22 Apr 2006 19:47:47 +1000 Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc commit 8833843c877cca459ab7b9fee661523bf25b98d1 tree 971de008289771eea00018d6ae36672387b5351e parent ac325acd50013fa8f4953208cbb96504dec9b12a parent 7c8ce71b092425f1e938285cab2a679c09444d9b author Paul Mackerras Sat, 22 Apr 2006 19:47:24 +1000 committer Paul Mackerras Sat, 22 Apr 2006 19:47:24 +1000 Merge branch 'merge' commit ac325acd50013fa8f4953208cbb96504dec9b12a tree 6c08470d68be38504c6aadae168b873efb39e8db parent 4bd174fe1cca738f53cf8bb9ac3cb327b1f516ed author Linas Vepstas Tue, 18 Apr 2006 21:05:21 -0700 committer Paul Mackerras Sat, 22 Apr 2006 18:46:13 +1000 [PATCH] powerpc/pseries: clear PCI failure counter if no new failures The current PCI error recovery system keeps track of the number of PCI card resets, and refuses to bring a card back up if this number is too large. The goal of doing this was to avoid an infinite loop of resets if a card is obviously dead. However, if the failures are rare, but the machine has a high uptime, this mechanism might still be triggered; this is too harsh. This patch will avoids this problem by decrementing the fail count after an hour. Thus, as long as a pci card BSOD's less than 6 times an hour, it will continue to be reset indefinitely. If it's failure rate is greater than that, it will be taken off-line permanently. This patch is larger than it might otherwise be because it changes indentation by removing a pointless while-loop. The while loop is not needed, as the handler is invoked once fo each event (by schedule_work()); the loop is leftover cruft from an earlier implementation. Signed-off-by: Linas Vepstas Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras commit 4bd174fe1cca738f53cf8bb9ac3cb327b1f516ed tree e4dffbeddbcb7e7f928c5989f0062f8142f83327 parent 5e1415c3f7d3ad133edb7ce9ca90641cf0f5fe79 author Olof Johansson Tue, 18 Apr 2006 11:25:53 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:46:11 +1000 [PATCH] powerpc: Remove stale iseries global Not even the iSeries maintainer seems to have access to this legendary piranha simulator. It adds a bit of ugliness in the common time init code, and if it's no longer used we might as well be done with it and remove the bloat. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 5e1415c3f7d3ad133edb7ce9ca90641cf0f5fe79 tree ba8144744acb3cbe4bdacb386f15cdc0b97e9e46 parent 90ddfebec1b450258f85d42f043cfbae450fe47e author Olof Johansson Wed, 12 Apr 2006 15:29:00 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:46:09 +1000 [PATCH] powerpc: Quiet oprofile output at boot No need to always print out which performance monitoring type is used on the console at every boot. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 90ddfebec1b450258f85d42f043cfbae450fe47e tree fce173315c893aef8f197bda3e4ad3d7c7e901ed parent e884e9c5f28c747ac2c3e1056e1fd655a79e950d author Olof Johansson Wed, 12 Apr 2006 15:28:13 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:46:07 +1000 [PATCH] powerpc: Quiet rtasd output at boot Most users won't really know the difference between a started RTAS daemon and a missing event-scan. Move it to debug levels. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit e884e9c5f28c747ac2c3e1056e1fd655a79e950d tree 2d32a8cac548d53b7f10dd8a6b1650ed5b58464c parent cc98f70557bd08f2eea7b955dd918692a655d72e author Olof Johansson Wed, 12 Apr 2006 15:26:59 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:14 +1000 [PATCH] powerpc: Quiet PCI init printouts Quiet some of the more debug related output from the pci probe routines. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit cc98f70557bd08f2eea7b955dd918692a655d72e tree 61e868f18d6000dfd4cc6017e44d88b2cc6d1dcb parent e110b281dc93e3b4587a3d0440bb7ae38daddfde author Olof Johansson Wed, 12 Apr 2006 15:26:00 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:13 +1000 [PATCH] powerpc: Lack of ISA interrupts on XICS isn't dangerous This isn't really a dangerous thing any more; most systems lack ISA interrupt controllers. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit e110b281dc93e3b4587a3d0440bb7ae38daddfde tree f124e7ce169a85f289d20d315901cbf6b1fba700 parent 4baaf0cfda7279e1adaedc203d7a09e8e44597ab author Olof Johansson Wed, 12 Apr 2006 15:25:01 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:12 +1000 [PATCH] powerpc: Less verbose mem configuration output Quieten some of the debug ram config output. we already print out available memory at KERN_INFO level. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 4baaf0cfda7279e1adaedc203d7a09e8e44597ab tree fbd95c42873b2a82972bd4d4fe40cb8876eb35d0 parent f98baffb82710803005c19897f1a55af91da5685 author Olof Johansson Wed, 12 Apr 2006 15:23:22 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:11 +1000 [PATCH] powerpc: Don't print chosen idle loop at every boot No need to write out what idle loop is used on every boot. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit f98baffb82710803005c19897f1a55af91da5685 tree 31c894ce8bfbf1438e05c1bced3fbf527ac7bc55 parent f430c02b13f00146106fedcace810e61b4493d8c author Olof Johansson Wed, 12 Apr 2006 15:22:29 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:10 +1000 [PATCH] powerpc: Quiet VETH version printk ibmveth_printk() is only used to print the driver version when the module initializes, which means on all machines as long as it's compiled in. If it's really only needed for debugging, boot with loglevel=8, or get it from dmesg instead. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit f430c02b13f00146106fedcace810e61b4493d8c tree bc4dc9cf36a466a6569dbf6b2f35941733f53097 parent 224ad80ac0de102d7bede8d36afbd5ef0a64019f author Olof Johansson Wed, 12 Apr 2006 15:21:06 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:09 +1000 [PATCH] powerpc: Quiet page order output No need to always print page orders. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 224ad80ac0de102d7bede8d36afbd5ef0a64019f tree 8ebb087c133c9e217c1ed81c7544b6c102e320d8 parent 8b6a7b2ea2ab18d46bc9e0e76b614d8c155291ad author Olof Johansson Wed, 12 Apr 2006 15:20:27 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:08 +1000 [PATCH] powerpc: Quiet time init output Move time_init console output to KERN_DEBUG prink level. No need to print it at every boot. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 8b6a7b2ea2ab18d46bc9e0e76b614d8c155291ad tree 4d492241e0cd8074147acf2aae7d9d1923a637e1 parent c256f4b9598c71afd8eb0b7d3d3790a38734cf43 author Olof Johansson Wed, 12 Apr 2006 15:19:50 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:07 +1000 [PATCH] powerpc: Quiet HVSI boot output There's no real need to print the number of found HVSI devices on the console at every boot. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit c256f4b9598c71afd8eb0b7d3d3790a38734cf43 tree 7366b0e03b5d9f1b0abfaa38230246f6d3875735 parent 81bbbe92949b069c101e13d3acbd4bc7d088cb79 author Anton Blanchard Fri, 07 Apr 2006 15:23:03 +1000 committer Paul Mackerras Sat, 22 Apr 2006 18:45:05 +1000 [PATCH] powerpc: remove io_page_mask Cleanup patch which removes the io_page_mask. It fixes the reset on some e1000 devices which is needed for clean kexec reboots. The legacy devices which broke with this patch (parallel port and PC speaker) have now been fixed in Linus' tree. Signed-off-by: Anton Blanchard Acked-by: Michael Neuling Signed-off-by: Paul Mackerras commit 81bbbe92949b069c101e13d3acbd4bc7d088cb79 tree 8417edecc09a954bc6bb2bd7b99d4a279535dd2b parent d6c1a9081080c6c4658acf2a06d851feb2855933 author Haren Myneni Wed, 05 Apr 2006 21:10:18 -0600 committer Paul Mackerras Sat, 22 Apr 2006 18:45:01 +1000 [PATCH] powerpc: clear IPIs on kdump In some crash scenarios, the kexec CPU is not responding to an IPI sent by secondary CPU after init thread is forked, causing the system to drop into xmon during kdump boot. This problem can be reproduced each time when the debugger is enabled and soft-reset is used to invoke kdump boot. The first CPU sends an IPI - setting the IPI priority for all secondary cpus (xics_cause_ipi()). But some CPUs will enter into the xmon via soft-reset, i.e, not executing xics_ipi_action(). Hence, IPI is not cleared. When exited from the debugger, one of these CPUs could become the primary kexec CPU. Since the IPI is not cleared, causing this issue in kdump boot. This patch clears and EOI IPI for kexec CPU as well before the kdump boot started. Signed-off-by: Haren Myneni Signed-off-by: Paul Mackerras commit d6c1a9081080c6c4658acf2a06d851feb2855933 tree eaf1095adbe057846485de066561327066ab9bb1 parent 4d6c58899c1cdac018f92cfa0383bb835a0c80ef author Michael Ellerman Tue, 04 Apr 2006 13:43:01 +0200 committer Paul Mackerras Sat, 22 Apr 2006 18:44:25 +1000 [PATCH] powerpc: Disable and EOI interrupts in machine_crash_shutdown() We've seen several bugs caused by interrupt weirdness in the kdump kernel. Panicking from an interrupt handler means we fail to EOI the interrupt, and so the second kernel never gets that interrupt ever again. We also see hangs on JS20 where we take interrupts in the second kernel early during boot. This patch fixes both those problems, and although it adds more code to the crash path I think it is the best solution. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit ed198cb49750fd9ec564e9f1df66c10efea605f1 tree 04b508f5455c6c49e8af89913974108b3e1a83b0 parent e977145aeaad23d443686f2a2d5b32800d1607c5 author David Woodhouse Sat, 22 Apr 2006 02:38:50 +0100 committer David Woodhouse Sat, 22 Apr 2006 02:38:50 +0100 [RBTREE] Update hrtimers to use rb_parent() accessor macro. Also switch it to use the same method of using off-tree nodes as everyone else now does -- set them to point to themselves. Signed-off-by: David Woodhouse commit e977145aeaad23d443686f2a2d5b32800d1607c5 tree 99b066ca9933aef27778b62e3f783d55592ba9e2 parent 55a981027fc393c86de2c4e7836c9515088a9a58 author David Woodhouse Fri, 21 Apr 2006 23:15:39 +0100 committer David Woodhouse Fri, 21 Apr 2006 23:15:39 +0100 [RBTREE] Add explicit alignment to sizeof(long) for struct rb_node. Seems like a strange requirement, but allegedly it was necessary for struct address_space on CRIS, because it otherwise ended up being only byte-aligned. It's harmless enough, and easier to just do it than to prove it isn't necessary... although I really ought to dig out my etrax board and test it some time. Signed-off-by: David Woodhouse commit 55a981027fc393c86de2c4e7836c9515088a9a58 tree dd950b79d9f57ce48b2b2a91262b88eecb5296da parent 1975e59375756da4ff4e6e7d12f67485e813ace0 author David Woodhouse Fri, 21 Apr 2006 13:35:51 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:35:51 +0100 [RBTREE] Merge colour and parent fields of struct rb_node. We only used a single bit for colour information, so having a whole machine word of space allocated for it was a bit wasteful. Instead, store it in the lowest bit of the 'parent' pointer, since that was always going to be aligned anyway. Signed-off-by: David Woodhouse commit 1975e59375756da4ff4e6e7d12f67485e813ace0 tree 2370244862fa47b4ad8d4156d1a4ed32c326d628 parent 21f1d5fc592e145574dede8debe9603334d08fde author David Woodhouse Fri, 21 Apr 2006 13:30:36 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:30:36 +0100 [RBTREE] Remove dead code in rb_erase() Observe rb_erase(), when the victim node 'old' has two children so neither of the simple cases at the beginning are taken. Observe that it effectively does an 'rb_next()' operation to find the next (by value) node in the tree. That is; we go to the victim's right-hand child and then follow left-hand pointers all the way down the tree as far as we can until we find the next node 'node'. We end up with 'node' being either the same immediate right-hand child of 'old', or one of its descendants on the far left-hand side. For a start, we _know_ that 'node' has a parent. We can drop that check. We also know that if 'node's parent is 'old', then 'node' is the right-hand child of its parent. And that if 'node's parent is _not_ 'old', then 'node' is the left-hand child of its parent. So instead of checking for 'node->rb_parent == old' in one place and also checking 'node's heritage separately when we're trying to change its link from its parent, we can shuffle things around a bit and do it like this... Signed-off-by: David Woodhouse commit 21f1d5fc592e145574dede8debe9603334d08fde tree 95e58363205a01dc32aa15d18ea8d36bd434d7d2 parent c569882b2e70a0c4eac99acdb39b493549041ba1 author David Woodhouse Fri, 21 Apr 2006 13:17:57 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:17:57 +0100 [RBTREE] Update JFFS2 to use rb_parent() accessor macro. Signed-off-by: David Woodhouse commit c569882b2e70a0c4eac99acdb39b493549041ba1 tree 2c405fa9d5c0bc29a1b7edc1bd92cb3db749a8d2 parent fed306f2baa170220b0299198a39c6be2a91bf19 author David Woodhouse Fri, 21 Apr 2006 13:17:24 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:17:24 +0100 [RBTREE] Update eventpoll.c to use rb_parent() accessor macro. Signed-off-by: David Woodhouse commit fed306f2baa170220b0299198a39c6be2a91bf19 tree 366ad7c6f8029608587d5e45738f8c229c3ff924 parent 52b5108ca7490c0609e4dbddd8439bc03d702c99 author David Woodhouse Fri, 21 Apr 2006 13:16:49 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:16:49 +0100 [RBTREE] Update key.c to use rb_parent() accessor macro. Signed-off-by: David Woodhouse commit 52b5108ca7490c0609e4dbddd8439bc03d702c99 tree 410b7114047eb0b0f84f5b11b7981994d64a3904 parent 3db3a445308b3cee9bbbd8baa6d05081c9532da0 author David Woodhouse Fri, 21 Apr 2006 13:15:57 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:15:57 +0100 [RBTREE] Update ext3 to use rb_parent() accessor macro. Signed-off-by: David Woodhouse commit 3db3a445308b3cee9bbbd8baa6d05081c9532da0 tree 768e3a190df58b0f5f5d4a5c5ade925649e757dd parent 7fe1e133bf45b0fe70491ed3d4c5b491feff7aa8 author David Woodhouse Fri, 21 Apr 2006 13:15:17 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:15:17 +0100 [RBTREE] Change rbtree off-tree marking in I/O schedulers. They were abusing the rb_color field to mark nodes which weren't currently on the tree. Fix that to use the same method as eventpoll did -- setting the parent pointer to point back to itself. And use the appropriate accessor macros for setting and reading the parent. Signed-off-by: David Woodhouse commit 7fe1e133bf45b0fe70491ed3d4c5b491feff7aa8 tree f21150f65eeaa03fc624c312dfc71d9f912983c2 parent f4ffaa452e71495a06376f12f772342bc57051fc author David Woodhouse Fri, 21 Apr 2006 13:12:44 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:12:44 +0100 [RBTREE] Add accessor macros for colour and parent fields of rb_node This is in preparation for merging those fields into a single 'unsigned long', because using a whole machine-word for a single bit of colour information is wasteful. Signed-off-by: David Woodhouse commit bf2af2a2027e52b653882fbca840620e896ae081 tree e42ce1ac34058c1990d929f38a6e805dd6edb602 parent 857c68f733eea07f11a061caea43a38fed61adb7 author Bastiaan Jacques Mon, 17 Apr 2006 14:17:59 +0200 committer Jeff Garzik Thu, 20 Apr 2006 18:37:08 -0400 [PATCH] ahci: add support for VIA VT8251 Adds AHCI support for the VIA VT8251. Includes a workaround for a hardware bug which requires a Command List Override before softreset. Signed-off-by: Bastiaan Jacques Signed-off-by: Jeff Garzik commit 857c68f733eea07f11a061caea43a38fed61adb7 tree 4567a9e91f717b22143ac1ccb0fb5323ac15afd3 parent 4741c336d27dec3ea68a35659abb8dc82b142388 parent 402a26f0c040077ed6f941eefac5a6971f0d5f40 author Jeff Garzik Thu, 20 Apr 2006 18:36:05 -0400 committer Jeff Garzik Thu, 20 Apr 2006 18:36:05 -0400 Merge branch 'master' commit 1f5d5dbf0372dd933d8325054889ba09d996e50b tree 16bffeb01b538b70e309dd248b198f30530fa8ad parent a7bb131899814fc2bb7a3226fa8384685fe34f7d parent fef6108d4556917c45cd9ba397c1c7597f3990e1 author Jeff Garzik Thu, 20 Apr 2006 17:55:24 -0400 committer Jeff Garzik Thu, 20 Apr 2006 17:55:24 -0400 Merge branch 'upstream-fixes' commit a7bb131899814fc2bb7a3226fa8384685fe34f7d tree 416fe931bfef0599615d7568b30244668315fa65 parent 18e37f2a979dd696e6b4495b6f2470c01ffeab6c parent f18b95c3e2ab0f75b23a5aabab0bc8f99bd6bbf3 author Jeff Garzik Thu, 20 Apr 2006 17:42:15 -0400 committer Jeff Garzik Thu, 20 Apr 2006 17:42:15 -0400 Merge branch 'upstream-fixes' commit 18e37f2a979dd696e6b4495b6f2470c01ffeab6c tree c1e5b5fe2db54c7596d8db10935ce8d2886a4db1 parent d5498bef6fcd8ca0e4579eeb0b0d724f20221bb1 author Marc Zyngier Thu, 13 Apr 2006 11:38:20 +0200 committer Jeff Garzik Thu, 20 Apr 2006 17:42:05 -0400 [PATCH] netdrvr: Convert cassini to pci_iomap Folks, This patch (against 2.6.17-rc1) converts the cassini driver to the pci_iomap API that will do the right thing, so architectures like PARISC can stop screaming about illegal usage of ioremap() on non-cacheable regions. Tested on 64bit PARISC kernel. Signed-off-by: Marc Zyngier Signed-off-by: Jeff Garzik commit d5498bef6fcd8ca0e4579eeb0b0d724f20221bb1 tree c95370d6526d60886731924cf2d467701006df13 parent 0a0c72c9118c4e63080eb409f0cfdf15808d23a4 author Jeff Garzik Thu, 20 Apr 2006 17:39:14 -0400 committer Jeff Garzik Thu, 20 Apr 2006 17:39:14 -0400 [netdrvr smc911x] trim trailing whitespace commit 0a0c72c9118c4e63080eb409f0cfdf15808d23a4 tree 99bd8141839f4b26d853626b5eaf532ca8a38bde parent 89be0501a013737d562f56ce1c5a2ff075995b11 author Dustin McIntire Wed, 19 Apr 2006 20:24:51 -0700 committer Jeff Garzik Thu, 20 Apr 2006 17:38:39 -0400 [PATCH] RE: [PATCH 1/1] net driver: Add support for SMSC LAN911x line of ethernet chips > > The patch was badly wordwrapped. Please fix and resend. > OK, I've fixed the wrapping and removed the CONFIG_ARM restriction. I've also did my best to modify the C style to conform to the comments. I noticed that the patch is getting ignored by majordomo due to its size >100K. Should it be broken up somehow to allow posting to the lists? Signed-off-by: Dustin McIntire Signed-off-by: Jeff Garzik commit 89be0501a013737d562f56ce1c5a2ff075995b11 tree 95ab664bcc4949235dce678c72436c673fbf06e9 parent e2fd956c670928e93208dc5d27dfdc7b51163900 author Sergei Shtylyov Wed, 19 Apr 2006 22:46:21 +0400 committer Jeff Garzik Thu, 20 Apr 2006 17:35:26 -0400 [PATCH] au1000_eth.c probe code straightened up Straighten up the AMD Au1xx0 Ethernet probing code, make it print out (and store in the 'net_device' structure) the physical address of the controller, not the KSEG1-based virtual. Make the driver also claim/release the 4-byte MAC enable registers and assign to the Ethernet ports two consecutive MAC addresses to match those that are printed on their stickers. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit e2fd956c670928e93208dc5d27dfdc7b51163900 tree 3ffdee703277984c7383af43de13963654c117e6 parent d1a667892658259aab52d9968571abd9efbc59a1 author Johannes Berg Wed, 19 Apr 2006 15:39:09 +1000 committer Jeff Garzik Thu, 20 Apr 2006 17:32:06 -0400 [PATCH] sungem: Marvell PHY suspend In a short discussion with Benjamin Herrenschmidt he mentioned that Marvell PHYs are powered down the same way as the other ones we currently handle. Thus actually do that, hopefully saving some power during suspend. Signed-off-by: Johannes Berg Acked-by: Benjamin Herrenschmidt Signed-off-by: Jeff Garzik commit d1a667892658259aab52d9968571abd9efbc59a1 tree 470101ab379d375bfd635ecec27ecd59441ac460 parent d269a69fbbbb7ddd2081af7a768feac754b8357a parent 1cb5821f444cadbe94453282f9f4767cf8744a8e author Jeff Garzik Thu, 20 Apr 2006 17:30:41 -0400 committer Jeff Garzik Thu, 20 Apr 2006 17:30:41 -0400 Merge branch 'e1000-7.0.38-k2-fixes' of git://63.64.152.142/~ahkok/git/netdev-2.6 commit d269a69fbbbb7ddd2081af7a768feac754b8357a tree 339e4e580ef66551a3f090bf6f6481755db1b59a parent 5ad05b990062c1b7a797f0ca293f6bdde62a50d9 author Daniele Venzano Mon, 17 Apr 2006 10:28:06 +0200 committer Jeff Garzik Thu, 20 Apr 2006 17:29:43 -0400 [PATCH] Add VLAN (802.1q) support to sis900 driver The attached patch adds support for VLANs to the sis900 driver and bumps the version number. It is based on an old (2003) patch for the 2.4 series by Hamid Hashemi Golpayegani. It applies on top of 2.6.16(.5). I have one report that it works and behaves as intended. Please review and consider for inclusion. Signed-off-by: Daniele Venzano -- Signed-off-by: Jeff Garzik commit 5ad05b990062c1b7a797f0ca293f6bdde62a50d9 tree 185775eb5fd444817cb643b5cc01ed1ef16d2212 parent 56347a2e7287377c35c2bac2e8643bf88690425f author Frank Pavlic Thu, 13 Apr 2006 20:19:23 +0200 committer Jeff Garzik Thu, 20 Apr 2006 17:27:54 -0400 [PATCH] s390: remove tty support from ctc network device driver [2/2] Hi, here comes the second of the two patches ... Frank From: Peter Tiedemann [2/2]: remove ctctty.c and ctctty.h files . Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 56347a2e7287377c35c2bac2e8643bf88690425f tree e312b0378db979377c96f2395e617c03d1184f43 parent 9707b27100a48950f1e15e08a7c5028786e47f55 author Frank Pavlic Thu, 13 Apr 2006 20:19:12 +0200 committer Jeff Garzik Thu, 20 Apr 2006 17:27:54 -0400 [PATCH] s390: remove tty support from ctc network device driver [1/2] Hi jeff, after the first shot I sent to you did not apply I resend two new patches I've made today to remove tty from ctc network driver. Please apply .... Thank you ... Frank From: Peter Tiedemann [1/2]: tty support code will be removed from the ctc network device driver. Today we have a couple of alternatives which are performing much better. The second thing is that ctc should be a network device driver only. We should not mix tty and networking here. This first patch will remove the tty code from ctcmain.c . It also removes the build entry from the Makefile as well as TTY definitions from ctcmain.h. The second patch will remove two files, ctctty.c and ctctty.h. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 9707b27100a48950f1e15e08a7c5028786e47f55 tree 5745b1e7497ae1499a2e2e9e0a567996419ab34f parent 8fc65162a8f25929be80c8d6321a3479e92b5aae parent 402a26f0c040077ed6f941eefac5a6971f0d5f40 author Jeff Garzik Thu, 20 Apr 2006 17:27:45 -0400 committer Jeff Garzik Thu, 20 Apr 2006 17:27:45 -0400 Merge branch 'master' commit 169e1a2a8a789fa84254695ec6a56fc410bb19a9 tree a12e7d6de595faae8ce3d05be54b6e6cb9c9c2fa parent c5f2e6404c65e8380c9ba80a7d58a27d2642743b author Andrew Morton Tue, 18 Apr 2006 21:09:08 -0700 committer James Bottomley Wed, 19 Apr 2006 20:51:18 -0400 [SCSI] scsi_lib.c: fix warning in scsi_kmap_atomic_sg drivers/scsi/scsi_lib.c: In function `scsi_kmap_atomic_sg': drivers/scsi/scsi_lib.c:2394: warning: unsigned int format, different type arg (arg 3) drivers/scsi/scsi_lib.c:2394: warning: unsigned int format, different type arg (arg 4) Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 954c24227318c166ec1925e1229db442e1f56f51 tree 6fab80f6c186bc83dd06e697774fbb5bf83e4235 parent 373d5e71833978fe3d91264d86857762bb92cfe2 author Joern Engel Tue, 18 Apr 2006 21:03:08 -0700 committer David Woodhouse Wed, 19 Apr 2006 09:10:06 +0100 mtd: improve parameter parsing for block2mtd Expand the parameter parsing for block2mtd. It now accepts: Ki, Mi, Gi - the official prefixes for binary multiples, see http://physics.nist.gov/cuu/Units/binary.html, ki - mistake on my side and analog to "k" for decimal multiples, KiB, MiB, GiB - for people that prefer to add a "B" for byte, kiB - combination of the above. There were complaints about not accepting "k" for 1024. This has long been common practice, but is known to lead to confusion. Hence the new SI units and hence block2mtd only accepts units that cannot be confused with decimal units. Diverging from common practice doesn't always please people, even if the change is for the better. Signed-off-by: Joern Engel Cc: David Woodhouse Cc: Thomas Gleixner Signed-off-by: Andrew Morton commit 1cb5821f444cadbe94453282f9f4767cf8744a8e tree b23e6c848614a7ca67248eaf4e8ec9b50c092075 parent dc86d32ab51c4ad3086472457fb90b61249d91f5 author Auke Kok Tue, 18 Apr 2006 12:31:04 -0700 committer Auke Kok Tue, 18 Apr 2006 12:31:04 -0700 e1000: fix mismerge skb_put. Seems there was a bit of a fix needed to due a bad merge in the legacy receive path. Fixes a panic due to skb_over_panic. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit dc86d32ab51c4ad3086472457fb90b61249d91f5 tree 4f8a266d797110e9f9f76eae04117a756e94f7a2 parent 8fc65162a8f25929be80c8d6321a3479e92b5aae author Auke Kok Tue, 18 Apr 2006 12:30:51 -0700 committer Auke Kok Tue, 18 Apr 2006 12:30:51 -0700 e1000: fix mispatch for media type detect. Recent patch was mismerged in the miitool path. e1000_media_type_copper was being compared with the phy type instead of the media type. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 9e73972cef1c0961c78b0e0b61c4ecc275b29f04 tree 27907bbd653504d71ff47cb00bdf8cd61e82f126 parent a890b15c0990cc8d686edcc85f5fccde71ad5ce9 parent 4741c336d27dec3ea68a35659abb8dc82b142388 author Jeff Garzik Tue, 18 Apr 2006 05:39:23 -0400 committer Jeff Garzik Tue, 18 Apr 2006 05:39:23 -0400 Merge branch 'upstream' commit b2b4b9a7c09ad66e095b13c97946a96f2dc8284e tree fb856b5998df266bd83e6e64b8884287e812845a parent 875999c5539999f61a45620aae0c3e5fb1d2b035 parent 4741c336d27dec3ea68a35659abb8dc82b142388 author Jeff Garzik Tue, 18 Apr 2006 05:39:10 -0400 committer Jeff Garzik Tue, 18 Apr 2006 05:39:10 -0400 Merge branch 'upstream' commit 4741c336d27dec3ea68a35659abb8dc82b142388 tree a8576df82129354b77b0144c480c446ec7aba7b2 parent 26ec634c31a11a003040e10b4d650495158632fd parent a9a5cd5d2a57fb76dbae2115450f777b69beccf7 author Jeff Garzik Tue, 18 Apr 2006 04:54:00 -0400 committer Jeff Garzik Tue, 18 Apr 2006 04:54:00 -0400 Merge branch 'master' commit 373d5e71833978fe3d91264d86857762bb92cfe2 tree 0c56caf25b684d7022ba023bcbdf8f963548d6e1 parent 6e62e8c2c7b1e3387d73ecb3f7539314b7a9931e author Richard Purdie Tue, 18 Apr 2006 02:05:46 +0100 committer Richard Purdie Tue, 18 Apr 2006 02:05:46 +0100 JFFS2: Return an error for long filenames Return an error if a name is too long for JFFS2 rather than corrupting data. Signed-off-by: Richard Purdie commit 6e62e8c2c7b1e3387d73ecb3f7539314b7a9931e tree 9bd5531198ad83d70a1a328f573f0d7561ad0da0 parent b802c0741103aa92251d536c115874d51f802ec8 author Richard Purdie Tue, 18 Apr 2006 02:04:18 +0100 committer Richard Purdie Tue, 18 Apr 2006 02:04:18 +0100 MTD: Correct Poodle partition size Correct the MTD NAND partition size for Poodle (Sharp Zaurus SL-5600) Signed-off-by: Richard Purdie commit b802c0741103aa92251d536c115874d51f802ec8 tree cf2cb539e68b224ad06b4a43350454b847543381 parent cd2866faaa0efd9af18fe4a86d129cbd99240796 author Thago Galesi Mon, 17 Apr 2006 17:38:15 +0100 committer David Woodhouse Mon, 17 Apr 2006 17:38:15 +0100 [PATCH] Remove unnecessary kmalloc/kfree calls in mtdchar This patch removes repeated calls to kmalloc / kfree in mtd_write / mtd_read functions, replacing them by a single kmalloc / kfree pair. Signed-off-by: Thiago Galesi Signed-off-by: David Woodhouse commit cd2866faaa0efd9af18fe4a86d129cbd99240796 tree aaf1892043ac32f6ea0dc19d0a4a74c40ce215f4 parent a6c591eda3078f92e7a3ff3db55f6841e4819fb5 author Jörn Engel Thu, 13 Apr 2006 18:55:09 +0200 committer David Woodhouse Mon, 17 Apr 2006 15:48:17 +0100 Remove unused MTD types Three types are never set or checked for. Remove. Signed-off-by: Jörn Engel Signed-off-by: David Woodhouse commit a6c591eda3078f92e7a3ff3db55f6841e4819fb5 tree 1d1c2ab720bc9931f00b8cc177878a6ad8ec5651 parent af63a3bcac77d8c01f3d963bac11a6f3f9b7c473 author Jörn Engel Thu, 13 Apr 2006 18:54:34 +0200 committer David Woodhouse Mon, 17 Apr 2006 15:48:17 +0100 Remove unchecked MTD flags Several flags are set by some devices, but never checked. Remove them. Signed-off-by: Jörn Engel Signed-off-by: David Woodhouse commit af63a3bcac77d8c01f3d963bac11a6f3f9b7c473 tree 0c4ce08cb4a1c377e7c0c30aac9eb4c025fd8e9a parent 7f7c08dfdf5bc0a7c906285d9d97b932f83e8979 author Jörn Engel Thu, 13 Apr 2006 18:53:55 +0200 committer David Woodhouse Mon, 17 Apr 2006 15:48:16 +0100 Make mtdblock_ro unconditionally readonly mtdblock_ro is by definition readonly. Remove the silly checks. Signed-off-by: Jörn Engel Signed-off-by: David Woodhouse commit 7f7c08dfdf5bc0a7c906285d9d97b932f83e8979 tree aaf40f4ef508cee41586e788d7d3f9e7075c364d parent 94171db1d2f23c22b6050d210b72db3bb2f0b81e author Jörn Engel Thu, 13 Apr 2006 18:53:14 +0200 committer David Woodhouse Mon, 17 Apr 2006 15:48:16 +0100 Simplify test for RAM devices mtdblock is the only user of aggregate capabilities in mtd. This is clearly bogus and should be changed. In particular, it tries to determine whether the device in question is a piece of RAM. For every single driver that fits the current criteria, an easier test would be to check for the type being MTD_RAM. Signed-off-by: Jörn Engel Signed-off-by: David Woodhouse commit 94171db1d2f23c22b6050d210b72db3bb2f0b81e tree 2318d487807e9f7393fcd46ef0090a27b4ad7981 parent d96fb997c6174f98a2a0a98200f99ac13b053bd6 parent c19f7a9e1ac45b57375d51f033b02deca50f4d3f author David Woodhouse Mon, 17 Apr 2006 15:35:18 +0100 committer David Woodhouse Mon, 17 Apr 2006 15:35:18 +0100 Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit d96fb997c6174f98a2a0a98200f99ac13b053bd6 tree bd2400a8553975a6463ef0160a7aaad914a9b236 parent fb6a82c94a9c69adfb6b9f6ce9f84be36884e471 author David Woodhouse Mon, 17 Apr 2006 00:19:48 +0100 committer David Woodhouse Mon, 17 Apr 2006 00:19:48 +0100 [JFFS2] Fix race in post-mount node checking For a while now, we've postponed CRC-checking of data nodes to be done by the GC thread, instead of being done while the user is waiting for mount to finish. The GC thread would iterate through all the inodes on the system and check each of their data nodes. It would skip over inodes which had already been used or were already being read in by read_inode(), because their data nodes would have been examined anyway. However, we could sometimes reach the end of the for-each-inode loop and still have some unchecked space left, if an inode we'd skipped was _still_ in the process of being read. This fixes that race by actually waiting for read_inode() to finish rather than just moving on. Thanks to Ladislav Michl for coming up with a reproducible test case and helping to track it down. Signed-off-by: David Woodhouse commit c5f2e6404c65e8380c9ba80a7d58a27d2642743b tree a8af59f4cd7154032ac35486586babe73467b3c9 parent cdb8c2a6d848deb9eeefffff42974478fbb51b8c author akpm@osdl.org Sat, 15 Apr 2006 00:30:24 -0700 committer James Bottomley Sat, 15 Apr 2006 09:04:40 -0500 [SCSI] scsi_scan.c: fix compile warnings drivers/scsi/scsi_scan.c: In function `scsi_probe_and_add_lun': drivers/scsi/scsi_scan.c:926: warning: unused variable `vend' drivers/scsi/scsi_scan.c:926: warning: unused variable `mod' drivers/scsi/scsi_scan.c: At top level: drivers/scsi/scsi_scan.c:829: warning: `scsi_inq_str' defined but not used Fix those, tighten up the (somewhat poorly-designed) logging macro and fix some coding-style warts. Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 8fc65162a8f25929be80c8d6321a3479e92b5aae tree cfad5c32408bbdc59a43db16c88f2bea7face7a5 parent 2acab771b7e676125cb8c96b61dcdefe9ba67e57 parent 99a1f9e88694b406b7c334153bacb56adfcf8388 author Jeff Garzik Fri, 14 Apr 2006 23:19:41 -0400 committer Jeff Garzik Fri, 14 Apr 2006 23:19:41 -0400 Merge branch '7.0.38-k2' of git://66.93.40.222/srv/git/netdev-2.6 commit 99a1f9e88694b406b7c334153bacb56adfcf8388 tree 01f2b3e0dc17f202ce91ebe6dcc0424e9eb9690d parent 3d41e30aa3dde76c81ecbbf0e3a25392fcd90469 author Auke Kok Fri, 14 Apr 2006 19:05:38 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:38 -0700 {e100{,0},ixgb}: Add Auke Kok as new patch maintainer for e{100,1000} and ixgb This adds Auke Kok to the list of maintainers for the Intel NICs. Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 3d41e30aa3dde76c81ecbbf0e3a25392fcd90469 tree c8dc188cd9f9016a0359e7fc6d2521f614c41641 parent 77b2aad5b4fcb6e050b64bbda158ce528f933023 author Auke Kok Fri, 14 Apr 2006 19:05:31 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:31 -0700 e1000: Version bump, contact fix, year string change Add the sourceforge project mailinglist to the contact information. Bump version to 7.0.38-k2 Update copyright string with the new year. Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 77b2aad5b4fcb6e050b64bbda158ce528f933023 tree 7d60229345056e9c4e4fe39e79801376bb61dc69 parent 9e2feace1acd38d7a3b1275f7f9f8a397d09040e author Auke Kok Fri, 14 Apr 2006 19:05:25 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:25 -0700 e1000: implement more efficient tx queue locking Implement more efficient locking (avoid the lock) when checking for a stopped queue. Also don't wake the queue unless the threshold is reached to avoid queue on/off thrash. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 9e2feace1acd38d7a3b1275f7f9f8a397d09040e tree 109e9bae993df91e2ff83ce7b4fccba9498d0273 parent 6fc7a7eca70780dc1539ce68a6513f9b11891f3c author Auke Kok Fri, 14 Apr 2006 19:05:18 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:18 -0700 e1000: Buffer optimizations for small MTU Remove multi-descriptor support from legacy recieve path Add memory usage efficiency by using more correct size descriptors for small MTU sizes and optimize using LPE for <= 1522 byte frame sizes An extra performance fix that effected our TCP window size growth as a receiver. Set our initial buffer to be 128 bytes instead of 256 to prevent over-socket charge when truesize is computed in the stack. old way: truesize = 256 + l1 = 256 + 1460 = 1716 new way: truesize = 128 + l1 = 128 + 1460 = 1588 The magic value that we can't cross is 1648. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 6fc7a7eca70780dc1539ce68a6513f9b11891f3c tree 474efb015129d75368637ee28aecbb3262da8680 parent 5d51b80f9224ca5b0ba1efc5a6348cd29b5c16b7 author Auke Kok Fri, 14 Apr 2006 19:05:12 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:12 -0700 e1000: Dead variable cleanup Removal of unused rx_dropped counter. Removed reference to E1000_CTRL_EXT_CANC which is no longer valid, replaced with E1000_CTRL_EXT_INT_TIMER_CLR Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 5d51b80f9224ca5b0ba1efc5a6348cd29b5c16b7 tree c6748fb719c9da8dc7124b7cccccf6cf31394000 parent fe7fe28ea581e090d2908a0d78a2611ae6d43e2c author Auke Kok Fri, 14 Apr 2006 19:05:06 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:06 -0700 e1000: Update truesize with the length of the packet for packet split Update skb with the real packet size. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit fe7fe28ea581e090d2908a0d78a2611ae6d43e2c tree 20ffef790a0ca0f0e8463df68d0628bffdccefe9 parent e619d52349ab8c0044859c28ab05e4c7a410fe14 author Auke Kok Fri, 14 Apr 2006 19:04:59 -0700 committer Auke Kok Fri, 14 Apr 2006 19:04:59 -0700 e1000: Made an adapter struct variable into a local (txb2b) Made an adapter struct variable into a local (txb2b) Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit e619d52349ab8c0044859c28ab05e4c7a410fe14 tree 74c09a1acbe54f569a1bc0c4eca05211ff9dab5f parent 4cc15f54991caf1572e03ffc65d9986e433007e2 author Auke Kok Fri, 14 Apr 2006 19:04:52 -0700 committer Auke Kok Fri, 14 Apr 2006 19:04:52 -0700 e1000: De-inline functions to benefit from compiler smartness De-inline functions to benefit from compiler smartness Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 4cc15f54991caf1572e03ffc65d9986e433007e2 tree cc32bb4993833593f3c46ead3a5572ba8920fdb6 parent d0e027db7861ef03de0ac08494a9a61984d8f8b0 author Auke Kok Fri, 14 Apr 2006 19:04:46 -0700 committer Auke Kok Fri, 14 Apr 2006 19:04:46 -0700 e1000: Esb2 wol link cycle bug and uninitialized registers Esb2 link didn't return after wol disable. The code previously assumed that writing reset to PHY_CTRL phy register turned the phy back on. In the ESB2 phy case that didn't occur. Add ESB2 to acquire/release_hw functions upon review it was discovered that esb2 was skipped on these functions Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit d0e027db7861ef03de0ac08494a9a61984d8f8b0 tree d1102d2ef0867b972a0737b70e5f0643c44788df parent a145410dccdb44f81d3b56763ef9b6f721f4e47c author Auke Kok Fri, 14 Apr 2006 19:04:40 -0700 committer Auke Kok Fri, 14 Apr 2006 19:04:40 -0700 e1000: Remove PM warning DPRINTKs breaking 2.4.x kernels remove DPRINTKs that were printing warnings about power management on 2.4 kernels. Since we really don't react differently these printk statements are not needed. This code was originally added to fix some compile time warnings that got fixed by newer kernels. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 2acab771b7e676125cb8c96b61dcdefe9ba67e57 tree 86227af3c9ad0d90823e5488a86f7f453ed1837a parent 201e06279823c73242de987f192f43d2b30e5331 parent 64541d19702cfdb7ea946fdc20faee849f6874b1 author Jeff Garzik Fri, 14 Apr 2006 20:48:55 -0400 committer Jeff Garzik Fri, 14 Apr 2006 20:48:55 -0400 Merge branch 'master' commit cdb8c2a6d848deb9eeefffff42974478fbb51b8c tree fc862e003d35def8bc9d160180ec1b1440679a52 parent 4c021dd136c0ad524e6d117296beafad2bf570c0 author Guennadi Liakhovetski Sun, 02 Apr 2006 21:57:43 +0200 committer James Bottomley Fri, 14 Apr 2006 16:45:27 -0500 [SCSI] dc395x: dynamically map scatter-gather for PIO The current dc395x driver uses PIO to transfer up to 4 bytes which do not get transferred by DMA (under unclear circumstances). For this the driver uses page_address() which is broken on highmem. Apart from this the actual calculation of the virtual address is wrong (even without highmem). So, e.g., for reading it reads bytes from the driver to a wrong address and returns wrong data, I guess, for writing it would just output random data to the device. The proper fix, as suggested by many, is to dynamically map data using kmap_atomic(page, KM_BIO_SRC_IRQ) / kunmap_atomic(virt). The reason why it has not been done until now, although I've done some preliminary patches more than a year ago was that nobody interested in fixing this problem was able to reliably reproduce it. Now it changed - with the help from Sebastian Frei (CC'ed) I was able to trigger the PIO path. Thus, I was also able to test and debug it. There are 4 cases when PIO is used in dc395x - data-in / -out with and without scatter-gather. I was able to reproduce and test only data-in with and without SG. So, the data-out path is still untested, but it is also somewhat simpler than the data-in. Fredrik Roubert (also CC'ed) also had PIO triggering on his system, and in his case it was data-out without SG. It would be great if he could test the attached patch on his system, but even if he cannot, I would still request to apply the patch and just wait if anybody cries... Implementation: I put 2 new functions in scsi_lib.c and their declarations in scsi_cmnd.h. I exported them without _GPL, although, I don't feel strongly about that - not many drivers are likely to use them. But there is at least one more - I want to use them in tmscsim.c. Whether these are the right files for the functions and their declarations - not sure either. Actually, they are not scsi-specific, so, might go somewhere around other scattergather magic? They are not platform specific either, and most SG functions are defined under arch/*/... As these issues were discussed previously there were some more routines suggested to manipulate scattergather buffers, I think, some of them were needed around crypto code... So, might be a common place reasonable, like lib/scattergather.c? I am open here. Signed-off-by: James Bottomley commit 4c021dd136c0ad524e6d117296beafad2bf570c0 tree a919121c43a6a47f5e9d8fdff6bf0b9c23701c90 parent 84d891d6727c17832c79ec96d3d107a87d857978 author FUJITA Tomonori Fri, 07 Apr 2006 19:10:03 +0900 committer James Bottomley Fri, 14 Apr 2006 15:50:04 -0500 [SCSI] ibmvscsi: convert kmalloc + memset to kcalloc Convert kmalloc + memset to kcalloc in ibmvscsi Signed-off-by: FUJITA Tomonori Acked-by: Dave Boutcher Signed-off-by: James Bottomley commit 84d891d6727c17832c79ec96d3d107a87d857978 tree a189a4d00c1387e409e2f9808c72c8088728c33b parent 5bb0b55a3283369f1cd8ac76a6d8bda8e7a77055 parent 7676f83aeb774e7a3abe6af06ec92b29488b5b79 author James Bottomley Fri, 14 Apr 2006 15:47:45 -0500 committer James Bottomley Fri, 14 Apr 2006 15:47:45 -0500 Merge ../scsi-rc-fixes-2.6 Conflicts: include/scsi/scsi_devinfo.h Same number for two BLIST flags: BLIST_MAX_512 and BLIST_ATTACH_PQ3 Signed-off-by: James Bottomley commit 5bb0b55a3283369f1cd8ac76a6d8bda8e7a77055 tree efecf16a9627f624df15822c90c5980e0a0ef289 parent 7996a778ff8c717cb1a7a294475c59cc8f1e9fb8 author Mike Christie Thu, 06 Apr 2006 21:26:46 -0500 committer James Bottomley Fri, 14 Apr 2006 15:19:42 -0500 [SCSI] iscsi: convert iscsi tcp to libiscsi This just converts iscsi_tcp to the lib Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 7996a778ff8c717cb1a7a294475c59cc8f1e9fb8 tree 3d7ee67ad547a65ad10f5c7e41e20f6124ee249b parent 30a6c65236f9d26e3325cae468f330b833a3878c author Mike Christie Thu, 06 Apr 2006 21:13:41 -0500 committer James Bottomley Fri, 14 Apr 2006 14:09:00 -0500 [SCSI] iscsi: add libiscsi There is a lot of code duplcited between iscsi_tcp and the upcoming iscsi_iser driver. This patch puts the duplicated code in a lib. There is more code to move around but this takes care of the basics. For iscsi_offload if they use the lib we will probably move some things around. For example in the queuecommand we will not assume that the LLD wants to do queue_work, but it is better to handle that later when we know for sure what iscsi_offload looks like (we could probably do this for iscsi_iser though to). Ideally I would like to get the iscsi_transports modules to a place where all they really have to do is put data on the wire, but how to do that will hopefully be more clear when we see other modules like iscsi_offload. Or maybe iscsi_offload will not use the lib and it will just be iscsi_iser and iscsi_tcp and maybe the iscsi_tcp_tgt if that is allowed in mainline. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 30a6c65236f9d26e3325cae468f330b833a3878c tree 355519ccc74d4b3984c06d7dcb5852282e47c845 parent fd7255f51a13ea915099c7e488001dfbbeb05104 author Mike Christie Thu, 06 Apr 2006 21:13:39 -0500 committer James Bottomley Fri, 14 Apr 2006 14:05:09 -0500 [SCSI] iscsi: fix up iscsi eh The current iscsi_tcp eh is not nicely setup for dm-multipath and performs some extra task management functions when they are not needed. The attached patch: - Fixes the TMF issues. If a session is rebuilt then we do not send aborts. - Fixes the problem where if the host reset fired, we would return SUCCESS even though we had not really done anything yet. This ends up causing problem with scsi_error.c's TUR. - If someone has turned on the userspace nop daemon code to try and detect network problems before the scsi command timeout we can now drop and clean up the session before the scsi command timesout and fires the eh speeding up the time it takes for a command to go from one patch to another. For network problems we fail the command with DID_BUS_BUSY so if failfast is set scsi_decide_disposition fails the command up to dm for it to try on another path. - And we had to add some basic iscsi session block code. Previously if we were trying to repair a session we would retrun a MLQUEUE code in the queuecommand. This worked but it was not the most efficient or pretty thing to do since it would take a while to relogin to the target. For iscsi_tcp/open-iscsi a lot of the iscsi error handler is in userspace the block code is pretty bare. We will be adding to that for qla4xxx. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit fd7255f51a13ea915099c7e488001dfbbeb05104 tree 964624f68f000848dae1a9f4c396502849707826 parent b5c7a12dc29ae0990d9e867749bdd717a3160325 author Mike Christie Thu, 06 Apr 2006 21:13:36 -0500 committer James Bottomley Fri, 14 Apr 2006 14:03:41 -0500 [SCSI] iscsi: add sysfs attrs for uspace sync up For iscsi boot when going from initramfs to the real root we need to stop the userpsace iscsi daemon. To later restart it iscsid needs to be able to rebuild itself and part of that process is matching a session running the kernel with the iscsid representation. To do this the attached patch adds several required iscsi values. If the LLD does not provide them becuase, login is done in userspace, then the transport class and userspace set ths up for the LLD. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit b5c7a12dc29ae0990d9e867749bdd717a3160325 tree 66bb4b7fd02e5a8a89f385aadf80a666ac941fbe parent 13f7e5acc8b329080672c13f05f252ace5b79825 author Mike Christie Thu, 06 Apr 2006 21:13:33 -0500 committer James Bottomley Fri, 14 Apr 2006 14:02:43 -0500 [SCSI] iscsi: rm kernel iscsi handles usage for session and connection from hare@suse.de and michaelc@cs.wisc.edu hw iscsi like qla4xxx does not allocate a host per session and for userspace it is difficult to restart iscsid using the "iscsi handles" for the session and connection, so this patch just has the class or userspace allocate the id for the session and connection. Note: this breaks userspace and requires users to upgrade to the newest open-iscsi tools. Sorry about his but open-iscsi is still too new to say we have a stable user-kernel api and we were not good nough designers to know that other hw iscsi drivers and iscsid itself would need such changes. Actually we sorta did but at the time we did not have the HW available to us so we could only guess. Luckily, the only tools hooking into the class are the open-iscsi ones or other tools like iscsitart hook into the open-iscsi engine from userspace or prgroams like anaconda call our tools so they are not affected. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 13f7e5acc8b329080672c13f05f252ace5b79825 tree 917c208390543eb0f926850778bf0540486e7ba3 parent 6c7154c97e20c0ea28547240dc86731c0cee1b2f author Kurt Garloff Mon, 03 Apr 2006 15:20:08 +0200 committer James Bottomley Fri, 14 Apr 2006 13:56:56 -0500 [SCSI] BLIST_ATTACH_PQ3 flags Some devices report a peripheral qualifier of 3 for LUN 0; with the original code, we would still try a REPORT_LUNS scan (if SCSI level is >= 3 or if we have the BLIST_REPORTLUNS2 passed in), but NOT any sequential scan. Also, the device at LUN 0 (which is not connected according to the PQ) is not registered with the OS. Unfortunately, SANs exist that are SCSI-2 and do NOT support REPORT_LUNS, but report a unknown device with PQ 3 on LUN 0. We still need to scan them, and most probably we even need BLIST_SPARSELUN (and BLIST_LARGELUN). See the bug reference for an infamous example. This is patch 3/3: 3. Implement the blacklist flag BLIST_ATTACH_PQ3 that makes the scsi scanning code register PQ3 devices and continues scanning; only sg will attach thanks to scsi_bus_match(). Signed-off-by: Kurt Garloff Signed-off-by: James Bottomley commit 6c7154c97e20c0ea28547240dc86731c0cee1b2f tree 9960dbadf3f685e70c03f0551f0bb890a68b94b7 parent 4186ab1973758190916703eb8889ebe8002c5c8f author Kurt Garloff Mon, 03 Apr 2006 15:18:35 +0200 committer James Bottomley Fri, 14 Apr 2006 13:56:03 -0500 [SCSI] Better log messages for PQ3 devs Some devices report a peripheral qualifier of 3 for LUN 0; with the original code, we would still try a REPORT_LUNS scan (if SCSI level is >= 3 or if we have the BLIST_REPORTLUNS2 passed in), but NOT any sequential scan. Also, the device at LUN 0 (which is not connected according to the PQ) is not registered with the OS. Unfortunately, SANs exist that are SCSI-2 and do NOT support REPORT_LUNS, but report a unknown device with PQ 3 on LUN 0. We still need to scan them, and most probably we even need BLIST_SPARSELUN (and BLIST_LARGELUN). See the bug reference for an infamous example. This patch 2/3: If a PQ3 device is found, log a message that describes the device (INQUIRY DATA and C:B:T:U tuple) and make a suggestion for blacklisting it. Signed-off-by: Kurt Garloff Signed-off-by: James Bottomley commit 4186ab1973758190916703eb8889ebe8002c5c8f tree e25a6c46e49ea9c310f2c7af8698d022fb7a2d4d parent 907d91d708d9999bec0185d630062576ac4181a7 author Kurt Garloff Mon, 03 Apr 2006 15:16:48 +0200 committer James Bottomley Fri, 14 Apr 2006 13:53:43 -0500 [SCSI] Try LUN 1 and use bflags Some devices report a peripheral qualifier of 3 for LUN 0; with the original code, we would still try a REPORT_LUNS scan (if SCSI level is >= 3 or if we have the BLIST_REPORTLUNS2 passed in), but NOT any sequential scan. Also, the device at LUN 0 (which is not connected according to the PQ) is not registered with the OS. Unfortunately, SANs exist that are SCSI-2 and do NOT support REPORT_LUNS, but report a unknown device with PQ 3 on LUN 0. We still need to scan them, and most probably we even need BLIST_SPARSELUN (and BLIST_LARGELUN). See the bug reference for an infamous example. This is patch 1/3: If we end up in sequential scan, at least try LUN 1 for devices that reported a PQ of 3 for LUN 0. Also return blacklist flags, even for PQ3 devices. Signed-off-by: Kurt Garloff Signed-off-by: James Bottomley commit 201e06279823c73242de987f192f43d2b30e5331 tree 409cbf8533ae3242a036c8c013bcd43d9c1410b3 parent 32ea89ecb25789b1b7db28146558587a42f3b372 parent c91e468a48a2afd2a2b0c2e29a35d6b8c51ea682 author Jeff Garzik Wed, 12 Apr 2006 18:11:33 -0400 committer Jeff Garzik Wed, 12 Apr 2006 18:11:33 -0400 Merge branch 'upstream-fixes' commit 32ea89ecb25789b1b7db28146558587a42f3b372 tree c5b3b33523b353f2eab2d8dcd2b3f069826cdc48 parent 58a7ce64426394a46e80cdc9440cc1e7c195e85d parent a145410dccdb44f81d3b56763ef9b6f721f4e47c author Jeff Garzik Wed, 12 Apr 2006 17:52:52 -0400 committer Jeff Garzik Wed, 12 Apr 2006 17:52:52 -0400 Merge branch 'master' commit a890b15c0990cc8d686edcc85f5fccde71ad5ce9 tree 73162355b58283a2531f13fbbf663809f95c1483 parent 79fa1b677be3a985cc66b9218a4dd09818f1051b parent 26ec634c31a11a003040e10b4d650495158632fd author Jeff Garzik Wed, 12 Apr 2006 16:54:43 -0400 committer Jeff Garzik Wed, 12 Apr 2006 16:54:43 -0400 Merge branch 'upstream' commit 875999c5539999f61a45620aae0c3e5fb1d2b035 tree 4535032a8a10f5782c0aef6a620b1a624ea9f863 parent 79072f38909e3d9883317238887460c39ddcc4cb parent 26ec634c31a11a003040e10b4d650495158632fd author Jeff Garzik Wed, 12 Apr 2006 16:54:16 -0400 committer Jeff Garzik Wed, 12 Apr 2006 16:54:16 -0400 Merge branch 'upstream' commit fb6a82c94a9c69adfb6b9f6ce9f84be36884e471 tree 7109ae6ececc3aeee7449a2fb692472875a57c84 parent b104513c74d972f09737017394c5abc7e0a6835d author Randy Dunlap Tue, 11 Apr 2006 20:12:10 -0400 committer David Woodhouse Tue, 11 Apr 2006 20:12:10 -0400 [PATCH] jffs2: fix printk warnings Fix printk format warnings in jffs2. Signed-off-by: Randy Dunlap Signed-off-by: David Woodhouse commit b104513c74d972f09737017394c5abc7e0a6835d tree dc1eb76a9b110c2a7895b9c72077d1201eecabf9 parent 6cc449c7d0292cb9b993f0df84fd3225e3099492 author Randy Dunlap Tue, 11 Apr 2006 20:05:20 -0400 committer David Woodhouse Tue, 11 Apr 2006 20:05:20 -0400 [PATCH] MTD: m25p80: fix printk format warning Fix printk format warning: drivers/mtd/devices/m25p80.c:189: warning: format '%zd' expects type 'signed size_t', but argument 6 has type 'u_int32_t' Signed-off-by: Randy Dunlap Signed-off-by: David Woodhouse commit 6cc449c7d0292cb9b993f0df84fd3225e3099492 tree f8ca83dc334e9f9ac12bae78689ae2441daabea0 parent f4e9ce66c70c5d08b8a4d2c676924748c8b7550b author Jesper Juhl Tue, 11 Apr 2006 19:42:44 -0400 committer David Woodhouse Tue, 11 Apr 2006 19:42:44 -0400 [PATCH] mtd, nettel: fix build error and implicit declaration I just hit the following error and warning : drivers/mtd/maps/nettel.c: In function `nettel_init': drivers/mtd/maps/nettel.c:418: error: `ROOT_DEV' undeclared (first use in this function) drivers/mtd/maps/nettel.c:418: error: (Each undeclared identifier is reported only once drivers/mtd/maps/nettel.c:418: error: for each function it appears in.) drivers/mtd/maps/nettel.c:418: warning: implicit declaration of function `MKDEV' make[3]: *** [drivers/mtd/maps/nettel.o] Error 1 make[2]: *** [drivers/mtd/maps] Error 2 make[1]: *** [drivers/mtd] Error 2 The patch fixes the missing ROOT_DEV declaration by including linux/root_dev.h and fixes the implicit declaration of MKDEV by including linux/kdev_t.h . Signed-off-by: Jesper Juhl Signed-off-by: David Woodhouse commit f4e9ce66c70c5d08b8a4d2c676924748c8b7550b tree cc986f086fb5ed6149ab0ef4beb2d97878d9e5c5 parent a145410dccdb44f81d3b56763ef9b6f721f4e47c author David Woodhouse Tue, 11 Apr 2006 19:29:07 -0400 committer David Woodhouse Tue, 11 Apr 2006 19:29:07 -0400 New MTD git tree in MAINTAINERS Signed-off-by: David Woodhouse commit 26ec634c31a11a003040e10b4d650495158632fd tree c2d12e097783bd36a83d8437c58ed1cf6a244914 parent bad28a37f5e4ab1db5c5f01b77664597b02b257f author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:37 -0400 [PATCH] sata_sil24: enable 64bit Enable 64bit. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit bad28a37f5e4ab1db5c5f01b77664597b02b257f tree a8821f7d5b48f639b054a0f17d03bc89d0c7b95f parent a5b4c47a2731f1dd685f28b79464e4442f3682ec author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:37 -0400 [PATCH] sata_sil24: fix on-memory structure byteorder Data structures residing on memory and fetched by the controller should have LE ordering. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit a5b4c47a2731f1dd685f28b79464e4442f3682ec tree 00394defab68b5457eb79b46c0c50e7cbcf20231 parent ecc2e2b9c97719592b3078d5a5a8666551c91115 author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: don't do hardreset during driver initialization There's no need to perform hardreset during driver initialization. It's already done during host reset and even if the controller is in some wacky state, we now have proper hardreset to back us up. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ecc2e2b9c97719592b3078d5a5a8666551c91115 tree a941aa2a8f8daacc8d21990a7b1b85a767c5de5c parent 0eaa6058a6a664ce692e3dc38c6891a74ca47f59 author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: reimplement hardreset Reimplement hardreset according to the datasheet. The old hardreset didn't reset controller status and the controller might not be ready after reset. Also, as SStatus is a bit flakey after hardreset, sata_std_hardrset() didn't use to wait long enough before proceeding. Note that as we're not depending on SStatus, DET==1 condition cannot be used to wait for link, so use shorter timeout for no device case. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 0eaa6058a6a664ce692e3dc38c6891a74ca47f59 tree 58f2c7f19d20a036e15b52c0171583ca8053a1a2 parent 2555d6c268240fb3f5f335bd62d0518025343c0f author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: kill 10ms sleep in softreset Nothing, not the datasheet nor the errats, says this delay is necessary and with the previous PORT_CS_INIT change, we know the controller is in good state. Kill 10ms sleep. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 2555d6c268240fb3f5f335bd62d0518025343c0f tree a4cd391fb73cf9c37fa4976d7d999ddea546d383 parent b5bc421c96ca56a9abaad4619da01fe0071904a2 author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: put port into known state before softresetting Make sure the controller has no pending commands and ready for command before issuing SRST. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit b5bc421c96ca56a9abaad4619da01fe0071904a2 tree 524f5edb321970e1595e9c6c940bc221ef41184f parent 37024e8ee0d8dbcd0c2634192cb3836549db054e author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: implement sil24_init_port() Implement sil24_init_port which performs port initialization via PORT_CS_INIT. To be used later by softreset and EH. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 37024e8ee0d8dbcd0c2634192cb3836549db054e tree 681276204a0bc13833e1b48eec5b43aa3f3d865e parent 9466d85bb2c80b1aa169dda638b535f2f19714e4 author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: implement loss of completion interrupt on PCI-X errta fix SiI3124 might lose completion interrupt if completion interrupt occurs shortly after SLOT_STAT register is read for the previous completion interrupt if it is operating in PCI-X mode. This currently doesn't trigger as libata never queues more than one command, but it will with NCQ changes. This patch implements the workaround - turning on WoC and explicitly clearing interrupt. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 9466d85bb2c80b1aa169dda638b535f2f19714e4 tree ccba111574540f6f5807c028be3f92049e17fdb3 parent 7dafc3fd9a9e34e4a02ee6d141fd391ad5bdcd90 author Tejun Heo Tue, 11 Apr 2006 22:32:18 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: consolidate host flags into SIL24_COMMON_FLAGS All sil24 controllers share the same host flags except for NPORTS. Consolidate them into SIL24_COMMON_FLAGS. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 7dafc3fd9a9e34e4a02ee6d141fd391ad5bdcd90 tree cb7e541c1e3bf6a3f181faaa8f56d3a18825f13d parent 3b9f1d0fb3fd68419ee3fa3e0833c6a05462150d author Tejun Heo Tue, 11 Apr 2006 22:32:18 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: add more constants Add HOST_CTRL_* and more PORT_IRQ_* bits. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 3b9f1d0fb3fd68419ee3fa3e0833c6a05462150d tree 502e4de127ad51afb82b670497c436bb5ee1cc0f parent 640088024dbf19553bb4b53d81e919cdf570f3b0 author Tejun Heo Tue, 11 Apr 2006 22:32:18 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:35 -0400 [PATCH] sata_sil24: rename PORT_IRQ_SDB_FIS to PORT_IRQ_SDB_NOTIFY Rename PORT_IRQ_SDB_FIS to more proper PORT_IRQ_SDB_NOTIFY. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 640088024dbf19553bb4b53d81e919cdf570f3b0 tree fcad1a678196c47b591154079a0b626be1c8b420 parent 499a86af41cf5a4bf811726841bbc49c0e96fd35 author Tejun Heo Tue, 11 Apr 2006 22:32:18 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:35 -0400 [PATCH] sata_sil24: typo fix Type fix. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 499a86af41cf5a4bf811726841bbc49c0e96fd35 tree 4fc1f8ff32782f069e488eaea200be055046704a parent 51713d359ae274fa4dd4b199ba3a6b0c21ef99e0 author Tejun Heo Tue, 11 Apr 2006 22:32:18 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:35 -0400 [PATCH] libata: export ata_set_sata_spd() This will be used by LLDD hardreset implementation. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 51713d359ae274fa4dd4b199ba3a6b0c21ef99e0 tree c233c1f8848ed921cabd4f8591085c24ccb0cdc3 parent ec573755fcd7975aae6b0d536dbcd74a6eed029c author Tejun Heo Tue, 11 Apr 2006 22:26:29 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:22:17 -0400 [PATCH] libata: cosmetic update to ata_bus_probe() Move ata_set_mode() failure handling outside of ap->ops->set_mode if clause such that it can handle ap->ops->set_mode failures after it's updated. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ec573755fcd7975aae6b0d536dbcd74a6eed029c tree 58600b1d741ba2a8f5bfa214768469a5031d0b49 parent 7dd29dd629bd5a4e6d8a164a9886da01f291ecf2 author Tejun Heo Tue, 11 Apr 2006 22:26:29 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:22:17 -0400 [PATCH] libata: disable failed devices only once in ata_bus_probe() Devices which consumed all their changes used to be disabled every iteration. This causes unnecessary noise in the console output. Disable once and leave alone. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 7dd29dd629bd5a4e6d8a164a9886da01f291ecf2 tree cf0dc7ae2468378dd5795346dac23badc7344667 parent 75fe18069a55c78f553643b4e3a24c6864d71d87 author Tejun Heo Tue, 11 Apr 2006 22:22:30 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:19:11 -0400 [PATCH] sata_sil24: use ata_wait_register() Replace hard-coded waiting loops in sata_sil24 to ata_wait_register(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 75fe18069a55c78f553643b4e3a24c6864d71d87 tree 30aa797f948d25589b4057d43c703b27a737eaeb parent c22daff41001e9ccead87179ac0547f85447139e author Tejun Heo Tue, 11 Apr 2006 22:22:29 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:19:11 -0400 [PATCH] ahci: use ata_wait_register() Replace ahci_poll_register() with ata_wait_register(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c22daff41001e9ccead87179ac0547f85447139e tree b8faa6e19419704c19f07a9f7043ab2435f719df parent 643be977f9feba8c3c1e768fc06cac84596ec6f8 author Tejun Heo Tue, 11 Apr 2006 22:22:29 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:19:11 -0400 [PATCH] libata: implement ata_wait_register() As waiting for some register bits to change seems to be a common operation shared by some controllers, implement helper function ata_wait_register(). This function also takes care of register write flushing. Note that the condition is inverted, the wait is over when the masked value does NOT match @val. As we're waiting for bits to change, this test is more powerful and allows the function to be used in more places. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 643be977f9feba8c3c1e768fc06cac84596ec6f8 tree f7c7b23e60cc726ba8874411956d15f3bfd7c9c4 parent 1c1d832cea1ab851a3f9b9d83245f5bc8b5b04b6 author Tejun Heo Tue, 11 Apr 2006 22:22:29 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:19:11 -0400 [PATCH] sata_sil24: better error message from softreset Improve softreset error message. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 1c1d832cea1ab851a3f9b9d83245f5bc8b5b04b6 tree f74785a6acfd94b8fe4efdc39a8919f7f2e63e9c parent 987d2f05b396760517eef7cba66b2f415ac484f5 author Tejun Heo Tue, 11 Apr 2006 22:22:29 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:19:11 -0400 [PATCH] sata_sil24: fix timeout calculation in sil24_softreset sil24_softreset calculated timeout by adding ATA_TMOUT_BOOT * HZ to jiffies; however, as ATA_TMOUT_BOOT is already in jiffies, multiplying by HZ makes the value way off. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 987d2f05b396760517eef7cba66b2f415ac484f5 tree 72d7d4e31f5aa8df3c7988119fa0787632d01460 parent 2bf2cb26b2512c6a609bb152982c388329bedff6 author Tejun Heo Tue, 11 Apr 2006 22:16:45 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:12:46 -0400 [PATCH] libata: make reset methods complain when they fail Make reset methods complain loud when they fail. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 2bf2cb26b2512c6a609bb152982c388329bedff6 tree 9f1f3ea5000304fd946f34b24d9904c2a1027480 parent db70fef0750e5f8dbb64f9fadb333d2c7caf26a1 author Tejun Heo Tue, 11 Apr 2006 22:16:45 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:12:46 -0400 [PATCH] libata: kill @verbose from ata_reset_fn_t @verbose was added to ata_reset_fn_t because AHCI complained during probing if no device was attached to the port. However, muting failure message isn't the correct approach. Reset methods are responsible for detecting no device condition and finishing successfully. Now that AHCI softreset is fixed, kill @verbose. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit db70fef0750e5f8dbb64f9fadb333d2c7caf26a1 tree 3ae791d9a7034701ee9cdd22ac79355f675105b8 parent 35bb94b116e1fd4959ef0d3187458b5820eac8c4 author Tejun Heo Tue, 11 Apr 2006 22:16:44 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:12:46 -0400 [PATCH] libata: set default cbl in probeinit Make setting CBL type responsibility of probeinit. This allows using only ap->cbl == ATA_CBL_SATA test in all other parts. Without this, ata_down_sata_spd_limit() doesn't work during probe reset. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 35bb94b116e1fd4959ef0d3187458b5820eac8c4 tree 48a05166c489838d04429279a2886ac6a32b20c9 parent 381544bba3ae6f2f1004b267da34f840b469033c author Jeff Garzik Tue, 11 Apr 2006 13:12:34 -0400 committer Jeff Garzik Tue, 11 Apr 2006 13:12:34 -0400 libata: Add helper ata_shost_to_port() commit 381544bba3ae6f2f1004b267da34f840b469033c tree e748d5da19d3fa79bee2ad5b40b44722cdf64184 parent 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 author Jeff Garzik Tue, 11 Apr 2006 13:04:39 -0400 committer Jeff Garzik Tue, 11 Apr 2006 13:04:39 -0400 libata: Fix EH merge difference between this branch and upstream. commit 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 tree eddf856286234f28cac747d20eb59d918e1bc8b5 parent c2a6585296009379e0f4eff39cdcb108b457ebf2 parent a145410dccdb44f81d3b56763ef9b6f721f4e47c author Jeff Garzik Tue, 11 Apr 2006 12:51:40 -0400 committer Jeff Garzik Tue, 11 Apr 2006 12:51:40 -0400 Merge branch 'master' Conflicts: drivers/scsi/libata-scsi.c include/linux/libata.h commit c18bcf45c46f72f630cbbddc79a765336b79ab4f tree da83ea4fc0c1e4e0744513f2bee4247c216c6587 parent 12df7556705aae97f24a397377e17898700d7192 parent 591f0a4287d0de243493fd0c133c862e1d1f1c97 author Kumar Gala Tue, 04 Apr 2006 16:11:29 -0500 committer Kumar Gala Tue, 04 Apr 2006 16:11:29 -0500 Merge branch '85xx' commit 591f0a4287d0de243493fd0c133c862e1d1f1c97 tree 02ee295688f70c00e8034139d1966b217bb7725e parent 6246b6128bbe34d0752f119cf7c5111c85fe481d author Andy Fleming Sun, 02 Apr 2006 17:42:40 -0500 committer Kumar Gala Tue, 04 Apr 2006 16:09:18 -0500 Add 85xx CDS to arch/powerpc This patch adds support for 85xx CDS support to arch/powerpc Signed-off-by: Andy Fleming Signed-off-by: Kumar Gala commit 79fa1b677be3a985cc66b9218a4dd09818f1051b tree d36030be7cd07461055f005394ef275212353010 parent 31ce6daefe2d312e31ee06b0b3301b1cb7878c04 parent c2a6585296009379e0f4eff39cdcb108b457ebf2 author Jeff Garzik Tue, 04 Apr 2006 08:45:13 -0400 committer Jeff Garzik Tue, 04 Apr 2006 08:45:13 -0400 Merge branch 'upstream' commit c2a6585296009379e0f4eff39cdcb108b457ebf2 tree d6c123aca21e0e54a3b2a52c93f26b6352b068de parent 95de719adc94392a95c3c4d0a2d6b8b1ea39d236 author Tejun Heo Mon, 03 Apr 2006 01:58:06 +0900 committer Jeff Garzik Tue, 04 Apr 2006 08:44:24 -0400 [PATCH] ahci: do not fail softreset if PHY reports no device All softreset methods are responsible for detecting device presence and succeed softreset in such cases. AHCI didn't use to check for device presence before proceeding with softreset and this caused unnecessary reset retrials during probing. This patch adds presence detection to AHCI softreset. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 95de719adc94392a95c3c4d0a2d6b8b1ea39d236 tree d8196f39ca64a2c727ff6eff94b28d10013c6564 parent c16226a1c75042bfdc50bd2921d5919f6267ba51 author Albert Lee Tue, 04 Apr 2006 10:57:18 +0800 committer Jeff Garzik Tue, 04 Apr 2006 08:44:24 -0400 [PATCH] libata: convert ATAPI_ENABLE_DMADIR to module parameter Convert the ATAPI_ENABLE_DMADIR compile time option needed by some SATA-PATA bridge to runtime module parameter. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 31ce6daefe2d312e31ee06b0b3301b1cb7878c04 tree c956f2e8cecb151b067289504475a57a7e9d7d80 parent 4332a771f4d2f23a6d3beff3dd5405e79775a211 author Albert Lee Mon, 03 Apr 2006 18:31:44 +0800 committer Jeff Garzik Tue, 04 Apr 2006 08:42:26 -0400 [PATCH] libata-dev: irq-pio minor fix 2 irq-pio minor fix 2: - Use qc as data for ata_pio_task(). Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 4332a771f4d2f23a6d3beff3dd5405e79775a211 tree 4d4dbcb97e1ff0ac89d49ab36ed6c248e348c4ce parent 862cff63781e3a9de85d8947c82d55f4cc95572b author Albert Lee Mon, 03 Apr 2006 17:43:24 +0800 committer Jeff Garzik Tue, 04 Apr 2006 08:42:25 -0400 [PATCH] libata-dev: irq-pio minor fix irq-pio minor fix: - remove the redundant hsm_task_state = HSM_ST_IDLE - add devno to printk() as done in upstream Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 862cff63781e3a9de85d8947c82d55f4cc95572b tree ab47b1597e3ef193590da98147e494b2d702bac2 parent 7819d64e31a685e35e4819515c84168d0879816e parent c16226a1c75042bfdc50bd2921d5919f6267ba51 author Jeff Garzik Tue, 04 Apr 2006 08:42:17 -0400 committer Jeff Garzik Tue, 04 Apr 2006 08:42:17 -0400 Merge branch 'upstream' commit c16226a1c75042bfdc50bd2921d5919f6267ba51 tree f7f6081aab45d598fa44b9e588722ed38c299b8e parent af64371ada9452632c349563d688d30d94e918ba parent 6246b6128bbe34d0752f119cf7c5111c85fe481d author Jeff Garzik Tue, 04 Apr 2006 08:41:29 -0400 committer Jeff Garzik Tue, 04 Apr 2006 08:41:29 -0400 Merge branch 'master' commit e6f1f3c54974a30c65ea0b699809d12f0aa04272 tree e9a0e2ebcc249e8e64d53a055a5016d821f03155 parent c12ea918ee175ceb3a258cd81f1c43e897d0c0bc author Bjorn Helgaas Mon, 03 Apr 2006 13:14:00 -0400 committer Len Brown Mon, 03 Apr 2006 16:06:47 -0400 ACPI: Don't print internal BIOS names of wakeup devices Internal BIOS names like these should be exposed to the user as little as possible: ACPI wakeup devices: C069 C0CE C1D1 C0DE C1D4 Eventually, the "wakeup" property of a device should be exported via the device tree, not by a printk of an internal BIOS name. For the hard-core, these are still available in /proc/acpi/wakeup_devices, just not printed to dmesg. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 51d797474f87b375819d084f7583a2864c5656c4 tree 03ccc62e0b1b9f62442ef26e373e2a9ad798d5d8 parent 3587c50991b96fee2d26942f380e36e4f40fad71 author Dave Airlie Mon, 03 Apr 2006 16:19:26 +1000 committer Dave Airlie Mon, 03 Apr 2006 16:19:26 +1000 intelfb: some cleanups for intelfbhw Signed-off-by: Dave Airlie commit 3587c50991b96fee2d26942f380e36e4f40fad71 tree 1266f26fa14b96e540a1388968a030edf264894d parent 3aff13cfb8810cc228e8fdcb92103ed0b11ee38e author Dave Airlie Mon, 03 Apr 2006 14:46:55 +1000 committer Dave Airlie Mon, 03 Apr 2006 14:46:55 +1000 intelfb: fixup pitch calculation like X does Signed-off-by: Dave Airlie commit 3aff13cfb8810cc228e8fdcb92103ed0b11ee38e tree f2fe6212fcee1952a81022c33afa9dbc836c2e71 parent 46f60b8e67e6fceede851dc69cdee2d7c0de27b9 author Dave Airlie Fri, 31 Mar 2006 17:08:52 +1000 committer Dave Airlie Mon, 03 Apr 2006 11:43:29 +1000 intelfb: fixup p calculation This fixes up the p calculation of p1 and p2 for the i9xx chipsets. This seems to work a lot better for lower pixel clocks.. Signed-off-by: Dave Airlie commit 46f60b8e67e6fceede851dc69cdee2d7c0de27b9 tree 844bfba5d06f348bdd443cdd471d5d814337d141 parent 9a90603f65dd5046ddcd586158abcad7784892b6 author Dave Airlie Fri, 24 Mar 2006 12:31:14 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:29 +1000 This patch makes a needlessly global struct static. Signed-off-by: Adrian Bunk Signed-off-by: Dave Airlie commit 9a90603f65dd5046ddcd586158abcad7784892b6 tree e522d2fbc83a491ed50cee596a4c5d983460c2b4 parent 8b91b0b4f2d731b92f59bc82492769a09b4955a6 author Dave Airlie Thu, 23 Mar 2006 21:53:05 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: add i945GM support Untested i945GM support just add the framework. Signed-off-by: Dave Airlie commit 8b91b0b4f2d731b92f59bc82492769a09b4955a6 tree aeb384e59229d4814733195db5836ad9ab448c17 parent 8bb91f6a2d1db8031bfbb367df075f041d0cdfe2 author Dave Airlie Thu, 23 Mar 2006 19:23:48 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: fixup whitespace.. repeat after me, I must not take code from X without reformatting... Signed-off-by: Dave Airlie commit 8bb91f6a2d1db8031bfbb367df075f041d0cdfe2 tree 558db93f69096ede171d0b4e6c6c0330d8362e92 parent 7679f4d69296de97a7f62458cc4d1c6c884dfcfb author Dave Airlie Thu, 23 Mar 2006 13:06:32 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: add hw cursor support for i9xx This adds hw cursor support for the i9xx chipsets. Signed-off-by: Dave Airlie commit 7679f4d69296de97a7f62458cc4d1c6c884dfcfb tree 118ec34ee36be93d95abeb2628a16cd0d386c927 parent 9639d5ec07a490134f05ac890506a367aaf8663b author Dave Airlie Thu, 23 Mar 2006 12:30:05 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: make i915 modeset This takes the modeset and pll code from my X driver. Signed-off-by: Dave Airlie commit 9639d5ec07a490134f05ac890506a367aaf8663b tree 9e921a2fa9de05dadbb75ab1e63d06df1efd6fa6 parent 0c187addabbaf93512902442b4a90140a21b0ddc author Dave Airlie Thu, 23 Mar 2006 11:23:55 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: add support for i945G This just adds the defines and structure for i945G Signed-off-by: Dave Airlie commit 0c187addabbaf93512902442b4a90140a21b0ddc tree 40cd618a76474ec9ba2cfde129315c7ebbaf4f9f parent 16109b3f4c1f2635afd32eb6d49348590de2cb25 author Dave Airlie Thu, 23 Mar 2006 11:20:08 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: enable on x86_64 i945G chipsets supports 64-bit. Signed-off-by: Dave Airlie commit 16109b3f4c1f2635afd32eb6d49348590de2cb25 tree 6a8777173acbc8d41fdcce615b899446eba8053b parent 8492f081e5552ff388068f612eae6f55f7210ed4 author Dave Airlie Mon, 20 Mar 2006 21:22:09 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: add p divisor increments for i9xx. Signed-off-by: Dave Airlie commit 8492f081e5552ff388068f612eae6f55f7210ed4 tree 8d86450eea6a761ef4a541a5f67a9401f88aac19 parent d024960cff5173bef6e83c01cf9cd2763c2c0ab0 author Dave Airlie Mon, 20 Mar 2006 20:54:12 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:27 +1000 intelfb: change splitm to be brute force The old splitm didn't always work use a brute force. Signed-off-by: Dave Airlie commit d024960cff5173bef6e83c01cf9cd2763c2c0ab0 tree a63dfaf6de88b82b2aaf892e741881e4e602befb parent 7258b11d2e9a47d2b01620622579f22906960e1a author Dave Airlie Mon, 20 Mar 2006 20:26:45 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:27 +1000 intelfb: add pll index to the intelfb structure Add the pll index into the information structure, change get_chipset to take only the info structure, use plls in correct places commit 7258b11d2e9a47d2b01620622579f22906960e1a tree cfc7fce74a518077b0d068c13da710e072a57b20 parent 6fdb94bd95dc7a2effcbffa7a1d9e792cade57b6 author Dave Airlie Mon, 20 Mar 2006 20:02:24 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:27 +1000 intelfb: prepare for i9xx support. This code just moves the PLL min/max calculations variables into a structure, it doesn't change or add any new functionality. Signed-off-by: Dave Airlie commit 7819d64e31a685e35e4819515c84168d0879816e tree dd567398511128d63ac8bc10567279a68e9ddd37 parent a808be8a12d61cdacba350fdce2e448045be8202 parent af64371ada9452632c349563d688d30d94e918ba author Jeff Garzik Sun, 02 Apr 2006 20:41:48 -0400 committer Jeff Garzik Sun, 02 Apr 2006 20:41:48 -0400 Merge branch 'upstream' commit af64371ada9452632c349563d688d30d94e918ba tree 0b6b451ba75c18bff270ab31eedffcfa5f941d67 parent 4bced2d40555eebf8d685f174aa6d58ace353655 author Jeff Garzik Sun, 02 Apr 2006 20:41:36 -0400 committer Jeff Garzik Sun, 02 Apr 2006 20:41:36 -0400 [libata] bump versions commit 4bced2d40555eebf8d685f174aa6d58ace353655 tree 55b3b7317ffe00c1688d579684bd5aad00b5380e parent 6d5f9732a16a74d75f8cdba5b00557662e83f466 author Jeff Garzik Sun, 02 Apr 2006 20:17:48 -0400 committer Jeff Garzik Sun, 02 Apr 2006 20:17:48 -0400 [libata] kill bogus cut-n-pasted comments in three drivers commit a808be8a12d61cdacba350fdce2e448045be8202 tree b08dda3fb0dee06724320a5b0079fbc51c09c35b parent c13b56a1130bbfacfb588de100e5a248383805a6 parent 6d5f9732a16a74d75f8cdba5b00557662e83f466 author Jeff Garzik Sun, 02 Apr 2006 11:38:12 -0400 committer Jeff Garzik Sun, 02 Apr 2006 11:38:12 -0400 Merge branch 'upstream' commit 6d5f9732a16a74d75f8cdba5b00557662e83f466 tree dd29e5a0ea5eb1ca9ee51b62606036b0f9846e3a parent 1ad8e7f9eb051b040880e45337ed74bfd916ef7f author Tejun Heo Mon, 03 Apr 2006 00:09:41 +0900 committer Jeff Garzik Sun, 02 Apr 2006 11:37:57 -0400 [PATCH] libata: print SControl in SATA link status info message Now that libata mangles with SControl, it's helpful to print out SControl in link status message. Add it. Signed-off-by: Jeff Garzik commit c13b56a1130bbfacfb588de100e5a248383805a6 tree 7f10fbcb822fe50225a3ae6f4644775b72c6290c parent 029f5468b5b5f93a09bf90326fdcb9124079658d author Jeff Garzik Sun, 02 Apr 2006 10:34:24 -0400 committer Jeff Garzik Sun, 02 Apr 2006 10:34:24 -0400 [libata] irq-pio: Fix merge mistake commit 029f5468b5b5f93a09bf90326fdcb9124079658d tree f869fb02ad1ca49e0920e073b22cbb96a184ccae parent 8e181c14f2baa5be9b7f7c3917b7d4ecf7529110 parent 1ad8e7f9eb051b040880e45337ed74bfd916ef7f author Jeff Garzik Sun, 02 Apr 2006 10:30:40 -0400 committer Jeff Garzik Sun, 02 Apr 2006 10:30:40 -0400 Merge branch 'upstream' Conflicts: drivers/scsi/libata-core.c drivers/scsi/pdc_adma.c drivers/scsi/sata_mv.c drivers/scsi/sata_nv.c drivers/scsi/sata_promise.c drivers/scsi/sata_qstor.c drivers/scsi/sata_sx4.c drivers/scsi/sata_vsc.c include/linux/libata.h commit 1ad8e7f9eb051b040880e45337ed74bfd916ef7f tree 010f563b369b0d00a280aa6545790c95a7b5a8a5 parent ece1d63619df010b8c4f08e43755e2a03f3b6eed author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:21 -0400 [PATCH] libata: make some libata-core routines extern Make libata-core routines which will be used by EH implementation extern. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ece1d63619df010b8c4f08e43755e2a03f3b6eed tree c6474fe7541d479bf19c36c79700dfa9f6093a8d parent 35e86b53b1a38e78ff0d70dae4aeb25f4572e433 author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:21 -0400 [PATCH] libata: separate out libata-eh.c A lot of EH codes are about to be added to libata. Separate out libata-eh.c. ata_scsi_timed_out(), ata_scsi_error(), ata_qc_timeout(), ata_eng_timeout(), ata_eh_qc_complete() and ata_eh_qc_retry() are moved. No code is changed by this patch. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 35e86b53b1a38e78ff0d70dae4aeb25f4572e433 tree aa182ee897dd7211723b4f73843f1a638df2a5ea parent d69cf37d5387801914bbf5297f070c7d2ee0206f author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:20 -0400 [PATCH] libata: dec scmd->retries for qcs with zero err_mask qcs might get retried because of unrelated failure. e.g. NCQ command failure causes the whole command set to be aborted. Decrement scmd->retries for such retrials to avoid unnecessarily failing commands. Note that scmd->retries will be incremented the first time. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d69cf37d5387801914bbf5297f070c7d2ee0206f tree de9f081b20302e394936d23a3f983407d87dafd3 parent 74e6c8c394ca2126a60e97bc1142ec2d91761e9a author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:20 -0400 [PATCH] libata: add @cdb to ata_exec_internal() Add @cdb to ata_exec_internal(). It will be used by new EH. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 74e6c8c394ca2126a60e97bc1142ec2d91761e9a tree 4f9422284300b495590501d9fb919c062d60069f parent 058e55e120ca59d37392f9aa753da2d9ead24505 author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:20 -0400 [PATCH] libata: don't read TF directly from sense generation functions TF register might not be directly accessible depending on errors. e.g. TF of failed NCQ command is in log page 10h. Make reading TF responsibility of error handlers. For the current EH, simply push TF reading into qc completion functions as they are practically part of EH. New EH will fill qc->tf with status registers before complting qcs. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 058e55e120ca59d37392f9aa753da2d9ead24505 tree 31b248615b0534dce61d52634b3adaae526c89aa parent c91af2c87e4048cdefcfc9f16fed8d728243c92d author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:20 -0400 [PATCH] libata: always generate sense if qc->err_mask is non-zero Current sense generation code does not generate sense error if status register value doesn't indicate error condition. However, LLDD's may indicate errors which 't show up in status register. Completing such qc's without generating sense results in successful completion of failed commands. Invoke ata_to_sense_error() regardless of status register if qc->err_mask is not zero such that ata_to_sense_error() generates default sense error. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c91af2c87e4048cdefcfc9f16fed8d728243c92d tree 346a50bed1b05bd144d755ba4281186877a432db parent 2719736779da2c7fbb17d3de16c817b429bfeb9c author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:20 -0400 [PATCH] libata: pass qc around intead of ap during PIO The current code passes pointer to ap around and repeatedly performs ata_qc_from_tag() to access the ongoing qc. This is unnatural and makes EH synchronization cumbersome. Make PIO codes deal with qc instead of ap. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 2719736779da2c7fbb17d3de16c817b429bfeb9c tree f65b910e990cc59805faefc33fbb84cd419572c4 parent e8384607d4f395985e3cc5f82d75fc73efc2ecf0 author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:20 -0400 [PATCH] libata: add ATA_QCFLAG_IO Add a new qc flag ATA_QCFLAG_IO. This flag gets set for normal IO commands originating from SCSI midlayer. This information will be used by EH to determine transfer speed reconfiguration. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e8384607d4f395985e3cc5f82d75fc73efc2ecf0 tree bc6f6e3b8b31734d6ef4f827e85473b5928a500b parent ea1dd4e13010eb9dd5ffb4bfabbb472bc238bebb author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:20 -0400 [PATCH] libata: clear ATA_DFLAG_PIO before setting it ata_dev_set_mode() is now responsible for managing ATA_DFLAG_PIO. Clear it before setting it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ea1dd4e13010eb9dd5ffb4bfabbb472bc238bebb tree 2c55fb5671c1dab0c99d84d46c09fd03ebdc5f53 parent 198e0fed9e59461fc1890dd8b75ec72d14638873 author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:19 -0400 [PATCH] libata: clear only affected flags during ata_dev_configure() ata_dev_configure() should not clear dynamic device flags determined elsewhere. Lower eight bits are reserved for feature flags, define ATA_DFLAG_CFG_MASK and clear only those bits before configuring device. Without this patch, ATA_DFLAG_PIO gets turned off during revalidation making PIO mode unuseable. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 198e0fed9e59461fc1890dd8b75ec72d14638873 tree c5c1d727117df989d6e6e8e2b79d065a669a7a27 parent 949b38af40a0b88b7267908b1554a45b97b5b737 author Tejun Heo Sun, 02 Apr 2006 18:51:52 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:19 -0400 [PATCH] libata: rename ATA_FLAG_PORT_DISABLED to ATA_FLAG_DISABLED Rename ATA_FLAG_PORT_DISABLED to ATA_FLAG_DISABLED for consistency. (ATA_FLAG_* are always about ports). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 949b38af40a0b88b7267908b1554a45b97b5b737 tree cff0a143d71c8e03bf8aceefdfec8f735bc33416 parent c43c555c3a6db7f0b55fd9b66d7ecff16e827d4e author Tejun Heo Sun, 02 Apr 2006 18:51:52 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:19 -0400 [PATCH] libata: clean up constants * Reorder ATA_DFLAG_* such that feature flags determined by ata_dev_configure() are on lower bits. Reserve lower eight bits for this purpose and allocate dynamic flags from bit 8. * Reorder ATA_FLAG_* such that feature flags determined during driver initiailization are on bits 0:15, dynamic flags on 16:23 and LLDD specific flags on 24:31. * Kill trailing white space and lower-case an one line comment for consistency. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c43c555c3a6db7f0b55fd9b66d7ecff16e827d4e tree 3036762ea56f742414eaaf098f9f5f34dedb03e4 parent 5eb45c02a9944e813a0b82457607557a1f2c64b5 author Tejun Heo Sun, 02 Apr 2006 18:51:52 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:19 -0400 [PATCH] libata: ATA_FLAG_IN_EH is not used, kill it Kill unused flag ATA_FLAG_IN_EH. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 5eb45c02a9944e813a0b82457607557a1f2c64b5 tree 32a874e2c41ceaa541ef6a30d8d3faf4be2127ad parent d63cb4a6365aa161341fc365df1edc87cd00c9c0 author Tejun Heo Sun, 02 Apr 2006 18:51:52 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:19 -0400 [PATCH] libata: ata_dev_revalidate() printk update Make sure ata_dev_revalidate() complains on failures and kill revalidation failure message printed from ata_dev_set_mode(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d63cb4a6365aa161341fc365df1edc87cd00c9c0 tree 6dbc938ac7f4f2d4ce3fcaadabadb8c2ff7fd01c parent 565083e1f14e7771aa6bac2d3d4aae0b08d48d78 author Tejun Heo Sun, 02 Apr 2006 18:51:52 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:19 -0400 [PATCH] libata: report device number when PIO fails Report device number on PIO failure. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 565083e1f14e7771aa6bac2d3d4aae0b08d48d78 tree 8e6a81175297d3d03aa1eede59fcb635d65380e2 parent 14d2bac1877ed4e2cc940d1680db1a4f29225811 author Tejun Heo Sun, 02 Apr 2006 17:54:47 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:02:58 -0400 [PATCH] libata: consider disabled devices in ata_dev_xfermask() ata_bus_probe() now marks failed devices properly and leaves meaningful transfer mode masks. This patch makes ata_dev_xfermask() consider disable devices when determining PIO mode to avoid violating device selection timing. While at it, move port-wide resttriction out of device iteration loop and try to make the function look a bit prettier. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 14d2bac1877ed4e2cc940d1680db1a4f29225811 tree 60b478485e7453dd5a41aea34699a305dd3c8d2c parent cf176e1aa92eb2a3faea8409e841396a66413937 author Tejun Heo Sun, 02 Apr 2006 17:54:46 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:02:57 -0400 [PATCH] libata: improve ata_bus_probe() Improve ata_bus_probe() such that configuration failures are handled better. Each device is given ATA_PROBE_MAX_TRIES chances, but any non-transient error (revalidation failure with -ENODEV, configuration failure with -EINVAL...) disables the device directly. Any IO error results in SATA PHY speed down and ata_set_mode() failure lowers transfer mode. The last try always puts a device into PIO-0. After each failure, the whole port is reset to make sure that the controller and all the devices are in a known and stable state. The reset also applies SATA SPD configuration if necessary. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit cf176e1aa92eb2a3faea8409e841396a66413937 tree b62a516d2f91d43a9f6d48492e2f6205160ac849 parent edbabd8679a39faef67def4438c9cbccb5c05c5d author Tejun Heo Sun, 02 Apr 2006 17:54:46 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:02:57 -0400 [PATCH] libata: implement ata_down_xfermask_limit() Implement ata_down_xfermask_limit(). This function manipulates @dev->pio/mwdma/udma_mask such that the next lower transfer mode is selected. This will be used to improve ata_bus_probe() failure handling and later by EH. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit edbabd8679a39faef67def4438c9cbccb5c05c5d tree dec165edf531bba3adf7c95239f14ded5d48c9f3 parent 90dac02c08dabd471927f151b8393eb51e3e020e author Tejun Heo Sun, 02 Apr 2006 20:55:02 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:02:57 -0400 [PATCH] libata: add 5s sleep between resets Some devices react badly if resets are performed back-to-back. Give devices some time to breath and tell user that we're taking a nap. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 90dac02c08dabd471927f151b8393eb51e3e020e tree fb799ab84c4fec00dba52c0180f24bd84a6ba69a parent 1c3fae4d7eb121933341443c37d3bbee43c0fb68 author Tejun Heo Sun, 02 Apr 2006 17:54:46 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:02:57 -0400 [PATCH] libata: use SATA speed down in ata_drive_probe_reset() Make ata_drive_probe_reset() use SATA SPD configuration. Hardreset will be force if speed renegotiation is necessary. Also, if a hardreset fails, PHY speed is stepped down and hardreset is retried until the lowest speed is reached. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 1c3fae4d7eb121933341443c37d3bbee43c0fb68 tree e7f0c4145b3a108817c2a7e6bea58a72eb3692e1 parent 002c8054fa8d0f1afce2b0c728be32d338b9293a author Tejun Heo Sun, 02 Apr 2006 20:53:28 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:02:57 -0400 [PATCH] libata: implement ap->sata_spd_limit and helpers ap->sata_spd_limit contrains SATA PHY speed of the port. It is initialized to the configured value prior to probing thus preserving BIOS configured value. hardreset is responsible for applying SPD limit and sata_std_hardreset() is updated to do that. SATA SPD limit will be used to enhance failure handling during probing and later by EH. This patch also normalizes some comments around affected code. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 002c8054fa8d0f1afce2b0c728be32d338b9293a tree 3ca1bddacad6bb08b8f9b27ef6ebfbdb4cee4d46 parent 852ee16a914fb3ada2f81e222677c04defc2f15f author Tejun Heo Sun, 02 Apr 2006 17:54:46 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:02:57 -0400 [PATCH] libata: implement ata_dev_absent() For the time being we cannot use ata_dev_present() as it was renamed to ata_dev_enabled() but we still need presence test. Implement negation of the test. Conveniently, the negated result is needed in more places. This is suggested by Jeff Garzik. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 144c87b4e03759214c362d267e01c2905f1ab095 tree ea92934f57b6ad05df936b61fa3ff35befcbd14b parent 7f048801f4a6767433d1aeefd9c24372515265f8 author Len Brown Sun, 02 Apr 2006 00:15:39 -0500 committer Len Brown Sun, 02 Apr 2006 00:15:39 -0500 ACPI: ia64 buildfix arch/ia64/hp/common/sba_iommu.c used ACPI_MEM_FREE instead of kfree() Signed-off-by: Len Brown Sat, 01 Apr 2006 23:45:39 -0500 committer Len Brown Sat, 01 Apr 2006 23:45:39 -0500 ACPI: ia64 buildfix Signed-off-by: Len Brown commit c12ea918ee175ceb3a258cd81f1c43e897d0c0bc tree faa804c30ab12a6e1aa73b9ec7c1aaf8628d6eaf parent df42baa0d8e54df18dd9366dd7c93d6be7d5d063 author Ashok Raj Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 22:50:03 -0500 x86_64: Remove stale lapic definition from apicdef.h Signed-off-by: Ashok Raj Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit eefa27a93a0490902f33837ac86dbcf344b3aa29 tree ffb8e6f4d56045c679850f41d5c5808773b67a49 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Ashok Raj Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 22:45:30 -0500 ACPI: Allow hot-add of ejected processor acpi_eject_store() didn't trim processors, causing subsequent hot-add to fail. Signed-off-by: Ashok Raj Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit ff2fc3e9e3edb918b6c6b288485c6cb267bc865e tree b59bfffe58d9e34be055030078b8da9451b8d5a7 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Jiri Slaby Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 22:33:06 -0500 ACPI: EC acpi-ecdt-uid-hack On some boxes ecdt uid may be equal to 0, so do not test for uids equality, so that fake handler will be unconditionally removed to allow loading the real one. See http://bugzilla.kernel.org/show_bug.cgi?id=6111 Signed-off-by: Jiri Slaby Cc: Luming Yu Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit df42baa0d8e54df18dd9366dd7c93d6be7d5d063 tree c64ec1197bbc2fb95ef90a66e3edfaff7356db70 parent 200739c179c63d21804e9e8e2ced265243831579 author Ashok Raj Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 22:28:30 -0500 ACPI: build fix for u8 cpu_index Local apic entries are only 8 bits, but it seemed to not be caught with u8 return value result in the check cpu_index >= NR_CPUS becomming always false. drivers/acpi/processor_core.c: In function `acpi_processor_get_info': drivers/acpi/processor_core.c:483: warning: comparison is always false due to limited range of data type Signed-off-by: Ashok Raj Cc: Dave Jones Cc: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 200739c179c63d21804e9e8e2ced265243831579 tree bbe38c43d29dea3eeae632de5e2f82d3c75eb484 parent 1a36561607abf1405b56a41aac2fd163429cd1f8 author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 22:20:49 -0500 ACPI: remove __init/__exit from Asus .add()/.remove() methods Even though the devices claimed by asus_acpi.c can not be hot-plugged, the driver registration infrastructure allows the .add() and .remove() methods to be called at any time while the driver is registered. So remove __init and __exit from them. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 9224a867c497053842dc595e594ca6d32112221f tree c952060abbe5563f15bd7cd69531d4fad3a9aafa parent 459c7266d7a5c1730169258217e25fdd1b7ca854 author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 22:07:51 -0500 HPET: fix ACPI memory range length handling ACPI address space descriptors contain _MIN, _MAX, and _LEN. _MIN and _MAX are the bounds within which the region can be moved (this is clarified in Table 6-38 of the ACPI 3.0 spec). We should use _LEN to determine the size of the region, not _MAX - _MIN + 1. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 459c7266d7a5c1730169258217e25fdd1b7ca854 tree 79b50e2c6d530539bfe4a468ab290069ddf8ac32 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 22:05:18 -0500 ACPI: fix memory hotplug range length handling Address space descriptors contain _MIN, _MAX, and _LEN. _MIN and _MAX are the bounds within which the region can be moved (this is clarified in Table 6-38 of the ACPI 3.0 spec). We should use _LEN to determine the size of the region, not _MAX - _MIN + 1. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 1a36561607abf1405b56a41aac2fd163429cd1f8 tree 096ea8a5212164643e54218a2d4b76ecdec95350 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:53:51 -0500 ACPI: simplify scan.c coding No functional changes; just remove leftover, unused "buffer" and simplify control flow (no need to remember error values and goto the end, when we can simply return the value directly). Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit e4513a57ef719d3d6d1cee0ca4d9f4016aa452bb tree e4b837a10ada6c1d8ecfb065cb864c556a4641ce parent 578b333bfe8eb1360207a08a53c321822a8f40f3 author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:48:08 -0500 ACPI: fix sonypi ACPI driver registration to unregister on failure Remove the assumption that acpi_bus_register_driver() returns the number of devices claimed. Returning the count is unreliable because devices may be hot-plugged in the future (admittedly not applicable for this driver). This also fixes a bug: if sonypi_acpi_driver was registered but found no devices, sonypi_exit() did not unregister it. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 578b333bfe8eb1360207a08a53c321822a8f40f3 tree ee71cd7fed8182b0477d733039509f4097933aab parent 9d9f749b316ac21cb59ad3e595cbce469b409e1a author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:48:08 -0500 ACPI: update asus_acpi driver registration to unload on failure Remove the assumption that acpi_bus_register_driver() returns the number of devices claimed. Returning the count is unreliable because devices may be hot-plugged in the future (admittedly not applicable for this driver). Since the hardware for this driver is not hot-pluggable, determine whether the hardware is present by noticing calls to the .add() method. It would be better to probe the ACPI namespace for the ASUS HIDs, and load the driver only when we find one, but ACPI doesn't support that yet. I don't have an ASUS laptop to test on, but on my HP dl360, it does report the appropriate error when attempting to load the module: $ sudo insmod drivers/acpi/asus_acpi.ko insmod: error inserting 'drivers/acpi/asus_acpi.ko': -1 No such device Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 9d9f749b316ac21cb59ad3e595cbce469b409e1a tree a7075d54e97fc67f72684a5e280adcb24c4666b8 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:42:57 -0500 ACPI: make acpi_bus_register_driver() return success/failure, not device count acpi_bus_register_driver() should not return the number of devices claimed. We're not asking to find devices, we're making a driver available to devices, including hot-pluggable devices that may appear in the future. I audited all callers of acpi_bus_register_driver(), and except asus_acpi.c and sonypi.c (fixed in previous patches), all either ignore the return value or test only for failure (<0). Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit cd090eedd85256829f762677d0752a846c1b88b9 tree 51fa4ddbaa8fc5fb70077dc1a6946bc3f52a47cb parent 81507ea9cfa64e9851b53e0fefebfa776eda9ecb author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:33:00 -0500 ACPI: Display "ACPI" to motherboard resources in /proc/io{mem,port} Add "ACPI" to motherboard resource allocation names, so people have a clue about where to look. And remove some trailing spaces. Changes these /proc/iomem entries from this: ff5c1004-ff5c1007 : PM_TMR ff5c1008-ff5c100b : PM1a_EVT_BLK ff5c100c-ff5c100d : PM1a_CNT_BLK ff5c1010-ff5c1013 : GPE0_BLK ff5c1014-ff5c1017 : GPE1_BLK to this: ff5c1004-ff5c1007 : ACPI PM_TMR ff5c1008-ff5c100b : ACPI PM1a_EVT_BLK ff5c100c-ff5c100d : ACPI PM1a_CNT_BLK ff5c1010-ff5c1013 : ACPI GPE0_BLK ff5c1014-ff5c1017 : ACPI GPE1_BLK Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 81507ea9cfa64e9851b53e0fefebfa776eda9ecb tree 0e76e2e8dd0bc5d0542c8490f09af886a5c82749 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:31:29 -0500 ACPI: request correct fixed hardware resource type (MMIO vs I/O port) ACPI supports fixed hardware (PM_TMR, GPE blocks, etc) in either I/O port or MMIO space, but used to always request the regions from I/O space because it didn't check the address_space_id. Sample ACPI fixed hardware in MMIO space (HP rx2600), was incorrectly reported in /proc/ioports, now reported in /proc/iomem: ff5c1004-ff5c1007 : PM_TMR ff5c1008-ff5c100b : PM1a_EVT_BLK ff5c100c-ff5c100d : PM1a_CNT_BLK ff5c1010-ff5c1013 : GPE0_BLK ff5c1014-ff5c1017 : GPE1_BLK Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 1c6e7d0aeecac38e66b1bb63e3eff07b2a1c2f2c tree 5d851856e5e5c76171053cdf6fe95b04ec76152d parent b5f2490b6e3317059e87ba40d4f659d1c30afc1f author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:28:25 -0500 PNPACPI: whitespace cleanup Tidy up whitespace. No functional change. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit b5f2490b6e3317059e87ba40d4f659d1c30afc1f tree 8eaa4898b89001bc5e53922d2414967f911b84dd parent 1acfb7f2b0d460ee86bdb25ad0679070ec8a5f0d author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:26:45 -0500 PNPACPI: remove some code duplication Factor out the duplicated switch from pnpacpi_count_resources() and pnpacpi_type_resources(). Remove the unnecessary re-initialization of resource->type and length from all the encode functions (id and length are originally set in the pnpacpi_build_resource_template() -> pnpacpi_type_resources() path). Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 1acfb7f2b0d460ee86bdb25ad0679070ec8a5f0d tree 2870bc143e40e0d7da477ff8e1b8df1a047bc52f parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Bjorn Helgaas Tue, 28 Mar 2006 17:03:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:24:49 -0500 PNPACPI: fix non-memory address space descriptor handling Fix resource_type handling for QWORD, DWORD, and WORD Address Space Descriptors. Previously we ignored the resource_type, so I/O ports and bus number ranges were incorrectly parsed as memory ranges. Sample PCI root bridge resources from HP rx2600 before this patch: # cat /sys/bus/pnp/devices/00:02/resources state = active mem 0x0-0x1f mem 0x0-0x3af mem 0x3e0-0x1fff mem 0x80000000-0x8fffffff With this patch: # cat /sys/bus/pnp/devices/00:02/resources state = active io 0x0-0x3af io 0x3e0-0x1fff mem 0x80000000-0x8fffffff mem 0x80004000000-0x80103fffffe Changes: 0x0-0x1f PCI bus number range was incorrectly reported as memory, now not reported at all 0x0-0x3af I/O port range was incorrectly reported as memory 0x3e0-0x1fff I/O port range was incorrectly reported as memory 0x80004000000-0x80103fffffe memory range wasn't reported at all because we only support PNP_MAX_MEM (4) memory resources Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 7e1f19e50371e1d148226b64c8edc77fec47fa5b tree 1daff4e687c568b0245dbdb92a3ec993abdbe464 parent d52bb94d56676acd9bdac8e097257a87b4b1b2e1 author Andrew Morton Tue, 28 Mar 2006 17:03:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:13:15 -0500 ACPI: UP build fix for bugzilla-5737 cpu_online_map doesn't exist if !CONFIG_SMP. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 1300124f69cafc54331bc06e968a8dd67863f989 tree 4f94d162680b699f159d04a1bcc6d793f3b8a23c parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Adrian Bunk Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:07:42 -0500 ACPI: Kconfig: ACPI should depend on, not select PCI Otherwise, illegal configurations like X86_VOYAGER=y, PCI=y are possible. This patch also fixes the options select'ing ACPI to also select PCI. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 8e181c14f2baa5be9b7f7c3917b7d4ecf7529110 tree b99427b2639c70e33911e80c947c984b340a4ed9 parent eee6c32f5f114f9b9f2d94862f0dc0d3ff523864 parent 852ee16a914fb3ada2f81e222677c04defc2f15f author Jeff Garzik Sat, 01 Apr 2006 15:17:56 -0500 committer Jeff Garzik Sat, 01 Apr 2006 15:17:56 -0500 Merge branch 'upstream' commit 852ee16a914fb3ada2f81e222677c04defc2f15f tree 8635f8a309a023e0991e30a6a3583aafd91b99f5 parent e82cbdb9a3791f781462c9d00e3486e8fb7e58a8 author Tejun Heo Sat, 01 Apr 2006 01:38:18 +0900 committer Jeff Garzik Sat, 01 Apr 2006 14:52:08 -0500 [PATCH] libata: preserve SATA SPD setting over hard resets Don't overwrite SPD setting during hard reset. This change has the (intended) side effect of honoring the BIOS configuration. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e82cbdb9a3791f781462c9d00e3486e8fb7e58a8 tree 70c08be45f82a44e86a2889a16841ea58c89fa84 parent e8e0619f68bff8f39d98c46aac85ed1d4557ccfd author Tejun Heo Sat, 01 Apr 2006 01:38:18 +0900 committer Jeff Garzik Sat, 01 Apr 2006 14:46:09 -0500 [PATCH] libata: don't disable devices from ata_set_mode() When ata_set_mode() fails on a device, make ata_set_mode() return error code and pointer to the device instead of disabling it directly. This gives more control to higher level driving logic. This patch does not change the end result (configured transfer mode) although it may make libata repeat mode configuration to the peer of a failing device. Later ata_bus_probe() rewrite will make full use of this change. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 58a7ce64426394a46e80cdc9440cc1e7c195e85d tree a33f3a552c22deb4a47976eb67d1a557d7fed29e parent b0348b90a4a8149e5a0df312ab7810793ba7b3a4 author Krzysztof Halasa Thu, 30 Mar 2006 17:01:53 +0200 committer Jeff Garzik Sat, 01 Apr 2006 14:32:52 -0500 [PATCH] Goramo PCI200SYN WAN driver subsystem ID patch Goramo finally got PCI subsystem ID for their PCI200SYN card. The attached patch adds support for it - cards with old EEPROM data will emit a warning with URL for update tool. Signed-off-by: Krzysztof Halasa Signed-off-by: Jeff Garzik commit b0348b90a4a8149e5a0df312ab7810793ba7b3a4 tree b2880d09ba55a08acb98dcf8062dd99e59e733e8 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Lennert Buytenhek Tue, 28 Mar 2006 17:19:50 +0200 committer Jeff Garzik Sat, 01 Apr 2006 14:32:52 -0500 [PATCH] smc91x: add support for LogicPD PXA270 platform This patch adds support for the smc91x on the LogicPD PXA270 to the smc91x driver. Signed-off-by: Lennert Buytenhek Signed-off-by: Jeff Garzik commit eee6c32f5f114f9b9f2d94862f0dc0d3ff523864 tree 76cae31872925fd2e66aeab833fed6b293f9af2d parent 6e07e16404deafadf45895a7d2aeb5feba53b479 author Albert Lee Sat, 01 Apr 2006 17:38:43 +0800 committer Jeff Garzik Sat, 01 Apr 2006 14:29:21 -0500 [PATCH] libata-dev: handle DRQ=1 ERR=1 (revised) Handle DRQ=1 ERR=1 situation. Revised according to what IDE try_to_flush_leftover_data() does. Changes: - For ATA PIO writes and ATAPI devices, just stop the HSM and let EH handle it. - For ATA PIO reads, read only one block of junk data and then let EH handle it. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 6e07e16404deafadf45895a7d2aeb5feba53b479 tree a7025d6632f0b3eb6232eafba79f331ead812fcf parent 08a556db919f67e1e4d33ae8d40f7222da34d994 parent e8e0619f68bff8f39d98c46aac85ed1d4557ccfd author Jeff Garzik Sat, 01 Apr 2006 14:29:12 -0500 committer Jeff Garzik Sat, 01 Apr 2006 14:29:12 -0500 Merge branch 'upstream' commit e8e0619f68bff8f39d98c46aac85ed1d4557ccfd tree 96bd428799db0694f6ebfd29fcb207857fa60c0f parent 4f65977df0b9a667fdcd85b95d457a220c94113f author Tejun Heo Sat, 01 Apr 2006 01:38:18 +0900 committer Jeff Garzik Sat, 01 Apr 2006 12:33:46 -0500 [PATCH] libata: reorganize ata_set_mode() Merge ata_host_set_pio() and ata_host_set_dma() into ata_set_mode() and use function-level *dev to iterate over devices. This eases soon-to-follow ata_set_mode() interface change. While at it, kill an unnecessary comment and normalize others. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 4f65977df0b9a667fdcd85b95d457a220c94113f tree b7cccdf707088b2f5c07c01c26b7761ef92ed175 parent e1211e3fa7fd05ff0d4f597fd37e40de8acc6784 author Tejun Heo Sat, 01 Apr 2006 01:38:18 +0900 committer Jeff Garzik Sat, 01 Apr 2006 12:33:46 -0500 [PATCH] libata: make ata_set_mode() handle no-device case properly Make ata_set_mode() return without doing anything if there is no device on the port. This is in preparation for ata_bus_probe() changes. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e1211e3fa7fd05ff0d4f597fd37e40de8acc6784 tree 672018d7facf99ad4d45b09e2e2980accebdfe38 parent 9974e7cc6c8b8ea796c92cdf28db93e4579a4000 author Tejun Heo Sat, 01 Apr 2006 01:38:18 +0900 committer Jeff Garzik Sat, 01 Apr 2006 12:33:45 -0500 [PATCH] libata: implement ata_dev_enabled and disabled() This patch renames ata_dev_present() to ata_dev_enabled() and adds ata_dev_disabled(). This is to discern the state where a device is present but disabled from not-present state. This disctinction is necessary when configuring transfer mode because device selection timing must not be violated even if a device fails to configure. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 9974e7cc6c8b8ea796c92cdf28db93e4579a4000 tree 4130f93143410344d191194464e38a5d89de7033 parent 4c360c81a6f8d4253f7fc2e69852305676fdfa72 author Tejun Heo Sat, 01 Apr 2006 01:38:17 +0900 committer Jeff Garzik Sat, 01 Apr 2006 12:33:45 -0500 [PATCH] libata: convert do_probe_reset() to ata_do_reset() Make do_probe_reset() generic by pushing classification check into ata_drive_probe_reset() and rename it to ata_do_reset(). This will be used by EH reset. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 4c360c81a6f8d4253f7fc2e69852305676fdfa72 tree ac36bd47924d0b591d966c4976335c6e6409b99c parent 96072e699be08af8e7c33c56759582ea89088a02 author Tejun Heo Sat, 01 Apr 2006 01:38:17 +0900 committer Jeff Garzik Sat, 01 Apr 2006 12:33:45 -0500 [PATCH] libata: separate out ata_spd_string() Separate out ata_spd_string() from sata_print_link_status(). This will be used by SATA spd configuration routines. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 96072e699be08af8e7c33c56759582ea89088a02 tree 121ba18baf51bd12a9066fcd8b7d530d15ee6017 parent 5bbc53f4cfd28bf1d0e476ed23bc3a094eff718a author Tejun Heo Sat, 01 Apr 2006 01:38:17 +0900 committer Jeff Garzik Sat, 01 Apr 2006 12:33:45 -0500 [PATCH] libata: make ata_bus_probe() return negative errno on failure ata_bus_probe() uses unsigned int rc to receive negative errno and returns the converted unsigned int value. Convert temporary variables to int and make ata_bus_probe() return negative errno on failure. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 5bbc53f4cfd28bf1d0e476ed23bc3a094eff718a tree a08fc82da508294f841570fdcb8553d69f8ac2d3 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Tejun Heo Sat, 01 Apr 2006 01:38:17 +0900 committer Jeff Garzik Sat, 01 Apr 2006 12:33:45 -0500 [PATCH] libata: fix ata_set_mode() return value Make ata_set_mode() return correct error value when ata_dev_set_mode() fails. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ec7381d6bfd3e7b8d2880dd5e9d03b131b0603f6 tree 011cacb6bdbc32ea0fe54e7be4e4cc0848c8e77e parent 8313524a0d466f451a62709aaedf988d8257b21c author Len Brown Sat, 01 Apr 2006 05:12:23 -0500 committer Len Brown Sat, 01 Apr 2006 05:12:23 -0500 ACPI: inline trivial acpi_os_get_thread_id() acpi_os_get_thread_id() is used only for debugging code that is not enabled on Linux, so stub it out. Signed-off-by: Len Brown commit 8313524a0d466f451a62709aaedf988d8257b21c tree d612fc796ae07d8a39542c95eec0f5169c9f64eb parent ea936b78f46cbe089a4ac363e1682dee7d427096 author Bob Moore Tue, 03 Oct 2006 00:00:00 -0400 committer Len Brown Sat, 01 Apr 2006 01:26:39 -0500 ACPI: ACPICA 20060310 Tagged all external interfaces to the subsystem with the new ACPI_EXPORT_SYMBOL macro. This macro can be defined as necessary to assist kernel integration. For Linux, the macro resolves to the EXPORT_SYMBOL macro. The default definition is NULL. Added the ACPI_THREAD_ID type for the return value from acpi_os_get_thread_id(). This allows the host to define this as necessary to simplify kernel integration. The default definition is ACPI_NATIVE_UINT. Valery Podrezov fixed two interpreter problems related to error processing, the deletion of objects, and placing invalid pointers onto the internal operator result stack. http://bugzilla.kernel.org/show_bug.cgi?id=6028 http://bugzilla.kernel.org/show_bug.cgi?id=6151 Increased the reference count threshold where a warning is emitted for large reference counts in order to eliminate unnecessary warnings on systems with large namespaces (especially 64-bit.) Increased the value from 0x400 to 0x800. Due to universal disagreement as to the meaning of the 'c' in the calloc() function, the ACPI_MEM_CALLOCATE macro has been renamed to ACPI_ALLOCATE_ZEROED so that the purpose of the interface is 'clear'. ACPI_MEM_ALLOCATE and ACPI_MEM_FREE are renamed to ACPI_ALLOCATE and ACPI_FREE. Signed-off-by: Bob Moore Signed-off-by: Len Brown commit ea936b78f46cbe089a4ac363e1682dee7d427096 tree c444b65c3d02b05934497caefcdcbbe675a00bdf parent 52fc0b026e99b5d5d585095148d997d5634bbc25 author Bob Moore Fri, 17 Feb 2006 00:00:00 -0500 committer Len Brown Sat, 01 Apr 2006 01:23:23 -0500 ACPI: ACPICA 20060217 Implemented a change to the IndexField support to match the behavior of the Microsoft AML interpreter. The value written to the Index register is now a byte offset, no longer an index based upon the width of the Data register. This should fix IndexField problems seen on some machines where the Data register is not exactly one byte wide. The ACPI specification will be clarified on this point. Fixed a problem where several resource descriptor types could overrun the internal descriptor buffer due to size miscalculation: VendorShort, VendorLong, and Interrupt. This was noticed on IA64 machines, but could affect all platforms. Fixed a problem where individual resource descriptors were misaligned within the internal buffer, causing alignment faults on IA64 platforms. Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 08a556db919f67e1e4d33ae8d40f7222da34d994 tree a83cc2c32b0f9996e67c430be200fb55c24444d9 parent 4f0e7c51ae392d841be395a9c6b8d26a9fbf33d2 author Albert Lee Fri, 31 Mar 2006 13:29:04 +0800 committer Jeff Garzik Fri, 31 Mar 2006 10:07:06 -0500 [PATCH] libata-dev: print out information for ATAPI devices with CDB interrupts print out information for ATAPI devices with CDB interrupts Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 52fc0b026e99b5d5d585095148d997d5634bbc25 tree 7bf93132cfd3e6957308a84198ee159f7d43cf6f parent 46358614ed5b031797522f1020e989c959a8d8a6 author Bob Moore Mon, 02 Oct 2006 00:00:00 -0400 committer Len Brown Fri, 31 Mar 2006 02:19:03 -0500 [ACPI] ACPICA 20060210 Removed a couple of extraneous ACPI_ERROR messages that appeared during normal execution. These became apparent after the conversion from ACPI_DEBUG_PRINT. Fixed a problem where the CreateField operator could hang if the BitIndex or NumBits parameter referred to a named object. From Valery Podrezov. http://bugzilla.kernel.org/show_bug.cgi?id=5359 Fixed a problem where a DeRefOf operation on a buffer object incorrectly failed with an exception. This also fixes a couple of related RefOf and DeRefOf issues. From Valery Podrezov. http://bugzilla.kernel.org/show_bug.cgi?id=5360 http://bugzilla.kernel.org/show_bug.cgi?id=5387 http://bugzilla.kernel.org/show_bug.cgi?id=5392 Fixed a problem where the AE_BUFFER_LIMIT exception was returned instead of AE_STRING_LIMIT on an out-of-bounds Index() operation. From Valery Podrezov. http://bugzilla.kernel.org/show_bug.cgi?id=5480 Implemented a memory cleanup at the end of the execution of each iteration of an AML While() loop, preventing the accumulation of outstanding objects. From Valery Podrezov. http://bugzilla.kernel.org/show_bug.cgi?id=5427 Eliminated a chunk of duplicate code in the object resolution code. From Valery Podrezov. http://bugzilla.kernel.org/show_bug.cgi?id=5336 Fixed several warnings during the 64-bit code generation. Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 46358614ed5b031797522f1020e989c959a8d8a6 tree 1f342b7a2a2424d3a71750c1d72ed9337a1b59cf parent a0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 author Len Brown Fri, 31 Mar 2006 02:16:19 -0500 committer Len Brown Fri, 31 Mar 2006 02:16:19 -0500 Revert "[PATCH] ACPI: fix vendor resource length computation" fixed in a different way by a subsequent ACPICA patch This reverts 35b73ceb9a7d10c81bd9e79e8485f7079ef2b40e commit. commit 6665bda76461308868bd1e52caf627f4cb29ed32 tree 7d4690bc13d631759c3c8f59f72f66b515a02968 parent fdc136ccd3332938e989439c025c363f8479f3e6 author Adrian Bunk Sat, 11 Mar 2006 10:12:00 -0500 committer Len Brown Fri, 31 Mar 2006 01:02:39 -0500 [ACPI] drivers/acpi/video.c: fix error path NULL pointer dereference The Coverity checker spotted this bug in acpi_video_device_lcd_query_levels(). Signed-off-by: Adrian Bunk Signed-off-by: Len Brown commit fdc136ccd3332938e989439c025c363f8479f3e6 tree 6e71b49f8b1ed92fe0c51984e27379acdf2991c3 parent a1f9e65e2085e0a87f28a4d5a8ae43b32c087f24 author Dave Jones Wed, 08 Mar 2006 22:12:00 -0500 committer Len Brown Fri, 31 Mar 2006 01:02:39 -0500 [ACPI] fix possible acpi thermal leak in failure path Coverity: #601 Signed-off-by: Dave Jones Signed-off-by: Len Brown commit a1f9e65e2085e0a87f28a4d5a8ae43b32c087f24 tree 153b66f46d752f45057472b3e64e8c2ac73407c1 parent 1fee94034917aa711fcbd4ebf4c36f7ebd9fa7d6 author Len Brown Wed, 25 Jan 2006 23:47:36 -0500 committer Len Brown Fri, 31 Mar 2006 01:02:39 -0500 [ACPI] document cmdline acpi_os_name= This can sometimes be used to work around broken BIOS. Use "Microsoft Windows" to take the same path through the BIOS as Windows98 would. The default is "Microsoft Windows NT", which is what NT and later versions of Windows use, and is the most tested path through most BIOS. Set it to anything else, including "Linux", at your own risk, as it seems that virtually no BIOS has been tested with anything but the two options above. Note that this uses the legacy _OS interface, so we don't expect this to ever change. Signed-off-by: Len Brown commit 1fee94034917aa711fcbd4ebf4c36f7ebd9fa7d6 tree 2fb60f5c2462654b88764bdf7acfa63a3aa6f4a0 parent ce362c009250340358a7221f3cdb7954cbf19c01 author Irwan Djajadi Fri, 20 Jan 2006 15:28:00 -0500 committer Len Brown Fri, 31 Mar 2006 01:02:39 -0500 [ACPI] drivers/acpi/hotkey.c: check kmalloc return value Signed-off-by: Irwan Djajadi Signed-off-by: Alexey Dobriyan Signed-off-by: Len Brown commit 0eacee585a89ce5827b572a73a024931506bef48 tree 063fb47ffc91fd9863f8314acf2db58001414736 parent ce362c009250340358a7221f3cdb7954cbf19c01 author Len Brown Fri, 31 Mar 2006 00:37:23 -0500 committer Len Brown Fri, 31 Mar 2006 00:37:23 -0500 ACPI: enable BIOS warning http://bugzilla.kernel.org/show_bug.cgi?id=5452 Signed-off-by: Len Brown commit 4f0e7c51ae392d841be395a9c6b8d26a9fbf33d2 tree 664564736e52a88e14d9c699c5c723b89785f4cb parent 74d89c16735d83349ea74232031819e989a49156 parent 55d8ca4f8094246da6e71889a4e04bfafaa78b10 author Jeff Garzik Wed, 29 Mar 2006 19:59:39 -0500 committer Jeff Garzik Wed, 29 Mar 2006 19:59:39 -0500 Merge branch 'upstream' Conflicts: drivers/scsi/sata_mv.c commit 79072f38909e3d9883317238887460c39ddcc4cb tree 28369f5a844535ff836565eefd62695b0e890fa3 parent 200d5a7684cc49ef4be40e832daf3f217e70dfbb parent 55d8ca4f8094246da6e71889a4e04bfafaa78b10 author Jeff Garzik Wed, 29 Mar 2006 19:58:22 -0500 committer Jeff Garzik Wed, 29 Mar 2006 19:58:22 -0500 Merge branch 'upstream' commit 74d89c16735d83349ea74232031819e989a49156 tree 1d8ded9c76b6ebe97c3841bbb986aacd63a801e5 parent 52a3220599647ba429fcbca2388ec35b850fa72f parent 05c8e0ac5c37e9739a852b526afeecae97607cbb author Jeff Garzik Wed, 29 Mar 2006 17:24:55 -0500 committer Jeff Garzik Wed, 29 Mar 2006 17:24:55 -0500 Merge branch 'upstream' commit 52a3220599647ba429fcbca2388ec35b850fa72f tree 7c2c775c130d852c94029807cb4a061e7d96dcbd parent 71601958f73b952281f2b02e16d1f11c99ee0a8b author Albert Lee Sat, 25 Mar 2006 18:18:15 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:22:36 -0500 [PATCH] libata-dev: wait idle after reading the last data block Some CD-ROM drives are slow to clear DRQ, after the last data block is read by PIO. Use ata_wait_idle() after reading the last data block. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 71601958f73b952281f2b02e16d1f11c99ee0a8b tree 87d7c55a27f0553f901b0c3ef4dfef792a3f946c parent 999bb6f4260f9499fdeab3f8fdcd8b9013eca39e author Albert Lee Sat, 25 Mar 2006 18:11:12 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:22:36 -0500 [PATCH] libata-dev: fix the device err check sequence (respin) Current irq-pio checks ERR bit and stops on ERR before it does anything else. This behavior doesn't look right. The DRQ bit should take higher precedence than the ERR bit. Changes: - Let the HSM do the data transfer whenever the device asks for DRQ bit, even if the ERR bit is set. - For DRQ=1 ERR=1, don't trust the data Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 999bb6f4260f9499fdeab3f8fdcd8b9013eca39e tree 9ba633841e27207bdbe9e08b76ee912962dd400e parent c234fb00ea8999076728137d96603b713ad8b53f author Albert Lee Sat, 25 Mar 2006 18:07:48 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:22:36 -0500 [PATCH] libata-dev: irq-pio minor fixes (respin) irq-pio minor fixes for printk() and comments. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit c234fb00ea8999076728137d96603b713ad8b53f tree 7490f2ff6546c493a41e85fbc36571f4c5b5e6c9 parent c2bbc551615c21a4c280c797987dbb50f2701594 author Albert Lee Sat, 25 Mar 2006 17:58:38 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:54 -0500 [PATCH] libata-dev: Make the the in_wq check as an inline function Make the the in_wq check easier to read as an inline function. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit c2bbc551615c21a4c280c797987dbb50f2701594 tree 8f23c49dceec2123663377c4750ea48fb46d8fea parent 27cdadef6dfe0d0614653919a110fc75ab1650ce author Albert Lee Sat, 25 Mar 2006 17:56:55 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:54 -0500 [PATCH] libata-dev: ata_check_atapi_dma() fix for ATA_FLAG_PIO_POLLING LLDDs ata_check_atapi_dma() fix for LLDDs with the ATA_FLAG_PIO_POLLING flag. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 27cdadef6dfe0d0614653919a110fc75ab1650ce tree 88c762ec72b2f09ef7aab5acdd8d3888b5c50758 parent a1af37344f669d0fefa8c8a9e37eb6a7c086a2c2 author Albert Lee Sat, 25 Mar 2006 17:53:57 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:54 -0500 [PATCH] libata-dev: Cleanup unused enums/functions Cleanup the following unused functions: - ata_pio_poll() - ata_pio_complete() - ata_pio_first_block() - ata_pio_block() - ata_pio_error() ap->pio_task_timeout and other enums. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit a1af37344f669d0fefa8c8a9e37eb6a7c086a2c2 tree 8a24383b850349d59917680700829d2ac25750b2 parent bb5cb290f095f17f88c912e3da35adf5b2d9500b author Albert Lee Sat, 25 Mar 2006 17:50:15 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:54 -0500 [PATCH] libata-dev: Convert ata_pio_task() to use the new ata_hsm_move() Convert ata_pio_task() to use the new ata_hsm_move(). Changes: - refactor ata_pio_task() to poll device status register and - call the new ata_hsm_move() when device indicates it is not BSY. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit bb5cb290f095f17f88c912e3da35adf5b2d9500b tree cf8cbbfc3419988f869b4527c8be5d63361b3eb2 parent 6912ccd5a4a095d71fd7215ef2abea877c8fed6f author Albert Lee Sat, 25 Mar 2006 17:48:02 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:54 -0500 [PATCH] libata-dev: Let ata_hsm_move() work with both irq-pio and polling pio Let ata_hsm_move() work with both irq-pio and polling pio codepath. Changes: - add a new parameter "in_wq" for polling pio - add return value "poll_next" to tell polling pio task whether the HSM is finished - merge code from ata_pio_first_block() to the HSM_ST_FIRST state. - call ata_poll_qc_complete() if called from the workqueue Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 6912ccd5a4a095d71fd7215ef2abea877c8fed6f tree e8381968de60c1e92e98b8c35b828ab1c44ca573 parent e2cec77117a6e4fcbac2601e2f7b0b3f4f5a4c84 author Albert Lee Sat, 25 Mar 2006 17:45:49 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:53 -0500 [PATCH] libata-dev: Minor fix for ata_hsm_move() to work with ata_host_intr() Minor fix for ata_hsm_move() to work with ata_host_intr(). Changes: - WARN_ON() and comment fix - Make the HSM_ST_LAST device status checking more rigid. - Treat unknown HSM state as BUG(). Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit e2cec77117a6e4fcbac2601e2f7b0b3f4f5a4c84 tree d1cbdf9f959c7d4584bca1e850fa9719b61bc99d parent 19d5d7309a928eb86f58b37165a2d501621ae3c0 author Albert Lee Sat, 25 Mar 2006 17:43:49 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:53 -0500 [PATCH] libata-dev: Move out the HSM code from ata_host_intr() Move out the irq-pio HSM code from ata_host_intr() to the new ata_hsm_move() function verbatim. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 19d5d7309a928eb86f58b37165a2d501621ae3c0 tree e811e0a3fa2786cd3b05a7fbb5037e9928737a29 parent 13ee4628ce68d1e54df01cc31239c8887c59e65d author Albert Lee Sat, 25 Mar 2006 17:41:43 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:53 -0500 [PATCH] libata-dev: Remove atapi_packet_task() atapi_packet_task() was replaced by ata_pio_task(). Remove the unused atapi_packet_task(). Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 13ee4628ce68d1e54df01cc31239c8887c59e65d tree 7d77a0b9e45b437c112d66d4968d5ae24a77e3cf parent cf2f7689f94ee02e52d5331bc1a87421a67a882c author Albert Lee Sat, 25 Mar 2006 17:39:34 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:53 -0500 [PATCH] libata-dev: Fix merge problem with upstream Fix merge problem with upstream. Changes: 1. add missing dev->cdb_len = 16 for ATA devices 2. use ata_pio_task instead of atapi_packet_task Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit cf2f7689f94ee02e52d5331bc1a87421a67a882c tree a356e551197ecc9852d5678cbff554119843440c parent 4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99 author Albert Lee Sat, 25 Mar 2006 17:37:53 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:53 -0500 [PATCH] libata-dev: Remove trailing whitespaces Remove trailing whitespaces. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 9cfda2c94df61c9f859b474abe774c65a4464d0a tree d6fa93519c2182f89d36c59dd9176dec264e8594 parent 5d5d7727a8cde78f798ecf04bac8031eff536f9d author Andi Kleen Mon, 27 Mar 2006 02:24:32 -0500 committer Len Brown Mon, 27 Mar 2006 02:33:00 -0500 [ACPI] fix "nolapic" flag in ACPI mode Signed-off-by: Len Brown commit 4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99 tree c4ff89dc09abe69d58db1e14da22ecda9fdd3ce8 parent 84ac69e8bf9f36eb0166817373336d14fa58f5cc parent aec5c3c1a929d7d79a420e943285cf3ba26a7c0d author Jeff Garzik Fri, 24 Mar 2006 12:29:39 -0500 committer Jeff Garzik Fri, 24 Mar 2006 12:29:39 -0500 Merge branch 'upstream' Conflicts: drivers/scsi/libata-core.c commit 84ac69e8bf9f36eb0166817373336d14fa58f5cc tree 46325313df2311680c8e11a828c243f5dccb3407 parent 11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e author Jeff Garzik Fri, 24 Mar 2006 09:27:49 -0500 committer Jeff Garzik Fri, 24 Mar 2006 09:27:49 -0500 [libata] irq-pio: fix build breakage commit 11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e tree b01421cb139b11065d776ed361a7a12b3a1aecc9 parent 54da9a3968448681d0ddf193ec90f2480c5cba1c parent 2cc432eed0491df66e14b578139bba2c75fb3f9a author Jeff Garzik Fri, 24 Mar 2006 09:24:04 -0500 committer Jeff Garzik Fri, 24 Mar 2006 09:24:04 -0500 Merge branch 'upstream' Conflicts: drivers/scsi/sata_vsc.c commit 200d5a7684cc49ef4be40e832daf3f217e70dfbb tree 44f51433004ed93a750342c3216bdda1c864b1fc parent 949ec2c8e6b7b89179b85baf6309c009e1a1b951 author Tejun Heo Wed, 15 Feb 2006 16:24:49 +0900 committer Jeff Garzik Wed, 22 Mar 2006 07:47:42 -0500 [PATCH] libata: increase LBA48 max sectors to 65535 max_hw_sectors/max_sectors separation patch made into the tree, increase max_sectors to its hardware limit. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 54da9a3968448681d0ddf193ec90f2480c5cba1c tree 69fdbaf8fb9cc61629e191b158a51073bd0c83fb parent 46e202ec1feeac3cb722cd3410d62a9a00891388 parent 2f7ccc51db9f10ed2eaa4cd1777181972a23754e author Jeff Garzik Sat, 11 Mar 2006 20:07:36 -0500 committer Jeff Garzik Sat, 11 Mar 2006 20:07:36 -0500 Merge branch 'upstream' commit 46e202ec1feeac3cb722cd3410d62a9a00891388 tree 158643d029b35d0ae7c10b52d522c516d80a3a8a parent ce1e7a2ac721eb9d825b63f74752d0c9e0c635c2 author Jeff Garzik Sat, 11 Mar 2006 19:25:47 -0500 committer Jeff Garzik Sat, 11 Mar 2006 19:25:47 -0500 libata: irq-pio build fixes commit ce1e7a2ac721eb9d825b63f74752d0c9e0c635c2 tree a7c0d18d6486734dffb9498e30db5b226b6e23bf parent c2956a3b0d1c17b38da369811a6ce93eb7a01a04 parent 75deb6fa985bd3162b9472f1fc394e23294da816 author Jeff Garzik Sat, 11 Mar 2006 19:21:17 -0500 committer Jeff Garzik Sat, 11 Mar 2006 19:21:17 -0500 Merge branch 'upstream' commit c2956a3b0d1c17b38da369811a6ce93eb7a01a04 tree 4b70c386afe2547908a8f03f0746ff614eb393e0 parent 801c63c38ae52e8bfb3f6518de00a0be22c55f9a author Albert Lee Fri, 03 Mar 2006 10:34:05 +0800 committer Jeff Garzik Fri, 03 Mar 2006 12:19:43 -0500 [PATCH] libata-dev: recognize WRITE_MULTI_FUA_EXT for r/w multiple Recognize ATA_CMD_WRITE_MULTI_FUA_EXT as r/w multiple commands. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 801c63c38ae52e8bfb3f6518de00a0be22c55f9a tree bb7b9539f2f2b8077a04c2df3b60ac8cc8fa692d parent 1ed82ae3df3882bfcb5bfe5e9f97e4e8e23af299 parent 348edc59a8f9b9a66700781d972c24a46a79ae86 author Jeff Garzik Fri, 03 Mar 2006 12:16:03 -0500 committer Jeff Garzik Fri, 03 Mar 2006 12:16:03 -0500 Merge branch 'upstream' commit 1ed82ae3df3882bfcb5bfe5e9f97e4e8e23af299 tree 7f30dbdccd6c28aa4e8f2c9edb7813a7ae78097b parent 11fff8287fdaeb700df79aa8253650b60c7b21e2 parent cccc65a3b60edaf721cdee5a14f68ba009341822 author Jeff Garzik Mon, 27 Feb 2006 11:51:52 -0500 committer Jeff Garzik Mon, 27 Feb 2006 11:51:52 -0500 Merge branch 'upstream' commit 11fff8287fdaeb700df79aa8253650b60c7b21e2 tree a0b695f44810b4cf8c4b3f81dd25811a10871003 parent a5fd79ccd60b7c9cc0221dfaaa950933eff6af99 parent f131883e73a8662dc92c3ea371ae9ded0c8f2c37 author Jeff Garzik Mon, 20 Feb 2006 16:56:08 -0500 committer Jeff Garzik Mon, 20 Feb 2006 16:56:08 -0500 Merge branch 'upstream' commit a5fd79ccd60b7c9cc0221dfaaa950933eff6af99 tree b227d75acaa3c3c45a82a0ee536a8723452e62ab parent ff607748590fba14aecedb0d50edc4ada98d4302 author Jeff Garzik Mon, 20 Feb 2006 05:21:14 -0500 committer Jeff Garzik Mon, 20 Feb 2006 05:21:14 -0500 sata_vsc build fix commit ff607748590fba14aecedb0d50edc4ada98d4302 tree 986e0a3abe922713069a8e8bc913043fed89a39a parent db024d5398cd332023896caf70530564b15ec88e parent 6aff8f1f07a7fff48121d1ad4a550f3af24ccc81 author Jeff Garzik Mon, 20 Feb 2006 05:13:31 -0500 committer Jeff Garzik Mon, 20 Feb 2006 05:13:31 -0500 Merge branch 'upstream' commit db024d5398cd332023896caf70530564b15ec88e tree 3d222d99f9264fdc66e7c7ad982d33b42d566c72 parent 3875e1945b55f0eb83fe7359614a801eeb716761 author Jeff Garzik Mon, 13 Feb 2006 00:23:57 -0500 committer Jeff Garzik Mon, 13 Feb 2006 00:23:57 -0500 [libata] build fix after cdb_len move commit 3875e1945b55f0eb83fe7359614a801eeb716761 tree 4567aef3fb7d081cb7d7b7c9bcd94e0e44d39557 parent 587005de144acd3007b8e7f2a2a7c6add157c155 parent f1b318793dcd2d9ff6b5ac06e7762098fa079cee author Jeff Garzik Mon, 13 Feb 2006 00:13:48 -0500 committer Jeff Garzik Mon, 13 Feb 2006 00:13:48 -0500 Merge branch 'upstream' commit 587005de144acd3007b8e7f2a2a7c6add157c155 tree edc973e8d9d44a2a2ebc8695f4adda8becd25118 parent 1cb9d721d9df9182a42d1ff59427a100c6522efc author Jeff Garzik Sat, 11 Feb 2006 18:17:32 -0500 committer Jeff Garzik Sat, 11 Feb 2006 18:17:32 -0500 [libata irq-pio] s/assert/WARN_ON/ commit 1cb9d721d9df9182a42d1ff59427a100c6522efc tree 3c7d47828f89853de49e979f97ffe78fd1dba7d6 parent ca7d5e42d783e54f0057317c9226262d68ab7717 parent bef4a456b8dc8b3638f4d49a25a89e1467da9483 author Jeff Garzik Sat, 11 Feb 2006 18:02:04 -0500 committer Jeff Garzik Sat, 11 Feb 2006 18:02:04 -0500 Merge branch 'upstream' commit ca7d5e42d783e54f0057317c9226262d68ab7717 tree 209751546842e1200bfbd2fd5144e1727ab18c86 parent a0819750024a0056d760a936d72f76882a7e393f parent cc9278ed5e992122a654a3f762561ee5e013810f author Jeff Garzik Fri, 10 Feb 2006 07:09:37 -0500 committer Jeff Garzik Fri, 10 Feb 2006 07:09:37 -0500 Merge branch 'upstream' commit a0819750024a0056d760a936d72f76882a7e393f tree 4d3e5a22b13e5a8ac3553fca1cedd9c689235138 parent 41232d3ecac9df8eb94ff27330eb84b8baccc6b7 parent 1fdffbce0332b3e00993d741e76935e7f4f0d40f author Jeff Garzik Thu, 09 Feb 2006 05:15:47 -0500 committer Jeff Garzik Thu, 09 Feb 2006 05:15:47 -0500 Merge branch 'upstream' commit 41232d3ecac9df8eb94ff27330eb84b8baccc6b7 tree e10e3b23dbb12c021270c8026c52abc7d0fe14c0 parent 2ddd1023d2ccde0b330338c48ab898b153f37712 author Jeff Garzik Thu, 09 Feb 2006 04:52:55 -0500 committer Jeff Garzik Thu, 09 Feb 2006 04:52:55 -0500 [libata] build fix after merging some pre-packet_task-removal code commit 2ddd1023d2ccde0b330338c48ab898b153f37712 tree 7f4f99bb6af63d638c1fcbc482c07f3908ffaf99 parent 99b3738fbf17208ac474420fa6b7e4b0c0c2b9ed parent 389984cb75a5d26aa6ee9724c343bbd130cb3eec author Jeff Garzik Thu, 09 Feb 2006 04:31:08 -0500 committer Jeff Garzik Thu, 09 Feb 2006 04:31:08 -0500 Merge branch 'upstream' commit 99b3738fbf17208ac474420fa6b7e4b0c0c2b9ed tree 6f977546112ccbd617ef40ae38a1ca558d71bce9 parent 332b5a52f2f96bc2d13bbe594a430318c0ee4425 parent 8a19ac89edbe9b702c10fd2039b8cb2db4644a5f author Jeff Garzik Thu, 09 Feb 2006 04:28:13 -0500 committer Jeff Garzik Thu, 09 Feb 2006 04:28:13 -0500 Merge branch 'upstream' commit 332b5a52f2f96bc2d13bbe594a430318c0ee4425 tree 6dd2a6c2689a1e0b848a90599c27270456ab69a3 parent 555a8965069b8e34292cbccc3ad8f619b96815fe author Albert Lee Wed, 08 Feb 2006 16:51:34 +0800 committer Jeff Garzik Thu, 09 Feb 2006 04:26:13 -0500 [PATCH] libata-dev: Minor comment fix Signed-off-by: Albert Lee === Signed-off-by: Jeff Garzik commit 555a8965069b8e34292cbccc3ad8f619b96815fe tree 4e28970fa7b2abea9507ca4c19ef3a0baac23ca4 parent 20ea079e5883ab2b82fa5e576957f52e4e5c252c author Albert Lee Wed, 08 Feb 2006 16:50:29 +0800 committer Jeff Garzik Thu, 09 Feb 2006 04:26:13 -0500 [PATCH] libata-dev: Use new AC_ERR_* flags - Use new AC_ERR_* flags as done in Tejun's patches - In ata_qc_timeout(), replace ac_err_mask(drv_stat) with AC_ERR_TIMEOUT. This makes time out handler always report error to upper layer. Otherwise if the drv_stat looks good, libata might falsely report OK to the upper layer. Signed-off-by: Albert Lee === Signed-off-by: Jeff Garzik commit 20ea079e5883ab2b82fa5e576957f52e4e5c252c tree b29d55ec3c4e4df846914365ad0c5a7eecbb2408 parent aef9d533da2eb7a5700a8c8700f2597c35cc50d1 author Albert Lee Wed, 08 Feb 2006 16:48:49 +0800 committer Jeff Garzik Thu, 09 Feb 2006 04:26:12 -0500 [PATCH] libata-dev: Use new ata_queue_pio_task() for PIO polling task - Use new ata_queue_pio_task() for PIO polling task. - Remove the unused ata_queue_packet_task() function. (irq-pio had merged the 2 queues into one.) Signed-off-by: Albert Lee === Signed-off-by: Jeff Garzik commit aef9d533da2eb7a5700a8c8700f2597c35cc50d1 tree fffe44eb7b843dafd101b3dee6b99330086ddaec parent f6ef65e6d004b77d516037424c7ccc209d0d3509 author Albert Lee Wed, 08 Feb 2006 16:37:43 +0800 committer Jeff Garzik Thu, 09 Feb 2006 04:26:12 -0500 [PATCH] libata-dev: Fix array index value in ata_rwcmd_protocol() Signed-off-by: Albert Lee === Signed-off-by: Jeff Garzik commit d52bb94d56676acd9bdac8e097257a87b4b1b2e1 tree f8b2d60d74eeb045860983ebeb1696869973ac6e parent c52851b60cc0aaaf974ff0e49989fb698220447d author Venkatesh Pallipadi Wed, 14 Dec 2005 15:05:00 -0500 committer Len Brown Thu, 09 Feb 2006 03:21:49 -0500 Enable P-state software coordination via _PDC http://bugzilla.kernel.org/show_bug.cgi?id=5737 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit c52851b60cc0aaaf974ff0e49989fb698220447d tree 37870e68caedb1a732833cd8868de28bbf97b8c4 parent 09b4d1ee881c8593bfad2a42f838d85070365c3e author Venkatesh Pallipadi Wed, 14 Dec 2005 15:05:00 -0500 committer Len Brown Thu, 09 Feb 2006 03:21:49 -0500 P-state software coordination for speedstep-centrino http://bugzilla.kernel.org/show_bug.cgi?id=5737 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 09b4d1ee881c8593bfad2a42f838d85070365c3e tree 7576d293ed3d14efcde7b88dcc352041c7dce7d1 parent 3b2d99429e3386b6e2ac949fc72486509c8bbe36 author Venkatesh Pallipadi Wed, 14 Dec 2005 15:05:00 -0500 committer Len Brown Thu, 09 Feb 2006 03:21:49 -0500 P-state software coordination for acpi-cpufreq http://bugzilla.kernel.org/show_bug.cgi?id=5737 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 3b2d99429e3386b6e2ac949fc72486509c8bbe36 tree b2162152b2c7fa56b13f74a0b166b978dd3ee548 parent 0bdd340c092b0936f78a54bdbd3927463ed4fca3 author Venkatesh Pallipadi Wed, 14 Dec 2005 15:05:00 -0500 committer Len Brown Thu, 09 Feb 2006 03:21:48 -0500 P-state software coordination for ACPI core http://bugzilla.kernel.org/show_bug.cgi?id=5737 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit ffd642e748c867a7339b57225b8bf8b9a0dcd9c5 tree 4e924eab664b99c87a59e4603f60c5002901ccbb parent 0bdd340c092b0936f78a54bdbd3927463ed4fca3 author David Shaohua Li Wed, 08 Feb 2006 17:35:00 -0500 committer Len Brown Thu, 09 Feb 2006 00:38:04 -0500 [ACPI] enable SMP C-states on x86_64 http://bugzilla.kernel.org/show_bug.cgi?id=5653 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit f6ef65e6d004b77d516037424c7ccc209d0d3509 tree 394bac3559237abb94be5051828b3e45315d6489 parent 7103c7bc863c10dd2a26c19c8cf4d7d2846da947 parent c19ba8af4f104cca28d548cac55c128b28dd31fb author Jeff Garzik Fri, 27 Jan 2006 02:45:00 -0500 committer Jeff Garzik Fri, 27 Jan 2006 02:45:00 -0500 Merge branch 'upstream-2.6.17' commit 7103c7bc863c10dd2a26c19c8cf4d7d2846da947 tree 73a9d674670c37e4f160c0d4553f3d14664900be parent b4d28889f7ebfe498dedaceb773b4c785b97d195 parent a72ec4ce6d3ae92e76baf5b2c65cc26e5e775e83 author Jeff Garzik Fri, 27 Jan 2006 02:39:25 -0500 committer Jeff Garzik Fri, 27 Jan 2006 02:39:25 -0500 Merge branch 'tmp' commit b4d28889f7ebfe498dedaceb773b4c785b97d195 tree 7ac1070f4c956d035f40cc3b381b5868b980fafa parent 7dfb869c8e45e5863534f38fdac990829b22964a parent 041c5fc33cb7ed4fe5322585a611fb6e29a05d3a author Jeff Garzik Fri, 27 Jan 2006 02:37:46 -0500 committer Jeff Garzik Fri, 27 Jan 2006 02:37:46 -0500 Merge branch 'tmp' commit 7dfb869c8e45e5863534f38fdac990829b22964a tree f36bbdba46b022356d05ac26d5073e395d2f8abd parent 628e386e27674906326455f01d87878a5f0cbce7 parent 11a56d2439259892319df81cf1582687d7e7fde5 author Jeff Garzik Fri, 27 Jan 2006 02:36:14 -0500 committer Jeff Garzik Fri, 27 Jan 2006 02:36:14 -0500 Merge branch 'tmp' commit 628e386e27674906326455f01d87878a5f0cbce7 tree 932163636366f5dcd6f9b3ee90a37fe0f21285b0 parent 8dd2e3bd57c3b389febba1de6b10372ef507f985 parent 77853bf2b48e34449e826a9ef4df5ea0dbe947f4 author Jeff Garzik Fri, 27 Jan 2006 02:29:20 -0500 committer Jeff Garzik Fri, 27 Jan 2006 02:29:20 -0500 Merge branch 'tmp' commit 8dd2e3bd57c3b389febba1de6b10372ef507f985 tree 1fdb120ec9c0c81f8f2a9452ae6c225d68aed5e3 parent 2af5920b81a4cd0a22d40b6b2c38356d3df03e13 parent 71e834f563799e09c6bd7d6638993b464fac26f5 author Jeff Garzik Fri, 27 Jan 2006 02:26:46 -0500 committer Jeff Garzik Fri, 27 Jan 2006 02:26:46 -0500 Merge branch 'tmp' commit 2af5920b81a4cd0a22d40b6b2c38356d3df03e13 tree 7ee66d514e394f70f12a608548487353d506215d parent 000080c3499cd5037e60c08a8053efb9e48aa9c0 parent 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 author Jeff Garzik Fri, 27 Jan 2006 02:20:42 -0500 committer Jeff Garzik Fri, 27 Jan 2006 02:20:42 -0500 Merge branch 'master' commit 000080c3499cd5037e60c08a8053efb9e48aa9c0 tree 9b3534675d986ad1d2982bc78a93f1a3912d61bc parent a4f16610081001640ffe0314024bc31c10f69757 author Albert Lee Mon, 26 Dec 2005 16:48:00 +0800 committer Jeff Garzik Tue, 17 Jan 2006 19:55:03 -0500 [PATCH] libata-dev: filter out noisy ATAPI error messages Changes: - Filter out ATAPI packet command error messages in ata_pio_error() - Filter out ATAPI packet command error messages in ata_host_intr() Signed-off-by: Albert Lee ====== Signed-off-by: Jeff Garzik commit a4f16610081001640ffe0314024bc31c10f69757 tree ed2586027ef02a9d195dd00e5c61ab1728afee24 parent ea9b395fe20ac74be788f415af2622ac8f0c35c7 author Albert Lee Mon, 26 Dec 2005 16:40:53 +0800 committer Jeff Garzik Tue, 17 Jan 2006 19:55:03 -0500 [PATCH] libata-dev: determine err_mask when error is found Changes: - Determine err_mask directly when an error is found. - Remove "qc->err_mask |= __ac_err_mask(status);" in ata_host_intr() Signed-off-by: Albert Lee ============ Signed-off-by: Jeff Garzik commit ea9b395fe20ac74be788f415af2622ac8f0c35c7 tree d1653e1a4cbe360aa7132ea4e29ab92a02038224 parent 61420e147a706ee7c7a902008045547fb2a2a330 parent 1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 author Jeff Garzik Tue, 17 Jan 2006 10:29:06 -0500 committer Jeff Garzik Tue, 17 Jan 2006 10:29:06 -0500 Merge branch 'upstream' commit 61420e147a706ee7c7a902008045547fb2a2a330 tree c5739fe1feac05cac49c96107138520c65f8f657 parent 3d0a59c02303df01848537b3bf938dc11e9a0ded parent a18ceba7b40e24a9da87249bd74f16ea5abd6894 author Jeff Garzik Tue, 03 Jan 2006 11:00:06 -0500 committer Jeff Garzik Tue, 03 Jan 2006 11:00:06 -0500 Merge branch 'upstream' commit 3d0a59c02303df01848537b3bf938dc11e9a0ded tree 69740a2e39a805ec1318253c2349c09cdf6da9cc parent 36dfc3f67b3054e6bbc5344256461802aa5d6257 author Jeff Garzik Tue, 13 Dec 2005 22:28:19 -0500 committer Jeff Garzik Tue, 13 Dec 2005 22:28:19 -0500 [libata sata_promise] irq_pio: fix merge bug commit 36dfc3f67b3054e6bbc5344256461802aa5d6257 tree 760f07b428964b0c0961deabe2f2bb0f54155142 parent e8b09428482deff1a9d7a36d371acee364182ec3 parent c6329f4df2263ab5a40601a5236639e61b682f51 author Jeff Garzik Tue, 13 Dec 2005 22:22:50 -0500 committer Jeff Garzik Tue, 13 Dec 2005 22:22:50 -0500 Merge branch 'upstream' commit e8b09428482deff1a9d7a36d371acee364182ec3 tree d6494c2681ac7f0ca0b267a8ac80f2d23102758c parent d1397f837647d8b6b3c9253a7e713d203f3cbb26 parent e508a391a0705f770ef1c4f1c304678b0e8e4fe8 author Jeff Garzik Tue, 13 Dec 2005 02:32:01 -0500 committer Jeff Garzik Tue, 13 Dec 2005 02:32:01 -0500 Merge branch 'upstream' commit d1397f837647d8b6b3c9253a7e713d203f3cbb26 tree 0bfe939169987703e63f3624d5dbb38938253760 parent 278efe950988e72e2d0cea35059438fc27035d13 parent d00d598ffbba974d9045ba8b95296655fe2162c5 author Jeff Garzik Tue, 13 Dec 2005 01:47:05 -0500 committer Jeff Garzik Tue, 13 Dec 2005 01:47:05 -0500 Merge branch 'upstream' commit 278efe950988e72e2d0cea35059438fc27035d13 tree 76096041fa7eeb2b6ecd5dcc8207012952d2bbc2 parent 701db69d6647f61e4660c9102d7f2fd5dffc203d author Jeff Garzik Tue, 06 Dec 2005 05:01:27 -0500 committer Jeff Garzik Tue, 06 Dec 2005 05:01:27 -0500 [libata] irq-pio: fix breakage related to err_mask merge commit 701db69d6647f61e4660c9102d7f2fd5dffc203d tree e3ebe94f72b4bbdfad608d77d7b11719022b8c9b parent 6cf5bcaaf9a92225017f7a3f1a630f6b5147ad4a parent fe79e683ccdb29c13b3e0d18507474b4e2d9aab6 author Jeff Garzik Tue, 06 Dec 2005 04:52:48 -0500 committer Jeff Garzik Tue, 06 Dec 2005 04:52:48 -0500 Merge branch 'upstream' commit 6cf5bcaaf9a92225017f7a3f1a630f6b5147ad4a tree bf5fead8ac5333346b17d34a1d2f8f9d5dc608be parent 6fc88198961141c2d9d34cde0855fb2e85ea3382 parent 436b0f76f2cee6617f27a649637766628909dd5d author Jeff Garzik Tue, 06 Dec 2005 04:14:25 -0500 committer Jeff Garzik Tue, 06 Dec 2005 04:14:25 -0500 Merge branch 'master' commit 6fc88198961141c2d9d34cde0855fb2e85ea3382 tree 8b8919de6277e77763b7a584fe2b2867c96cefd0 parent 5f3fdeb6242d84126e4bd45ac9e2246833fe8352 parent 5666c0947ede0432ba5148570aa66ffb9febff5b author Jeff Garzik Thu, 01 Dec 2005 01:59:38 -0500 committer Jeff Garzik Thu, 01 Dec 2005 01:59:38 -0500 Merge branch 'master' commit 5f3fdeb6242d84126e4bd45ac9e2246833fe8352 tree 011ff83db06c9d42c72544e8c10c06c978ba88ce parent 98a5d024eb589a863c1c79f3c3f8ecb666c0eec9 parent b71d4da092801634d04190693a38ca03bdbe2505 author Jeff Garzik Tue, 29 Nov 2005 03:57:29 -0500 committer Jeff Garzik Tue, 29 Nov 2005 03:57:29 -0500 Merge branch 'upstream' commit 98a5d024eb589a863c1c79f3c3f8ecb666c0eec9 tree 456799ad9fce41cdb2186ba3872c7a077ec3bd05 parent d67e7ebb2a15bf0429c55f2fc1c4b02808367874 parent 1b15688b31d8c88881102426279e8cc03953860b author Jeff Garzik Sun, 20 Nov 2005 00:41:18 -0500 committer Jeff Garzik Sun, 20 Nov 2005 00:41:18 -0500 Merge branch 'upstream' commit d67e7ebb2a15bf0429c55f2fc1c4b02808367874 tree 069547c95e376312fc0e7a51637a7a3c2a7c5c50 parent f333b3f111e9db76109e304df8ee777ace7fbf86 author Jeff Garzik Fri, 18 Nov 2005 11:55:00 -0500 committer Jeff Garzik Fri, 18 Nov 2005 11:55:00 -0500 [libata sata_mv] IRQ PIO build fix commit f333b3f111e9db76109e304df8ee777ace7fbf86 tree ce9a74a7327020c48c80d278e1db5f12552f0fb0 parent f4256e301d9800b1e0276404cb01b3ac85b51067 parent 79bfb0a98fdc73ed6a18469cef245cbf50a1d8bb author Jeff Garzik Fri, 18 Nov 2005 11:44:17 -0500 committer Jeff Garzik Fri, 18 Nov 2005 11:44:17 -0500 Merge branch 'upstream' commit f4256e301d9800b1e0276404cb01b3ac85b51067 tree 975f56627b78f757608b31684311a24ca1478481 parent fb2a26b9f8f5eda6b96ba9753edf105e5999d6d9 parent cd52d1ee9a92587b242d946a2300a3245d3b885a author Jeff Garzik Fri, 11 Nov 2005 23:39:35 -0500 committer Jeff Garzik Fri, 11 Nov 2005 23:39:35 -0500 Merge branch 'master' commit fb2a26b9f8f5eda6b96ba9753edf105e5999d6d9 tree 9019fb641794f0a3962d45621e6e5ffb0a8acaf6 parent 07f6f7d074e68d56d82e7cc5c65096033ac8dc56 parent 7c3983357fdaef3ae71a0d7081a4b6dcfd869d39 author Jeff Garzik Wed, 09 Nov 2005 01:35:03 -0500 committer Jeff Garzik Wed, 09 Nov 2005 01:35:03 -0500 Merge branch 'upstream' commit 07f6f7d074e68d56d82e7cc5c65096033ac8dc56 tree d420722be7721691e5c56dc5a0ff326e926a58e6 parent fbcdd80b0d5bde06f3483b9a13f9599a0452431c author Albert Lee Tue, 01 Nov 2005 19:33:20 +0800 committer Jeff Garzik Wed, 09 Nov 2005 01:22:19 -0500 [PATCH] libata irq-pio: add read/write multiple support - add is_multi_taskfile() to ata.h - initialize ata_device->multi_count with device identify data - use ata_pio_sectors() to support r/w multiple commands Signed-off-by: Albert Lee ======== Signed-off-by: Jeff Garzik commit fbcdd80b0d5bde06f3483b9a13f9599a0452431c tree d0fa83e2c4fc52fe44940524843a53b864f35adc parent e27486db89ef04d5df1727c52362fa3d50cff241 author Albert Lee Tue, 01 Nov 2005 19:30:05 +0800 committer Jeff Garzik Wed, 09 Nov 2005 01:22:19 -0500 [PATCH] libata irq-pio: eliminate unnecessary queuing in ata_pio_first_block() - change the return value of ata_pio_complete() 0 <-> 1 - add return value for ata_pio_first_block() - rename variable "qc_completed" to "has_next" in ata_pio_task() - use has_next to eliminate unnecessary queuing in ata_pio_first_block() Signed-off-by: Albert Lee ========== Signed-off-by: Jeff Garzik commit e27486db89ef04d5df1727c52362fa3d50cff241 tree cd78598ac47f541f51b5d729ea9cf31bdfa10e56 parent 467b16d4bebe8d251ca974eaa5da50b315206e9d author Albert Lee Tue, 01 Nov 2005 19:24:49 +0800 committer Jeff Garzik Wed, 09 Nov 2005 01:22:19 -0500 [PATCH] libata irq-pio: merge the ata_dataout_task workqueue with ata_pio_task workqueue - remove ap->dataout_task from struct ata_port - let ata_pio_task() handle the HSM_ST_FIRST state. - rename ata_dataout_task() to ata_pio_first_block() - replace the ata_dataout_task workqueue with ata_pio_task workqueue Signed-off-by: Albert Lee ======== Signed-off-by: Jeff Garzik commit 467b16d4bebe8d251ca974eaa5da50b315206e9d tree b9e2892e19e52f5889b16b14b1463958a900f51f parent c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83 author Albert Lee Tue, 01 Nov 2005 19:19:01 +0800 committer Jeff Garzik Wed, 09 Nov 2005 01:22:19 -0500 [PATCH] libata irq-pio: misc fixes - ata_pio_block(): add ata_altstatus(ap) to prevent reading device status before it is valid - remove the unnecessary HSM_ST_IDLE state from ata_pio_task() - raise BUG() when unknown state is found in ata_pio_task() Signed-off-by: Albert Lee ============ Signed-off-by: Jeff Garzik commit c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83 tree 1185ddc2c4cea1c4da09d6b83893f91aefe7cd3d parent 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 parent 8e8b77dd4846b73f2e0756cf59123ee709246d11 author Jeff Garzik Wed, 09 Nov 2005 01:20:26 -0500 committer Jeff Garzik Wed, 09 Nov 2005 01:20:26 -0500 Merge branch 'upstream' commit 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 tree 41758e4da78f94a20813554ef9f5ed9b323a4f8c parent cd8200e6d4f9f05e6ea48f7c000be890337396ac parent 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab author Jeff Garzik Sat, 05 Nov 2005 15:44:02 -0500 committer Jeff Garzik Sat, 05 Nov 2005 15:44:02 -0500 Merge branch 'master' commit cd8200e6d4f9f05e6ea48f7c000be890337396ac tree 2542b1bca535526750e5e1978091beebf4cf282b parent 122401ce39faab22b29eb11b20e4342f7f566b1b parent 005a5a06a6dd13a0ca3f2c6a0218e8d94ed36d8a author Jeff Garzik Sun, 30 Oct 2005 23:35:23 -0500 committer Jeff Garzik Sun, 30 Oct 2005 23:35:23 -0500 Merge branch 'upstream' commit 122401ce39faab22b29eb11b20e4342f7f566b1b tree e164f8fa5decc4b7182e7d66b1634c7fd43b9f7f parent 94ec1ef1cf29e137e5c79372e432b040c6604be6 parent 6e9d6b8ee4e0c37d3952256e6472c57490d6780d author Jeff Garzik Sun, 30 Oct 2005 20:25:28 -0500 committer Jeff Garzik Sun, 30 Oct 2005 20:25:28 -0500 Merge branch 'master' commit 94ec1ef1cf29e137e5c79372e432b040c6604be6 tree dde896c04e1684489f2019a527ee0c3fb0892c0c parent fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0 author Jeff Garzik Sun, 30 Oct 2005 02:15:08 -0500 committer Jeff Garzik Sun, 30 Oct 2005 02:15:08 -0500 [libata pdc_adma] fix for new irq-driven PIO code commit fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0 tree cba2597077cf33d122f8d771bf84618cc5374cf6 parent 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 parent 81cfb8864c73230eb1c37753aba517db15cf4d8f author Jeff Garzik Sun, 30 Oct 2005 01:58:41 -0500 committer Jeff Garzik Sun, 30 Oct 2005 01:58:41 -0500 Merge branch 'upstream' commit 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 tree e65562d7300ac653207b1e45ec7e5960ddf78fff parent be697c3f137c9ed808753bbbc5d7751c6e5303fc parent 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e author Jeff Garzik Fri, 28 Oct 2005 12:30:16 -0400 committer Jeff Garzik Fri, 28 Oct 2005 12:30:16 -0400 Merge branch 'master' commit be697c3f137c9ed808753bbbc5d7751c6e5303fc tree b9b71ffe318ea3668a5bf0ed8d1db9cf18a54698 parent 4e0e329d9a2011f9f7a7c0a378dc3bff7b0a0283 author Jeff Garzik Tue, 18 Oct 2005 21:27:34 -0400 committer Jeff Garzik Tue, 18 Oct 2005 21:27:34 -0400 [libata pdc_adma] update for removal of ATA_FLAG_NOINTR commit 4e0e329d9a2011f9f7a7c0a378dc3bff7b0a0283 tree a802614e01460631c694dfa118642d54c3d5fc79 parent e33b9dfa3008fcaa908dc0c8c472a812c400f839 parent 59a10b172fccaea793352c00fd9065f0a5b4ef70 author Jeff Garzik Tue, 18 Oct 2005 21:23:11 -0400 committer Jeff Garzik Tue, 18 Oct 2005 21:23:11 -0400 Merge branch 'upstream' commit e33b9dfa3008fcaa908dc0c8c472a812c400f839 tree 4a4f65a5ca0407ce67dd822047a687d2cdb431f3 parent 91b8b3132e1870bfe3c4d3a999f13f20fc4e9726 author Jeff Garzik Sun, 09 Oct 2005 09:51:46 -0400 committer Jeff Garzik Sun, 09 Oct 2005 09:51:46 -0400 [libata irq-pio] build fix commit 91b8b3132e1870bfe3c4d3a999f13f20fc4e9726 tree adc98107179591d18490e407da4f3e86145ccc6a parent 083958d313f886dc7d00522f2972f90f55c40041 author Albert Lee Sun, 09 Oct 2005 09:48:44 -0400 committer Jeff Garzik Sun, 09 Oct 2005 09:48:44 -0400 [libata irq-pio] use PageHighMem() to optimize the kmap_atomic() usage as done in ide-scsi.c Signed-off-by: Albert Lee commit 083958d313f886dc7d00522f2972f90f55c40041 tree 1cc709fc4a4c2441cff1ce29b13a4d5e57a238dc parent 7282aa4b49d08254ff1dcefdf3a2fb01b02ebbe2 author Albert Lee Sun, 09 Oct 2005 09:47:31 -0400 committer Jeff Garzik Sun, 09 Oct 2005 09:47:31 -0400 [libata irq-pio] reorganize "buf + offset" in ata_pio_sector() and __atapi_pio_bytes() - relocate DPRINTK("data %s\n", qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read"); - buf + offset, buf - offset tidy up Signed-off-by: Albert Lee commit 7282aa4b49d08254ff1dcefdf3a2fb01b02ebbe2 tree 37cba0515abcbf19190acd58f4a74227050a5b4d parent f58f8be7f65312f602f7970e7da47a6413e692b0 author Albert Lee Sun, 09 Oct 2005 09:46:07 -0400 committer Jeff Garzik Sun, 09 Oct 2005 09:46:07 -0400 [libata irq-pio] reorganize ata_pio_sector() and __atapi_pio_bytes() - move some code out of the kmap_atomic() / kunmap_atomic() zone - remove the redundant "do_write = (qc->tf.flags & ATA_TFLAG_WRITE);" Signed-off-by: Albert Lee commit f58f8be7f65312f602f7970e7da47a6413e692b0 tree f60cc040deebceea1b44082dc713e95687d8527f parent c71c18576d0d8aa4db876c737c3c597c724cf02f parent e710245bb0f980adfb1dfe850e43761a8117c6be author Jeff Garzik Sun, 09 Oct 2005 09:44:07 -0400 committer Jeff Garzik Sun, 09 Oct 2005 09:44:07 -0400 Merge branch 'upstream' commit c71c18576d0d8aa4db876c737c3c597c724cf02f tree f485f9f6491275eded41098a09eaf16ac43f3afc parent 0fbbbf2bde4da5cb01a949c3d7b21c0627f520a8 author Albert Lee Tue, 04 Oct 2005 06:03:45 -0400 committer Jeff Garzik Tue, 04 Oct 2005 06:03:45 -0400 libata: move atapi_send_cdb() and ata_dataout_task() to be near ata_pio_*() functions commit 0fbbbf2bde4da5cb01a949c3d7b21c0627f520a8 tree f081ef10f3067b28a1ee316a8e7292eeda143419 parent 54f00389563c80fa1de250a21256313ba01ca07d parent 2b235826098bb653982894dfc3f70fd029f6c2e4 author Jeff Garzik Mon, 03 Oct 2005 19:48:49 -0400 committer Jeff Garzik Mon, 03 Oct 2005 19:48:49 -0400 Merge libata upstream (which includes C/H/S support) include irq-pio branch. Merge branch 'upstream' commit 54f00389563c80fa1de250a21256313ba01ca07d tree d8f0372ba782b902144f8efbaec6a38d439aad09 parent 86a7397cda08a65bc4f306e812c846e2437b5347 author Albert Lee Fri, 30 Sep 2005 19:14:19 +0800 committer Jeff Garzik Fri, 30 Sep 2005 07:21:06 -0400 [PATCH] libata irq-pio: cleanup ata_qc_issue_prot() ata_qc_issue_prot(): - cleanup and let the PIO data out case always go through the ata_dataout_task() codepath. (Previously for PIO data out case, 2 code pathes were used - irq case goes through ata_data_out_task() codepath. - polling case jumps over the HSM_ST_FIRST state and goes to HSM_ST and ata_pio_task() directly.) ata_dataout_task(): - rearrange the queue_work() code to handle the PIO data out + polling case. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 86a7397cda08a65bc4f306e812c846e2437b5347 tree 05b9153129a271737271066b6efc648a5639e1bc parent f9997be974be40e884e9e8157ded2f2f9aed454c author Albert Lee Fri, 30 Sep 2005 19:11:35 +0800 committer Jeff Garzik Fri, 30 Sep 2005 07:21:06 -0400 [PATCH] libata irq-pio: simplify if condition in ata_dataout_task() - Use if (qc->tf.protocol == ATA_PROT_PIO) instead of if(is_atapi_taskfile()) in ata_dataout_task() Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit f9997be974be40e884e9e8157ded2f2f9aed454c tree 3881cac4d9ac8758ac008054a5e9af88a7184bbf parent c56b14d2a3e32695e13cd49b417da889da744d1c author Albert Lee Fri, 30 Sep 2005 19:09:31 +0800 committer Jeff Garzik Fri, 30 Sep 2005 07:21:06 -0400 [PATCH] libata irq-pio: rename atapi_packet_task() and comments Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit c56b14d2a3e32695e13cd49b417da889da744d1c tree 271722df61c97bd213ad54ac088cd835c09d4d07 parent e50362eccd8809a224cda5f71714a088ba37b2ab author Albert Lee Fri, 30 Sep 2005 19:07:39 +0800 committer Jeff Garzik Fri, 30 Sep 2005 07:21:06 -0400 [PATCH] libata irq-pio: add comments and cleanup Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit e50362eccd8809a224cda5f71714a088ba37b2ab tree 762b753691ef8c4645efaa677b32c57fd33ecbc0 parent 312f7da2824c82800ee78d6190f12854456957af author Albert Lee Tue, 27 Sep 2005 17:39:50 +0800 committer Jeff Garzik Wed, 28 Sep 2005 12:07:13 -0400 [PATCH] libata: interrupt driven pio for LLD libata.h: libata-core: Add ATA_FLAG_PIO_POLLING flag for LLDs that expect interrupt for command completion only. sata_nv.c: sata_vsc.c: irq handler is wrapper around ata_host_intr(), can handle PIO interrupts. sata_promise.c: sata_sx4.c: sata_qstor.c: sata_mv.c: Private irq handler. Polling mode ATA_FLAG_PIO_POLLING used for compatibility. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 312f7da2824c82800ee78d6190f12854456957af tree 68b3b18a4ddd783a5c75dba688aabf2de0682fb3 parent 14be71f4c5c5ad1e222c5202ee6d234e9c8828b7 author Albert Lee Tue, 27 Sep 2005 17:38:03 +0800 committer Jeff Garzik Wed, 28 Sep 2005 12:07:13 -0400 [PATCH] libata: interrupt driven pio for libata-core - add PIO_ST_FIRST for the state before sending ATAPI CDB or sending "ATA PIO data out" first data block. - add ATA_TFLAG_POLLING and ATA_DFLAG_CDB_INTR flags - remove the ATA_FLAG_NOINTR flag since the interrupt handler is now aware of the states - modify ata_pio_sector() and atapi_pio_bytes() to work in the interrupt context - modify the ata_host_intr() to handle PIO interrupts - modify ata_qc_issue_prot() to initialize states - atapi_packet_task() changed to handle "ATA PIO data out" first data block - support the pre-ATA4 ATAPI device which raise interrupt when ready to receive CDB Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik