ChangeSet@1.2199.20.1, 2005-03-26 13:47:42-08:00, davem@sunset.davemloft.net Merge sunset.davemloft.net:/home/davem/src/BK/network-2.6 into sunset.davemloft.net:/home/davem/src/BK/net-2.6 ChangeSet@1.2226, 2005-03-26 13:45:09-08:00, geert@linux-m68k.org [PATCH] 3dfx DRM depends on PCI 3dfx DRM depends on PCI Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds ChangeSet@1.2225, 2005-03-26 13:44:52-08:00, geert@linux-m68k.org [PATCH] TPM depends on PCI TPM depends on PCI. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds ChangeSet@1.2224, 2005-03-26 13:44:35-08:00, geert@linux-m68k.org [PATCH] M68k: Add missing pieces of thread info TIF_MEMDIE support M68k: Add missing pieces of thread info TIF_MEMDIE support (introduced in 2.6.11-rc3) Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds ChangeSet@1.2223, 2005-03-26 13:44:17-08:00, geert@linux-m68k.org [PATCH] Mac NCR5380 SCSI: Fix bus error Mac NCR5380 SCSI: Fix bus error by passing the correct instance pointer to request_irq() Signed-off-by: Finn Thain Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds ChangeSet@1.2222, 2005-03-26 13:44:00-08:00, geert@linux-m68k.org [PATCH] M68k: IP checksum updates M68k: IP checksum updates: - ip_fast_csum() needs a "memory" constraint with new gcc versions - Do not always use d0 in ip_fast_csum(), leave register allocation to gcc - Fixed constraints of csum_fold() - Fixed constraints of csum_tcpudp_nofold() - Moved comment for csum_tcpudp_magic() to the right place Signed-off-by: Kars de Jong Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds ChangeSet@1.2221, 2005-03-26 13:43:42-08:00, geert@linux-m68k.org [PATCH] Sun-3/3x: Enable Sun partition tables support by default Sun-3/3x: Enable Sun partition tables support by default Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds ChangeSet@1.2220, 2005-03-26 13:43:26-08:00, geert@linux-m68k.org [PATCH] Zorro: replace printk() with pr_info() in drivers/zorro/zorro.c Zorro: This fixes the only printk() in drivers/zorro that has no KERN_* constant. Signed-off-by: James Nelson Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds ChangeSet@1.2219, 2005-03-26 13:43:09-08:00, geert@linux-m68k.org [PATCH] M68k/stdma: Replace sleep_on() with wait_event() M68k/stdma: Use wait_event() instead of the deprecated sleep_on() function. Since wait_event() expects the condition passed in to be the stopping condition, negate the current one. Signed-off-by: Nishanth Aravamudan Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds ChangeSet@1.2218, 2005-03-26 13:42:52-08:00, geert@linux-m68k.org [PATCH] M68k: Update signal delivery handling M68k: Update signal delivery handling, which was broken by the removal of notify_parent() in 2.6.9-rc2 Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds ChangeSet@1.2217, 2005-03-26 13:31:00-08:00, gerg@snapgear.com [PATCH] m68knommu: remove unused variables in mcfserial.c Removed unused/unrefernced mcfrs_tmp_buf array in mcfserial.c, and mutex associated with it. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds ChangeSet@1.2216, 2005-03-26 13:30:45-08:00, gerg@snapgear.com [PATCH] m68knommu: cleanup ColdFire specific trap handling asm code A couple of fixes to the ColdFire specific trap handling code: . do not clear the stack alignment bits in exception frame (in Lreturn) breaks return stack badly if applications work with stack un-aligned. . use generated asm-offsets instead of local offset definitions . use THREAD_SIZE definition instead of hard coding stack size (this is needed to support 4k stacks) . some instruction optimization (uses instructions that encode using ledd bytes) Patches originally from Philippe De Muyter Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds ChangeSet@1.2215, 2005-03-26 13:30:30-08:00, gerg@snapgear.com [PATCH] m68knommu: use generated asm-offsets in trap handlers Use generated asm-offsets in trap handling code, not local definitions of the offsets. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds ChangeSet@1.2214, 2005-03-26 13:30:15-08:00, gerg@snapgear.com [PATCH] m68knommu: move LED variable definitions for 5307 The LED specific setup code that used to be in platform specific start up code moved to board level code. This is specificaly for the Motorola/Freescale 5307 family. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds ChangeSet@1.2213, 2005-03-26 13:30:01-08:00, gerg@snapgear.com [PATCH] m68knommu: generate asm-offsets for thread_info struct Offsets into the thread_info structure should be auto generated, instead of using hard coded offset values. This adds entries to the asm-offsets generated for the m68knommu varients. Original patch submitted by Philippe De Muyter Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds ChangeSet@1.2212, 2005-03-26 13:29:46-08:00, gerg@snapgear.com [PATCH] m68knommu: move LED variable definitions for 5272 The LED specific setup code that used to be in platform specific start up code moved to board level code. This is specificaly for the Motorola/Freescale 5272 family. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds ChangeSet@1.2211, 2005-03-26 13:29:30-08:00, gerg@snapgear.com [PATCH] m68knommu: update MAINTAINERS entry Update entry in MAINTAINERS file to use my generic uclinux.org email address. And also clarify who is support the m68knommu architecture branch. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds ChangeSet@1.2210, 2005-03-26 13:29:14-08:00, gerg@snapgear.com [PATCH] m68knommu: 4k stack support Support for 4k kernel stacks on m68knommu. This cleans up the use of THREAD_SIZE, so it is used instead of hard coded size. Also remove local offset definitions, these are generated in asm-offsets. Patches original from Patch submitted by Philippe De Muyter Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds ChangeSet@1.2209, 2005-03-26 13:28:59-08:00, gerg@snapgear.com [PATCH] m68knommu: remove duplicate definition of THREAD_SIZE Remove definition of THREAD_SIZE in page.h for m68knommu. It is defined in thread_info.h Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds ChangeSet@1.2208, 2005-03-26 13:28:43-08:00, gerg@snapgear.com [PATCH] m68knommu: fix spelling mistakes in mafcache.h Fix some spelling mistakes in mcfcache.h Patch originally submitted by Geert Uytterhoeven Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds ChangeSet@1.2207, 2005-03-26 13:28:27-08:00, gerg@snapgear.com [PATCH] m68knommu: add missing KM_ enums Bring the km_type enum definitions into like with other architectures. Patch originally submitted by Leon Woestenberg Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds ChangeSet@1.2206, 2005-03-26 13:28:10-08:00, gerg@snapgear.com [PATCH] m68knommu: optimize trap handling asm code Optimize the trap handling asm code for m68knommu targets. Mostly this is using instructions that use fewer bytes to encode. Also remove local definitions for constants that are automatically generated in the asm-offsets header. Original patch came from Philippe De Muyter Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds ChangeSet@1.2199.19.1, 2005-03-25 21:05:43-08:00, gregkh@suse.de Merge suse.de:/home/greg/linux/BK/bleed-2.6 into suse.de:/home/greg/linux/BK/foo ChangeSet@1.2199.5.2, 2005-03-25 20:57:47-08:00, gregkh@suse.de merge mainline with 2.6.11.6 and 2.6.11.5 ChangeSet@1.2199.14.43, 2005-03-25 20:50:14-08:00, davem@sunset.davemloft.net [NET]: Forgot to remove doc file when I killed ethertap. Noticed by Chris Wright. Signed-off-by: David S. Miller ChangeSet@1.2199.18.5, 2005-03-25 19:07:07-08:00, torvalds@ppc970.osdl.org Undo VIA AGP TLB flush low-bits-zero patch It causes problems for people, and as DaveJ says: "Yes, it's clearly completely broken". Cset exclude: davej@delerium.kernelslacker.org|ChangeSet|20050223022752|60156 ChangeSet@1.2199.18.4, 2005-03-25 18:14:44-08:00, paulus@samba.org [PATCH] ppc64: prom.c: use pSeries reconfig notifier Use the pSeries_reconfig notifier list to fix up a device node which is about to be added. Signed-off-by: Nathan Lynch Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2199.18.3, 2005-03-25 18:14:28-08:00, paulus@samba.org [PATCH] ppc64: introduce pSeries_reconfig.[ch] Move as much pSeries-specific DLPAR/hotplug code as possible into its own file, which is built only when pSeries support is enabled in the config. This new file is intended to contain support code for the "Dynamic Reconfiguration" option in the RISC Platform Architecture, which encompasses both PCI hotplug and dynamic logical partitioning (DLPAR). This patch mostly just moves code around, but the device node addition and removal API is slightly modified. In this way, of_add_node and of_remove_node are now responsible only for safely updating the device tree and global list, without all the other stuff like proc entries etc. of_add_node and of_remove_node have been renamed to of_attach_node and of_detach_node, respectively. This also adds the definitions and api for a notifier chain which is meant to be used by code that must act upon device node addition or removal. Patches to migrate code to the notifier api follow in this series. Signed-off-by: Nathan Lynch Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2199.18.2, 2005-03-25 18:04:55-08:00, paulus@samba.org [PATCH] ppc64: make OF node fixup code usable at runtime At boot we recurse through the device tree "fixing up" various fields and properties in the device nodes. Long ago, to support DLPAR and hotplug, we largely duplicated some of this fixup code, the main data structures which are attached to the new device nodes. This patch introduces a helper function (prom_alloc) for handling allocations at both boot and runtime, kills most of the duplicated code, and makes finish_node, finish_node_interrupts, and interpret_pci_props suitable for use at runtime by converting them to use prom_alloc. Signed-off-by: Nathan Lynch Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.2199.18.1, 2005-03-25 18:04:37-08:00, paulus@samba.org [PATCH] ppc64: preliminary changes to OF fixup functions Preliminary modifications to support using some of the interpret_func family of functions at runtime. Changes the mem_start argument to be passed by reference, and the return type to int for error handling to be implemented in following patches. Signed-off-by: Nathan Lynch Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds ChangeSet@1.1982.161.38, 2005-03-25 18:00:30-08:00, chrisw@osdl.org Linux 2.6.11.6 TAG: v2.6.11.6