| |||||||||||||
2.6.10-rc3 long-format changelogSummary of changes from v2.6.10-rc2 to v2.6.10-rc3 ============================================ <castet.matthieu@free.fr> [WATCHDOG] i8xx_tco.c-request_region-patch Fix: in i8xx_tco.c, during the initialisation, the driver accesses io without checking if the port is free. <yasuyuki.kozakai@toshiba.co.jp> [NETFILTER]: Fix multiple bugs in ipv6header match This patch fixes following bugs in ip6t_ipv6header.c - The cast of the pointer to the next IPv6 extension header is wrong. - The logical operation is wrong. These fixes intends - soft mode without invert flag "!" match if the packet contains all of the specified headers. - soft mode with invert flag "!" match if the packet DOESN'T contain all of the specified headers. - strict mode without invert flag "!" match if the packet contains JUST ONLY the specified headers. if the packet doesn't contain some specified headers or contains unspecified headers, the packet doesn't match with rule. - strict mode with invert flag "!" NOT MATCH if the packet contains JUST ONLY the specified headers. Otherwise, match. So, if the packet contains some specified headers and DOESN'T contain other specified headers, the packet MATCHES with rule. Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net> <yasuyuki.kozakai@toshiba.co.jp> [NETFILTER]: introduce skb_header_pointer() to ipv6header match Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net> <yasuyuki.kozakai@toshiba.co.jp> [NETFILTER]: Make eui64 match usuable in FORWARD chain Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net> <tony.luck@intel.com> [IA64] Allocate syscall #1270 for waitid syscall. Signed-off-by: Tony Luck <tony.luck@intel.com> <len.brown@intel.com> [ACPI] acpi_pci_irq_enable() now returns 0 on success. This bubbles all the way up to pci_enable_device(). This allows IRQ0 to be used as a legal PCI device IRQ. The ES7000 uses an interrupt source override to assign pin20 to IRQ0. Then platform_rename_gsi assigns pin0 a high-numbered IRQ -- available for PCI devices. But IRQ0 needs to be a legal PCI IRQ in the lookup code to make it as far as the re-name code. Signed-off-by: Natalie Protasevich <Natalie.Protasevich@UNISYS.com> Signed-off-by: Len Brown <len.brown@intel.com> <len.brown@intel.com> fix non-ACPI IOAPIC build <mark@mtfhpc.demon.co.uk> [SPARC]: In cg3 driver, access control reg using byte not long IOs. Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [SPARC64]: Update defconfig. Signed-off-by: David S. Miller <davem@davemloft.net> <benh@kernel.crashing.org> [SUNZILOG]: Update timeout when setting termios. Signed-off-by: David S. Miller <davem@davemloft.net> <len.brown@intel.com> Merge <davidm@hpl.hp.com> [IA64] speedup ptrace by avoiding kernel-stack walk This patch changes the syscall entry path to store the current-frame-mask (CFM) in pt_regs->cr_ifs. This just takes one extra instruction (a "dep" to clear the bits other than 0-37) and is free in terms of cycles. The advantage of doing this is that it lets ptrace() avoid having to walk the stack to determine the end of the user-level backing-store of a process which is in the middle of a system-call. Since this is what strace does all the time, this speeds up strace quite a bit (by ~50%). More importantly, it makes the syscall vs. non-syscall case much more symmetric, which is always something I wanted. Note that the change to ivt.S looks big but this is just a rippling effect of instruction-scheduling to keep syscall latency the same. All that's really going on there is that instead of storing 0 into cr_ifs member we store the low 38 bits of ar.pfs. Signed-off-by: David Mosberger <davidm@hpl.hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <len.brown@intel.com> [ACPI] handle out of spec EC bit width http://bugzilla.kernel.org/show_bug.cgi?id=1744 Signed-off-by: Luming Yu <luming.yu@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> <len.brown@intel.com> [ACPI] migrate to seq_file() interface http://bugzilla.kernel.org/show_bug.cgi?id=3333 Signed-off-by: David Shaohua Li <shaohua.li@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> <len.brown@intel.com> [ACPI] automatic workaround for NFORCE timer-override BIOS bug http://bugzilla.kernel.org/show_bug.cgi?id=3551 Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Len Brown <len.brown@intel.com> <len.brown@intel.com> [ACPI] clean up the NFORCE BIOS bug workaround delete now obsolete dmi_scan entries fix build for ACPI & !IOAPIC Signed-off-by: Len Brown <len.brown@intel.com> <fenghua.yu@intel.com> [IA64] add cpu_relax() in the body of spin loops This patch adds cpu_relax() in the body of spin loops in smp_call_function(), smp_call_function_single(), and ia64_mca_wakeup_ipi_wait(). Signed-off-by: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <len.brown@intel.com> [ACPI] fix warnings for 64-bit video build (Luming Yu) <len.brown@intel.com> Cset exclude: torvalds@ppc970.osdl.org|ChangeSet|20041111002817|28673 Cset exclude: acme@conectiva.com.br[torvalds]|ChangeSet|20041111002501|29509 <ebrower@gmail.com> [SPARC]: Remove unnecessary pm_idle comment. Signed-off-by: David S. Miller <davem@davemloft.net> <breuerr@mc.net> [CG14]: Fix NULL sbus_dev handling and colormap setup. Signed-off-by: David S. Miller <davem@davemloft.net> <len.brown@intel.com> [ACPI] remove acpi_ksyms.c Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Len Brown <len.brown@intel.com> <len.brown@intel.com> [ACPI] remove acpi_ksyms.c Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Len Brown <len.brown@intel.com> <len.brown@intel.com> [ACPI] add #ifdef ACPI_FUTURE_USAGE Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Len Brown <len.brown@intel.com> <kaber@coreworks.de> [NETFILTER]: Handle nonlinear skbs in ip_queue/ip6_queue Signed-off-by: Patrick McHardy <kaber@trash.net> <kaber@coreworks.de> [NET]: Move rx timestamp functions to net/core/dev.c Signed-off-by: Patrick McHardy <kaber@trash.net> <kaber@coreworks.de> [NETFILTER]: Enable rx timestamps in ip_queue/ip6_queue Signed-off-by: Patrick McHardy <kaber@trash.net> <kaber@coreworks.de> [NETFILTER]: associate locally generated icmp errors with conntrack of original packet Signed-off-by: Patrick McHardy <kaber@trash.net> <kaber@coreworks.de> [NETFILTER]: Fix invalid tcp/udp checksums within NATed icmp errors Signed-off-by: Patrick McHardy <kaber@trash.net> <acme@conectiva.com.br> [NET] Assign inet transport sockets to the right module This is another case where when all the protocols use sk->sk_prot we can remove another member from struct sock, sk->sk_owner, instead using the sk->sk_prot->owner, i.e. this property is not per socket instance, but per protocol. Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br> Signed-off-by: David S. Miller <davem@davemloft.net> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] alpha sysrq compile fix missing extern declaration in -Werror land... Add the proper declaration to sysrq.h. <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] sparse: add -m64 to CHECKFLAGS on alpha and sparc64 Get the sizes right, and thus avoid complaints about big constants etc. <jamie@shareable.org> [PATCH] revert recent futex_wait fix The patch was wrong. Back it out, and add some commentary explaining why we need to run queue_me() prior to the get_user(). Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jgarzik@pobox.com> [libata] fix DocBook bugs <ben-linux@org.rmk.(none)> [ARM PATCH] 2234/3: S3C2410 - new serial driver (1/4) Patch from Ben Dooks S3C2410/S3C2440 new serial driver this patch includes the following - clock selection using clock core - handling for both 2410 and 2440 uarts - uart suspend/resume support - Dimitry Andric's fix for un-initialised spinlocks - Herbert Poetzl's fixes for the following -> break character recognition -> Magic-SYSRQ handling -> Uart software flow control (IrDA console) Updated to include rmk's comments from Patch #2234/1 and fix a few checks for serial clocks, as well as merging fixes from rmk that had taken time to go through the biteepr to release. Signed-off-by: Ben Dooks Signed-off-by: Russell King <rmk@flint.arm.linux.org.uk> [SERIAL] s3c2410: remove duplicate include <ben-linux@org.rmk.(none)> [ARM PATCH] 2241/1: S3C2410 - default configuration update Patch from Ben Dooks updates to the default configuration to change the following: - use S3C2410 internal rtc instead of PC style rtc - add mtd support for nand - add mtd support for nor (and bast nor mapping) Signed-off-by: Ben Dooks Signed-off-by: Russell King <ben-linux@org.rmk.(none)> [ARM PATCH] 2242/1: BAST - default configuration update Patch from Ben Dooks Updates for the Simtec BAST (EB2410ITX) default configuration to fix the following: - add mtd support for NAND and NOR - remove PC style parallel port (does not build) - use S3C2410 core RTC for time - remove non-bast S3C2410 machines Signed-off-by: Ben Dooks Signed-off-by: Russell King <ben-linux@org.rmk.(none)> [ARM PATCH] 2243/1: BAST - move pm init to init_machine Patch from Ben Dooks Move the pm code to use the machine's init_machine code, instead of an late_initcall(). This change is as-per the documentation, and means we do not need to check for machine type in the init code. Thanks to Dimitry Andric for pointing this out Signed-off-by: Ben Dooks Signed-off-by: Russell King <ben-linux@org.rmk.(none)> [ARM PATCH] 2246/1: S3C2410 - rename i2c depending on 2410/2440 Patch from Ben Dooks Ensure the i2c platform device has the correct name if the system is an s3c2440. Signed-off-by: Ben Dooks Signed-off-by: Russell King <ben-linux@org.rmk.(none)> [ARM PATCH] 2247/1: S3C2410 - serial low-level updates Patch from Ben Dooks Move the configuration for the UART to use for the low-level messages generated by the uncompressor out of the kernel debug section, which means the system builds properly without having kernel debug enabled. Also remove the use of including <config/xxx.h> headers, and the default configuration updates Signed-off-by: Ben Dooks Signed-off-by: Russell King <bgerst@quark.didntduck.org> [PATCH] Regparm for x86 machine check handlers The patch to change traps and interrupts to the fastcall convention missed the machine check handlers. Signed-off-by: Brian Gerst <bgerst@didntduck.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kernel@linuxace.com> [NETFILTER]: revert MASQUERADE optimization for mostly static IPs Signed-off-by: Phil Oester <kernel@linuxace.com> Signed-off-by: Patrick McHardy <kaber@trash.net> <davem@nuts.davemloft.net> [AF_UNIX]: Serialize dgram read using semaphore just like stream. Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [IPV6]: Temp fix for ipv6 link-local address problem. Make sure loopback_dev, if up, has the ipv6 bits for it setup before the addrconf netdev notifier is registered. Signed-off-by: David S. Miller <davem@davemloft.net> <herbert@gondor.apana.org.au> [NETLINK]: Fix mc_list operations While doing the 2.4 version of the netlink patch, I noticed a bug in my mc_list code. First of all it wasn't holding the table lock when adding nodes to the list. It also didn't take the node off the list when multicast is switched off. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> <rusty@rustcorp.com.au> [NETFILTER]: Cleanup find_appropriate_src() Fix The fix to find_appropriate_src left a stupid test, which has no effect but is incoherent at best. It covers a corner case: if a previous connection from this source was mapped onto a different IP address (because it was explicitly told to), should the next one be mapped that was as well, if no explicit rule says to remap the src IP? I think the answer is yes: unless the user explicitly tells us to map into a particular range, we should follow the Kegel draft. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: David S. Miller <davem@davemloft.net> <rusty@rustcorp.com.au> [NETFILTER]: Fix stack leakage in iptables Found running netfilter code under valgrind: we return some uninitialized stack to userspace (needs root). Almost certainly harmless, but this suppressed the valgrind complaint, and doesn't hurt. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: David S. Miller <davem@davemloft.net> <kaber@trash.net> [SCTP]: Fix inetaddr notifier chain corruption Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> <Andries.Brouwer@cwi.nl> [PATCH] fix appletalk locking Just tried the new toy. It works. <mchan@broadcom.com> [TG3]: 5753 support and a bug fix. Add support for 5753 chips which is mostly just adding in the appropriate PCI ids and recognizing that these chips do not use GPIO2 for Vaux switching. Also do not set DMA read water mark on PCI Express. In such configurations these bits are reserved. Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [TG3]: Update driver version and reldate. Signed-off-by: David S. Miller <davem@davemloft.net> <herbert@gondor.apana.org.au> [IPV6]: Fix xfrm6_tunnel_check_size mtu calc. OK, let's make it the same as IPv4. This is still broken as the calculation is wrong. However, to fix it properly we need to store the MTUs inside the dst's. I'll get around to that sooner or later. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> <ak@suse.de> [PATCH] x86-64: Fix get_user_pages access to vsyscall page The current kernel oopses on x86-64 when gdb steps into the vsyscall page. This patch fixes it. I also removed the bogus NULL checks of *_offset and replaced them with proper _none checks. I made them BUGs because vsyscall pages should be always mapped. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <piggin@cyberone.com.au> [PATCH] mm: tune the page allocator thresholds without patch: pages_min pages_low pages_high dma 4 8 12 normal 234 468 702 high 128 256 384 with patch: pages_min pages_low pages_high dma 17 21 25 normal 939 1173 1408 high 128 160 192 without patch: | GFP_KERNEL | GFP_ATOMIC allocate immediately | 9 dma, 469 norm | 9 dma, 469 norm allocate after waking kswapd | 5 dma, 234 norm | 3 dma, 88 norm allocate after synch reclaim | 5 dma, 234 norm | n/a with patch: | GFP_KERNEL | GFP_ATOMIC allocate immediately | 22 dma, 1174 norm | 22 dma, 1174 norm allocate after waking kswapd | 18 dma, 940 norm | 6 dma, 440 norm allocate after synch reclaim | 18 dma, 940 norm | n/a So the buffer between GFP_KERNEL and GFP_ATOMIC allocations is: 2.6.8 | 465 dma, 117 norm, 582 tot = 2328K 2.6.10-rc | 2 dma, 146 norm, 148 tot = 592K patch | 12 dma, 500 norm, 512 tot = 2048K Which is getting pretty good. kswap starts at: 2.6.8 477 dma, 496 norm, 973 total 2.6.10-rc 8 dma, 468 norm, 476 total patched 17 dma, 939 norm, 956 total So in terms of total pages, that's looking similar to 2.6.8. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hugh@veritas.com> [PATCH] low discontig highmem_start_page In the case of i386 CONFIG_DISCONTIGMEM CONFIG_HIGHMEM without highmem, highmem_start_page was wrongly initialized (from a NULL zone_mem_map), causing __change_page_attr to BUG on boot. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hugh@veritas.com> [PATCH] tmpfs free_inodes leak When new_inode failed, shmem_get_inode forgot to restore free_inodes. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <trini@kernel.crashing.org> [PATCH] ppc32: Fix Motorola Sandpoint builds Motorola Sandpoint builds broke recently, as part of the pci_find_device -> pci_get_device change. The following is the trivial fix. Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <scheel@vnet.ibm.com> [PATCH] ppc64: iSeries legacy model emulation of PURR Here's a patch to extend the current Linux on Power support for PURR to legacy IBM iSeries servers (pre-Power5 processor models). This patch enables the reporting of timebase metrics to reflect physical processor utilization in a system running multiple logical partitions which share the same physical processors. The patch simply uses existing user interfaces for Linux IBM Power5 based servers to report data already collected by the hypervisor. The values reported with each call are running values in units of the system timebase. The calculation of physical processor utilization results from two samples (purr1 and purr2) differing by a know interval (time) such that: physical utilization = (purr2 - purr1) / (time * number of procs * timebase) where the number of procs and timebase can be obtained from /proc/cpuinfo. Applications have been written to the interface already defined and these applications have value back on the legacy iSeries models. Signed-off by: Jeff Scheel (scheel at vnet.ibm.com) Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <david@gibson.dropbear.id.au> [PATCH] ppc64: Kill unused KRANGE_{START,END} macros Remove KRANGE_{START,END} macros from ppc64 code. These were not used anywhere. Further KRANGE_END was misleading, since it implied a limit on the linear mapping range based on the pagetable structure, whereas in fact the linear mapping does not use a (Linux) pagetable at all. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: ratelimit some rtas errors Use printk_ratelimit() in rtc code to avoid flooding the kernel log buffer with errors. Also use rtas_get_error_log_max() instead of duplicating it in __fetch_rtas_last_error. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: Use pci_device_to_OF_node PCI_GET_DN() doesnt check to see if ->sysdata has been initialised correctly - we should instead use pci_device_to_OF_node. Leave PCI_GET_DN() in the one performance critical case (iommu table lookup in pci DMA functions). In this case ->sysdata is guaranteed to have been initialised by the iommu setup code. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: avoid 32bit only syscalls in unistd.h Steve Munroe points out that ppc64 glibc builds stubs for a number of 32bit only syscalls. While none of them exist in the kernel syscall table, their existence in unistd.h means glibc still tries to use them then falls back onto the 64bit safe versions. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: reduce ifdef clutter in arch/ppc64/kernel/sysfs.c From: Christoph Hellwig <hch@lst.de> Reduce ifdef clutter in arch/ppc64/kernel/sysfs.c Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: pci cleanup Cleanup ppc64 pci code. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: remove phb_set_model phb_set_model does a lot of work just to set up a text string that almost nothing uses. Replace this all with an is_python() check. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: make fixup_winbond_82c105 pseries specific The winbond irq fixup is pSeries specific. Move it into pSeries_pci.c and check for PLATFORM_PSERIES. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: remove duplication in pci_alloc_* We duplicated the code in pci_alloc_pci_controller twice and had an ifdef for iseries as well, just to select between kmalloc and bootmem memory. Change this so we instead pass the allocation into a common function - pci_setup_pci_controller. Also use a spinlock around the host_list and global_phb_number code since we now can modify it at runtime via hotplug. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: OF overrides for pci_probe_only, pci_assign_all_buses Allow pci_probe_only and pci_assign_all_buses to be modified via OF properties. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: remove BUG()s in pcibios_fixup_bus BUG() on missing IO or memory resources in pcibios_fixup_bus is rude, remove it. Also use list_for_each_entry. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: get_phb_reg_prop only required on python PCI machines get_phb_reg_prop was only used for python PCI machines, so remove it from common code and call it from there. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: alloc_bootmem returns void * As Andrew points out, there is no need for casts since alloc_bootmem returns void*. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: cleanups hpte_init_native, kill warning for !PSERIES builds From: Christoph Hellwig <hch@lst.de> This splits out a small helper that checks whether tlb batching should be enabled from hpte_init_native, thus cleaning up the ifdef hell and killing a warning for pmac builds. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulus@samba.org> [PATCH] PPC64 call ibm,os-term only if its available This patch is from Olaf Hering. The rtas property 'ibm,os-term' is not available on JS20, a panic will print: unable to mount root filesystem on /dev/hda Kernel panic - not syncing: Attempted to kill init! <0>ibm,os-term call failed -1 Rebooting in 42 seconds.. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulus@samba.org> [PATCH] PPC64 rtasd: window when error_log_cnt could get zeroed This patch is from Jake Moilanen <moilanen@austin.ibm.com>. There appears to be a hole that if we get an log_error() call, that we could zero out our error log count in nvram. When rtasd() starts up, it turns on the logging via 'no_more_logging = 0'. If we get a log_error() call after that is set but before nvram_read_error_log has actually read nvram to set error_log_cnt, the log_error() call will write back to nvram a uninitialized error_log_cnt value, and wipe out our sequence number. To close the hole, simply move the 'no_more_logging = 0' till after nvram sets error_log_cnt but before pSeries_log_error is called. I also changed the 'no_more_logging' variable to be 'no_logging' since it's not only used when we stop logging now. I also removed the "volatile" part of no_more_logging, since it's unneeded. Signed-off-by: Jake Moilanen <moilanen@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <sfr@canb.auug.org.au> [PATCH] ppc64 iSeries: don't share request queues in viocd This patch fixes the virtual cdrom driver to not share a single request queue. Sharing the queue causes an oops if you remove the module and more than one cdrom exists. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <sfr@canb.auug.org.au> [PATCH] ppc64: add missing braces to rtc driver This patch fixes the PPC64 rtc driver where a pair of braces was missing. Not a big bug, but a bug none the less. Also, while I was there, use C99 initialisers. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <fenghua.yu@intel.com> [PATCH] add cpu_relax() in spin loops & clean up barrier() The patch adds cpu_relax() in the body of some spin loops for 2.6.9. The patch also removes redundant barrier() code after cpu_relax() on ia32. In the PAUSE instruction section, IA32 SDM claims "it is recommended that a PASUE instruction be placed in all spin-wait loops". And x86_64 SDM says that PAUSE instruction is same as legacy mode in IA-32e mode operation. This patch is against 2.6.9 (kernel.org). It was tested on ia32 and x86_64. Acked-by: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <macro@linux-mips.org> [PATCH] i386: apic_printk() used before initialized Both detect_init_APIC() and init_apic_mappings() it's called from are invoked early, before the command line has been processed. Therefore its meaningless to call apic_printk() from them as that depends on apic_verbosity which is initialized from the command line. I could move apic_verbosity initialization to parse_cmdline_early(), but I think that would be an overkill, the point being we are initerested in feedback from detect_init_APIC() anyway. Without that it's hard to tell what's really going on as it's been the case with the recent report of the local APIC being non-functional despite the whole setup being apparently correct. So I converted these calls to ordinary printk() invocations. The init_apic_mappings() are less interesting, so I've made them output at the debug level. While at it I've made some obvious nearby formatting clean-up. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rddunlap@osdl.org> [PATCH] x86_64 hpet: fix function warning put function prototype outside of #ifdef block, to fix: arch/x86_64/kernel/time.c:941: warning: implicit declaration of function `oem_force_hpet_timer' Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Cc: <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ysato@users.sourceforge.jp> [PATCH] H8/300: /proc/cpuinfo typo fix Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ysato@users.sourceforge.jp> [PATCH] H8/300: signal handling update Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ysato@users.sourceforge.jp> [PATCH] H8/300: read{b,w,l} / write{b,w,l} error fix read{b,w,l} and write{b,w,l} compile error fix. Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ysato@users.sourceforge.jp> [PATCH] H8/300: vmlinux.lds.S update - duplicate define section delete. - fix CONFIG_ROMKERNEL. Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: update for m32r-g00ff This patchset was originally from NIIBE Yutaka. These patch update the m32r kernel for a new bootloader "m32r-g00ff". The "m32r-g00ff" has been written and developed by NIIBE Yutaka, and released under the GPL from http://www.gniibe.org/. So far, it supports two types of booting operations, CF boot and Network boot (HTTP boot). * CF boot - boot from CompactFlash or Microdrive(TM) We can boot a kernel from CF device. To make use of m32r-g00ff, we just put a first stage IPL(initial program loader) into a flash memory, and a secondary bootloader into CF media device. Currently, LILO-21.4.4 can be used to write m32r-g00ff into the boot sector of CF device on a cross development environment. * HTTP boot - boot via network with HTTP protocol By using m32r-g00ff, we can download and boot a kernel image from a web-server. The m32r-g00ff downloads a kernel image from a given URL, resolving the webserver's IP address by DNS. As a preparation, we just place a secondary bootloader binary and a kernel image on the webserver. - Position-independent zImage support; this aims at removing constraints of zImage(vmlinuz)'s location. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: CF boot support for Mappi2 - Update io_mappi2.c to access a CF device as an IDE disk device for Mappi2 eva board. - Please set CONFIG_M32R_CFC=n, when you use m32r-g00ff for CF boot. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: update defconfig files Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: update dot.gdbinit files This patch is for updating GDB initalization files (dot.gdbinit*) for all m32r target boards. Currently, part of dot.gdbinit* files are maintained by using a "gen_gdbinit" script. http://www.linux-m32r.org/eng/download.html#othertools Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: signal bug fix This patch fixes a bug introduced in the last batch of signal fixes. The system call return value should only be reset if called diectly from a system call, i.e. sigsuspend. The fixes added earlier caused any interrupted non-zero system call return to be reset, confusing fork and vfork, among others. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: 64-bit cleanups in the system calls 64-bit cleanup - this fixes the return values of the system calls to be longs. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: 64-bit type cleanups 64-bit cleanliness - Fix the number of bits of the time_t field in the COW header to be 32 and change an int to a longs. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: don't rule out syscall_nr == 0 From: Bodo Stroesser <bstroesser@fujitsu-siemens.com> Change the valid system call numbers to reflect the possibility that we could have __NR_restart_syscall. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: redundant code removal from signal delivery From: Bodo Stroesser <bstroesser@fujitsu-siemens.com> Change the do_signal interface to eliminate its argument. Also, remove the calls from the system call handlers since they are redundant. In all cases, pending signals are checked for in the interrupt handler. Temporarily, do_signal passes the current error to kern_do_signal. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: redundant argument removal from handle_signal From: Bodo Stroesser <bstroesser@fujitsu-siemens.com> Change the interface to handle_signal so that it doesn't take the system call return value as an argument and eliminate its return value. kern_do_signal also now doesn't return immediately after determining that there is no signal to deliver. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: handle_signal simplification From: Bodo Stroesser <bstroesser@fujitsu-siemens.com> Move the signal delivery code around to eliminate a couple of temporary variables. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: fix setting of interrupted syscall return value From: Bodo Stroesser <bstroesser@fujitsu-siemens.com> handle_signal now checks whether it is being called from a system call invocation. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: make signal frame construction more resemble x86 From: Bodo Stroesser <bstroesser@fujitsu-siemens.com> This makes the UML signal frame construction interface somewhat more similar to x86 than before. Also, some small code cleanup, and checking for errors before changing the signal mask in the SA_NODEFER case. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: fix signal mask on delivery error From: Bodo Stroesser <bstroesser@fujitsu-siemens.com> If the user stack limit is reached or the signal stack assigned with sigaltstack() is invalid when a user signal handler with SA_ONSTACK has to be started, the signal mask of the interrupted user program is modified. This happens because the mask, that should be used with the handler only, is written to "current->blocked" even if the handler could not be started. But without a handler, no rewrite of the original mask at sys_sigreturn will be done. A slightly different case is sys_sigsuspend(), where the mask is already modified when kern_do_signal() is started. "*oldset" and "current->blocked" are not equal here and thus current->blocked has to be set to *oldset, if an error occurs in handle_signal(). For both cases I've written small tests, and with the patch the result is OK. This issue is relevant for other architectures too (e.g. i386, I've seen). Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: Don't delay segfaults From: Bodo Stroesser <bstroesser@fujitsu-siemens.com> This one covers the fact, that the SIGSEGV signal, which is created by force_sigsegv() in case of an error in handle_signal(), is not delivered to the user immediately. In the worst case it even could be masked if a sigprocmask() systemcall follows immediately after return from kernel. The patch is relevant for other architectures, too. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: fix definitions of pte_unmap_* Some definitions of pte_unmap_* macros were written for HIGHPTE, which UML doesn't support. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: LFS 64-bit cleanups Add ARCH_USER_CFLAGS so the arches can modify USER_CFLAGS. We now take __ARCH_WANT_OLD_STAT and __ARCH_WANT_STAT64 from the base arch so that the LFS-64 code gets included or excluded automatically. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: Remove unused declaration Remove an unused declaration of time_stamp(). Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: remove some dead code Bodo pointed out that arch/um/kernel/skas/exec_user.c is dead code, so this removes it. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jdike@addtoit.com> [PATCH] uml: defconfig update Update defconfig. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: core changes From: Stefan Bader <shbader@de.ibm.com> From: Martin Schwidefsky <schwidefsky@de.ibm.com> s390 core changes: - Store correct set of registers to core dumps. - Fix make install with separate obj directory. - Regenerate default configuration. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: common i/o layer From: Cornelia Huck <cohuck@de.ibm.com> From: Thomas Spatzier <tspat@de.ibm.com> common i/o layer changes: - Prevent double unregister of ccw devices. - Move unregister out of the subchannel remove function, to avoid live-lock due to hotplug if the root device is currently indisposed. - Delete pending timer after a machine check. - Revert change to allocate qdio queues and SLIBS in DMA memory. - Decrement ccw_device_init_count only after ccw_device_register is done. - Remove unnecessary check in ccw_hotplug. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: dasd driver From: Stefan Weinhuber <wein@de.ibm.com> dasd driver changes: - Fix parameter parsing to allow sequences of devices, ranges and keywords. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: 3270 console 3270 console driver changes: - Add error handling in 3270 device startup. - Do halt_io if startup has been interrupted. - Fix reference counting in tty timers. - Simplify set_timer functions. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: monreader docu From: Gerald Schaefer <geraldsc@de.ibm.com> Docu for the z/VM monitor record read access feature. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: crypto driver From: Eric Rossman <edrossma@us.ibm.com> s390 crypto driver changes: - Small cleanup: misc -> crypto, header file defines, variable names and a printk message. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: zfcp host adapter From: Andreas Herrmann <aherrman@de.ibm.com> zfcp host adapter change: - Avoid usage of unregister debug feature. - Avoid race when unregistering debug feature. - Corrected some log messages for WKA ports. - Don't pass NULL pointer to debug_register_view and debug_set_level. - Some coding style cleanup. - Fix race between scsi_add_device and deregistration of the adapter. - Shorten & rename zfcp_els/zfcp_els_handler. - Remove unused code for unused ELS commands. - Evaluate response instead of request in adisc handler. - Allocate qdio queue structures below 2GB. - Remove ifdefs around ioctl32.h. - Use CONFIG_COMPAT instead of CONFIG_S390_SUPPORT. - Use semaphore in zfcp_ccw_shutdown. - Strip down debug_register/debug_unregister. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: zfcp read-only lun sharing From: Volker Sameske <sameske@de.ibm.com> zfcp host adapter: - Add read-only lun sharing feature. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: zfcp act enhancements From: Andreas Herrmann <aherrman@de.ibm.com> From: Maxim Shchetynin <maxim@de.ibm.com> zfcp host adapter changes: - Add access control enhancements. - Add event callbacks. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <shaggy@austin.ibm.com> [PATCH] radix_tree_delete() fix I was looking through the radix tree code and came across what I think is a bug in radix_tree_delete. for (idx = 0; idx < RADIX_TREE_TAG_LONGS; idx++) { if (pathp[0].node->tags[tag][idx]) { tags[tag] = 1; nr_cleared_tags--; break; } } The above loop should only be executed if tags[tag] is zero. Otherwise, when walking up the tree, we can decrement nr_cleared_tags twice or more for the same value of tag, thus potentially exiting the outer loop too early. Ensure that nr_cleared_tags is only decremented once for each tag. Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] kNFSd: fix d_find_alias brokenness 10 weeks ago, http://linux.bkbits.com:8080/linux-2.5/cset@415b3380pxf4s... The patch was mostly right, and fixed a real problem, but missed a bit. It passed the job of checking if an inode had a current alias off to d_find_alias instead of open-coding it in d_alloc_anon. However there is one case where d_alloc_anon would not return the right dentry. That case being when the inode was for the root of the filesystem. The root is a special case because it is not hashed. All other dentries that are not hashed are quite un-interesting: There are "unlinked" but not yet closed. The root of a filesystem is unhashed, but is interesting. Allowing d_find_alias to return an unhashed alias for a directory solves this problem. It is safe because callers of d_find_alias on a directory inode either have a name for the inode already (so finding an unlinked directory by mistake is impossible) or will soon be looking for a name and will drop the dentry if a name is not found. Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <bunk@stusta.de> [PATCH] kill lockd_syms.c The patch below kills lockd_syms.c. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no> Acked-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <juerg@paldo.org> [PATCH] Don't remove /sys in initramfs Using the "resume" kernel parameter together with an initramfs revealed a bug that causes removal of the /sys directory in the initramfs' tmpfs, making the system unbootable. The source of the problem is that the try_name() function removes the /sys directory unconditionally, instead of removing it only when it has been created by try_name(). The attached patch only removes /sys if it has been created before. Signed-off-by: Juerg Billeter <juerg@paldo.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] sound_alloc_dmap memory allocation warning suppression alloc_pages() failures are expected here. Manually prevent warnings. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ysato@users.sourceforge.jp> [PATCH] CONFIG_UNIX98_PTY=n warning fix ptmx_open() only exists if CONFIG_UNIX98_PTYS. Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulus@samba.org> [PATCH] Fix pmac_zilog.c so it compiles again It seems that pmac_zilog.c got missed in the dev.power_state to dev.power.power_state conversion. This patch makes that change, and also fixes a problem where it would not compile if CONFIG_MAGIC_SYSRQ was set but CONFIG_SERIAL_CORE_CONSOLE was not. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulus@samba.org> [PATCH] Do power_state conversion for mesh.c This patch changes dev.power_state to dev.power.power_state in drivers/scsi/mesh.c, and fixes an uninitialized variable use in a printk. Signed-off-by: Paul Mackerras <paulus@samba.org> Cc: James Bottomley <James.Bottomley@steeleye.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulus@samba.org> [PATCH] Add __iomem annotations to drivers/scsi/mac53c94.c This patch adds __iomem annotations to drivers/scsi/mac53c94.c, and changes one use of st_le32 to writel. Signed-off-by: Paul Mackerras <paulus@samba.org> Cc: James Bottomley <James.Bottomley@steeleye.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulus@samba.org> [PATCH] power_state and __iomem for mediabay.c This patch does the power_state -> power.power_state conversion for drivers/macintosh/mediabay.c and makes it use void __iomem * for ioremap cookies. Once the IDE code is converted to not use unsigned long for MMIO register addresses, I will be able to remove a few casts from here. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulus@samba.org> [PATCH] __iomem annotations for swim3.c This patch adds __iomem annotations to drivers/block/swim3.c. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulus@samba.org> [PATCH] Multilink fix for ppp_generic.c I released ppp-2.4.3 yesterday, with much improved support for multilink operation - when the first link is terminated, its pppd no longer exits immediately, but keeps running in order to keep the ppp interface up while there are other links still in the bundle. However, this shows up a bug in the kernel ppp driver, which is that there is no way for the pppd controlling the bundle to know when the last link in the bundle is terminated. This patch provides such a way: with this patch, pppd will get an EOF when reading from the /dev/ppp instance for the bundle when there are no channels connected. The change does not affect older versions of pppd or normal non-multilink operation (I have tested to make sure of that). Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <roland@topspin.com> [PATCH] cdev_init: zero out cdev before kobject_init() Right now, cdev_init() works in a way that is not very intuitive. If a driver passes an uninitialized struct cdev to cdev_init(), then an uninitialized struct kobject will be passed to kobject_init(), which does kset_get() on kobj->kset, which probably points off into space and causes an oops. Drivers can work around this by zeroing out their struct cdev in advance (and indeed most if not all of the things passed to cdev_init() come from BSS) but I think it makes more sense for cdev_init() to live up to its name and actually work on an uninitialized cdev. Signed-off-by: Roland Dreier <roland@topspin.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Andries.Brouwer@cwi.nl> [PATCH] dm_init unresolved reference to _exits drivers/md/dm.c dm_int refers to _exits which is defined as __exitdata. With CONFIG_HOTPLUG=n, __exitdata is discarded. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <agk@redhat.com> [PATCH] device-mapper: dm-crypt fix for zero-length key dm-crypt fix for zero-length key. Signed-Off-By: Christophe Saout <christophe@saout.de> Signed-Off-By: Alasdair G Kergon <agk@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <agk@redhat.com> [PATCH] device-mapper: Fix some DMERR macro usage Fix some DMERR macro usage. It already adds : and \n. Signed-Off-By: Alasdair G Kergon <agk@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <agk@redhat.com> [PATCH] device-mapper: Add DM_TARGET_MSG Add DM_TARGET_MSG ioctl so data can be passed to a dm target after its table has been loaded. Signed-Off-By: Alasdair G Kergon <agk@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <agk@redhat.com> [PATCH] device-mapper: Allow referencing by device number Currently userspace code using the dm ioctls must refer to a mapped device by either its name or its uuid. But in some circumstances you know neither of those directly. This patch lets you reference devices by their major/minor numbers as an alternative. Signed-Off-By: Alasdair G Kergon <agk@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <sylvain.meyer@worldonline.fr> [PATCH] fbdev: Add vram option to intelfb - add vram option to reserve more memory than stolen by BIOS if needed - fix intelfbhw_pan_display typo - add __initdata annotations Signed-off-by: Sylvain Meyer <sylvain.meyer@worldonline.fr> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Fix for using >16 pixel wide font in fb console From: Jani Jaakkola <jjaakkol@cs.Helsinki.FI>: The first one was that fbcon_set_font() used one byte padding for fonts having width 16 <= width < 24, which was wrong since the pieces of code actually using the font did not use any padding. This is fixed in the included patch and also fbcon_set_font() is made a little cleaner. After the patch the following font is not garbled in fb console: http://www.cs.helsinki.fi/u/jjaakkol/psf/bitstream_vera_s... The other bug is that fonts having height == 32 crash the kernel. I have no fix for this (at least not yet), but it can be reproduced with font: http://www.cs.helsinki.fi/u/jjaakkol/psf/bitstream_vera_s.... Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Support for bigger than 16x32 fonts in softcursor Fix crash if font font is bigger than 16x32 by dynamically allocating buffer based on font dimensions instead of statically allocating at 64 bytes. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Support for bigger than 16x32 fonts in rivafb cursor - Add support for fonts bigger thatn 16x32 by dynamically allocating buffer based on font dimensions instead of statically allocating at 64 bytes. - use softcursor if cursor size exceeds 32x32. - fix rivafb_cursor if cursor width is not divisible by 2 Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbcon: Disable fbcon cursor if vt softcursor is enabled Problem reported by Gerd Knorr: (1) boot with vesafb (thats what I'm using, maybe it shows on other framebuffers and/or vgacon as well). (2) login into one terminal, then type "echo -ne '\033[?17;15;239c'". You should have a nice, yellow and *not* blinking cursor block. That is what I have in my .profile because I can't stand the blinking cursors. (3) Switch to another terminal. The cursor goes into blinking underscore mode now (i.e. the default cursor). (4) Switch back to the first terminal. Now you have a yellow block with the last two pixel lines (i.e. the underscore) blinking. This bug is caused by both fbcon_cursor and vt softcursor being active at the same time. Fix: - Disable fbcon_cursor if vt softcursor is active (vc->vc_cursor_type & 0x10) != 0. - Recheck/reload fbcon cursor for each vt switch Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Allow mode change even if EDID block is not found - use symbol_get() to check for the presence of i2c - allow mode changing even if EDID block is not found (no I2C support) - fix crashes on chipsets that do not have i2c support - shorten string in info->fix.id - trivial chip name changes Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Fix cursor in doublescan mode in atyfb fix hw cursor in doublescan modes Signed-off-by: Alexander Kern <alex.kern@gmx.de> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Fix typo in atyfb Fix typo, and decrease amount of output Signed-off-by: Alexander Kern <alex.kern@gmx.de> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Change the find_mode behavior let find_mode search for nearest refresh rate Signed-off-by: Alexander Kern <alex.kern@gmx.de> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Markus.Lidel@shadowconnect.com> [PATCH] i2o: changed code with BUG() to BUG_ON() - changed code with BUG() to use BUG_ON() which could be optimized by some platforms (original from Milton Miller) Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Markus.Lidel@shadowconnect.com> [PATCH] i2o: remove unused code and make needlessly global code static - remove unused code - make needlessly global code static Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Markus.Lidel@shadowconnect.com> [PATCH] i2o: changed old queueing code with wait_event API - removed old queueing code and replaced it with new wait_event API Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Markus.Lidel@shadowconnect.com> [PATCH] i2o: converted SPIN_LOCK_UNLOCKED into spin_lock_init() - changed initialization of spin locks from SPIN_LOCK_UNLOCKED into spin_lock_init() Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <miles@gnu.org> [PATCH] Remove duplicate safe_for_read(READ_BUFFER) entry in scsi_ioctl.c Signed-off-by: Miles Bader <miles@gnu.org> Cc: James Bottomley <James.Bottomley@steeleye.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jejb@titanic.il.steeleye.com> Fix badness in scsi_lib.c From: Mike Christie <mikenc@us.ibm.com> > Oct 26 23:32:55 mina kernel: Unable to handle kernel paging request at > virtual address 6b6b6c7b > Oct 26 23:32:55 mina kernel: printing eip: > Oct 26 23:32:55 mina kernel: f882b8ce > Oct 26 23:32:55 mina kernel: *pde = 00000000 > Oct 26 23:32:55 mina kernel: Oops: 0000 [#1] > Oct 26 23:32:55 mina kernel: PREEMPT > Oct 26 23:32:55 mina kernel: Modules linked in: sd_mod usb_storage > ide_cd cdrom sg scsi_mod rd > Oct 26 23:32:55 mina kernel: CPU: 0 > Oct 26 23:32:55 mina kernel: EIP: 0060:[<f882b8ce>] Not tainted VLI > Oct 26 23:32:55 mina kernel: EFLAGS: 00010296 (2.6.10-rc1-mm1y) > Oct 26 23:32:55 mina kernel: EIP is at > scsi_block_when_processing_errors+0xe/0xe0 [scsi_mod] > Oct 26 23:32:55 mina kernel: eax: 00000000 ebx: 6b6b6b6b ecx: > f88ef640 edx: ec5b6578 > Oct 26 23:32:55 mina kernel: esi: e9baa4b8 edi: c17e9268 ebp: > e9677f0c esp: e9677eb4 > Oct 26 23:32:55 mina kernel: ds: 007b es: 007b ss: 0068 > Oct 26 23:32:55 mina kernel: Process fdisk (pid: 2891, > threadinfo=e9676000 task=ea0c61f0) > Oct 26 23:32:55 mina kernel: Stack: 00000000 00000001 00000000 00000000 > 00000000 00000000 00000000 00000000 > Oct 26 23:32:55 mina kernel: 00000000 00000000 00000003 e9677ef0 > c17e9268 0000006b c17e9268 e9677f0c > Oct 26 23:32:55 mina kernel: c0159761 c17e93e4 00000000 e9b98780 > e9baa4b8 c17e9268 e9677f24 f88ef6a8 > Oct 26 23:32:55 mina kernel: Call Trace: > Oct 26 23:32:55 mina kernel: [<c01056cf>] show_stack+0x7f/0xa0 > Oct 26 23:32:55 mina kernel: [<c0105876>] show_registers+0x156/0x1c0 > Oct 26 23:32:55 mina kernel: [<c0105af6>] die+0x156/0x2e0 > Oct 26 23:32:55 mina kernel: [<c011628d>] do_page_fault+0x36d/0x69c > Oct 26 23:32:55 mina kernel: [<c01051ed>] error_code+0x2d/0x38 > Oct 26 23:32:55 mina kernel: [<f88ef6a8>] sd_release+0x68/0xa0 [sd_mod] > Oct 26 23:32:55 mina kernel: [<c0184c03>] blkdev_put+0x183/0x1b0 > Oct 26 23:32:55 mina kernel: [<c01784ad>] __fput+0x14d/0x160 > Oct 26 23:32:55 mina kernel: [<c0176797>] filp_close+0x57/0x90 > Oct 26 23:32:55 mina kernel: [<c01768e3>] sys_close+0x113/0x240 > Oct 26 23:32:55 mina kernel: [<c0104ff1>] sysenter_past_esp+0x52/0x71 > Oct 26 23:32:55 mina kernel: Code: 0c 8b 43 04 8b 00 89 5c 24 04 c7 04 > 24 e4 d1 83 f8 89 44 24 08 e8 d3 21 8f c7 8d 76 00 55 89 e5 57 56 53 83 > ec 4c 8b 75 08 8b 1e <8b> 83 10 01 00 00 a8 08 74 7c fc 31 c0 8d 7d b4 > b9 05 00 00 00 The problem with using shost_for_each_device wrt to the above oops is that scsi_forget_host sets the state to SDEV_CANCEL, so that when scsi_host_cancel iterates over the devices using shost_for_each_device it cannot get a handle to the sdev (scsi_device_get fails becuase the state is set to SDEV_CANCEL). And, __scsi_iterate_devices does not clear the next pointer if this happens, so I think this is needed to fix just the refcount bug in shost_for_each_device. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <ben-linux@org.rmk.(none)> [ARM PATCH] 2248/1: S3C2410 - missing serial config in arch/arm/mach-s3c2410/Kconfig Patch from Ben Dooks Add patch that should have been in 2247/1, defining CONFIG_S3C2410_LOWLEVEL_UART_PORT Signed-off-by: Ben Dooks Signed-off-by: Russell King <dwmw2@shinybook.infradead.org> RS library spelling fixes. Originally from Joe Perches <joe@perches.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD: Intel flash chip driver locking fixes. Cleanups and fixes in preparation for XIP support -- fix unbalanced use of get_chip() and put_chip(), and clean up the code a little in preparation for what's to come. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD: DiskOnChip drivers should no longer require old docecc code. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD map/device driver cleanups -- remove bogus __iomem casts Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD: Fix suspend/resume on Intel flash chip driver We weren't correctly resetting our idea of the chip's state on suspend in all circumstances. Fix that. Signed-off-by: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD NAND drivers: cleanup MODULE_PARAM and bogus __iomem casts. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD: DiskOnChip driver fixes: MODULE_PARAM and __iomem, and fix RS init Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD: Fix oops after erase in NFTL/INFTL (DiskOnChip translation layers) Fix kernel NULL pointer dereference at mtd_erase_callback+6 when trying to insmod INFTL or NFTL modules. Signed-off-by: Kalev Lember <kalev@colleduc.ee> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD: Fix Pb1550 board NAND driver to not read write-only registers Signed-off-by: Pete Popov <ppopov@embeddedalley.com> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD: Compile fix for the typo fix in ixp2000 map driver. Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD: Avoid false positives in CFI probe due to floating data bus Signed-off-by: Russell King <rmk@arm.linux.org.uk> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD: Fix detection of hardware partitions in Intel flash chips Determine it from the CFI query data instead of hard-coding it. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <brking@us.ibm.com> [PATCH] sg: Fix oops of sg_cmd_done and sg_release race The following patch fixes a race condition in sg of sg_cmd_done racing with sg_release. I've seen this bug hit several times on test machines and the following patch fixes it. The race is that if srp->done is set and the waiting thread gets a spurious wakeup immediately afterwards, then the waiting thread can end up executing and completing, then getting closed, freeing sfp before the wake_up_interruptible is called, which then will result in an oops. The oops is fixed by locking around the setting srp->done to 1 and the wake_up, and also locking around the checking of srp->done, which guarantees that the wake_up_interruptible will always occur before the sleeping thread gets a chance to run. Signed-off-by: Brian King <brking@us.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <rct@gherkin.frus.com> [PATCH] sym53c500_cs driver update The attached minor patch to linux/drivers/scsi/pcmcia/sym53c500_cs.c allows interrupt sharing, which is evidently a "must have" feature for at least G4 PowerBooks (ppc architecture). The other user of the New Media Bus Toaster reports that his powerbook consistently assigns the yenta CardBus controller IRQ to whatever card he inserts. Signed-off-by: Bob Tracy <rct@frus.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <bunk@stusta.de> [PATCH] SCSI_QLOGIC_1280_1040 dependencies On Sat, Oct 23, 2004 at 11:55:20AM +1000, Eyal Lebedinsky wrote: > Should the second line be indented? > > Qlogic QLA 1240/1x80/1x160 SCSI support (SCSI_QLOGIC_1280) [M/n/?] m > Qlogic QLA 1020/1040 SCSI support (SCSI_QLOGIC_1280_1040) [N/y/?] (NEW) y Correct, SCSI_QLOGIC_1280_1040 should depend on SCSI_QLOGIC_1280. The patch below does this. Additionally, it prevents the case that both drivers are built statically and both support the 1020/1040. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <markh@osdl.org> [PATCH] 2.6 aacraid: Interrupt function cleanup This patch updates the adapter health check function and cleans up some unused interrupt related functions and macros. Signed-off-by: Mark Haverkamp <markh@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <dwmw2@shinybook.infradead.org> JFFS2: locking fixes We weren't correctly holding a lock when adding raw nodes to the per-inode list. Signed-off-by: Artem Bityuckiy <dedekind@infradead.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <Kai.Makisara@kolumbus.fi> [PATCH] "mt-st tell" fails in 2.6.10-rc1 On Tue, 2 Nov 2004, Marc Thomas wrote: > I've noticed that in 2.6.10-rc1 the "mt tell" command (from mt-st) fails to > report SCSI tape position, returning "No such device". Other tape (read) > operations appear to be ok. It worked fine in 2.6.9-rc4. The patch at the end of this message should fix this (passes basic tests). Someone added the ioctl to reset the SCSI device but the error handling is not quite correct. The code in 2.6.10-rc1 allows st_ioctl to continue unless reset succeeded. The fix allows continuation only if scsi_nonblockable_ioctl() does not handle the ioctl (returns -ENODEV). retval is cleared because the following code assumes it is zero unless set to something else. Signed-off-by: Kai Makisara <kai.makisara@kolumbus.fi> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <dwmw2@shinybook.infradead.org> JFFS2: Remove redundant 'ino' arg from jffs2_get_inode_nodes() We had it already in the inocache structure we were being passed Signed-off-by: Artem Bityuckiy <dedekind@infradead.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> JFFS2: make sync() actually work by providing ->sync_fs method. Signed-off-by: David Woodhouse <dwmw2@infradead.org> <markh@osdl.org> [PATCH] 2.6 aacraid: rx check health function update This patch updates the rx check health function. My previous only updated the rkt check health code. This and the previous patch should fix the kmalloc return checking bug: http://bugme.osdl.org/show_bug.cgi?id=3699 Signed-off-by: Mark Haverkamp <markh@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <dwmw2@shinybook.infradead.org> JFFS2: jffs2_fs_i.h needs <asm/semaphore.h> ... and should include it directly rather than hoping it's been done. Signed-off-by: David Woodhouse <dwmw2@infradead.org> <akpm@osdl.org> [PATCH] megaraid 2.20.4.1 Driver From: "Bagalkote, Sreenivas" <sreenib@lsil.com> We are releasing megaraid 2.20.4.1 driver. This version fixes two issues - - Handle IOCTL command timeouts properly - Replace incorrectly introduced pci_dma_sync_{sg,single}_for_cpu with correct pci_dma_sync_{sg,single}_for_device. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <akpm@osdl.org> Remove duplicate safe_for_read(READ_BUFFER) From: Miles Bader <miles@gnu.org> Signed-off-by: Miles Bader <miles@gnu.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <cp@absolutedigital.net> [PATCH] Documentation/kernel-parameters.txt: scsi param updates This patch updates Documentation/kernel-parameters.txt with the proper SCSI LUNs params and adds a description for 'max_luns'. Signed-off-by: Cal Peake <cp@absolutedigital.net> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <g.liakhovetski@gmx.de> [PATCH] tmascsim: (resend updated) track_queue_full Use scsi_track_queue_full(), don't lie about driver's queueing abilities. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <stern@rowland.harvard.edu> [PATCH] sd.c: adjust READ_CAPACITY for broken devices A number of USB mass storage devices return the wrong value in response to READ CAPACITY: They give the total number of blocks rather than the highest block number. Currently the usb-storage driver tries to adjust for this by altering the contents of the reply buffer. That's not a very good idea because it prevents users from seeing what the device actually has to say; it violates the principle that a transport should do nothing more than transfer data. This patch moves the responsibility for adjusting the capacity to the sd driver instead, by adding a new device flag. After this has been merged the corresponding change (to set the flag) will be made to the usb-storage driver. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <g.liakhovetski@gmx.de> [PATCH] refactor tmscsim inititalization code Streamline EEPROM handling code The patch below is a fixed (and slightly reworked) patch from Christoph. Thanks to Chiaki Ishikawa for fixes and tests. Original author: Christoph Hellwig Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <bunk@stusta.de> [PATCH] SCSI: aha1542.c: make some code static The patch below makes some needlessly global code static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <bunk@stusta.de> [PATCH] SCSI atp870u.c: make a needlessly global function The patch below makes the function is870 which has no external users static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <bunk@stusta.de> [PATCH] SCSI dc395x.c: make a function static The patch below makes the needlessly global function adapter_init_chip static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <bunk@stusta.de> [PATCH] SCSI: fdomain.c: make a struct static The patch below makes a needlessly global struct static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <dwmw2@shinybook.infradead.org> JFFS2: fix printk argument type warning fs/jffs2/gc.c:832: warning: signed size_t format, different type arg (arg 3) Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <bunk@stusta.de> [PATCH] SCSI qla1280: some firmware files cleanups - make all this needlessly global code static - remove the unused firmware_version variables Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <lenehan@twibble.org> [PATCH] SCSI dc395x.c: store pci device pointer Store the PCI device pointer into the adapter control block. This is used in the pci_map_*/pci_unmap_* calls and previously it would have been set to NULL. This appears to be no problem for x86 but is a problem for sparc64. Signed-off-by: Jamie Lenehan <lenehan@twibble.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <lenehan@twibble.org> [PATCH] SCSI dc395x.c: Fix type for irq and io ports Store the port and irq in unsigned long and unsigned int's instead of as u16's and u8's. The later was fine on x86 but not on sparc64. Signed-off-by: Jamie Lenehan <lenehan@twibble.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <lenehan@twibble.org> [PATCH] SCSI dc395x.c: Call pci_disable during cleanup. Call pci_disable_device if initialisation fails and during cleanup. Signed-off-by: Jamie Lenehan <lenehan@twibble.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <Andries.Brouwer@cwi.nl> [PATCH] net: scheduling policing fix Missing goto. Acked by Thomas Graf <dwmw2@shinybook.infradead.org> MTD: some cleanups The patch below makes the following cleanups for code under drivers/mtd/ : - make some needlessly global code static Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David Woodhouse <dwmw2@infradead.org> <dwmw2@shinybook.infradead.org> MTD: Fix memory leak in FTL translation layer. Signed-off-by: David Woodhouse <dwmw2@infradead.org> <jbarnes@sgi.com> [IA64] fix phys. address conversion in ia64_pal_tr_read The palinfo module may call ia64_pal_tr_read using an IPI. If the processor receiving the IPI is idle, the call will fail since the idle process stack is in region 5 and ia64_pal_tr_read uses __pa rather than ia64_tpa. This small patch fixes the problem by making it use ia64_tpa instead. Signed-off-by: Jesse Barnes <jbarnes@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <hch@lst.de> [IA64] remove dead wood from asm-ia64/hardirq.h syscall_count, ksoftirqd_task, local_syscall_count, local_ksoftirqd_task and local_nmi_count are totally unused (and gone from other architectures aswell) nmi_count() is a stub only used once in arch/ia64/kernel/irq.c, so we can use 0 directly there. I suspect it was added to keep irq.c in sync with i386, but even the CONFIG_GENERIC_HARDIRQS code (<hint>which IA64 needs to be converted to</hint>) leaves /proc/interrupts output to the architecture because it's so different over the architectures. Signed-off-by: Christoph Hellwig <hch@lst.de> Deleted the code to print "NMI:" and a row of zeroes from irq.c -Tony Signed-off-by: Tony Luck <tony.luck@intel.com> <jejb@titanic.il.steeleye.com> SCSI: Fix Bug 3753 (multiple definition of ST_partstat) Fix a missed piece of junk from a typedef conversion in st.h Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <tglx@linutronix.de> [PATCH] Lock initializer unifying Batch 2 (SCSI) To make spinlock/rwlock initialization consistent all over the kernel, this patch converts explicit lock-initializers into spin_lock_init() and rwlock_init() calls. Currently, spinlocks and rwlocks are initialized in two different ways: lock = SPIN_LOCK_UNLOCKED spin_lock_init(&lock) rwlock = RW_LOCK_UNLOCKED rwlock_init(&rwlock) this patch converts all explicit lock initializations to spin_lock_init() or rwlock_init(). (Besides consistency this also helps automatic lock validators and debugging code.) The conversion was done with a script, it was verified manually and it was reviewed, compiled and tested as far as possible on x86, ARM, PPC. There is no runtime overhead or actual code change resulting out of this patch, because spin_lock_init() and rwlock_init() are macros and are thus equivalent to the explicit initialization method. That's the second batch of the unifying patches. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <ben-linux@org.rmk.(none)> [ARM PATCH] 2251/1: S3C2410 - system timer rename [cosmetic] Patch from Ben Dooks Correct the name used when registering the system tick interrupt from S32410 to S3C2410. Signed-off-by: Dimitry Andric Signed-off-by: Ben Dooks Signed-off-by: Russell King <jgarzik@pobox.com> [libata ahci] minor fixes Add support for ioctl handling. Remove incorrect comment. <axboe@suse.de> [PATCH] io context leak on queue drain If the drain flag is set on the queue, get_request() needs to drop the acquired iocontext to avoid leaks. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dhowells@redhat.com> [PATCH] Fork fix fix The attached patch fixes the fork fix to avoid the divide-by-zero error I'd previously fixed, but without using any sort of conditional. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <chrisw@osdl.org> [PATCH] binfmt_elf: handle p_filesz == 0 on PT_INTERP section Jakub Jelinek points out that current fix has an underflow problem if elf_ppnt->p_filesz == 0. Fix that up, and also stop overwriting interpreter buffer, simply check that it's NULL-terminated. From: Jakub Jelinek <jakub@redhat.com> Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <chrisw@osdl.org> [PATCH] setup_arg_pages can insert overlapping vma Florian Heinz built an a.out binary that could map bss from 0x0 to 0xc0000000, and setup_arg_pages() would be unhappt in insert_vma_struct because the arg pages overlapped. This just checks before inserting, and bails out if it would overlap. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <chrisw@osdl.org> [PATCH] a.out: error check on set_brk It's possible for do_brk() to fail during set_brk() when exec'ing and a.out. This was noted with Florian's a.out binary and overcommit set to 0. Capture this error and terminate properly. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <davem@nuts.davemloft.net> [SPARC64]: Couple of do_sparc64_fault fixes. 1) Use in_atomic() for atomicity check. 2) Add mmap_sem deadlock on bad kernel access prevention just as on i386 3) Use VM_FAULT_* macros instead of magic constants. Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [SPARC64]: Two io_remap_page_range() fixes. 1) BUG on presence of existing mappings just as remap_pfn_range does 2) Perform TLB flush while holding page_table_lock Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [SPARC64]: Do not set VM_LOCKED on I/O mapped areas. Use VM_RESERVED instead. Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [SPARC64]: Update defconfig. Signed-off-by: David S. Miller <davem@davemloft.net> <marcel@holtmann.org> [Bluetooth] Update copyright information The initial firmware loading routine for the Broadcom based chips was written by Maxim Krasnyansky and so he also owns a copyright for this driver. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> <marcel@holtmann.org> [Bluetooth] Correct locking for zero SCID responses The l2cap_get_chan_by_ident() function must lock the socket with the bh_lock_sock() function on success. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> <marcel@holtmann.org> [Bluetooth] Add support for L2CAP secure mode The secure mode requests an authentication and enables the encryption for that connection. After the successful execution of these procedures it triggers the generation of a new link key. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> <marcel@holtmann.org> [Bluetooth] Check for L2CAP reliability The L2CAP sockets can now set LM_RELIABLE flag and get notification when a reliability problem with the ACL connection is detected. The Bluetooth qualification tests require this functionality. Signed-off-by: Maxim Krasnyansky <maxk@qualcomm.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> <ak@suse.de> [PATCH] x86-64: fix boot crash on VIA systems quirk_via_irqpic cannot be __devinit because it runs at pci_enable_device() time now. This fixes a boot time crash on a VIA x86-64 machine. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <linux-dev@morknet.de> [PATCH] Make dss1_divert ISDN module work on SMP again When I switched my installation from kernel 2.4 to 2.6 I recognized that the ISDN module dss1_divert was marked incompilable (config option CONFIG_CLEAN_COMPILE must be turned off). The compile problem was the obsolete using of kernel 2.4 critical sections. I replaced the cli() stuff with spinlocks as explained in the Documentation/spinlocks.txt file. After that the module compiles and runs as expected. Signed-off-by: Steffen A. Mork <linux-dev@morknet.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jgarzik@pobox.com> [libata docs] add chapter on libata driver API <bzolnier@trik.(none)> [ide] update CRISv10 IDE driver Signed-off-by: Mikael Starvik <starvik@axis.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <bzolnier@trik.(none)> [ide] no need to alloc sg_table in CRISv10 IDE driver Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <bzolnier@trik.(none)> [ide] update documentation for ide params From: Magnus Damm <magnus.damm@gmail.com> This patch removes ide parameters marked as obsolete in the source and adds documentation for "ide=". I think I got it right, the important part for me is "ide=nodma". Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <bzolnier@trik.(none)> [ide] "ide=nodma" printout fix From: Magnus Damm <magnus.damm@gmail.com> This simple patch changes the output from this: .. ide_setup: ide=nodmaIDE: Prevented DMA .. to this: .. ide_setup: ide=nodma : Prevented DMA .. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <bzolnier@trik.(none)> [ide] remove RICOH CD-R/RW MP7083A from DMA blacklist From: Srihari Vijayaraghavan <sriharivijayaraghavan@yahoo.com.au> I have tested my RICOH CD-R/RW with this patch (on CD reading/writing), and it works just fine with DMA enabled. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <bzolnier@trik.(none)> [ide] small IDE cleanups The patch below does the following small cleanups in the IDE code: - make some needlessly global code static - remove two unused functions from pdc202xx_new.c Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <bzolnier@trik.(none)> [ide] fix /proc/ide/hd?/settings to not spam logs On Thu, 11 Nov 2004 17:10:21 +0100, Jens Axboe <axboe@suse.de> wrote: > On Thu, Nov 11 2004, Alan Cox wrote: > > > + printk(KERN_WARNING "Warning: /proc/ide/hd?/settings interface is " > > > + "obsolete, and will be removed soon!\n"); > > > + > > > > The above should be rate limited or on the write case moved to after > > the capable() check. A program polling these settings now makes a nasty > > noise and wipes the logs. A user can also do it intentionally. > > Or just print it once... Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> <linux-dev@morknet.de> [PATCH] fix dss1_divert fixes As noted by Bartlomiej, this makes the spinlock be a proper lock rather than just a local lock to each user. Signed-off-by: Steffen A. Mork <linux-dev@morknet.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <herbert@gondor.apana.org.au> [IPV4/IPV6]: Remove frag_list check from output path. I've removed the frag_list check before fragmenting and we'll rely on dev_queue_xmit to fix things up if necessary. Any functions in between should do the right thing since they need to handle non-linear skb's anyway. Well that's the theory :) Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> <davem@nuts.davemloft.net> [IPV6]: Set sk_prot early enough in inet6_create() It needs to be before the sk_set_owner() call else we OOPS. Signed-off-by: David S. Miller <davem@davemloft.net> <torvalds@ppc970.osdl.org> Fix floppy driver lock-up when you have an irq storm. It happens with misconfigured interrupts (and no floppy controller). We should probably also make floppy use the irq probing mechanism, which handles that situation more gracefully. <adaplas@hotpop.com> [PATCH] rivafb: fix broken burst length calculation As noted by Linus, the burst-length "log2()" calculations were broken by the cleanup. This reverts to the old code. <andrew@walrond.org> [PATCH] fbdev: Fix rivafb breakage (typo introduced by NV IO access cleanups) Fix typo introduced during changes to use NV_ macros, which caused screen corruption when using rivafb Signed-off-by: Andrew Walrond <andrew@walrond.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <torvalds@ppc970.osdl.org> Fix reading /proc/<pid>/mem when parent dies. We should not touch "self_exec_id" here. The parent changed, not we. <eranian@hpl.hp.com> [IA64] perfmon: enable interrupts around semaphore call fix a problem in pfm_handle_work() where a task may go to sleep in down_interruptible() with interrupts disabled. This may happen only for a monitored thread for which the PFM_FL_NOTIFY_BLOCK flag is set. The fix re-enables interrupts around the semaphore call. It is safe to do so because pfm_handle_work() is called from do_notify_user() which is called only when the task is about to leave the kernel, i.e., no risk of stack overflow because of interrupt nesting. fix a debug printk warning in pfm_write_pmcs() signed-off-by: Stephane Eranian <eranian@hpl.hp.com> ack-by: David Mosberger <davidm@hpl.hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <patrick@tykepenguin.com> [DECNET]: Remove DECNET_SIOCGIFCONF. It's only purpose seems to be to break ifconfig. It often gets enabled by default by distributors who like to set everything on, and it just confuses people. The functionality is available via netlink anyway - which is what anyone using DECnet will be using for configuration. Signed-off-by: Patrick Caulfield <patrick@tykepenguin.com> Signed-off-by: David S. Miller <davem@davemloft.net> <rddunlap@osdl.org> [SCTP]: Fix printk arg type fix printk argument type warning: net/sctp/socket.c:2672: warning: format argument is not a pointer (arg 5) Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <Ian.Pratt@cl.cam.ac.uk> [IPV4]: Missing pskb_may_pull in icmp_filter. Signed-off-by: David S. Miller <davem@davemloft.net> <lnville@tuxdriver.com> [VLAN]: change_mtu should return 0 on success. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net> <ben-linux@org.rmk.(none)> [ARM PATCH] 2249/1: S3C2410 - update help for arch/arm/Kconfig.debug Patch from Ben Dooks Update help-text to show the new option for controlling where the low-level debug messgaes go. Signed-off-by: Ben Dooks Signed-off-by: Russell King <ben-linux@org.rmk.(none)> [ARM PATCH] 2256/1: S3C2410 - dma load fixes Patch from Ben Dooks Fix pair of bugs in dma loading code 1) no need to error if loading onto stopped channel 2) irq code prints error if buffer done callback fully reloads the channel. Signed-off-by: Ben Dooks Signed-off-by: Russell King <shemminger@osdl.org> [RANDOM]: Remove TCP MD4 code if not CONFIG_INET Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <jmorris@redhat.com> [AF_UNIX]: Fix SELinux crashes with SOCK_SEQPACKET 1) Don't call security_unix_may_send() hook during sendmsg() for SOCK_SEQPACKET, and ensure that sendmsg() can only be called on a connected socket so as not to bypass the security_unix_stream_connect() hook. 2) Return -EINVAL if sendto() is called on SOCK_SEQPACKET with an address supplied. Signed-off-by: James Morris <jmorris@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> <ben-linux@org.rmk.(none)> [ARM PATCH] 2263/1: S3C2410 - gpio pin config fixes Patch from Ben Dooks Fix S3C2410_GPE3, S3C2410_GPE4 and S3C2410_GPE7 pin functions, and add S3C2440 AC97 pin functions Signed-off-by: Ben Dooks Signed-off-by: Russell King <dsaxena@net.rmk.(none)> [ARM PATCH] 2252/1: Fix IXP4XX timer interrupt implementation Patch from Deepak Saxena The current timer interrupt implementation can cause time to skip forward by ~65s and causes a 1 minute pause during bootup. The fix for this was found during 2.4 but got lost in the 2.6 transition. Details @: http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/... Signed-off-by: Deepak Saxena Signed-off-by: Russell King <dsaxena@net.rmk.(none)> [ARM PATCH] 2253/1: Fix IXP4xx PCI config cycle routines Patch from Deepak Saxena The IXP4xx PCI config cycle routines currently virtualize accesses to device 0:0 to map to the host bridge itself. This is technically incorrect b/c on certain boards we have an actual device wired to 0:0 and the existing code will not see these. Signed-off-by: Deepak Saxena Signed-off-by: Russell King <jejb@mulgrave.(none)> SCSI: fix USB forced remove oops Because of the changes to add the target in to the driver model, the cancellation method no-longer works correctly. Fix it by iterating using shost_for_each_device instead. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <dsaxena@net.rmk.(none)> [ARM PATCH] 2254/1: Fix ixp4xx-regs.h PCI config address typo Patch from Deepak Saxena There seems to be a typo that has creeped into include/asm/arch-ixp4xx/ixp4xx-regs.h. IXP4XX_EXP_CFG_BASE_VIRT and IXP4XX_PCI_CFG_BASE_VIRT were both defined to the same value. The patch changes PCI_CFG_BASE_VIRT to the value in the memory map comment. Signed-off-by: Deepak Saxena Signed-off-by: Russell King <dsaxena@net.rmk.(none)> [ARM PATCH] 2258/1: Add missing IXP2000 Makefile.boot file Patch from Deepak Saxena Signed-off-by: Deepak Saxena Signed-off-by: Russell King <dsaxena@net.rmk.(none)> [ARM PATCH] 2262/1: Various IXP2000 typo fixes and comment cleanups Patch from Deepak Saxena Patch from Lennert Buytenhek Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King <dsaxena@net.rmk.(none)> [ARM PATCH] 2268/1: Update Documentation/arm/Booting Patch from Deepak Saxena One of the problems I have seen with several bootloaders is that they forget to disable network devices before jumping into the kernel and we end up with kernel text being overwritten by random data before the in-kernel driver resets the devices. This patch adds a blurb to the ARM Bootloader documentation reminding developers to quiesce all DMA capable devices before executing the kernel. Signed-off-by: Deepak Saxena Signed-off-by: Russell King <davem@nuts.davemloft.net> [SPARC]: Fix serial console handling. Due to recent logic changes in uart_add_one_port(), the serial console was being registered twice. To avoid this, so serial console init before we actually register the uarts ports with the core serial layer. Noticed by William Lee Irwin III <wli@holomorphy.com> Signed-off-by: David S. Miller <davem@davemloft.net> <iod00d@hp.com> [IA64] perfmon: fix double end-of-comment in previous checkin Following trivial patch fixes what looks like a merge bug. Signed-off-by: Grant Grundler <iod00d@hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <rmk@flint.arm.linux.org.uk> [PCMCIA] Don't place Cardbus bridges into D3 state on suspend. Some laptops, notably IBM T22, refuse to suspend when the Cardbus bridge is placed into D3. Therefore, comment out the call for the time being. <akpm@osdl.org> [PATCH] fix kobject varargs bug From: Gerd Knorr <kraxel@bytesex.org> It uses the varargs list twice in a illegal way. That doesn't harm on i386 by pure luck, but blows things up on amd64 machines. Using var args list twice without calling va_start twice is illegal. Signed-off-by: Gerd Knorr <kraxel@bytesex.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <maneesh@in.ibm.com> [PATCH] fix oops in sysfs_remove_dir() The following patch should avoid the sysfs_remove_dir() oops you are seeing while device removal. It anyway fixes the obvious error and is needed. But it will not make any change to the first error you are seeing while connecting the device. o Following patch avoids the sysfs_remove_dir() oops when it is passed a kobject with NULL dentry. Signed-off-by: Maneesh Soni <maneesh@in.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: Do not register useless smsc47m1 While verifying my stack of patches against what you sent to Linus last week, I noticed this one. Looks like I simply forgot to send it to you, as I cannot find any trace of it in the lm_sensors mailing-list archives. The patch prevents an smsc47m1 device from being registered when no monitoring function is actually active within the chip. See this ticket for background: http://secure.netroedge.com/~lm78/readticket.cgi?ticket=1801 This is certainly better to explicitely fail in this case than leave the user with an empty sysfs directory (except for alarms), which tends to make him/her think of a driver bug, which it isn't (what it really is is a BIOS brokenness). Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: Fixes to the i2c-amd756-s4882 driver While working on the 2.4 version of the i2c-amd756-s4882 driver, I noticed a few quirks on the 2.6 version I sent to you. The following patch attempts to fix them. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: Cleanups to the recent smbus functions removal This patch cleans up the recent removal of smbus functions proposed by Arjan and then fixed by Gabriel. Changes are as follow: 1* Discard i2c_smbus_block_process_call, as it isn't used anywhere either. I guess that Arjan missed it because it wasn't exported. 2* Document the functions removal, so that people have at least an idea that the functions can be restored later if needed. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <paubert@iram.es> [PATCH] I2C: minor comment fix It seems so. BTW I hate wrong comments and happened to add one in my patch. To fix my blunder, can you apply the appended one line removal on top of Jean's patch. Signed-off-by: Gabriel Paubert <paubert@iram.es> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <thomas@plx.com> [PATCH] I2C: i2c-nforce2.c add support for nForce3 Pro 150 MCP This is the all new and improved version of the patch: - following the advise from Jean Delvare I removed the redundant definition of the PCI IDs from the driver and just add them to the pci_ids.h file. - the patch is now created against linux 2.6.10-RC2. Signed-off-by: Thomas Leibold <thomas@plx.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <daniel.ritz@gmx.ch> [PATCH] USB: Add some help text for touchkitusb add some help text for touchkitusb. the howto there should also work for mtouchusb and other touchscreens using the input layer. Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <petkan@nucleusys.com> [PATCH] USB: pegasus endian fixes big-endian related fixes; Signed-off-by: Petko Manolov <petkan@nucleusys.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <pmarques@grupopie.com> [PATCH] USB: add PID to ftdi_sio.c The attached patch fixes a bug introduced by myself (a brown paper bag one) when I posted the patch that introduced this same PID to the id_table_FT232BM array only and not the id_table_combined array. Signed-off-by: Paulo Marques <pmarques@grupopie.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <rl@hellgate.ch> [PATCH] USB: visor: Always do generic_startup generic_startup in visor.c was not called for some hardware, resulting in attempts to access memory that had never been allocated, which in turn caused the problem several people reported with recent (2.6.10ish) kernels. Signed-off-by: Roger Luethi <rl@hellgate.ch> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <twogood@users.sourceforge.net> [PATCH] Re: The "ipaq" module: Updated list of vendor/product IDs This patch for ipaq.h and ipaq.c in drivers/usb/serial/ has the following features: o Provides an updated table with all vendor/product IDs (except one [1]) present in Microsoft ActiveSync 3.7.1, the latest version available for download. o Removes #defines with vendor and product IDs from ipaq.h [2] The table has been autogenerated from the file wceusbsh.inf (extracted from MSASYNC.EXE with cabextract). The scripts used to generate the table become available for download as part of the SynCE project (http://synce.sourceforge.net). [1] Vendor 0x45e (Microsoft) with device 0xCE is not included, because they are used when the device is turned off but still connected to the PC via USB. When the device is turned on, it changes vendor/product IDs to the more specific ones. [2] Not needed with an autogenerated device table Signed-off-by: David Eriksson <twogood@users.sourceforge.net> Signed-off-by: Ganesh Varadarajan <ganesh@veritas.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <phil@ipom.com> [PATCH] USB Storage: Unusual_dev entry for tekom/yakumo Here's another unusual_devs entry for the Tekom/Yakumo devices. While I was there I realized two of the tekom entries were out of order, so I fixed that as well. From: Paul Ortyl <ortylp@3miasto.net> Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <masaki-c@nict.go.jp> [PATCH] USB: new defice for usb serial pl2303 Add device ID to pl2303 usb serial driver for 1) I/O DATA USB-RSAQ3 2) ELECOM UC-SGT Signed-off-by: CHIKAMA Masaki <masaki-c@nict.go.jp> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mdharm-usb@one-eyed-alien.net> [PATCH] USB Storage: fixes to usb-storage scanning thread This was originally patch as401 from Alan Stern. This patch makes a couple of small changes to the new scanning thread. It changes the name to "usb-stor-scan", which was my original intention and makes more sense than the current name. It also removes the PF_NOFREEZE flag; if someone suspends their system immediately after plugging in a USB storage device then the scanning thread should be frozen along with everything else. The delay will be restarted after the system wakes up. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Matthew Dharm <mdharm-usb@one-eyed-alien.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mdharm-usb@one-eyed-alien.net> [PATCH] USB Storage: Force INQUIRY length to be 36 This is patch as399, originally from Alan Stern. A recent change to the scsi_probe_lun() routine now allows host drivers to specify a device's INQUIRY length in a way that cannot be overridden by the value returned from the device. This patch makes usb-storage set the length to 36; now buggy devices won't be able to cause trouble by saying that they have 37 bytes of INQUIRY data available. The only way this value could be changed is if someone creates a SCSI blacklist entry with the BLIST_INQUIRY_58 flag -- and no one would do that for a USB device (I hope)! Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Matthew Dharm <mdharm-usb@one-eyed-alien.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <mdharm-usb@one-eyed-alien.net> [PATCH] USB Storage: Remove unnecessary state testing This patch started as as405 from Alan Stern. It has been re-generated against the current tip of the BK tree. For quite a while we've had a bunch of state-transition testing code in the driver, to report if anything bad ever happens (like the SCSI midlayer trying to queue a second command before the first one finishes). None of those tests triggered in a very long time; this aspect of the code appears to be extremely stable. So this patch removes all those tests for illegal values of us->sm_state. It turns out that sm_state was used only for one other purpose: to check whether a command had timed out and caused a SCSI abort. That piece of information can easily be stored in a single new bitflag (which is called calling US_FLIDX_TIMED_OUT) and doing so makes us->sm_state completely unused. Hence the patch removes it from the structure. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Matthew Dharm <mdharm-usb@one-eyed-alien.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <bunk@stusta.de> [PATCH] PCI Hotplug: remove unused drivers/pci/hotplug/pciehp_sysfs.c Remove unused the drivers/pci/hotplug/pciehp_sysfs.c Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <eike-hotplug@sf-tec.de> [PATCH] PCI Hotplug: clean up rpaphp_pci.c::rpaphp_find_pci_dev this patch improves rpaphp_find_pci_dev. First it uses the for_each_pci_dev macro instead of the while loop, making this hotplug safe (which is a good idea in a hotplug driver, isn't it?). Then it removes retval_dev. retval_dev is set to the found device when something is found, NULL otherwise. If nothing is found dev will be NULL at the end of the loop anyway and the found device if we found something, no need for retval_dev then. And a very small coding style fix. Signed-off-by: Rolf Eike Beer <eike-hotplug@sf-tec.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <rddunlap@osdl.org> [PATCH] PCI Hotplug: cpcihp_generic: fix module_param data type drivers/pci/hotplug/cpcihp_generic.c:214: warning: return from incompatible pointer type Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <eike-kernel@sf-tec.de> [PATCH] PCI: fix Documentation/pci.txt inconsistency Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <ak@suse.de> [PATCH] x86_64: fix async IPIs Fix async IPI to not return before stack data is used. This can fix reboot crashes and apparently helps vmware. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <axboe@suse.de> [PATCH] 3ware bad queuecommand returns If your ->queuecommand() completes a command through done, it must not return non-zero to the mid layer so that it takes ownership of the command again. Signed-off-by: Jens Axboe <axboe@suse.de> corrected typo Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <axboe@suse.de> [PATCH] ide-scsi bad queuecommand return ide-scsi completes a command but returns ownership to the mid layer. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <axboe@suse.de> [PATCH] megaraid bad queuecommand return In case of scb allocation failure, mega_build_cmd() can return NULL scb but set busy, which causes a non-zero return from ->queuecommand() while the scsi command has been completed. Just returning busy without calling done() should be enough for appropriate retries. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <axboe@suse.de> [PATCH] ncr53c8xx bad queuecommand return One more case of returning non-zero with a completed command. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <axboe@suse.de> [PATCH] nsp32 bad queuecommand return The driver appropriately returns SCSI_MLQUEUE_HOST_BUSY, but it has already completed the command. Just return 0 instead and let the mid layer handle it through scsi_done(). Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <axboe@suse.de> [PATCH] aacraid bad queuecommand return aac_read() and aac_write() may complete a command but return -1, which is propagated through aac_scsi_cmd() to the mid layer through ->queuecommand. If the command has been completed, it must return 0. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <axboe@suse.de> [PATCH] megaraid2 bad queuecommand return If the command is already completed, megaraid_queue_command() must return 0. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <axboe@suse.de> [PATCH] nsp_cs bad queuecommand return Return 0 from queuecommand, if the command has been completed already. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> <jeffm@novell.com> [PATCH] selinux: cache not freed if load_policy fails; reload BUG's If security_load_policy() fails on the first try, the cache is never cleaned up. When the policy is fixed and a reload is attempted, the old cache will still exist, causing a BUG() in kmem_cache_create(). This patch adds a destroy operation to clean up the cache on failure. Signed-off-by: Jeff Mahoney <jeffm@novell.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mingo@elte.hu> [PATCH] sched: fix ->nr_uninterruptible handling bugs PREEMPT_RT on SMP systems triggered weird (very high) load average values rather easily, which turned out to be a mainline kernel ->nr_uninterruptible handling bug in try_to_wake_up(). the following code: if (old_state == TASK_UNINTERRUPTIBLE) { old_rq->nr_uninterruptible--; potentially executes with old_rq potentially being != rq, and hence updating ->nr_uninterruptible without the lock held. Given a sufficiently concurrent preemption workload the count can get out of whack and updates might get lost, permanently skewing the global count. Nothing except the load-average uses nr_uninterruptible() so this condition can go unnoticed quite easily. the fix is to update ->nr_uninterruptible always on the runqueue where the task currently is. (this is also a tiny performance plus for try_to_wake_up() as a stackslot gets freed up.) while fixing this bug i found three other ->nr_uninterruptible related bugs: - the update should be moved from deactivate_task() into schedule(), beacause e.g. setscheduler() does deactivate_task()+activate_task(), which in turn may result in a -1 counter-skew if setscheduler() is done on a task asynchronously, which task is still on the runqueue but has already set ->state to TASK_UNINTERRUPTIBLE. sys_sched_setscheduler() is used rarely, but the bug is real. (The fix is also a small performance enhancement.) The rules for ->nr_uninterruptible updating are the following: it gets increased by schedule() only, when a task is moved off the runqueue and it has a state of TASK_UNINTERRUPTIBLE. It is decreased by try_to_wake_up(), by the first wakeup that materially changes the state from TASK_UNINTERRUPTIBLE back to TASK_RUNNING, and moves the task to the runqueue. - on CPU-hotplug down we might zap a CPU that has a nonzero counter. Due to the fuzzy nature of the global counter a CPU might hold a nonzero ->nr_uninterruptible count even if it has no tasks anymore. The solution is to 'migrate' the counter to another runqueue. - we should not return negative counter values from the nr_uninterruptible() function, since it accesses them without taking the runqueue locks, so the total sum might be slightly above or slightly below the real count. I tested the attached patch on x86 SMP and it solves the load-average problem. (I have tested CPU_HOTPLUG compilation but not functionality.) I think this is a must-have for 2.6.10, because there are apps that go berzerk if load-average is too high (e.g. sendmail). Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <sfr@canb.auug.org.au> [PATCH] ppc64 iSeries: PURR emulation fix It appears that the PURR emulation patch was the victim of the renaming of a structure element. The current BK kernel will not build for iSeries without this patch. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rmk+lkml@arm.linux.org.uk> [PATCH] parport_pc CONFIG_PCI=n build fix The following patch fixes these build errors on machines with CONFIG_PCI=n: drivers/parport/parport_pc.c:3199: error: `parport_init_mode' undeclared (first use in this function) drivers/parport/parport_pc.c:3199: error: (Each undeclared identifier is reported only once drivers/parport/parport_pc.c:3199: error: for each function it appears in.) Signed-off-by: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <wli@holomorphy.com> [PATCH] parport_pc warning fixes Stomp a couple of warnings which several people have tried to fix. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: Fix build error of arch/m32r/mm/fault.c The modification of "Changes for arch/m32r/mm/fault.c@1.3" was prepared for enforce-a-gap-between-heap-and-stack.patch(*) of -mm tree, but it has not been merged into mainline. (*) "heap-stack-gap for 2.6" (Sep. 25, 2004) http://www.uwsg.iu.edu/hypermail/linux/kernel/0409.3/0435... So, this patch is for withdrawing the previous arch/m32r/mm/fault.c. Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <andrea@novell.com> [PATCH] fix for mpol mm corruption on tmpfs With the inline symlink shmem_inode_info structure is overwritten with data until vfs_inode, and that caused the ->policy to be a corrupted pointer during unlink. It wasn't immediatly easy to see what was going on due the random mm corruption that generated a weird oops, it looked more like a race condition on freed memory at first. There's simply no need to set a policy for inodes, since the idx is always zero. All we have to do is to initialize the data structure (the semaphore may need to run during the page allocation for the non-inline symlink) but we don't need to allocate the rb nodes. This way we don't need to call mpol_free during the destroy_inode (not doable at all if the policy rbtree is corrupt by the inline symlink ;). An equivalent version of this patch based on a 2.6.5 tree with additional numa features on top of this (i.e. interleaved by default, and that's prompted me to add a comment in the LNK init path), works fine in a numa simulation on my laptop (untested on the bare hardware). Signed-off-by: Andrea Arcangeli <andrea@novell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <andrea@novell.com> [PATCH] mempolicy can select the wrong policy mempolicy.c code will return the wrong policy in some cases. Signed-off-by: Andrea Arcangeli <andrea@novell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <prasanna@in.ibm.com> [PATCH] kprobes: dont steal interrupts from vm86 This patch fixes the problem reported by Stas Sergeev, that kprobes steals the virtual-8086 exceptions. This fix modifies kprobe_handler() to return 0 when in virtual-8086 mode. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <bjorn.helgaas@hp.com> [PATCH] Fix ia64 flush_tlb_page build error Fix ia64 build error: implicit declaration of function `flush_tlb_page' Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rddunlap@osdl.org> [PATCH] cdrom: handle SYSCTL without PROC_FS Fixes oops (reference to cdrom_root_table->child->) when CONFIG_SYSCTL=y and CONFIG_PROC_FS=n. Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <bjorn.helgaas@hp.com> [PATCH] early uart console support This adds an early polled-mode "uart" console driver, based on Andi Kleen's early_printk work. The difference is that this locates the UART device directly by its MMIO or I/O port address, so we don't have to make assumptions about how ttyS devices will be named. After the normal serial driver starts, we try to locate the matching ttyS device and start a console there. Sample usage: console=uart,io,0x3f8 console=uart,mmio,0xff5e0000,115200n8 If the baud rate isn't specified, we peek at the UART to figure it out. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <bjorn.helgaas@hp.com> [PATCH] move HCDP/PCDP to early uart console This changes the HCDP/PCDP support to use the early uart console rather than using early_serial_setup(). As a consequence, ia64 serial device names will now stay constant regardless of firmware console settings. (A serial device selected as an EFI console device on HP ia64 boxes used to automatically become ttyS0.) This also removes the ia64 early-boot kludge of assuming legacy COM ports at 0x3f8 and 0x2f8. For boxes that have legacy ports but no HCDP, "console=ttyS0" will still work, but the console won't start working until after the serial driver initializes and discovers the devices. WARNING: If you have an HP machine and you're using the MP serial console port (the connector labelled "console" on the 3-headed cable), this patch will break your console! HOW TO FIX IT: 1) The console device will change from /dev/ttyS0 to /dev/ttyS1, ttyS2, or ttyS3, so: 1a) Edit /etc/inittab to add a getty entry for /dev/ttyS1 (rx4640, rx5670, rx7620, rx8620, Superdome), /dev/ttyS2 (rx1600), or /dev/ttyS3 (rx2600). 1b) Edit /etc/securetty to add ttyS1, ttyS2, or ttyS3. 1c) Leave the existing ttyS0 entries in /etc/inittab and /etc/securetty so you can still boot old kernels. 2) Edit /etc/elilo.conf to remove any "console=" arguments (see [1]). 3) Run elilo to install the bootloader with new configuration. 4) Reboot and use the EFI boot option maintenance menu to select exactly one device for console output, input, and standard error. Then do a cold reset so the changes take effect. For the MP console, be careful to select the device with "Acpi(HWP0002,700)/Pci(...)/Uart" in the path (see [2]). DETAILS: - Prior to this patch, serial device names depended on the HCDP, which in turn depends on EFI console settings. After this patch, the naming always stays the same, regardless of firmware settings. For example, an rx1600 with a single built-in serial port plus an MP has these ports: Old Old MMIO (EFI console (EFI console address on builtin) on MP port) New ========== ========== ========== ====== builtin 0xff5e0000 ttyS0 ttyS1 ttyS0 MP UPS 0xf8031000 ttyS1 ttyS2 ttyS1 MP Console 0xf8030000 ttyS2 ttyS0 ttyS2 MP 2 0xf8030010 ttyS3 ttyS3 ttyS3 MP 3 0xf8030038 ttyS4 ttyS4 ttyS4 - If you want to have multiple devices in the EFI console path, you can, but Linux won't be able to deduce which console to use, so it will default to using VGA. You can use "console=hcdp" (the UART device from the EFI path) or "console=ttyS<n>" to select the device directly. TROUBLESHOOTING: - No kernel output after "Uncompressing Linux... done": -> You're using an MP port as the console and specified "console=ttyS0". This port is now named something else. Remove the "console=" option. -> Multiple UARTs selected as EFI console devices, and you're looking at the wrong one. Make sure only one UART is selected (use the EFI Boot Manager "Boot option maintenance" menu). -> You're physically connected to the MP port but have a non-MP UART selected as EFI console device. Either move the console cable to the non-MP UART, or change the EFI console path to the MP UART (the MP UART is the one with "Acpi(HWP0002,700)/Pci(...)/Uart" in it.) - Long pause (60+ seconds) between "Uncompressing Linux... done" and start of kernel output: -> No early console, probably because you used "console=ttyS<n>". Remove the "console=" option. - Kernel and init script output works fine, but no "login:" prompt: -> Add getty entry to /etc/inittab for console tty. Use the table in (1a) above or look for the "Adding console on ttyS<n>" message that tells you which device is the console. - "login:" prompt, but can't login as root: -> Add entry to /etc/securetty for console tty. [1] When the EFI console path contains exactly one device (either serial or VGA), 2.6.6 and newer kernels default to that device automatically. So if you remove "console=" arguments, you can use the same elilo configuration to boot any 2.6.6 or newer kernel with or without this patch. If you need to boot kernels older than 2.6.6 (including RHEL3 and SLES9), keep an 'append="console=ttyS0"' line in those elilo.conf stanzas. Non-HP machines will still need "console=" for serial consoles because they don't supply the HCDP table. [2] The HP management card (MP) causes confusion because it is always active as an EFI console, even if it doesn't appear in the EFI console path. If your console path is set to a non-MP UART, and you happen to be attached to the MP UART, everything works in EFI, but the kernel will think the non-MP UART is the console, so you won't see any kernel output. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <giuseppe@eppesuigoccas.homedns.org> [PATCH] gbefb.c build fix The current gbefb.c source cannot be compiled as module because of a small typo where "option" was written instead of "options" in two places. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] vmscan: ignore swap token when in trouble The token-based thrashing control patches introduced a problem: when a task which doesn't hold the token tries to run direct-reclaim, that task is told that pages which belong to the token-holding mm are referenced, even though they are not. This means that it is possible for a huge number of a non-token-holding mm's pages to be scanned to no effect. Eventually, we give up and go and oom-kill something. So the patch arranges for the thrashing control logic to be defeated if the caller has reached the highest level of scanning priority. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] md: Fix problem with unsigned variable going "negative" in linear.c We replace 'size' by 'start'. 'start' means exactly the same as 'curr_offset - size', and the equivalence of the new code can be tested based on this. The difference is that 'start' will never be negative and so can fit in a 'sector_t' while 'size' could be negative. Also make curr_offset sector_t, as it should have been. Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hugh@veritas.com> [PATCH] mlock-vs-VM_IO hang fix With Andrea Arcangeli <andrea@novell.com> Fix a hang which occurs when mlock() encounters a mapping of /dev/mem. These have VM_IO set. follow_page() keeps returning zero (not a valid pfn) and handle_mm_fault() keeps on returning VM_FAULT_MINOR (there's a pte there), so get_user_pages() locks up. The patch changes get_user_pages() to just bale out when it hits a VM_IO region. make_pages_present() is taught to ignore the resulting -EFAULT. We still have two bugs: a) If a process has a VM_IO vma, get_user_pages() will bale early, without having considered the vmas at higher virtual addresses. As do_mlock() also walks the vma list this bug is fairly benign, but get_user_pages() is doing the wrong thing there. b) The `len' argument to get_user_pages should be long, not int. We presently have a 16TB limit on 64-bit. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <bunk@stusta.de> [PATCH] ISDN divert_init.c build fix drivers/isdn/divert/divert_init.c:25: error: conflicting types for 'printk' Signed-off-by: Adrian Bunk <bunk@fs.tum.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <trini@kernel.crashing.org> [PATCH] ppc32: Fix CONFIG_8260 and CONFIG_BLK_DEV_INITRD <alebas@televes.com> found that CONFIG_8260 and CONFIG_BLK_DEV_INITRD was broken as arch/ppc/syslib/m8260_setup.c was missing <linux/root_dev.h>. Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <bunk@stusta.de> [PATCH] ST_partstat multiple definition drivers/scsi/osst.o(.bss+0x0): multiple definition of `ST_partstat' drivers/scsi/st.o(.bss+0x0): first defined here Signed-off-by: Adrian Bunk <bunk@fs.tum.de> Cc: James Bottomley <James.Bottomley@steeleye.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] x86 current_stack_pointer warning fix With newer gcc's: include/asm/thread_info.h:95: warning: unused variable `current_stack_pointer' Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <sfr@canb.auug.org.au> [PATCH] ppc64 iSeries: fix viodasd remove This patch just makes sure that we do not dereference a viodasd gendisk pointer after it has been freed. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulus@samba.org> [PATCH] ppc64: move emulate_step to arch/ppc64/lib This patch moves the emulate_step function, which is used in xmon's single-stepping code, out of xmon.c and into arch/ppc64/lib/sstep.c, so that kprobes can use it too. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <olof@austin.ibm.com> [PATCH] ppc64: Make pci_alloc_consistent() conform to API docs Documentation/DMA-mapping.txt says that pci_alloc_consistent() needs to return a mapping that is aligned by the closest larger order of two as the allocation. We're currently breaking this with our iommu code. To fix this, add align_order arguments to the relevant functions and pass it down. Specifying align_order of 0 gives same behaviour as previous. Signed-off-by: Olof Johansson <olof@austin.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <trini@kernel.crashing.org> [PATCH] x86_64: only single-step into signal handlers if the tracer asked for it Port of the i386 patch of the same name. Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <clameter@sgi.com> [PATCH] mmtimer driver update - reduce processing in timer interrupt through the use of a tasklet - fix various race conditions - use the correct interrupt vector for the SN2 RTC Signed-off-by: Dimitri Sivanich <sivanich@sgi.com> Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: Kconfig.debug support This patch updates Kconfig and add Kconfig.debug for m32r. - arch/m32r/Kconfig: Move "Kernel hacking" menu to Kconfig.debug. - arch/m32r/Kconfig.debug: Newly added. - lib/Kconfig.debug: Add m32r arch. Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: Fix a boot hang of UP kernel This patch fixes a hanging up at boot time of 2.6.10-rc2 m32r UP kernel. It was due to a lack of update_process_times() in time.c. Such a boot hang was caused only in UP systems, because update_process_times() had been executed correctly in smp_local_timer_interrupt() of arch/m32r/kernel/smp.c for SMP. arch/m32r/kernel/time.c: - UP: Fix do_timer_interrupt() to use update_process_times(). - UP: Move profile_tick() into do_timer_interrupt(). - Change __inline__ to inline. Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] m32r: make zImage a default build target Here is a patch to update arch/m32r/Makefile for m32r. - Make zImage a default build target - Add zImage to targets marked with [*]. <takata@linux-m32r.org> [PATCH] m32r: io_xxxxx.c cleanups cleanups for arch/m32r/kernel/io*.c. - Fix ugly indentation. - Change __inline__ to inline. - Remove RCS ID strings. Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] M68k: Update defconfigs for 2.6.10-rc1 M68k: Update defconfigs Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] M68k: Add 3 missing syscalls M68k: Add 3 missing syscalls (up to 2.6.10-rc1) Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] 68851 MMU: Fix harmless typo in the MMU configuration code. 68851 MMU: Fix harmless (CPU_68020 == MMU_68851 anyway) typo in the MMU configuration code. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] Sun-3: Fix link error Sun-3: Fix link error (we forgot to update vmlinux-sun3.lds during last update of vmlinux-std.lds) Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] fm2fb: Update Steffen A. Mork's email address fm2fb: Update Steffen A. Mork's email address Signed-off-by: Steffen A. Mork <linux-dev@morknet.de> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] M68k I/O: Move HP300 I/O macros close to other I/O macros again M68k I/O: Move HP300 I/O macros close to other I/O macros again (after merge error in 2.6.10-rc2) Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] M68k: Update defconfigs for 2.6.10-rc2 M68k: Update defconfigs for 2.6.10-rc2 Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <blaisorblade_spam@yahoo.it> [PATCH] uml: update some copyrights Update/add some copyright notices. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <blaisorblade_spam@yahoo.it> [PATCH] uml: partial KBUILD_OUTPUT fix Start fixing KBUILD_OUTPUT support for UML. These changes are trivial and no-ops when this feature is not enabled - the "hard part" of this support is under discussion because it's hard to do properly (UML uses both shipped and build-generated headers from a lot of different directories, and for good reasons). Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: remove zfcp hba api callbacks From: Heiko Carstens <heiko.carstens@de.ibm.com> Remove the disputed hba api event callback code. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hch@lst.de> [PATCH] allow NFS exports of EFS filesystems Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <stelian@popies.net> [PATCH] sonypi: return an error from sonypi_camera_command() if the camera isn't enabled The sonypi_camera_command() used to fail without returning an error code if the user fergot to enable the camera in the sonypi module (using the camera=1 module parameter). This caused the meye driver to apparently load correctly but miserably fail later, when trying to access the camera for getting some data out of it. This patch adds an error code to sonypi_camera_command() and makes the meye driver check for it in the PCI probe routine. If the function fails, a message is printed in the kernel logs reminding the user it should better RTFM. The patch also removes some sonypi_camera_command() commands (those supposed to return the current camera settings) which are unreliable. The meye driver does not use them anyway. Signed-off-by: Stelian Pop <stelian@popies.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <oleg@tv-sign.ru> [PATCH] uninline do_trap(), remove get_cr2() Uninlining do_trap() saves 544 bytes in traps.o. get_cr2() seems to be unused, remove it. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <colin.lkml@colino.net> [PATCH] Switch therm_adt746x to new module_param This patch replaces MODULE_PARM to module_param for adt746x. Signed-off-by: Colin Leroy <colin@colino.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <pmeda@akamai.com> [PATCH] unlocked access to task->comm Looking at get_task_comm patch: http://linus.bkbits.net:8080/linux-2.5/patch@1.1803.144.3 There is one other place where task->comm is accessed outside current. There are two issues. The code is trying to copy to temp space without task_lock. It is not using temp space for actual user copy. Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dsd@gentoo.org> [PATCH] Permit LOG_SENSE and LOG_SELECT in SG_IO command table This patch adds LOG_SENSE as a read-ok command. cdrecord-prodvd uses this. I also added LOG_SELECT as write-ok as this seems to fit in as well. Signed-off-by: Daniel Drake <dsd@gentoo.org> Acked-by: Jens Axboe <axboe@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] knfsd: svcrpc: fqdn length fix Problem identified by Jan Kasprzak. Limit on domainname_max (currently 50) is too small. Just use the beginning of input buffer as scratch space for it, and save a little stack space while we're at it. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <magnus.damm@gmail.com> [PATCH] documentation: nohighio The kernel parameter "nohighio" seems to be gone in the code, but the parameter is still left in the documentation. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] documentation: nmi_watchdog.txt update Acked-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <bunk@stusta.de> [PATCH] remove outdated OSS Changelogs There's not much value in shipping Changelogs that weren't updated since at least 2.4.0. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <roland@topspin.com> [PATCH] linux/mount.h: add atomic.h and spinlock.h #includes <linux/mount.h> uses atomic_t and spinlock_t, but doesn't include either <asm/atomic.h> or <linux/spinlock.h>, which means that any users of <linux/mount.h> have to include them. This patch adds the necessary #includes to avoid this. Signed-off-by: Roland Dreier <roland@topspin.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <haroldo.gamal@infolink.com.br> [PATCH] smbfs: Bug #3758 - Broken symlinks on smbfs The patches attached here fixes the BUG #3758 - "Broken symlinks on smbfs with 2.6.10-rc[12]". There are two patches, one to be applied over version 2.6.9 and the other over 2.6.10-rc2. The old utilities (and the old driver) uses uid=0, gid=0, dmask=0 and fmask=0 to flag the lack of this parameters on the mount command line. When the user do not specify the uid, gid, fmask or dmask, the current driver will assign gid=root, gid=root, dmask=755, fmask=755. This behavior is similar to the old 2.x samba versions. To make the driver see the permissions and ownership assigned on the server, "smbmount" and "smbmnt" utilities must be patched. The patches is already available on the attached patches at Bug #3330 or Samba Bug #999. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jack@suse.cz> [PATCH] Minor fix of inequalities in the quota code Change inequalities for deciding when a user has cleaned up enough space to be below softlimit to match the ones for deciding when the softlimit has been exceeded. Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jack@suse.cz> [PATCH] Add missing DQUOT_OFF Attached patch adds missing DQUOT_OFF to the umount path of the root filesystem (it is only remounted read-only and so the usual path with DQUOT_OFF is not taken). Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <blaisorblade_spam@yahoo.it> [PATCH] akpm has moved And I didn't feel a thing. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ak@suse.de> [PATCH] x86_64: fix vsyscalls Fix incorrect alignment in the vsyscall variables that caused vsyscalls to be completely broken. This change should decrease system time during TPC-* tests considerably. Clean up the vmlinux.lds to make it easier readable Do some cleanups in the vsyscall code. Align cacheline_aligned correctly on 128 byte cacheline systems. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ak@suse.de> [PATCH] x86_64: fix interrupt routing with nosmp Fix interaction between nosmp and pcibios_fixup_irqs(). Originally from Oleg Nesterov via i386 When we boot with nosmp we dont have all the mptable info, so IO_APIC_get_PCI_irq_vector() doesnt work and devices just end up getting a wrong interrupt. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ak@suse.de> [PATCH] x86_64: fix early oops printing Fix early oopses Without this very early oopses crash recursively while trying to figure out the current CPU number. Based on a patch by James Cleverdon. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ak@suse.de> [PATCH] x86_64: increase timer fallback threshold Increase time fallback threshold Otherwise ACPI triggers it too often. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <bgerst@didntduck.org> [PATCH] fastcall fixes for x86 smp interrupts I cross-checked the functions called by the BUILD_INTERRUPT macros and came up with this patch. Even though some of these functions currently take no args I made them all consistent. Some functions in the Voyager code that are not directly called from asm code become static. Signed-off-by: Brian Gerst <bgerst@didntduck.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jmorris@redhat.com> [AF_UNIX]: Don't lose ECONNRESET in unix_seqpacket_sendmsg() The fix for SELinux w/SOCK_SEQPACKET had an error, noted by Alan Cox. This fixes it. Signed-off-by: James Morris <jmorris@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> <janitor@at.rmk.(none)> [PCMCIA] replace schedule_timeout() with msleep() Use msleep() instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan Signed-off-by: Maximilian Attems Signed-off-by: Russell King <rmk@arm.linux.org.uk> <bunk@de.rmk.(none)> [PCMCIA] make cardbus_type static Patch from Adrian Bunk Since there's no user outside this file, cardbus_type in drivers/pcmcia/yenta_socket.c can be made static. Signed-off-by: Adrian Bunk Signed-off-by: Russell King <michal@info.rmk.(none)> [PCMCIA] Exclude uneeded code when ! CONFIG_PROC_FS Patch from Michal Rokos proc_pccard is declared twice, so remove the first declaration such that it is only in ifdef CONFIG_PROC_FS block. Signed-off-by: Russell King <rmk@arm.linux.org.uk> <rmk@flint.arm.linux.org.uk> [ARM] Sparse fixes Clean up sparse warnings in rtctime.c and netwinder-hw.c <rmk@flint.arm.linux.org.uk> [ARM] Add missing ecard_resource_flags() macro. <rmk@flint.arm.linux.org.uk> [ARM] Fix VFP NaN flag handling. The special non-signalling NaN flag was escaping and setting some FPSCR exception enable flags. Ensure that this flag is masked out before we update the FPSCR. <hch@de.rmk.(none)> [ARM] kill unused call_irq() Patch from Christoph Hellwig These routine in arm is unused (in fact not even compiled). Instead of converting it to local_softirq_pending I'd suggest just removing it as below as it's been there totally unused for a long time. <nico@org.rmk.(none)> [ARM PATCH] 2267/1: don't fiddle with GPDR/GAFR directly Patch from Nicolas Pitre This is preemption unsafe and rather not pretty. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] sparc io.h annotations and fixes * annotations for sparc io.h * missing memcpy_toio()/memcpy_fromio() added Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] pcilynx iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] tgafb iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] iphase iomem annotations partially annotated Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] 64bit portability fixes assorted 64bit issues - extraction of number passed in pointer, use of %zd for size_t, ssize_t instead of int as return value of ->read(), %p for pointers instead of casting to int and using %x. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] ad1889 annotations and fixes fixed leaks on failure exits in ->probe() <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] drivers/media annotations trivial iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (1/4) eicon iomem annotations and fixes * adds new helpers ({GET,PUT}_{WORD,DWORD}) parallel to READ_WORD et.al., but used on normal memory instead of iomem. Instances of READ_WORD and friends that are applied to vmalloc'ed memory and local variables switched to new helpers. Signed-off-by: Armin Schindler <armin@melware.de> Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (2/4) eicon iomem annotations and fixes * added __iomem to declarations of iomem pointers Signed-off-by: Armin Schindler <armin@melware.de> Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (3/4) eicon iomem annotations and fixes * new helpers - READ_BYTE() and WRITE_BYTE(). On Linux they are needed, since direct access to iomem pointers is not allowed (and does not work on some architectures). * memcpy() to/from iomem is not allowed on Linux (same story). Proper primitives are memcpy_toio() and memcpy_fromio(). Several places misused memcpy(); switched to memcpy_{to,from}io(). Signed-off-by: Armin Schindler <armin@melware.de> Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (4/4) eicon iomem annotations and fixes * s_4bri.c has a nasty typo - bogus & in qBri_cpu_trapped(). We have void *base; followed by regs[0] = READ_DWORD((&base + offset) + 0x70); which is *NOT* what is meant there - instead of access to memory pointed to by base we get access to _stack_ at some offset from the place where the local variable base lives. Signed-off-by: Armin Schindler <armin@melware.de> Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] x86_64: duplicated patch We ended up adding this patch twice. Cc: <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <agruen@suse.de> [PATCH] compat_sys_fcntl[64] contain superfluous, buggy test here is a fix to a previous ChangeSet from John; 32-bit emulation of flock(fd, F_GETLK, &lock) currently is broken. The ChangeSet: http://linux.bkbits.net:8080/linux-2.5/cset%404152257aJKu... from John Engel <jhe@us.ibm.com> fixes an off-by-one error and according to the ChangeSet comment, it also contains a fix to handle l_len < 0 which is now defined in POSIX 1003.1-2001 from the fcntl man page. Gordon Jin <gordon.jin@intel.com> reports that the added test causes compat_sys_fcntl[64] to fail: If fcntl(fd, F_GETLK, &lock) finds no conflicting lock it sets l_whence to F_UNLCK, leaves all the other fields unchanged, and returns 0. The (f.l_start < 0) test wrongly converts this to an EINVAL result. The underlying sys_fcntl function which compat_sys_fcntl and compat_sys_fcntl64 invoke already handles POSIX behavior correctly. The additional tests in the compat wrappers are not needed. Here is a test case; its expected result is: PASS get flock: l_type=1, l_whence=0, l_start=145, l_len=10 #include <stdlib.h> #include <unistd.h> #include <fcntl.h> #include <errno.h> #include <stdio.h> int main(int argc, char *argv[]) { int fd; struct flock fl; char buf[255]; fl.l_type = F_WRLCK; fl.l_whence = SEEK_END; fl.l_start = -100; fl.l_len = -10; /* fl.l_whence = SEEK_SET; fl.l_start = 100; fl.l_len = 10; */ switch(fork()) { case -1: perror("fork"); exit(-1); case 0: fd = open("/tmp/testfile", O_RDWR|O_CREAT, 0600); if (fd == -1) { perror("open"); exit(-1); } if (write(fd, buf, 255) == -1) { perror("write"); exit(-1); } if (fcntl(fd, F_SETLK, &fl) == -1) { perror("F_SETLK"); exit(-1); } sleep(2); break; default: sleep(1); fd = open("/tmp/testfile", O_RDWR|O_CREAT, 0600); if (fd == -1) { perror("open"); exit(-1); } if (fcntl(fd, F_SETLK, &fl) != -1 || errno != EAGAIN) { perror("F_SETLK"); exit(1); } fl.l_type = F_WRLCK; /* fl.l_whence = SEEK_SET; fl.l_start = 0; fl.l_len = 0; */ if (fcntl(fd, F_GETLK, &fl) == -1) { perror("F_GETLK"); printf("FAIL\n"); exit(-1); } printf("PASS\n"); printf("get flock: l_type=%d, l_whence=%d, l_start=%zd, " "l_len=%zd\n", fl.l_type, fl.l_whence, (size_t) fl.l_start, (size_t) fl.l_len); break; } exit(0); } Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <alexander.kern@siemens.com> [PATCH] USB quirk section fix usb_early_handoff is referenced from __devinit and hence should be __devinitdata. Acked-by: Greg Kroah-Hartman <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] pc300 portability fixes 64bit portability fixes - as it is, driver had been broken on all 64bit platforms except alpha. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] i2o iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] cpqphp_nvram iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] misc __user annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] more C99 initializers Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] drivers/w1 iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] sound/oss iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] zoran fix direct dereferencing of ioremapped memory. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] imsttfb iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] pcbit fix direct dereferencing of iomem pointer. [not sure who maintains that one, so no Cc] Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] dpt_i2o partial iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] 3w-9xxx iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] ncr iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] isdn_divert annotations missing __user annotations + removal of gratitious casts in LHS of assignments. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] fix for breakage introduced in hgafb.c ChangeSet "adaplas: [PATCH] fbdev: Add __iomem annotations to hgafb" had actually broken it - it not only added a (useless) cast in rowaddr(), it had also added a dereferencing. Since it is video memory and since we do memory transfers on the resulting "address"... IOW, it's even exploitable - not that there had been a lot of HGA boxen out there, but... This restores the intended behaviour. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Fix screen corruption in neofb This patch fixes the screen corruption resulting from neofb cleanup. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Fix lockup when switching to/from X/console - Do a set_par very late instead of during fbcon_blank by setting the FBINFO_MISC_MODESWITCHLATE flag which should help prevent lockups when switching from X - Shorten chipset names that were missed before - Do not validate modeline if monitor specifications are not available Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Add NV30 pci_id and cleanup of probe error returns From Guido Guenther <agx@sigxcpu.org> this patch against 2.6.10-rc2 finally detects rivafb on NV30 based power books by adding the pciid. Wolfram Quester tested it and reported it working. It also cleans up the error code reported from the probe function. From Antonino Daplas <adaplas@pol.net> - do not validate mode if monitor specifications are not available Signed-Off-By: Guido Guenther <agx@sigxcpu.org> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Fix module_param in rivafb third argument in module_param is the sysfs permission not a default value. This fixes things for rivafb in 2.6.10-rc2: Signed-Off-By: Guido Guenther <agx@sigxcpu.org> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <benh@kernel.crashing.org> [PATCH] ppc64: Fix default command line The ppc64 kernel can be built with a default command line (CONFIG_CMDLINE) for cases where none is provided by the firmware. However, some OF implementation always pass a "bootargs" property that only contains the "0" terminating byte of a C string which caused us to think there was a command line, and not use the built-in one. This patch fixes it. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <benh@kernel.crashing.org> [PATCH] ppc64: Fix typo when parsing isa "reg" properties This patch fixes a typo in the code that parse Open Firmware properties for devices under an "isa" node, the incorrect struct size was used when parsing the "reg" property of these. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <benh@kernel.crashing.org> [PATCH] ppc64: pci_bus_to_host() simplification The pci_bus_to_host() inline function used on ppc64 to find the pci_contoller structure a give pci_bus resides on used to contain bogus tree walking code, which fortunately ended up never beeing necessary since "sysdata" always points to a device_node structure that has the proper "phb" field (even if it is not the device-node of the actual P2P, which happens during boot). Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <benh@kernel.crashing.org> [PATCH] ppc64: Fix early serial setup baud rate The "udbg" code used on ppc64 for early consoles including early serial console recently got a new "default speed" option. This was implemented as a switch case that missed a few important cases, one beeing necessary for a board beeing released soon. This patch fixes it by using the proper division to calculate the dll value for the uart instead of that bogus switch/case. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <benh@kernel.crashing.org> [PATCH] del_timer() vs. mod_timer() SMP race We just spent some days fighting a rare race in one of the distro's who backported some of timer.c from 2.6 to 2.4 (though they missed a bit). The actual race we found didn't happen in 2.6 _but_ code inspection showed that a similar race is still present in 2.6, explanation below: Code removing a timer from a list (run_timers or del_timer) takes that CPU list lock, does list_del, then timer->base = NULL. It is mandatory that this timer->base = NULL is visible to other CPUs only after the list_del() is complete. If not, then mod timer could see it NULL, thus take it's own CPU list lock and not the one for the CPU the timer was beeing removed from the list, and thus the list_add in mod_timer() could race with the list_del() from run_timers() or del_timer(). Our race happened with run_timers(), which _DOES_ contain a proper smp_wmb() in the right spot in 2.6, but didn't in the "backport" we were fighting with. However, del_timer() doesn't have such a barrier, and thus is subject to this race in 2.6 as well. This patch fixes it. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <sds@epoch.ncsc.mil> [PATCH] SELinux: map Unix seqpacket sockets to appropriate security class This patch for SELinux fixes a bug in the mapping of socket types to security classes and ensures that Unix seqpacket sockets are mapped to an appropriate security class. The Unix stream security class is re-used in this case as it has the same permission checking applied as for seqpacket. Signed-off-by: Stephen Smalley <sds@epoch.ncsc.mil> Signed-off-by: James Morris <jmorris@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <Tim_T_Murphy@Dell.com> [PATCH] serial: add support for Dell Remote Access Card 4. Here's a patch to include Dell's 4th generation Remote Access Controller ids. Acked-by: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <pmeda@akamai.com> [PATCH] /proc/cmdline missing mmput Fix the mmput bug introduced while fixing cmdline race. Signed-off-by: Prasanna Meda <pmeda@akamai.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rmk@arm.linux.org.uk> [PATCH] smc91c92_cs outw() fix The patch below fixes wrong arguments to outw in smc91c92_cs.c Signed-off-by: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <cp@absolutedigital.net> [PATCH] fix typo in init/Kconfig Patch below fixes a typo in init/Kconfig for option CC_ALIGN_FUNCTIONS. Signed-off-by: Cal Peake <cp@absolutedigital.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kernel@obster.org> [PATCH] mc146818rtc.h include fix Prevents user-space including spinlock.h which breaks the build. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kraxel@bytesex.org> [PATCH] video-buf oops/crash fixes Some places which need adaption to the last video-buf API change where forgotten, this patches fixes them up. Hope I really caught them all now. Signed-off-by: Gerd Knorr <kraxel@bytesex.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kraxel@bytesex.org> [PATCH] v4l: disable unused function. #ifdef out a currently unused (in-kernel) function, lets see if any out-of-kernel users cry. If not we can drop it altogether later on. Signed-off-by: Gerd Knorr <kraxel@bytesex.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kraxel@bytesex.org> [PATCH] v4l: more modparam convert more modules to new-style insmod options. Signed-off-by: Gerd Knorr <kraxel@bytesex.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kraxel@bytesex.org> [PATCH] tuner update Update for the tuner module: add support for a new tuner chip. Signed-off-by: Gerd Knorr <kraxel@bytesex.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <torvalds@evo.osdl.org> x86: clean up ptrace single-stepping, make PT_DTRACE exact. (This makes the naming of "DTRACE" purely historical, since on x86 it now means "single step in progress"). <torvalds@evo.osdl.org> x86: make TF handling at signals consistent. This depends on the previous ptrace single-step cleanup, and makes sure that signal handling does not lose TF events. This allows debuggers to trace programs that set TF on their own. <torvalds@ppc970.osdl.org> acpi: don't disable PCI irq links that were active at boot. This fixes at least some interrupt polarity setup cases. The ACPI guys may want to eventually do this differently, but in the meantime this makes ACPI behaviour closer to non-ACPI behaviour, and fixes known problems. I'll further argue that this protects non-PCI devices that may just share the irq routing from being screwed, but that may or may not be an argument that everybody buys into. <sam@mars.ravnborg.org> kbuild: Major update of Documentation/kbuild/modules.txt Included some of the information given to people developing external modules. This should answer the typical questions and lay a better ground for adding new information as needed. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> <cp@absolutedigital.net> fix typo in init/Kconfig Patch below fixes a typo in init/Kconfig for option CC_ALIGN_FUNCTIONS. Signed-off-by: Cal Peake <cp@absolutedigital.net> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> <dsaxena@net.rmk.(none)> [ARM PATCH] 2270/1: [Trivial] Remove reference to head-armv.S Patch from Deepak Saxena arch/arm/kernel/head-armv.S is now simply head.S. This patches updates references in kernel comments. Signed-off-by: Deepak Saxena Signed-off-by: Russell King <bjorn.helgaas@hp.com> [IA64] iosapic.c: don't direct interrupts to offline cpus Ignore offline CPUs when registering IOSAPIC interrupts. We previously directed interrupts even to offline CPUs, which means that if you have some unused CPUs (e.g., you used "maxcpus="), some interrupts won't work. This really hurts because distro installs typically use "maxcpus=1". Patch by Alex Williamson. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <ben-linux@org.rmk.(none)> [ARM PATCH] 2272/1: S3C2410 - rtc should check for <0 on alarm set Patch from Ben Dooks Since alarm fields can be ints, there is the posibility that the alarm set code needs to check for <0 as a valid posibility for `any` Signed-off-by: Ben Dooks Signed-off-by: Russell King <yoshfuji@linux-ipv6.org> [IPV6] Fix possible dead-lock in ipv6_create_tempaddr(). If we need to obtain lock both ifp and ifp->idev, we need to do lock idev first to avoid dead-lock. Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> <yoshfuji@linux-ipv6.org> [IPV6] Fix a race when dad completed during shutting down its owner interface. Bug was noticed by Herbert Xu <herbert@gondor.apana.org.au>. Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> <yoshfuji@linux-ipv6.org> [IPV6] Stop DAD during shutting down the interface. Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> <manfred99@gmx.ch> [ATM]: Force -n option in gzip invocation. Signed-off-by: David S. Miller <davem@davemloft.net> <manfred99@gmx.ch> [DECNET]: dn_neigh.c needs linux/module.h Signed-off-by: David S. Miller <davem@davemloft.net> <torvalds@evo.osdl.org> acpi: disable PCI links at boot again, fix ELCR Len Brown convinced me that the problem with disabling PCI routing entries wasn't the disable as much as the fact that ELCR needs to be updated when removing the PCI routing. So this reverts the previous cset and updates ELCR as suggested by Len. <yoshfuji@linux-ipv6.org> [IPV6] Clean-up locking in ipv6_add_addr(). Use addrconf_hash_lock instead of private lock. Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> <Brian.Haley@hp.com> [IPV6] improve ipv6_ifa_notify() readability. <tony.luck@intel.com> [IA64] Add add_key, request_key, keyctl syscalls Signed-off-by: Tony Luck <tony.luck@intel.com> <juhl-lkml@dif.dk> [SCTP]: Fix static inline declarations. Was using 'inline static int' for some strange reason. GCC now complains about this so... Signed-off-by: Jesped Juhl <juhl-lkml@dif.dk> Signed-off-by: David S. Miller <davem@davemloft.net> <kaber@trash.net> [XFRM]: Fix endless loop in xfrm_policy_insert The patch 'Fix policy update bug when increasing priority of last policy' broke this, when a policy with lower priority than an existing policy is inserted xfrm_policy_insert loops forever. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> <len.brown@intel.com> [ACPI] survive a BIOS that erroneously supplies multiple MADTs http://bugzilla.redhat.com/beta2/show_bug.cgi?id=135449 Signed-off-by: Len Brown <len.brown@intel.com> <juhl-lkml@dif.dk> [PATCH] remove errornous semicolon in arch/i386/kernel/traps.c::do_general_protection Building with gcc -W revealed this warning: arch/i386/kernel/traps.c: In function `do_general_protection': arch/i386/kernel/traps.c:506: warning: empty body in an if-statement upon inspecting the code I see what looks like a mistakenly placed ";" if (!fixup_exception(regs)) { if (notify_die(DIE_GPF, "general protection fault", regs, error_code, 13, SIGSEGV) == NOTIFY_STOP); return; die("general protection fault", regs, error_code); } That ";" after the second if should go away so the return; before die() is not unconditional. Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <janitor@sternwelten.at> [VLAN]: Handler register_netdevice_notifier() errors. Signed-off-by: walter harms <wharms@bfs.de> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: David S. Miller <davem@davemloft.net> <janitor@sternwelten.at> [ATM]: Handle register_netdevice_notifier() errors in mpc.c Signed-off-by: walter harms <wharms@bfs.de> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: David S. Miller <davem@davemloft.net> <geert@linux-m68k.org> [DIO]: Fix typo in dio_resource_len() Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <herbert@gondor.apana.org.au> [NETFILTER]: Apply ipsec to ipt_REJECT packets. With help from Patrick McHardy. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> <akpm@osdl.org> [PATCH] e100: early reset fix Gents, what do we think of the below fix? Thanks. My IBM A21P laptop is getting an IRQ storm at boot. IRQ #11 is shared between USB and e100, and USB is getting in there first. Consequently, when e100 initialises the hardware, that interrupt line is ready to go. As soon as e100.c runs pci_set_master(), the interrupt hits the CPU. But of course the e100 driver isn't ready to handle the interrupt yet, so the system disables IRQ #11. This only happens on warm boots (/sbin/reboot). Things work OK from power-on. So I assume that the BIOS is failing to fully reset the NIC and that some sort of interrupt is internally pending. The patch rearranges e100_probe() so that we issue e100_hw_reset() prior to running pci_set_master(), and fixes the problem. Note that e100_probe() is now running e100_hw_reset() twice - I didn't remove the later call for general paranoia reasons. eepro100.c has the same lockup, and needs a similar fix. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com> <akpm@osdl.org> [PATCH] tulip: make tulip_stop_rxtx() wait for DMA to fully stop From: "John W. Linville" <linville@tuxdriver.com> tulip_stop_rxtx() doesn't wait for DMA to fully stop like the function call name implies. This was submitted through my employer -- I am not the original author of this patch. However, I passed it by Jeff Garizk and he expressed interest in having it upstream. Signed-off-by: Grant Grundler <iod00d@hp.com> Acked-by: Charlie Brett <charlie.brett@hp.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com> <akpm@osdl.org> [PATCH] M68k: Update Atari defconfig (enable Ethernet and MII) From: Geert Uytterhoeven <geert@linux-m68k.org> M68k: Update Atari defconfig (enable Ethernet and MII) Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com> <akpm@osdl.org> [PATCH] M68k HP Lance Ethernet: Fix leaks on probe/removal From: Geert Uytterhoeven <geert@linux-m68k.org> HP Lance Ethernet: There's tons of leaks in the hplcance probing code, and it doesn't release the memory region on removal either (from Christoph Hellwig) Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com> <akpm@osdl.org> [PATCH] make ibmveth link always up From: Santiago Leon <santil@us.ibm.com> The attached patch makes the ibmveth driver indicate that its link is always up rather than always down, thus allowing the userspace side of booting to configure the network interface correctly. Signed-Off-By: Santiago Leon <santil@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com> <akpm@osdl.org> [PATCH] M68k: Update HP300 defconfig (enable DIO and HP Lance Ethernet) From: Geert Uytterhoeven <geert@linux-m68k.org> M68k: Update HP300 defconfig (enable DIO and HP Lance Ethernet) Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com> <brazilnut@us.ibm.com> [PATCH] pcnet32: added pci_disable_device This patch adds pci_disable_device in the appropriate places to eliminate the following message when removing the module. pcnet32 0000:00:05.0: Device was removed without properly calling pci_disable_device(). This may need fixing. pcnet32 0000:02:05.0: Device was removed without properly calling pci_disable_device(). This may need fixing. Tested ia32. signed-off-by: Don Fry <brazilnut@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com> <khali@linux-fr.org> [PATCH] I2C: More verbose w83l785ts driver This simple patch increases the verbosity of the w83l785ts hardware monitoring driver. I wrote it months ago in the hope it would help solve a reported problem [1]. Not sure whether it did (no news from user since July), but the extra debug info may help in the future and doesn't hurt otherwise, so let's have this in for every user (not that many AFAIK), just in case. [1] http://bugzilla.kernel.org/show_bug.cgi?id=2899 Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <johnpol@2ka.mipt.ru> [PATCH] w1: do not stop and oops if netlink socket was not allocated. Do not panic if netlink socket was not created. This will allow only first device to broadcast it's slave updates. We need kernel connector here. Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <johnpol@2ka.mipt.ru> [PATCH] w1: make W1_DS9490_BRIDGE available W1_DS9490R_BRIDGE kconfig typo. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <johnpol@2ka.mipt.ru> [PATCH] drivers/w1/dscore: fix the inline mess Remove unneded inlines. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <aris@cathedrallabs.org> [PATCH] i2c-elektor: get rid of cli/sti this patch get rid of cli()/sti(). while correcting this I found that when a process wakes by an interrupt, pcf_pending doesn't come back to 0 and next caller will return imediately. also, there are other drivers with the exact same problem. if you don't have any comments on this, I'll do the same for other drivers. [I2C] i2c-elektor: getting rid of cli()/sti() usage Signed-off-by: Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <aris@cathedrallabs.org> [PATCH] [2/2] i2c-elektor: adding missing casts [I2C] i2c-elektor: adding missing casts Signed-off-by: Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <jthiessen@penguincomputing.com> [PATCH] I2C: add adm1026 chip driver Here is the revised adm1026 driver port for kernel 2.6.10-rc2. It takes into account Jean Delvare's and Mark Hoffman's comments and recommendations, and provides pretty much the entire feature set of the 2.4.X kernel driver, but in (hopefully) a manner compliant with the standards for the 2.6.X kernel lm_sensors drivers. As discussed in previous messages, control over the pwm output is provided via: pwm[1-3] {0-255} pwm[1-3]_enable {0-2} (off, manual, automatic fan control) Note that there is really only one pwm register and one enable bit. pwm[2-3] and pwm[2-3]_enable are provided for the sake of a chip-indpendent interface, and are simply RW mirrors of pwm1 and pwm1_enable, respectively. Access to the DAC is provided via: analog_out {0-2500} (millivolts) No way is currently provided to turn on DAC-mediated automatic fan control. See my previous email in this thread for the reasons why. Control over automatic fan "on" temperatures are provided by: temp[1-3]_auto_point1_temp {-128000 - 127000} Hardware-determined hysteresis and range values are revealed in: temp[1-3]_auto_point1_temp_hyst {temp[1-3]_auto_point1_temp - 6000} temp[1-3]_auto_point2_temp {temp[1-3]_auto_point1_temp + 20000} Failsafe critical temperatures at which the fans go to maximum speed are controled via: temp[1-3]_crit_enable {0-1} (off, on) temp[1-3]_crit {-128000 - 127000} Again, there is really only one "enable critical-temperature-fan-maximization" bit. temp[2-3]_crit_enable are simply RW mirrors of temp1_crit_enable These values override any values set for the pwm-mediated automatic fan control. VRM is now set via Rudolf Marek's functions. VID is read from the assumed correct set of pins (GPIO11-GPIO15), and no longer a user-writable field. In keeping with Greg KH's changes, normal_i2c_range normal_isa_range have been removed, and normal_i2c has been updated to enumerate all addresses. (Just adding 0x2d) Finally, the val-comparison-before-assignment bug has been corrected. Signed-off-by: Justin Thiessen <jthiessen@penguincomputing.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] I2C: make fixup_fan_min static in adm1026 driver. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <dlsy@snoqualmie.dp.intel.com> [PATCH] PCI Hotplug: Add pci_enable_device() in hot-plug drivers Here is the patch to add pci_enable_device() to the two hot-plug drivers. In 2.6.10-rc2, the unconditional PCI ACPI IRQ routing has been removed. Without this patch, the drivers won't work in INTx mode with ACPI enabled. Signed-off-by: Dely Sy <dely.l.sy@intel.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] PCI Hotplug: fix warning compile issue in cpqphp driver As pointed out by "O.Sezer" <sezeroz@ttnet.net.tr> in a patch to 2.4 Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <rl@hellgate.ch> [PATCH] USB visor: Don't count outstanding URBs twice Incrementing the outstanding_urbs counter twice for the same URB can't be good. No wonder Simon didn't get far syncing his Palm. Signed-off-by: Roger Luethi <rl@hellgate.ch> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <zaitcev@redhat.com> [PATCH] ub: flag day - major 180 The major 180 has been allocated by LANANA. This is needed for people who insist on running 2.6 without udev (imagine that). From: Pete Zaitcev <zaitcev@redhat.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <zaitcev@redhat.com> [PATCH] ub: oops with preempt ("Sahara Workshop") I admit that the code should be locked properly instead, but the global plan is to drop all P3 tagged printks anyway. So let it be guarded for the moment. Signed-off-by: Pete Zaitcev <zaitcev@yahoo.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB Gadget: add and use gadget_is_pxa27x() The UDC in Intel's "Bulverde" processors is incompatible with the one in their PXA 25x/26x/21x processors, and has different sorts of restrictions. For example, it can implement real CDC Ethernet, while the earlier (PXA 25x etc) can't. This adds a gadget_is_pxa27x() function and uses it appropriately in the current set of gadget drivers. (And moves an LH7A40X entry to the right place in "ether.c"). From: Dmitry Krivoschokov <dkrivoschokov@dev.rtsoft.ru> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB: fix Genesys GL880S EHCI This has two minor patches to make this driver work better with the Genesys GL880S: don't report hardware port indicators (until the root hub code supports them); and patch the misreported number of ports (two, not four). Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB: usb_sg_*() unlink deadlock fix This would be rare with HCDs that maintain chains of DMA transfers, except if the HC dies in the middle of an I/O request; so no rush to merge this. It'd happen in a PIO based HCD though ... :) Async unlink of an URB from an endpoint's I/O queue _normally_ involves a delay from handshaking with the host controller, to be sure the DMA queue is inactive. So urb->complete() runs after usb_unlink_urb() returns, and from a different context. But not always... The completion may run immediately whenever the HCD knows that HC isn't busy with the URB. Maybe that HCD is in a HALT state, or the endpoint queue is is temporarily off-schedule (halted, or dead after PM resume from D3cold, etc) ... or maybe the HCD doesn't use DMA, so most unlinks just list_del_init() and return. This makes usb_sg_cancel() and sg_complete() drop the io->lock when they cancel active urbs, preventing potential self-deadlock when that completion handler runs immediately. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB: "sparse -Wcontext" and USB HCDs ... This adds "sparse -Wcontext" annotations to the main HCDs, reflecting that they all need to drop their (schedule) lock while issuing URB completion callbacks. (Some completion callbacks will resubmit that URB, relying on that to keep the endpoint queue from emptying and getting descheduled.) Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <alborchers@steinerpoint.com> [PATCH] USB Gadget: gadget serial documentation This patch adds the gadget serial documentation. Signed-off-by: Al Borchers <alborchers@steinerpoint.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <armijn@uulug.nl> [PATCH] USB: add ati_remote.c device id please consider applying the attached patch which adds an identifier for another variant of the X10 RF remote. This one is very common everywhere in Europe where Aldi (a supermarket discounter) sells their PCs (Netherlands, Belgium, northern Germany, France, Spain, ...). Considering that they ship a few 100,000 PCs once or twice every year you can imagine there are quite a few of these remotes kicking around. I've tested with 2.6.10-rc2 and various versions of XMMS and lirc with the devinput driver. It does play well with lirc-0.7.0-pre8 but not so nice with 0.7.0. I don't know why, but according to some posts on the lirc list it seems to be in lirc. By the way, there seem to be even more variants of this device, according to: http://cvs.sourceforge.net/viewcvs.py/lirc/lirc/drivers/l... From: Armijn Hemel <armijn@uulug.nl> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <david-b@pacbell.net> [PATCH] USB: ax8817x/usbnet, no GFP_KERNEL blocking in_irq This removes some nasty might_sleep() warnings. Worth fixing before 2.6.10-final IMO; we don't actually _know_ of oopses this bug caused ... The AX8817x link detection code was calling usb_submit_urb() with GFP_KERNEL in a completion handler (IRQ handler). That's a no-no. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <dfries@mail.win.org> [PATCH] USB: fix for HID field index The problem I'm having is that the field index is always returned as 0 when reading struct hiddev_usage_ref and I need something to distinguish the input data as the usage code is the same. I looked through hid-core.c and hiddev.c and hiddev_hid_event is the only place I could see field->index being used. It wasn't being initialized causing the input to always be returned as zero. Signed-off-by: David Fries <dfries@mail.win.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: fix dev_dbg() call in visor.c Turns out that this macro doesn't work in usb-serial drivers, I had forgotten about that :( Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <paulus@samba.org> [PATCH] ppc64: fix compilation with recent toolchains The ppc64 toolchains don't create dot symbols (i.e. a globally visible ".foo" symbol for the text of function foo) any more. This breaks the kernel compile because we refer to function text addresses in the system call table. Fortunately there is an option, -mcall-aixdesc, which restores the previous behaviour, and even more fortunately, old ppc64 toolchains understand the option as well as new ones. This patch adds -mcall-aixdesc to CFLAGS in arch/ppc64/Makefile. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulus@samba.org> [PATCH] ppc64: remove the volatile from cpus_in_xmon Remove the volatile from cpus_in_xmon, and put a barrier() in the loop that waits for the other cpus to come in to xmon. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] dont deprecate MODULE_PARM Let's revert this for now so all those warnings do not soil our 2.6.10 release. We'll get Rusty's kernel-wide-sweep fixup patches in for 2.6.11, and then we can put this warning back. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: linux,rtas* fixes Move the linux,rtas* properties into the /rtas node and make them 32bit. Use rtas-size and avoid duplicating it in linux,rtas-size. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: Reserve kernel memory in kernel instead of wrapper Reserve the kernel memory (0 - klimit) in the kernel instead of the wrapper. Remove an old comment that incorrectly referred to klimit. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] ppc64: linux,tce* changes Remove linux,has-tce-table since we can just look for linux,tce-base and linux,tce-size. Make linux,tce-base store real addresses instead of virtual ones, the wrapper may not know the translation the kernel will use. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <olof@austin.ibm.com> [PATCH] ppc64: Make early processor spinup based on physical ids This changes the early CPU spinup code to be based on physical CPU ID instead of logical. This will make it possible to kexec off of a different cpu than 0, for example after it's been hot-unplugged. The booted cpu will still be mapped as logical cpu 0, since there's various stuff in the early boot that assumes logical boot cpuid is 0. Also, it expands the kexec boot param structure to allow the booted physical cpuid to be passed in. This includes bumping the version number to 2 for backwards compat. Signed-off-by: Olof Johansson <olof@austin.ibm.com> Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mporter@kernel.crashing.org> [PATCH] ppc32: Fix uninitialized PPC40x vars Fix more uninitialized variables in the PPC40x code. Signed-off-by: Matt Porter <mporter@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <trini@kernel.crashing.org> [PATCH] ppc32: Have the 8260 board-hook happen a bit later Borut Lukic <borutlukic@email.si> brought to my attention that in platform_init() on 8260 the board hook was being called too early to allow for overrides (e.g. different memory sizings functions or rtc, or anything else). This moves the call to the end of platform_init() and I suspect fixes some unnoticed yet bugs in a number of 8260 platforms. Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <trini@kernel.crashing.org> [PATCH] ppc32: Fix __iomem warnings in TODC code A trivial fix for the __iomem warnings in arch/ppc/syslib/todc_time.c Signed-off-by: Randy Vinson <rvinson@mvista.com> Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <benh@kernel.crashing.org> [PATCH] ppc32: Fix an IRQ issue with cpufreq The ppc32 PowerMac cpufreq code, when using the PMU to switch the frequency, would eventually lose interrupts. The solution is to raise the CPU priority at the controller level. It's also unnecessary to call the full PIC suspend/resume code in this case as the IO chip isn't reset, unlike the sleep code. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nanhai.zou@intel.com> [PATCH] ia64/x86_64/s390 overlapping vma fix IA64 is also vulnerable to the huge-vma-in-executable bug in 64 bit elf support, it just insert a vma of zero page without checking overlap, so user can construct a elf with section begin from 0x0 to trigger this BUGON(). However, I think it's safe to check overlap before we actually insert a vma into vma list. And I also feel check vma overlap everywhere is unnecessary, because invert_vm_struct will check it again, so the check is duplicated. It's better to have invert_vm_struct return a value then let caller check if it successes. Here is a patch against 2.6.10.rc2-mm3 I have tested it on i386, x86_64 and ia64 machines. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Zou Nan hai <Nanhai.zou@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dtor_core@ameritech.net> [PATCH] i8k: fix 'power_status' sysfs permissions Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <paulus@samba.org> [PATCH] ppc64: fix hang on legacy iSeries Recently we have uncovered a bug in the kernel exception exit path which can cause iSeries machines to hang with interrupts disabled, typically when unloading a module. This patch fixes the bug and should go in 2.6.10. Here is the detailed explanation: There are a couple of places in the exception exit path in entry.S where we disable interrupts and then later reenable them. We hard-disable interrupts even on legacy iSeries (rather than soft-disabling them) because the final part of the exception exit path needs interrupts hard-disabled (even on legacy iSeries), because otherwise an incoming interrupt could trash SRR0 and SRR1 and cause us to lose state. The intention was that each path that hard-disabled interrupts would hard-enable them again, either explicitly or by executing an rfid instruction (return from interrupt, doubleword). However there was one path where we didn't correctly hard-enable interrupts. This meant we could end up calling schedule() with interrupts hard-disabled and then switch to the stopmachine thread (used in removing a module), which spins polling a variable until another cpu changes it. Since local_irq_enable() etc. on legacy iSeries only soft-enable interrupts, we got into the stopmachine thread with interrupts hard-disabled, and the machine hung at that point. This patch fixes it by making sure that when we go to re-enable interrupts, the MSR value we are loading up actually does have the MSR.EE (external interrupt enable) bit set. Stephen Rothwell has verified that this actually does fix the bug on iSeries. The bug also potentially exists on pSeries (and this patch fixes it), but there it doesn't really matter, because schedule() will enable interrupts (and on pSeries that means hard-enabling them), and because the hypervisor doesn't mind you having interrupts hard-disabled for extended periods on pSeries. Note that all these comments about pSeries also apply to POWER5 iSeries (i5) machines. While I was there I noticed that we were jumping to ret_from_except after calling do_IRQ on iSeries, rather than ret_from_except_lite, meaning that we will restore registers 14-31 twice, unnecessarily. I changed it to jump to ret_from_except_lite instead, and Stephen checked that this change doesn't cause any breakage. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <axboe@suse.de> [PATCH] cfq-iosched: fix allocation increment race #3 There is a stupid error in cfq-iosched that spews a warning on (typically) SMP systems because cfqq->allocated[rw] goes below zero. The error is that the increment on alloc happens outside of the queue lock. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <axboe@suse.de> [PATCH] bio: fix leak in failure case in bio_copy_user() There's a leak in the error case in bio_copy_user(). If we fail allocating a page or adding a page to the bio, we will leak the bio map data. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mingo@elte.hu> [PATCH] floppy boot-time detection fix When the FDC hardware is initialized, it sometimes generates a floppy interrupt right away - without being told to. This interrupt can hit the detection code that executes right after the initialization code, in particular it can get intermixed with user_reset_fdc() that the detection code uses. The fd driver is fundamentally single-threaded when it comes to handling events: an unexpected irq that arrives in the wrong moment can confuse the reset_fdc() code, which, with softirq and hardirq threading on, executes in keventd. In the stock kernel this stale irq doesnt seem to hit the detection code in the wrong moment, but i think under certain circumstances it may still happen. One of the typical incarnations of the race was the following message: reset set in interrupt, calling c0258400 and googling for "reset set in interrupt, calling" does turn up a fair number of bootlogs (most of them 2.4 ones) that show such a detection failure, so i think upstream wants to have the fix too. the fix is simple: delay a bit after initialization, to make sure the stale irq does not interfere with the detection code. It will be safely ignored, since do_floppy is still NULL. It might look sloppy that i went for a delay, but delay i think it is better than waiting for the irq to occur, because i dont think there's a guarantee that fdc initialization triggers an interrupt, so waiting for it could hang the boot process. A delay OTOH is totally harmless. The attached patch implements this fix, which resolves the detection problem on my testbox. here's again how a failure looks like: Floppy drive(s): fd0 is 1.44M reset set in interrupt, calling c0258400 floppy0: no floppy controllers found and this is how it works with the fix: Floppy drive(s): fd0 is 1.44M FDC 0 is a post-1991 82077 Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dsaxena@net.rmk.(none)> [ARM PATCH] 2255/1: Add IXDPG425 platform support Patch from Deepak Saxena New IXP425 based platform from Intel. This machine is similar to an ADI Coyote except for the addition of an on-board NEC ECHI controller. Patch also fixes issue with board setup for Coyote (and IXDPG425) that would cause the MTD driver to fail. Signed-off-by: Deepak Saxena Signed-off-by: Russell King <dsaxena@net.rmk.(none)> [ARM PATCH] 2257/1: Add I2C device to IXDP2x01 platforms Patch from Deepak Saxena Signed-off-by: Deepak Saxena Signed-off-by: Russell King <dsaxena@net.rmk.(none)> [ARM PATCH] 2259/1: Rip out ixp2000 IRQ_ERR_STATUS demultiplexing Patch from Lennert Buytenhek There are thirteen different IRQs chained off IRQ_ERR_STATUS, one for each possible error class that the IXP can signal an interrupt for, but there are no in-tree users of these interrupts, and it doesn't make much sense to treat them as separate interrupts if we can just have one handler checking each of the thirteen errors in one go instead. Besides that, the error interrupt handling can't even have been working properly in the first place as the chained handler was testing the wrong bits in the IRQ_ERR_STATUS register. So this patch rips it all out. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King <dsaxena@net.rmk.(none)> [ARM PATCH] 2260/1: Rename IXP2000_IRQ_SWI to reduce user confusion Patch from Lennert Buytenhek IXP2000 interrupt source zero is a software-generated interrupt source, but it is not an SWI in the ARM sense of the word. Rename the interrupt source to reduce any confusion. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King <dsaxena@net.rmk.(none)> [ARM PATCH] 2261/1: Cleanup use of ixp_reg_write in arch/arm/mach-ixp2000 Patch from Lennert Buytenhek Several files in this directory directly dereference pointers to on-chip I/O instead of using ixp_reg_write, making them susceptible to IXP2400 erratum #66. This changset fixes those. We do not touch any files that will only be built for IXP2800 systems as the 2800 does not have this issue. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King <ben-linux@org.rmk.(none)> [ARM PATCH] 2273/1: S3C2410 - timex.h CLOCK_TICK_RATE fix Patch from Ben Dooks CLOCK_TICK_RATE is 12MHz on at least 2 s3c2410 based machines, or close to it. Although this doesn't seem to have any effect on loops_per_jiffie, it is best to try and be accurate. Signed-off-by: Ben Dooks Signed-off-by: Russell King <peterc@au.rmk.(none)> [ARM PATCH] 2269/2: Updated Pleb-1 support patch for Linux 2.6 Patch from Peter Chubb This patch REPLACES patch #2269/1 Instead of using the almost-obsolete SMC9194 driver, use the new SMC91xx driver. Signed-off-by: Peter Chubb Signed-off-by: Russell King <rmk@flint.arm.linux.org.uk> [SERIAL] imx: remove two unnecessary includes <rmk@flint.arm.linux.org.uk> [ARM] sa1111: don't reference dev->power.saved_state if CONFIG_PM is unset <ben-linux@org.rmk.(none)> [ARM PATCH] 2275/1: S3C2410 - serial rx fifo full check Patch from Ben Dooks Check for the serial rx fifo full before checking for the fifo size. Signed-off-by: Ben Dooks Signed-off-by: Russell King <rmk@flint.arm.linux.org.uk> [ARM] icside: ensure interfaces are probed and correctly setup. <nico@org.rmk.(none)> [ARM PATCH] 2271/3: MMC for Mainstone/PXA27x Patch from Nicolas Pitre ... with a bit of reorg to make the core code a bit more generic too. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] more sparc64 io.h annotations Prototypes annotated the same way they are on other platforms. I'm not too fond of readb() taking const volatile void * (sic), but AFAICS that's the only way to tell cc(1) that both volatile and const pointers are acceptable here ;-/ memcpy_toio/memcpy_fromio/memset_io made void - same as they are elsewhere. And no, nobody had been insane enough to use the return values... Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] fore200e iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] sunzilog iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] mesh iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] tpam annotations and cleanups annotated, sanitized casts between pointers and numbers, switched the functions that took offsets in card memory to unsigned long (from the void *, which was absolutely wrong and lead to bogus casts from hell all over the place). Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (1/12) bw2 iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (2/12) cg14 iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (3/12) cg3 iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (4/12) cg6 iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (5/12) controlfb iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (6/12) hgafb iomem annotations switched from isa_...() to ioremap() + normal read*/write* Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (7/12) leo iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (8/12) offb iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (9/12) p9100 iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (10/12) platinumfb iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (11/12) tcx iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@www.linux.org.uk> [PATCH] (12/12) valkyriefb iomem annotations <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] i2c iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] pmac iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] pmac sound iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] pmac_zilog iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] sunbpp iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] misc sparc iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] partial fc4 iomem annotations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] iomem annotations and isa_-ectomy: media/video/pms.c switched to ioremap() + normal iomem access primitives Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] mtd/maps trivial annotations NULL noise removal, missing __iomem in a couple of declarations, removal of bogus cast to void * in iounmap() calls. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] misc iomem annotations Each chunk is independent from the rest, so it could've been split further, but IMO there's no point. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] isa_check_signature() finally gone last callers of isa_check_signature() switched to ioremap() + check_signature() Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <zecke@org.rmk.(none)> [ARM PATCH] 2276/1: [PATCH] SIMpad: make simpad.c compile Patch from Holger Hans Peter Freyther Fix compile of simpad.c .... Signed-off-by: Holger Hans Peter Freyther Signed-off-by: Russell King <zecke@org.rmk.(none)> [ARM PATCH] 2277/1: [PATCH] SIMpad: fix warnings emitted by the compiler Patch from Holger Hans Peter Freyther Fix warnings emitted by the compiler for leds-simpad.c and sa1100_simpad.c Signed-off-by: Holger Hans Peter Freyther Signed-off-by: Russell King <zecke@org.rmk.(none)> [ARM PATCH] 2278/1: [PATCH] SIMpad: add a default config Patch from Holger Hans Peter Freyther Add a default config file for simpad Signed-off-by: Holger Hans Peter Freyther Signed-off-by: Russell King <zecke@org.rmk.(none)> [ARM PATCH] 2279/1: [PATCH] SIMpad: Add a mq200 device to the platform bus Patch from Holger Hans Peter Freyther The SIMpad uses the MediaQ 200 framebuffer device. There is no driver in the vanilla kernel for that device. But adding the device to the platform bus makes it possible to just drop the mq200 driver into the kernel and the display will work. Please consider applying the patch. Signed-off-by: Holger Hans Peter Freyther Signed-off-by: Russell King <zecke@org.rmk.(none)> [ARM PATCH] 2280/1: [PATCH] SIMpad: Change maintainer to me Patch from Holger Hans Peter Freyther Line numbers could depend on 2279/1 Change the maintainer of the SIMpad board to me. This change was discussed on the simpad linux mailinglist and was supported by the former maintainer of SIMpad. I'll subscribe and introduce myself shortly on the arm linux mailinglist and ask for SIMpad not to be removed. Signed-off-by: Holger Hans Peter Freyther Signed-off-by: Russell King <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] t128 iomem annotations and isa_-ectomy switched to ioremap() + normal iomem primitives. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] dtc iomem annotations and isa_-ectomy switched to ioremap() + normal iomem operations Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] seagate iomem annotations, cleanup and isa_-ectomy * switched to ioremap() * switched to normal iomem operations * killed a bunch of phys_to_virt() * killed open-coded (and inferior) instances of memcpy_toio()/memcpy_fromio(). * fixed a dumb typo introduced in "kill off isa_check_signature()" patch (sorry - missed the fact that it was not covered by allmodconfig and didn't verify until after sending the patch in question ;-/). Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] wd7000 iomem annotations and fixes direct dereferencing of iomem pointer (by memcmp()) Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] swim3 __user annotation Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] misc drivers/atm iomem annotations and NULL noise removal Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] iomem annotations and fixes + isa_-ectomy in msnd * switched to ioremap() + normal operations * split msnd_fifo_write() (and msnd_fifo_read()) into iomem and normal versions (original was even worse - it used to do __user and __iomem versions in the same code and in atomic context; when that bogosity got fixed, the difference between these cases (now normal memory and iomem) had been lost). Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rmk@flint.arm.linux.org.uk> [ARM] ARMv6 always selects correct user operations at runtime. <ben-linux@org.rmk.(none)> [ARM PATCH] 2284/1: S3C2410 - core device registration update Patch from Ben Dooks If one of the devices fails to register, do not remove any registered devices and continue registering in case any more devices register. Signed-off-by: Ben Dooks Signed-off-by: Russell King <ben-linux@org.rmk.(none)> [ARM PATCH] 2285/1: S3C2410 - regs-sdi.h fixes Patch from Ben Dooks Fixes from Koen Martens to update the register definitions for the MMC/SD/SDIO interface, tidied up for release with extra notes on what has been depreceated in later silicon. Signed-off-by: Koen Martens Signed-off-by: Ben Dooks Signed-off-by: Russell King <phil@ipom.com> [PATCH] USB Storage: Add unusual_devs entry for another yakumo camera This adds an unusual devs entry for another Yakumo camera - it suffers from the residue problem. Originally reported by Michele Alzetta <michele.alzetta@aliceposta.it>. Greg, please apply. Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <marcel@holtmann.org> [PATCH] fix unnecessary increment in firmware_class_hotplug() and USB core > This patch is to fix unnecessary increment of 'i' used to > specify an element of an arry 'envp[]' in firmware_class_hotplug(). > The 'i' is already incremented in add_hotplug_env_var(), actually. you are right. The incrementation is wrong, but it doesn't have any negative effect. However the same applies for the usb_hotplug() function in drivers/usb/core/usb.c. Signed-off-by: Keiichiro Tokunaga <tokunaga.keiich@jp.fujitsu.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <shemminger@osdl.org> [PATCH] usb_unlink_urb: ratelimit warning The warning about using unlink_urb needs to be rate limited, because if a driver is still doing it will overrun the system logs. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <rddunlap@osdl.org> [PATCH] usb-storage should enable scsi disk in Kconfig Add comment/NOTE that USB_STORAGE probably needs BLK_DEV_SD also. Add a few device types to help text and reformat it. Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <ak@suse.de> [PATCH] PCI: Add sysfs file to map PCI busses to cpus Add sysfs file to map PCI busses to cpus Export the information from pcibus_to_cpumask() to sysfs. This is useful for some user space programs who want to optimize their IO using O_DIRECT. There was some indecision on whether it's more useful to report cpus or nodes here. In the end cpus was chosen because that is what the existing macros report. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <ak@suse.de> [PATCH] PCI: Disable mmconfig on AMD CPUs. Disable mmconfig on AMD CPUs. This patch fixes various problems on PCI Express boards, like the Nforce4. They have a MCFG table in ACPI, but not all devices can be accessed using MMCONFIG. e.g. the CPU builtin PCI devices in the A64 Northbridge can't. Linux happily uses mmconfig for all PCI devices and that cause failures and memory corruption. Right solution apparently is to get more information from MCFG which is supposed to tell for which busses mmconfig is legal and for which ones not. But that would be a much more complicated patch and I don't have a specification of this enhanced table. This patch just disable MMCONFIG on all AMD CPUs. This is a kludge, but works around the problem for now. Patch for both i386 and x86-64 Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> [PATCH] USB: fix oops in io_edgeport.c driver This fixes https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=128916 Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <akpm@osdl.org> [PATCH] e100 deadlock fix Revert my version of this fix and apply Scott's version, which was acked by the e100 maintainers. Also, initialise the spinlocks before calling e100_hw_reset(), so things don't instantly deadlock on SMP. Signed-off-by: Scott Feldman <sfeldma@pobox.com> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mtk-lkml@gmx.net> [PATCH] RLIMIT_MEMLOCK accounting of shmctl() SHM_LOCK is broken The accounting of shmctl() SHM_LOCK memory locks against the user structure is broken. The check of the size of the to-be-locked region is based on the size of the segment as specified when it was created by shmget() (this size is *not* rounded up to a page boundary). Fix it by rounding the size properlt. Also, tune up the spinlock coverage in there a little. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <dtor_core@ameritech.net> [PATCH] v4l: fix permissions on module parameters exported via sysfs Fix permissions on module parameters exported via sysfs. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <ak@suse.de> [PATCH] x86_64: Fix lost edge triggered irqs on UP kernel Patch from Petr Vandrovec <vandrove@vc.cvut.cz> Recently I've observed problems with IDE disks while running UP kernel on x86-64 - it complained a lot about lost irq from hda/hdc. I tracked problem down to the problem that at enable_irq() code calls hw_resend_irq(), but on x86-64 hw_resend_irq() does something useful only when CONFIG_SMP is defined, on UP systems it does nothing. Due to this IRQ is lost - and when IDE retries command, it can again happen that IRQ is delivered before IDE code does enable_irq(), and again and again, unless due to drive being lazy finally once kernel does enable_irq() before drive prepares its answer, and things move forward ... to next lost IRQ. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: Fix crash if fb_set_var() called before register_framebuffer() The field info->modelist is initialized during register_framebuffer. This field is also referred to in fb_set_var(). Thus a call to fb_set_var() before register_framebuffer() will cause a crash. A few drivers do this, notably controlfb. (This might fix reports of controlfb crashing in powermacs). Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <andrew.patterson@hp.com> [PATCH] cciss: Off-by-one error causing oops in CCISS_GETLUNIFO ioctl This patch fixes an an "off-by-one" error found in the CCISS_GETLUNIFO ioctl in the cciss driver. It is cycling through the part table of the gendisk structure which is a zero-based array, not a one-based array. This often causes an oops when referencing the out-of-bounds element. Signed-off by: Andrew Patterson <andrew.patterson@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <domen@coderock.org> [PATCH] video: semicolon bug in atyfb_base.c Indentiation and logic suggest this was wrong. Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <James.Bottomley@SteelEye.com> [PATCH] Change MCA maintainer Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <aris@cathedrallabs.org> [PATCH] i2c-ite: get rid of cli()/sti() I found only this one. Next time I'll try to make better grep expressions :^) [I2C] i2c-ite: get rid of cli()/sti() Signed-off-by: Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: Add support for the nForce2 Ultra 400 to i2c-nforce2 This simple patch adds support for the nForce2 Ultra 400 to i2c-nforce2. I just made a similar update on the 2.4/CVS version of the driver. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <khali@linux-fr.org> [PATCH] I2C: macintoch/therm_* drivers cleanups This patch cleans the macintoch/therm_* drivers a bit. It removes useless IDs, cleans names (no white space), some coding style fixes as well, etc. It's exactly the same as what I posted yesterday as a candidate fix to bug #3823: http://bugzilla.kernel.org/show_bug.cgi?id=3823 Although it isn't the proper fix for that bug, as you underlined, this still sounds like a sane set of cleanups for these drivers. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: minor Makefile fix. This fixes http://bugme.osdl.org/show_bug.cgi?id=3813 Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <daniel.ritz@gmx.ch> [PATCH] USB touchkitusb: module_param to swap axes add a module parameter to swap the axes. many displays need this... Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <magnus.damm@gmail.com> [IPV4]: Use schedule_timeout() instead of jiffies polling in ipconfig. Signed-off-by: David S. Miller <davem@davemloft.net> <yoshfuji@linux-ipv6.org> [IPV6]: Fix races in ip6_route_{input,output}() We need to hold refcnt before releasing rt6_lock. Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net> <patrick@tykepenguin.com> [DECNET]: Typo in accept causes OOPS. Signed-off-by: Patrick Caulfield <patrick@tykepenguin.com> Signed-off-by: David S. Miller <davem@davemloft.net> <juhl-lkml@dif.dk> [NET]: Fix inline keyword usage in skbuff.c Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: David S. Miller <davem@davemloft.net> <rusty@rustcorp.com.au> [PATCH] Remove Futex Warning If we're waiting on a futex and we are woken up, it's either because someone did FUTEX_WAKE, we timed out, or have been signalled. However, the WARN_ON(!signal_pending(current)) test is overzealous: with threads (a common use of futexes), we share the signal handler and the other thread might get to the signal before us. In addition, exit_notify() can do a recalc_sigpending_tsk() on us, which will then clear our TIF_SIGPENDING bit, making signal_pending(current) return false. Returning EINTR is a little strange in this case, since this thread hasn't handled a signal. However, with threads it's the best we can do: there's always a race where another thread could have been the actual one to handle the signal. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <axboe@suse.de> [PATCH] cfq-iosched: kill show_status sysfs entry This is a debug entry that isn't of much use to the generic user or on a production system. Additionally it can also easy overflow the sysfs PAGE_SIZE limitation, if you have many processes doing io. So kill the entry. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <bjorn.helgaas@hp.com> [IA64] Bigsur config: Add CONFIG_SERIAL_8250_ACPI so we can find serial devices In the absence of an HCDP, we used to assume there were legacy COM ports at 0x3f8 and 0x2f8, but I recently removed that assumption. "console=ttyS0" still works (assuming you have CONFIG_SERIAL_8250_ACPI turned on so you can find the ttyS0 device), but the console doesn't start working until the serial driver initializes. If you need an early console and you know where it lives, something like "console=uart,io,0x3f8" will start working very early. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <tony.luck@intel.com> [IA64] if idle doesn't halt, it should at least relax Asit Mallick pointed out that the ia64 idle loop needs a "hint @pause" instruction in the cases where we don't actually halt the cpu. Acked-by: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: Tony Luck <tony.luck@intel.com> <len.brown@intel.com> [ACPI] fix build errors resulting from auto-merge Signed-off-by: Len Brown <len.brown@intel.com> <greg@kroah.com> PCI: fix build warning in pci-sysfs.c Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com> USB: move a internal usbfs only structure out of a public header file. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <sfeldma@pobox.com> [PKTGEN]: Clean error count before each run. Signed-off-by: Scott Feldman <sfeldma@pobox.com> Signed-off-by: David S. Miller <davem@davemloft.net> <mitch@sfgoth.com> [NET]: Missing security_*() check in net/compat.c While looking at the SCM passing code in net/core/scm.c I noticed that there's a 32-bit compat implementation of scm_detach_fds()'s called scm_detach_fds_compat() living in net/compat.c. While these two functions are mostly the same the latter does not include the call to the security_file_receive() hook which is almost certainly a bug. Signed-off-by: Mitchell Blank Jr <mitch@sfgoth.com> Signed-off-by: James Morris <jmorris@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> <johnpol@2ka.mipt.ru> [PATCH] W1: check nls in return path. Check netlink socket being non NULL in error return path. Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> <len.brown@intel.com> [ACPI] platform_rename_gsi() is no longer limited to ACPI specific code, so call it ioapic_renumber_irq(). A note to google: GSI is a Global System Interrupt -- a flat, linear, global IRQ number. Suggested-by: Linus Torvalds Signed-off-by: Len Brown <len.brown@intel.com> <shemminger@osdl.org> [UDP]: Select handling of bad checksums. Alternate workaround for blocking usage of select() by UDP applications. The problem is Linux optimizes the UDP receive checksum path so that checksum validation is not performed until the application read. This is a performance win but can cause applications that do select with blocking file descriptors to get false positives if the received message has a checksum error. There is a long running thread about this on LKML. This patch makes these applications work, but keeps the one-pass performance gain for those applications smart enough to use non-blocking file descriptors with select/poll. There is still a possibility to get a false positive if application does select on non-blocking fd then makes it blocking before doing the receive, but that is unlikely. Tested by injecting bad packets with SOCK_RAW. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net> <len.brown@intel.com> [ACPI] fix IRQ assignment regression with CONFIG_PNPACPI=y http://bugzilla.kernel.org/show_bug.cgi?id=3762 Signed-off-by: Len Brown <len.brown@intel.com> <tgraf@suug.ch> [GNET_STATS]: kernel-api doc for gnet stats/estimator Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net> <len.brown@intel.com> [ACPI] fix reboot on poweroff regression due to enabled wakeup GPEs http://bugzilla.kernel.org/show_bug.cgi?id=3669 Signed-off-by: David Shaohua Li <shaohua.li@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> <len.brown@intel.com> [ACPI] IPMI must supply the address of its GPE handler to install or remove it Signed-off-by: Len Brown <len.brown@intel.com> <nico@org.rmk.(none)> [ARM PATCH] 2287/1: remove bogus EXPORT_SYMBOL(*) Patch from Nicolas Pitre Those functions are marked __init and called from __init context as well. They have no business with modules what so ever. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King <tony@com.rmk.(none)> [ARM PATCH] 2201/1: OMAP timer 1/2: Clean-up MPU timer Patch from Tony Lindgren This patch by Tuukka Tikkanen & me cleans up the OMAP MPU timer code to allow adding 32KHz timer support. Functionality is the same as earlier. Signed-off-by: Tony Lindgren Signed-off-by: Russell King <rmk@flint.arm.linux.org.uk> [ARM] omap: remove unnecessary linux/device.h include. <zecke@org.rmk.(none)> [ARM PATCH] 2283/1: SA1100 USB Config options Patch from Holger Hans Peter Freyther arch/arm/mach-sa1100/KConfig had options for USB client. The related code was removed early in 2.6. releases. I think it is appropriate to remove the Config options for it itself, as they're void. Signed-off-by: Holger Hans Peter Freyther Signed-off-by: Russell King <nico@org.rmk.(none)> [ARM PATCH] 2288/1: unlink MMC DMA on driver exit Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King <len.brown@intel.com> Cset exclude: len.brown@intel.com[lenb]|ChangeSet|20041109085620|42985 <len.brown@intel.com> [ACPI] disable LAPIC at reboot and poweroff if Linux forced it on http://bugzilla.kernel.org/show_bug.cgi?id=3643 Signed-off-by: Alexey Y Starikovskiy <alexey.y.starikovskiy@intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Len Brown <len.brown@intel.com> <len.brown@intel.com> [ACPI] update C-state limiting patch Now "max_cstate=" instead of "acpi_cstate_limit=" Delete redundant static cstate flags .c2 and .c3 http://bugme.osdl.org/show_bug.cgi?id=3549 For static processor driver, boot cmdline: processor.max_cstate=2 For processor module, /etc/modprobe.conf: options processor max_cstate=2 or # modprobe processor max_cstate=2 From kernel or kernel module: #include <linux/acpi.h> acpi_set_cstate_limit(2); Suggested-by: Pavel Machek Signed-off-by: Len Brown <len.brown@intel.com> <ralf@linux-mips.org> [PATCH] MIPS updates o General updates of MIPS to 2.6.10-rc2 o Remove the Baget platform due to lack of maintenance over several years. Some of the drivers remain and will be removed in a separate patch. o Remove the HP Laserjet platform. No user reports ever and no patches from the original submitters made this port a neat hack - and a directory full of clutter. o SMP support for the PMC-Sierra. Signed-Off-By: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jeremy@goop.org> [PATCH] Buffer overrun in arch/x86_64/sys_ia32.c:sys32_ni_syscall() With Chris Wright <chrisw@osdl.org> struct task_struct.comm is defined to be 16 chars, but arch/x86_64/sys_ia32.c:sys32_ni_syscall() and sys32_vm86_warning() copy it into a static 8 byte buffer, which will surely cause problems. This patch makes lastcomm[] the right size, and makes sure it can't be overrun. Since the code also goes to the effort of getting a local copy of current in "me", we may as well use it for printing the message. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] md: fix careless bug in raid10 raid10 performs resync by reading all blocks, comparing to look for The requires re-tasking a bio that was used to read, so that it can be re-used for write. So a number of fields need to be reset. The bi_bdev field was not being reset. However when using on a partition of a device, it gets changed by generic_make_request. This patch simply resets bi_bdev to the correct value. Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <neilb@cse.unsw.edu.au> [PATCH] md: fix jiffies handling in md.c Use time_after_eq instead of >= From: Michal Schmidt <xschmi00@stud.feec.vutbr.cz> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <pavel@ucw.cz> [PATCH] swsusp kconfig: Change in wording Vadim says: I was reading through the kernel/power/Kconfig file, and noticed that the wording was slightly unclear. I poked at it a bit, hopefully making the description a tad more straightforward, but you be the judge. :) Diffed against 2.6.10-rc2. From: Vadim Lobanov <vlobanov@speakeasy.net> Signed-off-by: Vadim Lobanov <vlobanov@speakeasy.net> Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <takata@linux-m32r.org> [PATCH] media: Update drivers/media/video/arv.c Here is a patch to update AR camera device driver. drivers/media/video/arv.c: - Remove warnings; use module_param() instead of MODULE_PARM(), because MODULE_PARM() is deprecated. - Fix white-space damages. Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <kkeil@suse.de> [PATCH] i4l: fix deadlock in CAPI code, reenable SMP This patch fix a deadlock in CAPI device driver registration code and reenable SMP for the activ AVM cards., also some minor cleanup and fixes. Signed-off-by: Karsten Keil <kkeil@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <hirofumi@mail.parknet.co.jp> [PATCH] cont_prepare_write() fix When cont_prepare_write() is padding out the "hole" with zeroed pages it doesn't increase i_size at the same time. If writeback comes in during the execution of cont_prepare_write(), block_write_full_page() will think that these pages are outside i_size and will just clean the page without writing it. Fix that up by using generic_commit_write(), which will advance i_size for each page as it is dirtied. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <nathans@sgi.com> [PATCH] Fix an XFS direct I/O deadlock Here's a patch which fixes the deadlock Brad Fitzpatrick reported here: http://lkml.org/lkml/2004/11/14/98 The meat of the problem is a locking order reversal between the XFS I/O lock and the inode semaphore (i_sem). When we mix a number of threads doing both direct reads and writes, we hit an ABBA deadlock after a while because direct-io.c is taking and dropping i_sem after the XFS read path has already taken its I/O lock. This is the wrong way around from XFS's point of view, in particular its the opposite order to the XFS write path. So this patch changes the logic for direct reads in the DIO_OWN_LOCKING case (i.e. XFS-only case), but leaves things as is for the other two types of locking. Not real pretty, but fixes up the lock ordering and deadlock. Oh, I have tested direct reads and writes on ext3 and block devices as well, to ensure they still function correctly with the change (i.e. they don't regress, should be a no-op there) which covers the other locking cases in __blockdev_direct_IO. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] generic_make_request stack savings Move this error-handling into a separate function so that its sizeable stack utilisation is avoided - generic_make_request() can be called recursively by stacking drivers. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rusty@rustcorp.com.au> [PATCH] Fix parameter handling in ibm_acpi.c You can't call module_param et al inside a function. It doesn't make sense, and it doesn't work. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rusty@rustcorp.com.au> [PATCH] Fix occasional stop_machine() lockup with > 2 CPUs Stephen Rothwell noted a case where one CPU was sitting in userspace, one in stop_machine() waiting for everyone to enter stopmachine(). This can happen if migration occurs at exactly the wrong time with more than 2 CPUS. Say we have 4 CPUS: 1) stop_machine() on CPU 0creates stopmachine() threads for CPUS 1, 2 and 3, and yields waiting for them to migrate to their CPUs and ack. 2) stopmachine(2) gets rebalanced (probably on exec) to CPU 1. 3) stopmachine(2) calls set_cpus_allowed on CPU 1, sleeps awaiting migration thread. 4) stopmachine(1) calls set_cpus_allowed on CPU 0, moves onto CPU1 and starts spinning. Now the migration thread never runs, and we deadlock. The simplest solution is for stopmachine() to yield until they are all in place. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <avvisi@spalletti.it> [PATCH] Add PCI-quirks for ASUS M6Ne notebook Added M6Ne PCI IDs in asus_hides_smbus_hostbridge() function Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <tglx@linutronix.de> [PATCH] yenta_socket.c: Fix missing pci_disable_dev Simple fix to make pci_enable/disable symetric and avoid the warning on module unload. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <daniel.ritz@gmx.ch> [PATCH] yenta: don't enable read prefetch on older o2 bridges. It turns out that just blindly enabling read prefetch is wrong for the older (and buggy) oz6833 bridge. fixed in the attached patch. - don't touch the oz6832/6833 - more verbose - only set the read prefetch and the write burst bits it broke on some old laptop with a cardbus tulip. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <efalk@google.com> [PATCH] Documentation for IDE and CDROM ioctls I've written two document files, and packaged them as a patch. Two things caught my eye while I was writing this up: The header comments for CDROMREADRAW, CDROMREADMODE1, and CDROMREADMODE2 disagree with the actual source code. The header comments imply that a cdrom_read structure is used to pass data, but the source code actually reads a cdrom_msf structure and then overwrites it with raw data. I'm not sure if there's a bug in the header comments, in the driver source, or I misread something. The CDROM_LOCKDOOR ioctl seems to lock/unlock all doors on all drives, because it uses a global variable. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <efalk@google.com> [PATCH] fix typo in cdrom.c Bug in dvd_read_manufact found by inspection. Cc: Jens Axboe <axboe@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <marc.leeman@gmail.com> [PATCH] make number of ramdisks Kconfigurable Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rddunlap@osdl.org> [PATCH] eth1394: use SET_NETDEV_DEV() for udev Use SET_NETDEV_DEV() so that the device works correctly with udev. Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <bjorn.helgaas@hp.com> [PATCH] DAC960: Don't look at PCI_Device->irq before calling pci_enable_device(). The DAC960 driver looks at PCI_Device->irq before calling pci_enable_device(), which means it requests the wrong IRQ and hangs. This fixes it. Thanks to Johannes Rommel for reporting the problem and testing the fix. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] revert the "dio handle eof" fix This recent fix isn't quite right: it is causing smaller-than-expected I/Os to be submitted when extending files, which causes AIO-based writes to oops. So just revert it - the bug was really over in blockdev_get_blocks() anyway. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <akpm@osdl.org> [PATCH] blkdev_get_blocks(): handle eof For reasons which escape me, blockdev_get_blocks() is returning -EIO if the mapping request straddles the end of the disk. This causes reads which straddle end-of-disk to return -EIO. Fix it up so that it correctly trims the returned result down to match the size of the device, for both reads and writes. If a write attempt is fully beyond end-of-device then return -EIO. We never get this far anyway, because generic_write_checks() will return -ENOSPC if all of the write lies outside a blockdev's i_size. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <viro@parcelfarce.linux.theplanet.co.uk> [PATCH] Work around devices with bogus media change indication on the first open What that patch does is making the first open _always_ assume that we need to revalidate/reread partition table and kills partition-parsing in register_disk(); instead we just have it do open/close and let the revalidation path in open do the job. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: core changes From: Martin Schwidefsky <schwidefsky@de.ibm.com> From: Ulrich Weigand <uweigand@de.ibm.com> s390 core changes: - Remove defines for kernel_stack_size and async_stack_size. - Reserve system call number for kexec. - Add cc-option check for new gcc option packed-stack. - Fix race on no_hz_cpu_mask in stop_hz_timer. - Fix ptrace to make it send a SIGTRAP before the first instruction of a single stepped signal handler is executed. - Use force_sig_info with a full siginfo structure for illegal operation. - Remove verbatim copy of si_codes from asm-s390/siginfo.h. Use the generic definitions. - Regenerate default configuration. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: common i/o layer From: Cornelia Huck <cohuck@de.ibm.com> From: Steffen Thoss <thoss@de.ibm.com> common i/o layer changes: - Delay re-registration of a subchannel with a different subchannel id until the ccw device removal triggered from the subchannels remove function has completed. - Fix check when to call unreg_rereg. - Fix get_disc_cdev_by_devno. - Activate the time delay disablement facility. This saves a few cycles in millicode processing. - Don't ifdef reset of busy start time. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: dcss segments From: Carsten Otte <cotte@de.ibm.com> dcss segment interface changes: - Add check when loading segments to avoid out of range mappings. - Add code to check for segment_load returning -ERANGE. - Rename segment_info to segment_type. - Restore previous segment state if reload fails. - Add segment_modify_shared() to change shared attributes of a dcss segment and use it in the dcss block device driver. - Add support for contiguous EW/EN multipart segments. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: dasd driver From: Horst Hummel <horst.hummel@de.ibm.com> From: Stefan Weinhuber <wein@de.ibm.com> dasd driver changes: - Introduce "fixbuffers" dasd option that uses buffer pages for the dasd i/o similar to bounce buffers. - Fix I/O errors when using XRC. - Increment retry counter again if notifier callback is called with CIO_GONE. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: z/VM monitor stream From: Gerald Schaefer <geraldsc@de.ibm.com> z/VM monitor stream changes: - Add monitor control element to deal with end-of-frame records. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: network driver From: Thomas Spatzier <tspat@de.ibm.com> From: Peter Tiedemann <ptiedem@de.ibm.com> network driver changes: - qeth: return -EINVAL if an skb is too large. - qeth: don't call netif_stop_queue after cable pull. Drop the packets instead. - qeth: fix race between SET_IP and SET_MC kernel thread by removing SET_MC thread and let the SET_IP thread do multicast requests as well. - qeth: make it compile without CONFIG_VLAN. - ctc: avoid compiler warnings. - lcs: write package sequence number to skb->cb. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <schwidefsky@de.ibm.com> [PATCH] s390: qeth network driver From: Thomas Spatzier <tspat@de.ibm.com> network driver changes: - qeth: Handle both VLAN_FRAME and INCLUDES_VLAN_TAG in qdio header. - qeth: Always save IP addresses registered on a card when going offline. - qeth: Check size of printk buffer to 4K for ipa_takeover, vipa & rxip. From: Thomas Spatzier <tspat@de.ibm.com>, Heiko Carstens <heiko.carstens@de.ibm.com> Thomas created the patch below which removes the hardcoded 3900 bytes limit as suggested by Jeff Garzik. Please apply. network driver changes: - qeth: Calculate end of sysfs data buffer correctly. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <anton@samba.org> [PATCH] Allow multiple cpus in irq affinity call The generic irq affinity code limits us to a single cpu target regardless of what the architecture supports. If required this should be done in the architecture specific ->set_affinity call. With this patch ppc64 is able to select all cpus affinity again. Signed-off-by: Anton Blanchard <anton@samba.org> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mingo@elte.hu> [PATCH] acpi_processor_idle() latency fix We check need_resched() _before_ disabling preemption. This opens up the following scenario: swapper: !need_resched() [IRQ context] wakes up a task marks idle task as need-resched swapper: acpi_processor_idle(); // sleeps until next irq instant 1msec latency introduced... normally default_idle() is safe because it re-checks need_resched with interrupts disabled before it truly halts the CPU. But acpi_processor_idle() doesnt seem to be doing this! Your trace clearly shows a missed preemption due to ACPI. I'm wondering why no-one has triggered this before, it's a really bad bug that should be fixed in 2.6.10. Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: "Brown, Len" <len.brown@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] M68k Ethernet drivers depend on NET_ETHERNET M68k Ethernet drivers depend on NET_ETHERNET instead of NETDEVICES Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <geert@linux-m68k.org> [PATCH] M68k HP Lance Ethernet depends on DIO bus support HP Lance Ethernet depends on DIO bus support Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <icampbell@arcom.com> [PATCH] Avoid deadlock in smc91x driver This patch avoids a deadlock on rtnl_sem in smc_close() when bringing down an smc91x interface. The semaphore is already held by devinet_ioctl() and the pending work queue contains linkwatch_event() (scheduled by netif_carrier_off()) which also wants rtnl_sem hence it is unsafe to call flush_scheduled_work(). The solution is to track whether we have any pending work of our own and wait for that instead of flushing the entire queue. I also fixed a typo 'ence' -> 'Hence' and renamed smc_detect_phy to smc_phy_detect in order to follow the same pattern as the other smc_phy_* functions. Signed-off-by: Ian Campbell <icampbell@arcom.com> Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <pmeda@akamai.com> [PATCH] sys_set/getpriority PRIO_USER semantics fix and optimisation This change brings the semantics equivalent to 2.4 and also to what the man page says; Also optimises by avoiding unneeded lookup in uid cache, when who is same as the current->uid. sys_set/getpriority is rewritten in 2.5/2.6, perhaps while transitioning to the pid maps. It has now semantical bug, when uid is zero. Note that akpm also fixed refcount leak and locking in the new functions in changeset http://linus.bkbits.net:8080/linux-2.5/cset@1.1608.10.84 Signed-off-by: <pmeda@akamai.com> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <mporter@kernel.crashing.org> [PATCH] Fix warnings in ibm_emac driver This patch fixes annoying warnings in ibm_emac driver. Signed-off-by: Eugene Surovegin <ebs@ebshome.net> Signed-off-by: Matt Porter <mporter@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <adaplas@hotpop.com> [PATCH] fbdev: fix wrong colors at 16 bpp in tridentfb Timothy Lee reports: Hardware: CyberBlade/i1 on VIA Epia-800 Problem Description: When the framebuffer is set to 16 bpp, console's text colours are incorrect. For example, white becomes yellow, black becomes blue, etc. Steps to reproduce: 1. Load tridentfb 2. Use "setterm -n -depth 16" to request 16 bpp framebuffer The problem arose from the fact that each psuedo palette entry should be 32-bit in size, even under 16-bit display mode. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <joe.korty@ccur.com> [PATCH] fix uninitialized variable in waitid(2) Specify an initial value signal_struct's field stop_state whenever a signal_struct variable is created. Bug was discovered through the occasional failure of telnet(1) to connect. Signed-off-by: Joe Korty <joe.korty@ccur.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <rddunlap@osdl.org> [PATCH] VISWS: prevent APM Prevent X86_VISWS config from building APM support. APM isn't supported and it won't build if attempted. Also disable P4THERMAL for VISWS. Signed-off-by: Randy Dunlap <rddunlap@osdl.org> Acked-by: Andrey Panin <pazke@donpac.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <manfred@colorfullife.com> [PATCH] proc_pid_status() oops fix proc_pid_status dereferences pointers in the task structure even if the task is already dead. This is probably the reason for the oops described in http://bugme.osdl.org/show_bug.cgi?id=3812 The attached patch removes the pointer dereferences by using pid_alive() for testing that the task structure contents is still valid before dereferencing them. The task structure itself is guaranteed to be valid - we hold a reference count. Signed-Off-By: Manfred Spraul <manfred@colorfullife.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <greg@kroah.com> [PATCH] Driver Core: restore comment in kobject_uevent.c Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <greg@kroah.com> [PATCH] sysfs: fix sysfs_dir_close memory leak sysfs_dir_close did not free the "cursor" sysfs_dirent used for keeping track of position in the list of sysfs_dirent nodes. Consequently, doing a "find /sys" would leak a sysfs_dirent for each of the 1140 directories in my /sys tree, or about 36kB each time. From: "Adam J. Richter" <adam@yggdrasil.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <greg@kroah.com> [PATCH] Add documentation about why the in-kernel api is the way it is. Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <jbarnes@engr.sgi.com> [PATCH] correct copyright in arch/ia64/kernel/domain.c Ok, here we go (finally). A patch to correct the cut-and-paste copyright in arch/ia64/kernel/domain.c. Both Silicon Graphics, Inc. and myself (yes personally) hold the copyright on this file. Signed-off-by: Jesse Barnes <jbarnes@sgi.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> <torvalds@ppc970.osdl.org> Linux 2.6.10-rc3 (Log in to post comments)
|
|||||||||||||