commit b4bd8c66435a8cdf8c90334fb3b517a23ff2ab95 Author: Linus Torvalds Date: Fri Oct 13 09:25:04 2006 -0700 Linux 2.6.19-rc2 That was slightly more painful than really necessary.. commit b8a3ad5b53918787f4708ad9dfe90d2557cc78dd Author: Linus Torvalds Date: Fri Oct 13 08:42:10 2006 -0700 Include proper header file for PFN_DOWN() The recent commit (99a10a60ba9bedcf5d70ef81414d3e03816afa3f) to fix up mmap_kmem() broke compiles because it used PFN_DOWN() without including . Signed-off-by: Linus Torvalds commit 0e7af8d04ecb4f6ba8cd1f731f036a004ad0e174 Author: David Woodhouse Date: Fri Oct 13 16:04:23 2006 +0100 [PATCH] Fix headers_check for O= builds; disable automatic check on UML. * make header_check work with O= Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit e0fafda36a2fc5ecf8d11771f6c01c523b2a1fd8 Author: Geert Uytterhoeven Date: Thu Oct 12 23:18:53 2006 +0200 [PATCH] m68knommu: sync syscalls with m68k m68knommu: sync syscalls with m68k Signed-Off-By: Geert Uytterhoeven Signed-Off-By: Greg Ungerer Signed-off-by: Linus Torvalds commit 6569345abbcdbd1e13915a3bc5033c98817d0ec6 Author: Stephen Hemminger Date: Thu Oct 12 11:01:30 2006 -0700 [PATCH] thermal throttle: sysfs error checking Get rid of warning in the thermal throttling code about not checking sysfs return values. Signed-off-by: Stephen Hemminger Signed-off-by: Linus Torvalds commit 1b95817dd76084c10cb8dc899f429bcc85454741 Author: Al Viro Date: Thu Oct 12 19:10:04 2006 +0100 [PATCH] uml shouldn't do HEADERS_CHECK The lack of asm-um/Kbuild is deliberate. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 99a10a60ba9bedcf5d70ef81414d3e03816afa3f Author: Franck Bui-Huu Date: Thu Oct 12 21:06:33 2006 +0200 [PATCH] Fix up mmap_kmem vma->vm_pgoff is an pfn _offset_ relatif to the begining of the memory start. The previous code was doing at first: vma->vm_pgoff << PAGE_SHIFT which results into a wrong physical address since some platforms have a physical mem start that can be different from 0. After that the previous call __pa() on this wrong physical address, however __pa() is used to convert a _virtual_ address into a physical one. This patch rewrites this convertion. It calculates the pfn of PAGE_OFFSET which is the pfn of the mem start then it adds the vma->vm_pgoff to it. It also uses virt_to_phys() instead of __pa() since the latter shouldn't be used by drivers. Signed-off-by: Franck Bui-Huu Signed-off-by: Linus Torvalds commit 7f14daa19ea36b200d237ad3ac5826ae25360461 Author: Petr Vandrovec Date: Fri Oct 13 04:13:16 2006 +0200 [PATCH] Get core dump code to work... The file based core dump code was broken by pipe changes - a relative llseek returns the absolute file position on success, not the relative one, so dump_seek() always failed when invoked with non-zero current position. Only success/failure can be tested with relative lseek, we have to trust kernel that on success we've got right file offset. With this fix in place I have finally real core files instead of 1KB fragments... Signed-off-by: Petr Vandrovec [ Cleaned it up a bit while here - use SEEK_CUR instead of hardcoding 1 ] Signed-off-by: Linus Torvalds commit 81c06b10bcd4c7e8c88b4b425c55402b1d65fd0e Author: James Bottomley Date: Thu Oct 12 22:25:03 2006 -0500 [VOYAGER] fix up ptregs removal mess Apparently whoever converted voyager never actually checked that the patch would compile ... Remove as much of the pt_regs references as possible and move the remaining ones into line with what's in x86 generic. Signed-off-by: James Bottomley commit 58f07943b0ef1e59cbf9a45cdc727048d224637f Author: James Bottomley Date: Thu Oct 12 22:23:18 2006 -0500 [VOYAGER] fix up attribute packed specifiers in voyager.h The old style (attribute on each structure entry) never really worked. Move it to an attribute per structure Signed-off-by: James Bottomley commit c771746ef6ad64357897a90da42908d5c800a2c5 Author: James Bottomley Date: Thu Oct 12 22:21:16 2006 -0500 [VOYAGER] fix genirq mess The implementation of genirq in x86 completely broke voyager (and presumably visws). Since it's plugged into so much of the x86 infrastructure, you can't expect it to work unconverted. This patch introduces a voyager IRQ handler type and switches voyager to the genirq infrastructure. Signed-off-by: James Bottomley commit 1a4e15a04ec69cb3552f4120079f5472377df5f7 Author: Steve French Date: Thu Oct 12 21:33:51 2006 +0000 [CIFS] Missing flags2 for DFS Partly suggested by Igor Mammedov Signed-off-by: Steve French commit 370298e2e6f513bc4a9e9445eeed060d8c31f1ca Author: Steven Whitehouse Date: Thu Oct 12 15:40:05 2006 -0400 [GFS2] Update git tree name/location The plan is to have two trees. One for bug fixes to be sent on a regular basis (-fixes) and another called -nmw which will contain items queued for the next merge window (hence the name). The -nmw tree will come & go according to need. Signed-off-by: Steven Whitehouse commit 4c5e1b1a8c3f591b21f09001d6748296ddff33b8 Author: Patrick Caulfield Date: Thu Oct 12 10:41:22 2006 +0100 [DLM] fix iovec length in recvmsg The DLM always passes the iovec length as 1, this is wrong when the circular buffer wraps round. Signed-Off-By: Patrick Caulfield Signed-off-by: Steven Whitehouse commit c312c4fdc88514dd9522b7858eb879e610aeb9b1 Author: Russell Cattelan Date: Thu Oct 12 09:23:41 2006 -0400 [GFS2] Pass the correct value to kunmap_atomic Pass kaddr rather than (incorrect) struct page to kunmap_atomic. Signed-off-by: Russell Cattelan Signed-off-by: Steven Whitehouse commit fe1a698ffef5af546dd4a8cd6a1f2f202491c4ef Author: Steven Whitehouse Date: Wed Oct 11 13:34:59 2006 -0400 [GFS2] Fix bug where lock not held The log lock needs to be held when manipulating the counter for the number of free journal blocks. Signed-off-by: Steven Whitehouse commit 1ee48af22ed6dcddea8cdf93c7f2a268cbcf0d56 Author: Adrian Bunk Date: Sun Oct 8 04:30:48 2006 +0200 [DLM] Kconfig: don't show an empty DLM menu Don't show an empty "Distributed Lock Manager" menu if IP_SCTP=n. Reported by Dmytro Bagrii in kernel Bugzilla #7268. Signed-off-by: Adrian Bunk Signed-off-by: David Teigland Signed-off-by: Patrick Caulfield Signed-off-by: Steven Whitehouse commit f5c54804d9e3bb23d8924af09d9ca1c8de9560b6 Author: Steven Whitehouse Date: Tue Oct 10 13:45:15 2006 -0400 [GFS2] Fix uninitialised variable This fixes a bug where, in certain cases an uninitialised variable could cause a dereference of a NULL pointer in gfs2_commit_write(). Also a typo in a comment is fixed at the same time. Signed-off-by: Steven Whitehouse commit 52ae7b7935a079aaba25da98fe90772d04109f26 Author: Russell Cattelan Date: Mon Oct 9 12:11:54 2006 -0500 [GFS2] Fix a size calculation error Fix a size calculation error. The size was incorrect being computed as a negative length and then being passed to an unsigned parameter. This in turn would cause the allocator to think it needed enough meta data to store a gigabyte file for every file created. Signed-off-by: Russell Cattelan Signed-off-by: Steven Whitehouse commit 1baaf0b424fe611a99cf3e2e59e84df0561d679a Author: Al Viro Date: Thu Oct 12 19:07:59 2006 +0100 [PATCH] more kernel_execve() fallout (sbus) drivers/sbus/char stuff using kernel_execve() needs linux/syscalls.h now; includes trimmed, while we are at it. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 734c4c67393893f61b39bcdfe1e94f72111c56d6 Author: Ravikiran Thirumalai Date: Thu Oct 12 12:17:52 2006 -0700 [PATCH] Fix build breakage with CONFIG_X86_VSMP Kernel build breaks with CONFIG_X86_VSMP. Probably due to some header file cleanups in 2.6.19-rc1. Signed-off-by: Ravikiran Thirumalai Signed-off-by: Linus Torvalds commit 78b93f2db11df75ada5d04962ba631940b0a1398 Author: Al Viro Date: Thu Oct 12 19:00:35 2006 +0100 [PATCH] fixing includes in alpha_ksyms.c kernel_execve() fallout Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit d103e164bee2f21d0efe7d713cbbb0a443ba480d Author: Steve French Date: Thu Oct 12 17:49:24 2006 +0000 [CIFS] Workaround incomplete byte length returned by some servers on small SMB responses Signed-off-by: Steve French commit 8770c018da7bbaa3b41371abc401b2aa7e76a71a Author: Jens Axboe Date: Thu Oct 12 17:24:52 2006 +0200 [PATCH] ide-cd: one more missing REQ_TYPE_CMD_ATA check Signed-off-by: Jens Axboe commit 230a03950ecd63bc613c6adeffbe9049189d9f05 Author: Andrew Morton Date: Thu Oct 12 15:07:55 2006 +0000 [CIFS] cifs Kconfig: don't select CONNECTOR `select' is a bit obnoxious: the option keeps on coming back and it's hard to work out what to do to make it go away again. The use of `depends on' is preferred (although it has usability problems too..) Signed-off-by: Andrew Morton Signed-off-by: Steve French commit 994bd4f9f5a065ead4a92435fdd928ac7fd33809 Author: Eric W. Biederman Date: Wed Oct 11 22:44:46 2006 -0600 [PATCH] x86_64 irq: Properly update vector_irq This patch fixes my one line thinko where I was clearing the vector_irq entries on the wrong cpus. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit d58cdfb89ce0c6bd5f81ae931a984ef298dbda20 Author: Vasily Tarasov Date: Thu Oct 12 15:09:51 2006 +0200 [PATCH] block layer: ioprio_best function fix Currently ioprio_best function first checks wethere aioprio or bioprio equals IOPRIO_CLASS_NONE (ioprio_valid() macros does that) and if it is so it returns bioprio/aioprio appropriately. Thus the next four lines, that set aclass/bclass to IOPRIO_CLASS_BE, if aclass/bclass == IOPRIO_CLASS_NONE, are never executed. The second problem: if aioprio from class IOPRIO_CLASS_NONE and bioprio from class IOPRIO_CLASS_IDLE are passed to ioprio_best function, it will return IOPRIO_CLASS_IDLE. It means that during __make_request we can merge two requests and set the priority of merged request to IDLE, while one of the initial requests originates from a process with NONE (default) priority. So we can get a situation when a process with default ioprio will experience IO starvation, while there is no process from real-time class in the system. Just removing ioprio_valid check should correct situation. Signed-off-by: Vasily Tarasov Signed-off-by: Jens Axboe commit cea2885a2e989d1dc19af1fc991717b33b7d1456 Author: Jens Axboe Date: Thu Oct 12 15:08:45 2006 +0200 [PATCH] ide-cd: fix breakage with internally queued commands We still need to maintain a private PC style command, since it isn't completely unified with REQ_TYPE_BLOCK_PC yet. Signed-off-by: Jens Axboe commit c5841642242e9ae817275e09b36b298456dc17d2 Author: Vasily Tarasov Date: Wed Oct 11 13:26:30 2006 +0200 [PATCH] block layer: elv_iosched_show should get elv_list_lock elv_iosched_show function iterates other elv_list, hence elv_list_lock should be got. Signed-off-by: Vasily Tarasov Signed-off-by: Vasily Tarasov commit e6e80f294c2688302f41959c57acfee7e131e489 Author: Jens Axboe Date: Wed Oct 11 10:03:09 2006 +0200 [PATCH] splice: fix pipe_to_file() ->prepare_write() error path Don't jump to the unlock+release path, we already did that. Signed-off-by: Jens Axboe commit a22b169df1b9f259391cf3b8ad8bfeea3d7be3f1 Author: Vasily Tarasov Date: Wed Oct 11 09:24:27 2006 +0200 [PATCH] block layer: elevator_find function cleanup We can easily produce search through the elevator list without introducing additional elevator_type variable. Signed-off-by: Vasily Tarasov Signed-off-by: Jens Axboe commit 2b1191af683d16a899c2b81b87b605841ceffdec Author: Jens Axboe Date: Mon Oct 9 13:04:35 2006 +0200 [PATCH] elevator: elevator_type member not used elevator_type field in elevator_type structure is useless: it isn't used anywhere in kernel sources. Signed-off-by: Vasily Tarasov Signed-off-by: Jens Axboe commit 30bdbe397bf58131a91fd836f60972442bed0544 Author: Akinbou Mita Date: Thu Oct 12 01:52:05 2006 -0700 [PKT_SCHED] sch_htb: use rb_first() cleanup Use rb_first() to get first entry in rb tree. Signed-off-by: Akinbou Mita Signed-off-by: David S. Miller commit b974179abef7cd680b80bd7c7042802bdd6f0eb6 Author: Patrick McHardy Date: Thu Oct 12 01:50:30 2006 -0700 [RTNETLINK]: Fix use of wrong skb in do_getlink() skb is the netlink query, nskb is the reply message. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 52c41a3224666d252d34597b580f1b6d4dc440e7 Author: Patrick McHardy Date: Thu Oct 12 01:48:20 2006 -0700 [DECNET]: Fix sfuzz hanging on 2.6.18 Dave Jones wrote: > sfuzz D 724EF62A 2828 28717 28691 (NOTLB) > cd69fe98 00000082 0000012d 724ef62a 0001971a 00000010 00000007 df6d22b0 > dfd81080 725bbc5e 0001971a 000cc634 00000001 df6d23bc c140e260 00000202 > de1d5ba0 cd69fea0 de1d5ba0 00000000 00000000 de1d5b60 de1d5b8c de1d5ba0 > Call Trace: > [] lock_sock+0x75/0xa6 > [] dn_getname+0x18/0x5f [decnet] > [] sys_getsockname+0x5c/0xb0 > [] sys_socketcall+0xef/0x261 > [] syscall_call+0x7/0xb > DWARF2 unwinder stuck at syscall_call+0x7/0xb > > I wonder if the plethora of lockdep related changes inadvertantly broke something? Looks like unbalanced locking. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 8238b218ec883adb44d710960a031c76105274cd Author: David S. Miller Date: Thu Oct 12 00:49:15 2006 -0700 [NET]: Do not memcmp() over pad bytes of struct flowi. They are not necessarily initialized to zero by the compiler, for example when using run-time initializers of automatic on-stack variables. Noticed by Eric Dumazet and Patrick McHardy. Signed-off-by: David S. Miller commit 42b6785eeb40fe3e9dab9981b6e3231a77c7c2f6 Author: YOSHIFUJI Hideaki Date: Tue Oct 10 19:42:09 2006 -0700 [NET]: Introduce protocol-specific destructor for time-wait sockets. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 9469c7b4aa210ce94c6e7208cfadbd0aca0ebe08 Author: YOSHIFUJI Hideaki Date: Tue Oct 10 19:41:46 2006 -0700 [NET]: Use typesafe inet_twsk() inline function instead of cast. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 496c98dff8e353880299168d36fa082d6fba5237 Author: YOSHIFUJI Hideaki Date: Tue Oct 10 19:41:21 2006 -0700 [NET]: Use hton{l,s}() for non-initializers. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 4244f8a9f86a6d6e820b4cb53835c15c56d41aff Author: YOSHIFUJI Hideaki Date: Tue Oct 10 19:40:50 2006 -0700 [TCP]: Use TCPOLEN_TSTAMP_ALIGNED macro instead of magic number. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 0be669bb37693103c15e64610454f8f431a38feb Author: Joerg Roedel Date: Tue Oct 10 14:49:53 2006 -0700 [IPV6]: Seperate sit driver to extra module (addrconf.c changes) This patch contains the changes to net/ipv6/addrconf.c to remove sit specific code if the sit driver is not selected. Signed-off-by: Joerg Roedel Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 989e5b96e1af399296e2d1a34ca4a5aea1cf6d63 Author: Joerg Roedel Date: Tue Oct 10 14:47:44 2006 -0700 [IPV6]: Seperate sit driver to extra module This patch removes the driver of the IPv6-in-IPv4 tunnel driver (sit) from the IPv6 module. It adds an option to Kconfig which makes it possible to compile it as a seperate module. Signed-off-by: Joerg Roedel Signed-off-by: David S. Miller commit effee6a00034a8d83a6dea6d221820d87364ac21 Author: Miklos Szeredi Date: Mon Oct 9 21:42:14 2006 -0700 [NET]: File descriptor loss while receiving SCM_RIGHTS If more than one file descriptor was sent with an SCM_RIGHTS message, and on the receiving end, after installing a nonzero (but not all) file descritpors the process runs out of fds, then the already installed fds will be lost (userspace will have no way of knowing about them). The following patch makes sure, that at least the already installed fds are sent to userspace. It doesn't solve the issue of losing file descriptors in case of an EFAULT on the userspace buffer. Signed-off-by: Miklos Szeredi Signed-off-by: David S. Miller commit 6aa2551cf135f1d246d31482adc8c679eeea3a83 Author: Vlad Yasevich Date: Mon Oct 9 21:34:26 2006 -0700 [SCTP]: Fix the RX queue size shown in /proc/net/sctp/assocs output. Show the true receive buffer usage. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 331c4ee7faa4ee1e1404c872a139784753100498 Author: Vlad Yasevich Date: Mon Oct 9 21:34:04 2006 -0700 [SCTP]: Fix receive buffer accounting. When doing receiver buffer accounting, we always used skb->truesize. This is problematic when processing bundled DATA chunks because for every DATA chunk that could be small part of one large skb, we would charge the size of the entire skb. The new approach is to store the size of the DATA chunk we are accounting for in the sctp_ulpevent structure and use that stored value for accounting. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 6e8c751e07b34d73069e9333f67fbe5ffe31ec3a Author: Chad Sellers Date: Fri Oct 6 16:09:52 2006 -0400 SELinux: Bug fix in polidydb_destroy This patch fixes two bugs in policydb_destroy. Two list pointers (policydb.ocontexts[i] and policydb.genfs) were not being reset to NULL when the lists they pointed to were being freed. This caused a problem when the initial policy load failed, as the policydb being destroyed was not a temporary new policydb that was thrown away, but rather was the global (active) policydb. Consequently, later functions, particularly sys_bind->selinux_socket_bind->security_node_sid and do_rw_proc->selinux_sysctl->selinux_proc_get_sid->security_genfs_sid tried to dereference memory that had previously been freed. Signed-off-by: Chad Sellers Signed-off-by: James Morris commit 3bccfbc7a7ba4085817deae6e7c67daf0cbd045a Author: Venkat Yekkirala Date: Thu Oct 5 15:42:35 2006 -0500 IPsec: fix handling of errors for socket policies This treats the security errors encountered in the case of socket policy matching, the same as how these are treated in the case of main/sub policies, which is to return a full lookup failure. Signed-off-by: Venkat Yekkirala Signed-off-by: James Morris commit 5b368e61c2bcb2666bb66e2acf1d6d85ba6f474d Author: Venkat Yekkirala Date: Thu Oct 5 15:42:18 2006 -0500 IPsec: correct semantics for SELinux policy matching Currently when an IPSec policy rule doesn't specify a security context, it is assumed to be "unlabeled" by SELinux, and so the IPSec policy rule fails to match to a flow that it would otherwise match to, unless one has explicitly added an SELinux policy rule allowing the flow to "polmatch" to the "unlabeled" IPSec policy rules. In the absence of such an explicitly added SELinux policy rule, the IPSec policy rule fails to match and so the packet(s) flow in clear text without the otherwise applicable xfrm(s) applied. The above SELinux behavior violates the SELinux security notion of "deny by default" which should actually translate to "encrypt by default" in the above case. This was first reported by Evgeniy Polyakov and the way James Morris was seeing the problem was when connecting via IPsec to a confined service on an SELinux box (vsftpd), which did not have the appropriate SELinux policy permissions to send packets via IPsec. With this patch applied, SELinux "polmatching" of flows Vs. IPSec policy rules will only come into play when there's a explicit context specified for the IPSec policy rule (which also means there's corresponding SELinux policy allowing appropriate domains/flows to polmatch to this context). Secondly, when a security module is loaded (in this case, SELinux), the security_xfrm_policy_lookup() hook can return errors other than access denied, such as -EINVAL. We were not handling that correctly, and in fact inverting the return logic and propagating a false "ok" back up to xfrm_lookup(), which then allowed packets to pass as if they were not associated with an xfrm policy. The solution for this is to first ensure that errno values are correctly propagated all the way back up through the various call chains from security_xfrm_policy_lookup(), and handled correctly. Then, flow_cache_lookup() is modified, so that if the policy resolver fails (typically a permission denied via the security module), the flow cache entry is killed rather than having a null policy assigned (which indicates that the packet can pass freely). This also forces any future lookups for the same flow to consult the security module (e.g. SELinux) for current security policy (rather than, say, caching the error on the flow cache entry). This patch: Fix the selinux side of things. This makes sure SELinux polmatching of flow contexts to IPSec policy rules comes into play only when an explicit context is associated with the IPSec policy rule. Also, this no longer defaults the context of a socket policy to the context of the socket since the "no explicit context" case is now handled properly. Signed-off-by: Venkat Yekkirala Signed-off-by: James Morris commit 134b0fc544ba062498451611cb6f3e4454221b3d Author: James Morris Date: Thu Oct 5 15:42:27 2006 -0500 IPsec: propagate security module errors up from flow_cache_lookup When a security module is loaded (in this case, SELinux), the security_xfrm_policy_lookup() hook can return an access denied permission (or other error). We were not handling that correctly, and in fact inverting the return logic and propagating a false "ok" back up to xfrm_lookup(), which then allowed packets to pass as if they were not associated with an xfrm policy. The way I was seeing the problem was when connecting via IPsec to a confined service on an SELinux box (vsftpd), which did not have the appropriate SELinux policy permissions to send packets via IPsec. The first SYNACK would be blocked, because of an uncached lookup via flow_cache_lookup(), which would fail to resolve an xfrm policy because the SELinux policy is checked at that point via the resolver. However, retransmitted SYNACKs would then find a cached flow entry when calling into flow_cache_lookup() with a null xfrm policy, which is interpreted by xfrm_lookup() as the packet not having any associated policy and similarly to the first case, allowing it to pass without transformation. The solution presented here is to first ensure that errno values are correctly propagated all the way back up through the various call chains from security_xfrm_policy_lookup(), and handled correctly. Then, flow_cache_lookup() is modified, so that if the policy resolver fails (typically a permission denied via the security module), the flow cache entry is killed rather than having a null policy assigned (which indicates that the packet can pass freely). This also forces any future lookups for the same flow to consult the security module (e.g. SELinux) for current security policy (rather than, say, caching the error on the flow cache entry). Signed-off-by: James Morris commit 388b24057f90ba109d4bf855006a8809c383eb76 Author: paul.moore@hp.com Date: Thu Oct 5 18:28:24 2006 -0400 NetLabel: use SECINITSID_UNLABELED for a base SID This patch changes NetLabel to use SECINITSID_UNLABLELED as it's source of SELinux type information when generating a NetLabel context. Signed-off-by: Paul Moore Signed-off-by: James Morris commit ffb733c65000ee701294f7b80c4eca2a5f335637 Author: paul.moore@hp.com Date: Wed Oct 4 11:46:31 2006 -0400 NetLabel: fix a cache race condition Testing revealed a problem with the NetLabel cache where a cached entry could be freed while in use by the LSM layer causing an oops and other problems. This patch fixes that problem by introducing a reference counter to the cache entry so that it is only freed when it is no longer in use. Signed-off-by: Paul Moore Signed-off-by: James Morris commit ab5da288ce6a526a0a730362b8c4e03c3a0b58d5 Author: Martin Habets Date: Wed Oct 11 14:58:30 2006 -0700 [SPARC32]: Fix sparc32 modpost warnings. Fix these 2.6.19-rc1 build warnings from modpost: WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'core_kernel_text' (at offset 0x3e060) and '__kernel_text_address' WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'core_kernel_text' (at offset 0x3e064) and '__kernel_text_address' WARNING: vmlinux - Section mismatch: reference to .init.text:_einittext from .text between 'core_kernel_text' (at offset 0x3e07c) and '__kernel_text_address' WARNING: vmlinux - Section mismatch: reference to .init.text:_einittext from .text between 'core_kernel_text' (at offset 0x3e080) and '__kernel_text_address' WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'is_ksym_addr' (at offset 0x4b3a4) and 'kallsyms_expand_symbol' WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'is_ksym_addr' (at offset 0x4b3a8) and 'kallsyms_expand_symbol' WARNING: vmlinux - Section mismatch: reference to .init.text:_einittext from .text between 'is_ksym_addr' (at offset 0x4b3b4) and 'kallsyms_expand_symbol' WARNING: vmlinux - Section mismatch: reference to .init.text:_einittext from .text between 'is_ksym_addr' (at offset 0x4b3e4) and 'kallsyms_expand_symbol' WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'get_symbol_pos' (at offset 0x4b640) and 'kallsyms_lookup_size_offset' WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'get_symbol_pos' (at offset 0x4b644) and 'kallsyms_lookup_size_offset' WARNING: vmlinux - Section mismatch: reference to .init.text:_einittext from .text between 'get_symbol_pos' (at offset 0x4b654) and 'kallsyms_lookup_size_offset' WARNING: vmlinux - Section mismatch: reference to .init.text:_einittext from .text between 'get_symbol_pos' (at offset 0x4b658) and 'kallsyms_lookup_size_offset' WARNING: vmlinux - Section mismatch: reference to .init.text:_sinittext from .text between 'get_symbol_pos' (at offset 0x4b68c) and 'kallsyms_lookup_size_offset' The crux of the matter is that modpost only checks the relocatable sections. i386 vmlinux has none, so modpost does no checking on it (it does on the modules). However, sparc vmlinux has plenty of relocatable sections because it is being built with 'ld -r' (to allow for btfixup processing). So for sparc, modpost does do a lot of checking. Sure enough, running modpost on arch/sparc/boot/image yields no output (i.e. all is well). modpost.c check_sec_ref() has: /* We want to process only relocation sections and not .init */ if (sechdrs[i].sh_type == SHT_RELA) { // check here } else if (sechdrs[i].sh_type == SHT_REL) { // check here } Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit eba8cefc789f6e51a79363604a7db1dba6a678cb Author: Martin Habets Date: Tue Oct 10 14:44:01 2006 -0700 [SPARC32]: Fix sparc32 modpost warnings with sunzilog Fix this 2.6.19-rc1 build warnings from modpost: WARNING: vmlinux - Section mismatch: reference to .init.text:sunzilog_console_setup from .data between 'sunzilog_console' (at offset 0x8394) and 'devices_subsys' Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit e3096de34c35683bc233f76d4e86562f1d782d0d Author: Martin Habets Date: Tue Oct 10 14:36:47 2006 -0700 [SPARC32]: Mark srmmu_nocache_init as __init. Fix these 2.6.19-rc1 build warnings from modpost: WARNING: vmlinux - Section mismatch: reference to .init.text:__alloc_bootmem from .text between 'srmmu_nocache_init' (at offset 0x1a0f8) and 'srmmu_mmu_info' WARNING: vmlinux - Section mismatch: reference to .init.text:__alloc_bootmem from .text between 'srmmu_nocache_init' (at offset 0x1a118) and 'srmmu_mmu_info' WARNING: vmlinux - Section mismatch: reference to .init.text:srmmu_early_allocate_ptable_skeleton from .text between 'srmmu_nocache_init' (at offset 0x1a188) and 'srmmu_mmu_info' Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit c2baeb0526277676d4cee022f663af880c22fe84 Author: David S. Miller Date: Tue Oct 10 14:17:05 2006 -0700 [SPARC32]: pcic.c needs asm/irq_regs.h Signed-off-by: David S. Miller commit acf1a1b1043327b2179ea529730358e58c7c277e Author: Steve French Date: Thu Oct 12 03:28:28 2006 +0000 [CIFS] Level 1 QPathInfo needed for proper OS2 support Signed-off-by: Steve French commit 8ae91b9ad88a130cd50fc0b78b16e7b9510b8067 Author: Ryusuke Sakato Date: Thu Oct 12 12:16:13 2006 +0900 sh: SH-4A UBC support A simple patch to enable the UBC on SH-4A. Signed-off-by: Ryusuke Sakato Signed-off-by: Paul Mundt commit baf4326e49801526e4516e4de7f37b5e51468c49 Author: Paul Mundt Date: Thu Oct 12 12:03:04 2006 +0900 sh: interrupt exception handling rework Kill off interrupt_table for all of the CPU subtypes, we now default in to stepping in to do_IRQ() for _all_ IRQ exceptions and counting the spurious ones, rather than simply flipping on the ones we cared about. This and enabling the IRQ by default automatically has already uncovered a couple of bugs and IRQs that weren't being caught, as well as some that are being generated far too often (SCI Tx Data Empty, for example). The general rationale is to use a marker for interrupt exceptions, test for it in the handle_exception() path, and skip out to do_IRQ() if it's found. Everything else follows the same behaviour of finding the cached EXPEVT value in r2/r2_bank, we just rip out the INTEVT read from entry.S entirely (except for in the kGDB NMI case, which is another matter). Note that while this changes the do_IRQ() semantics regarding r4 handling, they were fundamentally broken anyways (relying entirely on r2_bank for the cached code). With this, we do the INTEVT read from do_IRQ() itself (in the CONFIG_CPU_HAS_INTEVT case), or fall back on r4 for the muxed IRQ number, which should also be closer to what SH-2 and SH-2A want anyways. Signed-off-by: Paul Mundt commit 8884c4cb8b621963b5eb4a9ae45070bd0cb7085f Author: Paul Mundt Date: Thu Oct 12 11:56:31 2006 +0900 sh: Default enable R7780RP IRQs. Now that we've started accounting for spurious IRQs, change the logic somewhat so that we have a better chance of catching them. Signed-off-by: Paul Mundt commit ddae957da48cc381c1472a8909905e1818e4afdd Author: Steve French Date: Thu Oct 12 01:23:29 2006 +0000 [CIFS] fix typo in previous patch Signed-off-by: Steve French commit 533f90af6d90b9e4859a158565385d1d84a79f75 Author: Steve French Date: Thu Oct 12 00:02:32 2006 +0000 [CIFS] Fix old DOS time conversion to handle timezone Signed-off-by: Steve French commit 70903ca004fef17b0f6483714baefdb2f6ecceb0 Author: Steve French Date: Wed Oct 11 18:49:24 2006 +0000 [CIFS] Do not need to adjust for Jan/Feb for leap day calculation in 2100 (year divisible by 100) Signed-off-by: Yehuda Sadeh Weinraub Signed-off-by: Steve French commit 9a244b95ddb62a17b62f4b061b6e13ca4d177942 Author: Ralf Baechle Date: Wed Oct 11 19:30:03 2006 +0100 [MIPS] Pass NULL not 0 for pointer value. Signed-off-by: Ralf Baechle commit c11b3c1bc0250027ff05665898f8d8eec40b7e49 Author: Ralf Baechle Date: Wed Oct 11 18:35:33 2006 +0100 [MIPS] IP27: Make declaration of setup_replication_mask a proper prototype. Signed-off-by: Ralf Baechle commit 67672f5b1f90ff19b970727b3fe2fa2b3cee3bef Author: Ralf Baechle Date: Wed Oct 11 01:42:30 2006 +0100 [MIPS] BigSur: More useful defconfig. Signed-off-by: Ralf Baechle commit 04d4d7d5e36957b2d941310fc8243aa7bf036f3b Author: Ralf Baechle Date: Wed Oct 11 01:22:12 2006 +0100 [MIPS] Cleanup definitions of speed_t and tcflag_t. Signed-off-by: Ralf Baechle commit 472f291df59fc1c5eb3ade74a50bfa222030e736 Author: Mark Mason Date: Tue Oct 10 17:03:10 2006 -0700 [MIPS] Fix compilation warnings in arch/mips/sibyte/bcm1480/smp.c Signed-off-by: Mark Mason Signed-off-by: Ralf Baechle commit 9b95e629eab59ee140fe2b17bbd7fea6821c6085 Author: Atsushi Nemoto Date: Tue Oct 10 22:46:52 2006 +0900 [MIPS] Optimize and cleanup get_saved_sp, set_saved_sp If CONFIG_BUILD_ELF64 was not selected and gcc had -msym32 option (i.e. 4.0 or newer), there is no point to use %highest, %higher for kernel symbols. This patch also fixes 64-bit SMTC version of get_saved_sp() which is broken but harmless since there is no such CPUs for now. A bonus is set_saved_sp() and SMP version of get_saved_sp() are more readable now. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit dff9262ed1491a1e531dc56e687605b5e4cd488d Author: Atsushi Nemoto Date: Wed Oct 11 01:07:01 2006 +0900 [MIPS] does not need pt_regs anymore. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f94054121efcba573f12101a75a4be93e871b309 Author: Ralf Baechle Date: Tue Oct 10 15:44:10 2006 +0100 [MIPS] Workaround for bug in gcc -EB / -EL options. Certain gcc versions upto gcc 4.1.1 (probably 4.2-subversion as of 2006-10-10 don't properly change the the predefined symbols if -EB / -EL are used, so we kludge that here. A bug has been filed at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29413. Signed-off-by: Ralf Baechle commit ea5742830ada301de22a68e604b48fb6107c270f Author: Yoichi Yuasa Date: Tue Oct 10 16:56:11 2006 +0900 [MIPS] Fix timer setup for Jazz Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit f061c5847bcc72eebf6a783f458d42092eac1b6a Author: Al Viro Date: Wed Oct 11 17:45:47 2006 +0100 [PATCH] i2Output always takes kernel data now Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cff52daffa080eff6353f44df418b080dacefb96 Author: Al Viro Date: Wed Oct 11 17:40:22 2006 +0100 [PATCH] alpha_ksyms.c cleanup taken exports to actual definitions of symbols being exported. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9ab6a45394715918b025f2d3b799477295af4cc0 Author: Al Viro Date: Wed Oct 11 17:40:22 2006 +0100 [PATCH] remove bogus arch-specific syscall exports Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit f39d88adc5daf544cf9ae666a097b595b212871e Author: Al Viro Date: Wed Oct 11 17:28:47 2006 +0100 [PATCH] z2_init() in non-modular case ... another victim - this time of 2.5.1-pre2 Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2db5f59ca74d911f93c39494db1581c3c93d5a29 Author: Al Viro Date: Wed Oct 11 17:28:37 2006 +0100 [PATCH] amiga_floppy_init() in non-modular case It used to be called directly, but that got lost in 2.1.87-pre1. Similar breakage in ataflop got fixed 3 years ago, this one had gone unnoticed. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2e811488cedddefb9d1df97c260b6048ea8ef835 Author: Al Viro Date: Wed Oct 11 17:28:27 2006 +0100 [PATCH] clean m68k ksyms sun3_ksyms gone, m68k_ksyms trimmed down to exports of the assembler ones, for sun3 added the missing exports of __ioremap() and iounmap(). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 437111ca381263520d23c877e55e0a83558e79da Author: Al Viro Date: Wed Oct 11 17:28:17 2006 +0100 [PATCH] sun3 __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1e5c374d3833f816b4840227c6949f689af0cb44 Author: Al Viro Date: Wed Oct 11 17:28:07 2006 +0100 [PATCH] misc m68k __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b971018bae94bb43ae2402f884684ad69e85f931 Author: Al Viro Date: Wed Oct 11 17:27:57 2006 +0100 [PATCH] m68k uaccess __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4b4fcaa1a9eec90b44b66a67af6e130349ba008e Author: Al Viro Date: Wed Oct 11 17:25:45 2006 +0100 [PATCH] misuse of strstr Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fd2c903b89a6c3cec9388eb24a134ebc1be20747 Author: Al Viro Date: Wed Oct 11 17:24:55 2006 +0100 [PATCH] m32r: more __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 12ea59e8109d7192ecb2ac994588e24b11ab0428 Author: Al Viro Date: Wed Oct 11 17:24:35 2006 +0100 [PATCH] m32r: NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 870e75a2930a1db02c7a5c09a13edcb4e3b07838 Author: Al Viro Date: Wed Oct 11 17:24:45 2006 +0100 [PATCH] m32r: signal __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7857a7f59d5d0b4e8c15606a79c0bcdbdef18ab6 Author: Al Viro Date: Wed Oct 11 17:24:25 2006 +0100 [PATCH] m32r: C99 initializers in setup.c Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 399ad77b9098ed2eb27cbfbeb6449c1caab3c18e Author: Al Viro Date: Wed Oct 11 17:22:34 2006 +0100 [PATCH] arm-versatile iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fc048b5b0f2554bc953a8ada5b2e3b82bde2fcb0 Author: Al Viro Date: Wed Oct 11 17:22:54 2006 +0100 [PATCH] arm: use unsigned long instead of unsigned int in get_user() Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 35d59fc5d6f318a28a99c5936171afd4edef28c8 Author: Al Viro Date: Wed Oct 11 17:22:44 2006 +0100 [PATCH] arm __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5f6e3c836508926e50cebe17ad87f59666a7fb47 Author: Alexey Dobriyan Date: Wed Oct 11 01:22:26 2006 -0700 [PATCH] md: use BUILD_BUG_ON Signed-off-by: Alexey Dobriyan Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76fd020937f2d09f76a4cd8dbae1f3bec640ff0b Author: Jeff Garzik Date: Wed Oct 11 01:22:25 2006 -0700 [PATCH] ISDN: several minor fixes pcbit: kill 'may be used uninitialized' warning. although the code does eventually fill the 32 bits it cares about, the variable truly is accessed uninitialized in each macro. Easier to just clean it up now. sc: fix a ton of obviously incorrect printk's (some with missing arguments even) Signed-off-by: Jeff Garzik Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf02c082bf7a464518d45b9c178b8aa83f74dd5d Author: Andreas Mohr Date: Wed Oct 11 01:22:24 2006 -0700 [PATCH] fs/bio.c: tweaks - Calculate a variable in bvec_alloc_bs() only once needed, not earlier (bio.o down from 18408 to 18376 Bytes, 32 Bytes saved, probably due to data locality improvements). - Init variable idx to silence a gcc warning which already existed in the unmodified original base file (bvec_alloc_bs() handles idx correctly, so there's no need for the warning): fs/bio.c: In function `bio_alloc_bioset': fs/bio.c:169: warning: `idx' may be used uninitialized in this function Signed-off-by: Andreas Mohr Acked-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49a6cbe1cd8a72451d9d6ab5b1e163f17c1bbee3 Author: Jeff Garzik Date: Wed Oct 11 01:22:23 2006 -0700 [PATCH] drivers/mca: handle sysfs errors Also includes a kmalloc->kzalloc cleanup. Signed-off-by: Jeff Garzik Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69b2186c5fcb335e29c558e3b4e410e1939b5cc8 Author: Jeff Garzik Date: Wed Oct 11 01:22:23 2006 -0700 [PATCH] firmware/efivars: handle error Signed-off-by: Jeff Garzik Acked-by: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42ddfd6859b9d57490c94d26e29a43ffd78366e5 Author: Jeff Garzik Date: Wed Oct 11 01:22:22 2006 -0700 [PATCH] EISA: handle sysfs errors Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e59393ec242d7b772356c95e2be48384cd0c5d7 Author: Jeff Garzik Date: Wed Oct 11 01:22:21 2006 -0700 [PATCH] ipmi: handle sysfs errors Signed-off-by: Jeff Garzik Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41bfcfd9ac0fbb59aaaa18e3ed5774e85b716de4 Author: Jeff Garzik Date: Wed Oct 11 01:22:20 2006 -0700 [PATCH] firmware/dell_rbu: handle sysfs errors Signed-off-by: Jeff Garzik Cc: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c636ebdb186bf37f98d3839f69293597723edb36 Author: David Howells Date: Wed Oct 11 01:22:19 2006 -0700 [PATCH] VFS: Destroy the dentries contributed by a superblock on unmounting The attached patch destroys all the dentries attached to a superblock in one go by: (1) Destroying the tree rooted at s_root. (2) Destroying every entry in the anon list, one at a time. (3) Each entry in the anon list has its subtree consumed from the leaves inwards. This reduces the amount of work generic_shutdown_super() does, and avoids iterating through the dentry_unused list. Note that locking is almost entirely absent in the shrink_dcache_for_umount*() functions added by this patch. This is because: (1) at the point the filesystem calls generic_shutdown_super(), it is not permitted to further touch the superblock's set of dentries, and nor may it remove aliases from inodes; (2) the dcache memory shrinker now skips dentries that are being unmounted; and (3) the superblock no longer has any external references through which the VFS can reach it. Given these points, the only locking we need to do is when we remove dentries from the unused list and the name hashes, which we do a directory's worth at a time. We also don't need to guard against reference counts going to zero unexpectedly and removing bits of the tree we're working on as nothing else can call dput(). A cut down version of dentry_iput() has been folded into shrink_dcache_for_umount_subtree() function. Apart from not needing to unlock things, it also doesn't need to check for inotify watches. In this version of the patch, the complaint about a dentry still being in use has been expanded from a single BUG_ON() and now gives much more information. Signed-off-by: David Howells Acked-by: NeilBrown Acked-by: Ian Kent Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ce315234aefcbc599dea390c15672156ebf9e7b Author: David Howells Date: Wed Oct 11 01:22:15 2006 -0700 [PATCH] AUTOFS: Make sure all dentries refs are released before calling kill_anon_super() Make sure all dentries refs are released before calling kill_anon_super() so that the assumption that generic_shutdown_super() can completely destroy the dentry tree for there will be no external references holds true. What was being done in the put_super() superblock op, is now done in the kill_sb() filesystem op instead, prior to calling kill_anon_super(). This makes the struct autofs_sb_info::root member variable redundant (since sb->s_root is still available), and so that is removed. The calls to shrink_dcache_sb() are also removed since they're also redundant as shrink_dcache_for_umount() will now be called after the cleanup routine. Signed-off-by: David Howells Acked-by: Ian Kent Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit edc666e2ff9ec2e4e9510f1127c68c22cffc93f6 Author: David Howells Date: Wed Oct 11 01:22:14 2006 -0700 [PATCH] ReiserFS: Make sure all dentries refs are released before calling kill_block_super() Make sure all dentries refs are released before calling kill_block_super() so that the assumption that generic_shutdown_super() can completely destroy the dentry tree for there will be no external references holds true. What was being done in the put_super() superblock op, is now done in the kill_sb() filesystem op instead, prior to calling kill_block_super(). Changes made in [try #2]: (*) reiserfs_kill_sb() now checks that the superblock FS info pointer is set before trying to dereference it. Signed-off-by: David Howells Cc: "Rafael J. Wysocki" Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e42ef777f62277ea9bb70976be65bb374e00b9c Author: Andrew Morton Date: Wed Oct 11 01:22:13 2006 -0700 [PATCH] dell_rbu: printk() warning fix drivers/firmware/dell_rbu.c: In function 'packetize_data': drivers/firmware/dell_rbu.c:252: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'int' Cc: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 272057447f646c51bc77c60044eb21c683fa366d Author: Randy Dunlap Date: Wed Oct 11 01:22:12 2006 -0700 [PATCH] kernel-doc: make parameter description indentation uniform - In parameter descriptions, strip all whitespace between the parameter name (e.g., @len) and its description so that the description is indented uniformly in text and man page modes. Previously, spaces or tabs (which are used for cleaner source code viewing) affected the produced output in a negative way. Before (man mode): to Destination address, in user space. from Source address, in kernel space. n Number of bytes to copy. After (man mode): to Destination address, in user space. from Source address, in kernel space. n Number of bytes to copy. - Fix/clarify a few function description comments. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c751c1dbb1289d220a8a175ba0df47706ce95a7e Author: Mike Frysinger Date: Wed Oct 11 01:22:11 2006 -0700 [PATCH] include linux/types.h in linux/nbd.h The nbd header uses __be32 and such types but doesn't actually include the header that defines these things (linux/types.h); so let's include it. Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32e794015aa698fd6bf1ec21b713f900a707fb15 Author: Randy Dunlap Date: Wed Oct 11 01:22:10 2006 -0700 [PATCH] kernel-doc: drop various "inline" qualifiers Drop __inline, __always_inline, and noinline in the produced kernel-doc output, similar to other pseudo directives. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c7fff6ef36526fb54694ee8201870f98b6a1747 Author: Randy Dunlap Date: Wed Oct 11 01:22:10 2006 -0700 [PATCH] uaccess.h: match kernel-doc and function names Place kernel-doc function comment header immediately before the function that is being documented. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35e38a6e03bedba7c633ae03d286accd85ab6a42 Author: Randy Dunlap Date: Wed Oct 11 01:22:09 2006 -0700 [PATCH] kernel-doc: fix function name in usercopy.c Fix kernel-doc function name in usercopy.c. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 256a6b41365e17cebe5c2fc91ddff716c9aa055a Author: Ingo Molnar Date: Wed Oct 11 01:22:08 2006 -0700 [PATCH] lockdep: fix printk recursion logic Bug reported and fixed by Tilman Schmidt : if lockdep is enabled then log messages make it to /var/log/messages belatedly. The reason is a missed wakeup of klogd. Initially there was only a lockdep_internal() protection against lockdep recursion within vprintk() - it grew the 'outer' lockdep_off()/on() protection only later on. But that lockdep_off() made the release_console_sem() within vprintk() always happen under the lockdep_internal() condition, causing the bug. The right solution to remove the inner protection against recursion here - the outer one is enough. Signed-off-by: Ingo Molnar Cc: Tilman Schmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fcce7432a731e67f1cd3ef1e71dca9ea84dedb1 Author: Aneesh Kumar Date: Wed Oct 11 01:22:07 2006 -0700 [PATCH] fix lockdep-design.txt I was looking at lockdep-desing.txt and i guess i am confused with the changes with respect to fd7bcea35e7efb108c34ee2b3840942a3749cadb. It says + '.' acquired while irqs enabled + '+' acquired in irq context + '-' acquired in process context with irqs disabled + '?' read-acquired both with irqs enabled and in irq context + But the get_usage_chars() function does this for '-' if (class->usage_mask & LOCKF_ENABLED_HARDIRQS) *c1 = '-'; So i guess what would be correct would be '.' acquired while irqs disabled '+' acquired in irq context '-' acquired with irqs enabled '?' read acquired in irq context with irqs enabled. Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dc3099a9b2c346b16383597fadaa79a05a52388 Author: Alexey Dobriyan Date: Wed Oct 11 01:22:06 2006 -0700 [PATCH] lockdep: use BUILD_BUG_ON Signed-off-by: Alexey Dobriyan Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39913b31d0cd11b5b18a303e220c95ffbd9e1a88 Author: Alexey Dobriyan Date: Wed Oct 11 01:22:06 2006 -0700 [PATCH] DAC960: use memmove for overlapping areas Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ecd05ae68a903761e736e9e0aca40d6ace4319e Author: Alexey Dobriyan Date: Wed Oct 11 01:22:05 2006 -0700 [PATCH] fs/*: use BUILD_BUG_ON Signed-off-by: Alexey Dobriyan Cc: David Woodhouse Cc: David Howells Cc: Mark Fasheh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fbab41ccc479b6b0ba15c137af9e0b1c100bff24 Author: Adrian Bunk Date: Wed Oct 11 01:22:04 2006 -0700 [PATCH] HT_IRQ must depend on PCI CONFIG_PCI=n, CONFIG_HT_IRQ=y results in the following compile error: ... LD vmlinux arch/i386/mach-generic/built-in.o: In function `apicid_to_node': summit.c:(.text+0x53): undefined reference to `apicid_2_node' arch/i386/kernel/built-in.o: In function `arch_setup_ht_irq': (.text+0xcf79): undefined reference to `write_ht_irq_low' arch/i386/kernel/built-in.o: In function `arch_setup_ht_irq': (.text+0xcf85): undefined reference to `write_ht_irq_high' arch/i386/kernel/built-in.o: In function `k7nops': alternative.c:(.data+0x1358): undefined reference to `mask_ht_irq' alternative.c:(.data+0x1360): undefined reference to `unmask_ht_irq' make[1]: *** [vmlinux] Error 1 Bug report by Jesper Juhl. Signed-off-by: Adrian Bunk Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53bc5b2db16ceefdd972b9ffd1f7bde5c427939e Author: Aneesh Kumar Date: Wed Oct 11 01:22:03 2006 -0700 [PATCH] Fix typos in mm/shmem_acl.c Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e50190a8341485b413f599033cb74649f849d939 Author: Matthew Wilcox Date: Wed Oct 11 01:22:02 2006 -0700 [PATCH] Consolidate check_signature There's nothing arch-specific about check_signature(), so move it to . Use a cross between the Alpha and i386 implementations as the generic one. Signed-off-by: Matthew Wilcox Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53d5ed627df852ba8bab7f70df25290bd733792c Author: Matthew Wilcox Date: Wed Oct 11 01:22:01 2006 -0700 [PATCH] Use linux/io.h instead of asm/io.h In preparation for moving check_signature, change these users from asm/io.h to linux/io.h Signed-off-by: Matthew Wilcox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c58165108e26d18849a0138c719e680f281197a Author: Monakhov Dmitriy Date: Wed Oct 11 01:22:00 2006 -0700 [PATCH] D-cache aliasing issue in __block_prepare_write A couple of flush_dcache_page()s are missing on the I/O-error paths. Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97e860d364aa9d08e895ecb619b9122ae2c70df8 Author: Eric Sesterhenn Date: Wed Oct 11 01:21:59 2006 -0700 [PATCH] Remove unnecessary check in fs/fat/inode.c Aince all callers dereference sb, and this function does so earlier too, we dont need the check. Signed-off-by: Eric Sesterhenn Acked-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 887ed2f3aecde2ff24e06666932dc5f144745044 Author: Trond Myklebust Date: Wed Oct 11 01:21:58 2006 -0700 [PATCH] VM: Fix the gfp_mask in invalidate_complete_page2 If try_to_release_page() is called with a zero gfp mask, then the filesystem is effectively denied the possibility of sleeping while attempting to release the page. There doesn't appear to be any valid reason why this should be banned, given that we're not calling this from a memory allocation context. For this reason, change the gfp_mask argument of the call to GFP_KERNEL. Signed-off-by: Trond Myklebust Cc: Steve Dickson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd0810410beb86c570aeb3dcd3dc1fc5ab9e6077 Author: Matthias Urlichs Date: Wed Oct 11 01:21:57 2006 -0700 [PATCH] document the core-dump-to-a-pipe patch The pipe-a-coredump-to-a-program feature was undocumented. *Grumble*. NB: a good enhancement to that patch would be: save all the stuff that a core file can get from the %x expansions in the environment. Signed-off-by: Matthias Urlichs Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01a3ee2b203e511e20f98b85a9172fd32c53e87c Author: Reinette Chatre Date: Wed Oct 11 01:21:55 2006 -0700 [PATCH] bitmap: parse input from kernel and user buffers lib/bitmap.c:bitmap_parse() is a library function that received as input a user buffer. This seemed to have originated from the way the write_proc function of the /proc filesystem operates. This has been reworked to not use kmalloc and eliminates a lot of get_user() overhead by performing one access_ok before using __get_user(). We need to test if we are in kernel or user space (is_user) and access the buffer differently. We cannot use __get_user() to access kernel addresses in all cases, for example in architectures with separate address space for kernel and user. This function will be useful for other uses as well; for example, taking input for /sysfs instead of /proc, so it was changed to accept kernel buffers. We have this use for the Linux UWB project, as part as the upcoming bandwidth allocator code. Only a few routines used this function and they were changed too. Signed-off-by: Reinette Chatre Signed-off-by: Inaky Perez-Gonzalez Cc: Paul Jackson Cc: Joe Korty Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39484e53bb00f55b6303a908070db133608ef2a5 Author: Maciej W. Rozycki Date: Wed Oct 11 01:21:54 2006 -0700 [PATCH] 32-bit compatibility HDIO IOCTLs A couple of HDIO IOCTLs are not yet handled and a few others are marked as using a pointer rather than an unsigned long. The formers include: HDIO_GET_WCACHE, HDIO_GET_ACOUSTIC, HDIO_GET_ADDRESS and HDIO_GET_BUSSTATE. The latters are: HDIO_SET_MULTCOUNT, HDIO_SET_UNMASKINTR, HDIO_SET_KEEPSETTINGS, HDIO_SET_32BIT, HDIO_SET_NOWERR, HDIO_SET_DMA, HDIO_SET_PIO_MODE and HDIO_SET_NICE. Additionally 0x330 used to be HDIO_GETGEO_BIG and may be issued by 32-bit `hdparm' run on a 64-bit kernel making Linux complain loudly. This is a fix for these issues. Signed-off-by: Maciej W. Rozycki Cc: Alan Cox Acked-by: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e3ad8af43c2f555c1be6c02581f6cc939dcb71c Author: Jeff Garzik Date: Wed Oct 11 01:21:53 2006 -0700 [PATCH] x86/microcode: handle sysfs error Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8258d4a574d3a8c01f0ef68aa26b969398a0e140 Author: Andrew Morton Date: Wed Oct 11 01:21:53 2006 -0700 [PATCH] invalidate_inode_pages2_range() debug A failure in invalidate_inode_pages2_range() can result in unpleasant things happening in NFS (at least). Stick a WARN_ON_ONCE() in there so we can find out if it happens, and maybe why. (akpm: might be a -mm-only patch, we'll see..) Cc: Chuck Lever Cc: Trond Myklebust Cc: Steve Dickson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit beed33a816204cb402c69266475b6a60a2433ceb Author: Nick Piggin Date: Wed Oct 11 01:21:52 2006 -0700 [PATCH] sched: likely profiling This likely profiling is pretty fun. I found a few possible problems in sched.c. This patch may be not measurable, but when I did measure long ago, nooping (un)likely cost a couple of % on scheduler heavy benchmarks, so it all adds up. Tweak some branch hints: - the 2nd 64 bits in the bitmask is likely to be populated, because it contains the first 28 bits (nearly 3/4) of the normal priorities. (ratio of 669669:691 ~= 1000:1). - it isn't unlikely that context switching switches to another process. it might be very rapidly switching to and from the idle process (ratio of 475815:419004 and 471330:423544). Let the branch predictor decide. - preempt_enable seems to be very often called in a nested preempt_disable or with interrupts disabled (ratio of 3567760:87965 ~= 40:1) Signed-off-by: Nick Piggin Acked-by: Ingo Molnar Cc: Daniel Walker Cc: Hua Zhong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f33d9bd50478c9a969b65f58feb6b69a3ad478cb Author: Jeff Garzik Date: Wed Oct 11 01:21:51 2006 -0700 [PATCH] tpm: fix error handling - handle sysfs error - handle driver model errors - de-obfuscate platform_device_register_simple() call, which included an assignment in between two function calls, in the same C statement. Signed-off-by: Jeff Garzik Acked-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a2b4062f5adf2218b9b021e1c33f374bf142cb2 Author: Vasily Averin Date: Wed Oct 11 01:21:50 2006 -0700 [PATCH] ext2: errors behaviour fix Current error behaviour for ext2 and ext3 filesystems does not fully correspond to the documentation and should be fixed. According to man 8 mount, ext2 and ext3 file systems allow to set one of 3 different on-errors behaviours: ---- start of quote man 8 mount ---- errors=continue / errors=remount-ro / errors=panic Define the behaviour when an error is encountered. (Either ignore errors and just mark the file system erroneous and continue, or remount the file system read-only, or panic and halt the system.) The default is set in the filesystem superblock, and can be changed using tune2fs(8). ---- end of quote ---- However EXT3_ERRORS_CONTINUE is not read from the superblock, and thus ERRORS_CONT is not saved on the sbi->s_mount_opt. It leads to the incorrect handle of errors on ext3. Then we've checked corresponding code in ext2 and discovered that it is buggy as well: - EXT2_ERRORS_CONTINUE is not read from the superblock (the same); - parse_option() does not clean the alternative values and thus something like (ERRORS_CONT|ERRORS_RO) can be set; - if options are omitted, parse_option() does not set any of these options. Therefore it is possible to set any combination of these options on the ext2: - none of them may be set: EXT2_ERRORS_CONTINUE on superblock / empty mount options; - any of them may be set using mount options; - 2 any options may be set: by using EXT2_ERRORS_RO/EXT2_ERRORS_PANIC on the superblock and other value in mount options; - and finally all three options may be set by adding third option in remount. Currently ext2 uses these values only in ext2_error() and it is not leading to any noticeable troubles. However somebody may be discouraged when he will try to workaround EXT2_ERRORS_PANIC on the superblock by using errors=continue in mount options. This patch: EXT2_ERRORS_CONTINUE should be read from the superblock as default value for error behaviour. parse_option() should clean the alternative options and should not change default value taken from the superblock. Signed-off-by: Vasily Averin Acked-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2245d7c21f5bb1f104ee1226ebcb3dd5b9acfff6 Author: Dmitry Mishin Date: Wed Oct 11 01:21:49 2006 -0700 [PATCH] ext3: errors behaviour fix Current error behaviour for ext2 and ext3 filesystems does not fully correspond to the documentation and should be fixed. According to man 8 mount, ext2 and ext3 file systems allow to set one of 3 different on-errors behaviours: ---- start of quote man 8 mount ---- errors=continue / errors=remount-ro / errors=panic Define the behaviour when an error is encountered. (Either ignore errors and just mark the file system erroneous and continue, or remount the file system read-only, or panic and halt the system.) The default is set in the filesystem superblock, and can be changed using tune2fs(8). ---- end of quote ---- However EXT3_ERRORS_CONTINUE is not read from the superblock, and thus ERRORS_CONT is not saved on the sbi->s_mount_opt. It leads to the incorrect handle of errors on ext3. Then we've checked corresponding code in ext2 and discovered that it is buggy as well: - EXT2_ERRORS_CONTINUE is not read from the superblock (the same); - parse_option() does not clean the alternative values and thus something like (ERRORS_CONT|ERRORS_RO) can be set; - if options are omitted, parse_option() does not set any of these options. Therefore it is possible to set any combination of these options on the ext2: - none of them may be set: EXT2_ERRORS_CONTINUE on superblock / empty mount options; - any of them may be set using mount options; - 2 any options may be set: by using EXT2_ERRORS_RO/EXT2_ERRORS_PANIC on the superblock and other value in mount options; - and finally all three options may be set by adding third option in remount. Currently ext2 uses these values only in ext2_error() and it is not leading to any noticeable troubles. However somebody may be discouraged when he will try to workaround EXT2_ERRORS_PANIC on the superblock by using errors=continue in mount options. This patch: EXT3_ERRORS_CONTINUE should be taken from the superblock as default value for error behaviour. Signed-off-by: Dmitry Mishin Acked-by: Vasily Averin Acked-by: Kirill Korotaev Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa3ba2e81ea23416272a22009bba95954c81969c Author: Florin Malita Date: Wed Oct 11 01:21:48 2006 -0700 [PATCH] fix Module taint flags listing in Oops/panic Module taint flags listing in Oops/panic has a couple of issues: * taint_flags() doesn't null-terminate the buffer after printing the flags * per-module taints are only set if the kernel is not already tainted (with that particular flag) => only the first offending module gets its taint info correctly updated Some additional changes: * 'license_gplok' is no longer needed - equivalent to !(taints & TAINT_PROPRIETARY_MODULE) - so we can drop it from struct module * exporting module taint info via /proc/module: pwc 88576 0 - Live 0xf8c32000 evilmod 6784 1 pwc, Live 0xf8bbf000 (PF) Signed-off-by: Florin Malita Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3719bc5c22c9025bf1c909fe8b527ebf1de9a153 Author: Alan Cox Date: Wed Oct 11 01:21:47 2006 -0700 [PATCH] ide-generic: jmicron fix Some people find their Jmicron pata port reports its disabled even though it has devices on it and was boot probed. Fix this (Candidate for 2.6.18.*, less so for 2.6.19 as we've got a proper jmicron driver on the merge for that to replace ide-generic support) Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5657933863f43cc6bb76a54d659303dafaa9e58 Author: Andrew Morton Date: Wed Oct 11 01:21:46 2006 -0700 [PATCH] grow_buffers() infinite loop fix If grow_buffers() is for some reason passed a block number which wants to lie outside the maximum-addressable pagecache range (PAGE_SIZE * 4G bytes) then it will accidentally truncate `index' and will then instnatiate a page at the wrong pagecache offset. This causes __getblk_slow() to go into an infinite loop. This can happen with corrupted disks, or with software errors elsewhere. Detect that, and handle it. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0ab2928cc2202f13f0574d4c6f567f166d307eb Author: Stephane Eranian Date: Wed Oct 11 01:21:45 2006 -0700 [PATCH] Add carta_random32() library routine This is a follow-up patch based on the review for perfmon2. This patch adds the carta_random32() library routine + carta_random32.h header file. This is fast, simple, and efficient pseudo number generator algorithm. We use it in perfmon2 to randomize the sampling periods. In this context, we do not need any fancy randomizer. Signed-off-by: stephane eranian Cc: David Mosberger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b611967de4dc5c52049676c4369dcac622a7cdfe Author: Davide Libenzi Date: Wed Oct 11 01:21:44 2006 -0700 [PATCH] epoll_pwait() Implement the epoll_pwait system call, that extend the event wait mechanism with the same logic ppoll and pselect do. The definition of epoll_pwait is: int epoll_pwait(int epfd, struct epoll_event *events, int maxevents, int timeout, const sigset_t *sigmask, size_t sigsetsize); The difference between the vanilla epoll_wait and epoll_pwait is that the latter allows the caller to specify a signal mask to be set while waiting for events. Hence epoll_pwait will wait until either one monitored event, or an unmasked signal happen. If sigmask is NULL, the epoll_pwait system call will act exactly like epoll_wait. For the POSIX definition of pselect, information is available here: http://www.opengroup.org/onlinepubs/009695399/functions/select.html Signed-off-by: Davide Libenzi Cc: David Woodhouse Cc: Andi Kleen Cc: Michael Kerrisk Cc: Ulrich Drepper Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f836e5fecf59d0d0353e9af11fd14a32a3001ae Author: David Woodhouse Date: Wed Oct 11 01:21:43 2006 -0700 [PATCH] Add CONFIG_HEADERS_CHECK option to automatically run 'make headers_check' In order to encourage people to notice when they break the exported headers, add a config option which automatically runs the sanity checks when building vmlinux. That way, those who use allyesconfig will notice failures. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c21be1c9c1ab42fe285a74f184e1acbc37ee084b Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:42 2006 -0700 [PATCH] uml: allow finer tuning for host VMSPLIT setting Now that various memory splits are enabled, add a config option allowing the user to compile UML for its need - HOST_2G_2G allowed to choose either 3G/1G or 2G/2G, and enabling it reduced the usable virtual memory. Detecting this at run time should be implemented in the future, but we must make the stop-gap measure work well enough (this is valid in _many_ cases). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca316fcf641532ee70dfc59daf632d1685b7d902 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:41 2006 -0700 [PATCH] uml: deprecate CONFIG_MODE_TT Deprecate TT mode in Kconfig so that users won't select it, update the MODE_SKAS description (it was largely obsolete and misleadin) and btw describe advantages for high memory usage with CONFIG_STATIC_LINK. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2d57151bd3110ae3f0db3e5770ab1a46d1b647a Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:40 2006 -0700 [PATCH] uml: remove duplicate export The export is together with the definition, in arch/x86_64/lib/csum-partial.c, which is compiled in by arch/um/sys-x86_64/Makefile. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d27ecef7c63064c1f2eadf413e694e65a34f1f79 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:40 2006 -0700 [PATCH] uml: asm offsets duplication removal Unify macros common to x86 and x86_64 kernel-offsets.h files. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2465b8580a5649ee789f213d39c1b49d84fefe8f Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:38 2006 -0700 [PATCH] uml: allow using again x86/x86_64 crypto code Enable compilation of x86_64 crypto code;, and add the needed constant to make the code compile again (that macro was added to i386 asm-offsets between 2.6.17 and 2.6.18, in 6c2bb98bc33ae33c7a33a133a4cd5a06395fece5). Cc: Herbert Xu Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 711553efa5b8581365084cacf3585a36ca253bab Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:37 2006 -0700 [PATCH] uml: declare in Kconfig our partial LOCKDEP support Declare UML partial support for LOCKDEP - however IRQFLAGS tracing requires some coding which nobody did yet, so we cannot run full lockdep on UML. Grep for CONFIG_TRACE_IRQFLAGS on i386 code to find their implementation. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69fada32d868d7f4be128ea4df8fbe4fd897fc34 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:36 2006 -0700 [PATCH] uml: fix uname under setarch i386 On a 64bit Uml, if run under "setarch i386" (which a user did), uname() currently returns the obtained i686 as machine - fix that. Btw, I'm quite surprised that under setarch i386 a 64-bit binary can run. Cc: Andi Kleen Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b4ad242fcfcf1e261604cb91ee5fb8032900997 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:35 2006 -0700 [PATCH] uml: fix processor selection to exclude unsupported processors and features Makes UML compile on any possible processor choice. The two problems were: *) x86 code, when 386 is selected, checks at runtime boot_cpuflags, which we do not have. *) 3Dnow support for memcpy() et al. does not compile currently and fixing this is not trivial, so simply disable it; with this change, if one selects MK7 UML compiles (while it did not). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5cdb5797d364a112879e49cc708083853ffc592 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:34 2006 -0700 [PATCH] uml: make UML_SETJMP always safe If enable is moved by GCC in a register its value may not be preserved after coming back there with longjmp(). So, mark it as volatile to prevent this; this is suggested (it seems) in info gcc, when it talks about -Wuninitialized. I re-read this and it seems to say something different, but I still believe this may be needed. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d875f9fd3f2369bf6f4d0e9989f00fe610eac470 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:34 2006 -0700 [PATCH] uml: make TT mode compile after setjmp-related changes Make TT mode compile after the introduction of klibc's implementation of setjmp. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e27e80b3da7ad6b90185bd689879888907104a40 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:33 2006 -0700 [PATCH] uml: readd forgot prototype This was forgot in a previous patch so UML does not compile with TT mode enabled. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21c935e5298a3bc4f16cdff7ce3b1efab92b995e Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:32 2006 -0700 [PATCH] uml: correct removal of pte_mkexec Correct commit 5906e4171ad61ce68de95e51b773146707671f80 - this makes more sense: we turn pte_mkexec + pte_wrprotect to pte_mkread. However, due to a bug in pte_mkread, it does the exact same thing as pte_mkwrite, so this patch improves the code but does not change anything in practice. The pte_mkread bug is fixed separately, as it may have big impact. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1875a48fed4239769bacb039175a52e42b0ebd71 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Oct 11 01:21:31 2006 -0700 [PATCH] uml: revert wrong patch Andi Kleen pointed out that -mcmodel=kernel does not make sense for userspace code and would stop everything from working, and pointed out the correct fix for the original bug (not easy to do for me). Reverts part of commit 06837504de7b4883e92af207dbbab4310d0db0ed. Cc: Andi Kleen Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9858db504caedb2424b9a32744c23f9a81ec1731 Author: Nick Piggin Date: Wed Oct 11 01:21:30 2006 -0700 [PATCH] mm: locks_freed fix Move the lock debug checks below the page reserved checks. Also, having debug_check_no_locks_freed in kernel_map_pages is wrong. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dafb13673c463bc2aade4a4819704dde0f5fa37f Author: Nick Piggin Date: Wed Oct 11 01:21:30 2006 -0700 [PATCH] mm: arch_free_page fix After the PG_reserved check was added, arch_free_page was being called in the wrong place (it could be called for a page we don't actually want to free). Fix that. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 699397499742d1245ea5d677a08fa265df666d2d Author: Keith Owens Date: Wed Oct 11 01:21:28 2006 -0700 [PATCH] Fix do_mbind warning with CONFIG_MIGRATION=n With CONFIG_MIGRATION=n mm/mempolicy.c: In function 'do_mbind': mm/mempolicy.c:796: warning: passing argument 2 of 'migrate_pages' from incompatible pointer type Signed-off-by: Keith Owens Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b16bc64d1aed40fb9cff9187061005b2a89b5d5d Author: Dave Jones Date: Wed Oct 11 01:21:27 2006 -0700 [PATCH] move rmap BUG_ON outside DEBUG_VM We have a persistent dribble of reports of this BUG triggering. Its extended diagnostics were recently made conditional on CONFIG_DEBUG_VM, which was a bad idea - we want to know about it. Signed-off-by: Dave Jones Cc: Nick Piggin Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 469340236a7c9673df3e6a2425f559517f01464e Author: Christoph Lameter Date: Wed Oct 11 01:21:26 2006 -0700 [PATCH] mm: kevent threads: use MPOL_DEFAULT Switch the memory policy of the kevent threads to MPOL_DEFAULT while leaving the kzalloc of the workqueue structure on interleave. This means that all code executed in the context of the kevent thread is allocating node local. Signed-off-by: Christoph Lameter Cc: Christoph Lameter Cc: Alok Kataria Cc: Andi Kleen Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc513a333b45f8913d40c8241a0cb61be79e1c60 Author: Dave Kleikamp Date: Wed Oct 11 01:21:25 2006 -0700 [PATCH] Documentation/filesystems/ext4.txt This file, ext4.txt, was put together with information from Andrew Morton, Andreas Dilger, Suparna Bhattacharya, and Ted Ts'o. I copied the mount options, with the exception of "extents", from ext3.txt, so if anyone is aware of anything out-of-date, please let me know. Signed-off-by: Dave Kleikamp Cc: Theodore Ts'o Cc: Suparna Bhattacharya Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63f5793351d821749979e36889f9c089c6028c83 Author: Andrew Morton Date: Wed Oct 11 01:21:24 2006 -0700 [PATCH] ext4 whitespace cleanups Someone's tab key is emitting spaces. Attempt to repair some of the damage. Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ceea16bf85fb46035dda1db263ca29b0e07e22ba Author: Dmitry Mishin Date: Wed Oct 11 01:21:21 2006 -0700 [PATCH] ext4: errors behaviour fix Current error behaviour for ext2 and ext3 filesystems does not fully correspond to the documentation and should be fixed. According to man 8 mount, ext2 and ext3 file systems allow to set one of 3 different on-errors behaviours: ---- start of quote man 8 mount ---- errors=continue / errors=remount-ro / errors=panic Define the behaviour when an error is encountered. (Either ignore errors and just mark the file system erroneous and continue, or remount the file system read-only, or panic and halt the system.) The default is set in the filesystem superblock, and can be changed using tune2fs(8). ---- end of quote ---- However EXT3_ERRORS_CONTINUE is not read from the superblock, and thus ERRORS_CONT is not saved on the sbi->s_mount_opt. It leads to the incorrect handle of errors on ext3. Then we've checked corresponding code in ext2 and discovered that it is buggy as well: - EXT2_ERRORS_CONTINUE is not read from the superblock (the same); - parse_option() does not clean the alternative values and thus something like (ERRORS_CONT|ERRORS_RO) can be set; - if options are omitted, parse_option() does not set any of these options. Therefore it is possible to set any combination of these options on the ext2: - none of them may be set: EXT2_ERRORS_CONTINUE on superblock / empty mount options; - any of them may be set using mount options; - 2 any options may be set: by using EXT2_ERRORS_RO/EXT2_ERRORS_PANIC on the superblock and other value in mount options; - and finally all three options may be set by adding third option in remount. Currently ext2 uses these values only in ext2_error() and it is not leading to any noticeable troubles. However somebody may be discouraged when he will try to workaround EXT2_ERRORS_PANIC on the superblock by using errors=continue in mount options. This patch: EXT4_ERRORS_CONTINUE should be taken from the superblock as default value for error behaviour. Signed-off-by: Dmitry Mishin Acked-by: Vasily Averin Acked-by: Kirill Korotaev Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70bbb3e0a07c1ff2dd383761b12f865b6002a7a0 Author: Andrew Morton Date: Wed Oct 11 01:21:20 2006 -0700 [PATCH] ext4: rename logic_sb_block I assume this means "logical sb block". So call it that. I still don't understand the name though. A block is a block. What's different about this one? Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4e5bc244f23ee024a4dfa034b591b219b2bfb8f Author: Andrew Morton Date: Wed Oct 11 01:21:19 2006 -0700 [PATCH] ext4 64 bit divide fix With CONFIG_LBD=n, sector_div() expands to a plain old divide. But ext4 is _not_ passing in a sector_t as the first argument, so... fs/built-in.o: In function `ext4_get_group_no_and_offset': fs/ext4/balloc.c:39: undefined reference to `__umoddi3' fs/ext4/balloc.c:41: undefined reference to `__udivdi3' fs/built-in.o: In function `find_group_orlov': fs/ext4/ialloc.c:278: undefined reference to `__udivdi3' fs/built-in.o: In function `ext4_fill_super': fs/ext4/super.c:1488: undefined reference to `__udivdi3' fs/ext4/super.c:1488: undefined reference to `__umoddi3' fs/ext4/super.c:1594: undefined reference to `__udivdi3' fs/ext4/super.c:1601: undefined reference to `__umoddi3' Fix that up by calling do_div() directly. Also cast the arg to u64. do_div() is only defined on u64, and ext4_fsblk_t is supposed to be opaque. Note especially the changes to find_group_orlov(). It was attempting to do do_div(int, unsigned long long); which is royally screwed up. Switched it to plain old divide. Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72b64b594081ef0a0717f6aad77e891c72ed4afa Author: Andrew Morton Date: Wed Oct 11 01:21:18 2006 -0700 [PATCH] ext4 uninline ext4_get_group_no_and_offset() Way too big to inline. Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8fadc14323684c547f74cf2f4d13517c6c264731 Author: Alexandre Ratchov Date: Wed Oct 11 01:21:15 2006 -0700 [PATCH] ext4: move block number hi bits move '_hi' bits of block numbers in the larger part of the block group descriptor structure Signed-off-by: Alexandre Ratchov Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d1ee42f27d30eed1659f3e85bcbbc7b3711f61f Author: Alexandre Ratchov Date: Wed Oct 11 01:21:14 2006 -0700 [PATCH] ext4: allow larger descriptor size make block group descriptor larger. Signed-off-by: Alexandre Ratchov Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18eba7aae080d4a5c0d850ea810e83d11f0a8d77 Author: Mingming Cao Date: Wed Oct 11 01:21:13 2006 -0700 [PATCH] jbd2: switch blks_type from sector_t to ull Similar to ext4, change blocks in JBD2 from sector_t to unsigned long long. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b8f1f0106ab39ad58765d4e7c57189835f51127 Author: Mingming Cao Date: Wed Oct 11 01:21:13 2006 -0700 [PATCH] ext4: removesector_t bits check Previously when in-kernel ext4 block type is sector_t, it's only 4 bits long under some 32bit arch (when CONFIG_LBD is not on). So we need to check the size of sector_t before we read 48bit long on-disk blocks to in-kernel blocks. These checks are unnecessary now as we changed the in-kernel blocks to unsigned longlong. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ae0210760aed9d626eaede5b63db95e198f7c8e Author: Mingming Cao Date: Wed Oct 11 01:21:11 2006 -0700 [PATCH] ext4: blk_type from sector_t to unsigned long long Change ext4 in-kernel block type (ext4_fsblk_t) from sector_t to unsigned long long. Remove ext4 block type string micro E3FSBLK, replaced with "%llu" [akpm@osdl.org: build fix] Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd81d8eec043094d3ff729a8ff6d5b3a06d3c4b1 Author: Laurent Vivier Date: Wed Oct 11 01:21:10 2006 -0700 [PATCH] ext4: 64bit metadata In-kernel super block changes to support >32 bit free blocks numbers. Signed-off-by: Laurent Vivier Signed-off-by: Dave Kleikamp Signed-off-by: Alexandre Ratchov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1ddeb7eaecea6a924e3a79aa386797020cb436f Author: Badari Pulavarty Date: Wed Oct 11 01:21:09 2006 -0700 [PATCH] ext4: 48bit i_file_acl As we are planning to support 48-bit block numbers for ext4, we need to support 48-bit block numbers for extended attributes. In the short term, we can do this by reuse (on-disk) 16-bit padding (linux2.i_pad1 currently used only by "hurd") as high order bits for xattr. This patch basically does that. Signed-off-by: Badari Pulavarty Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 299717696d48531d70aeb4614c3939e4a28456c1 Author: Mingming Cao Date: Wed Oct 11 01:21:09 2006 -0700 [PATCH] jbd2: sector_t conversion JBD layer in-kernel block varibles type fixes to support >32 bit block number and convert to sector_t type. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b517bea1c74e4773482b3f41b3f493522a8c8e30 Author: Zach Brown Date: Wed Oct 11 01:21:08 2006 -0700 [PATCH] 64-bit jbd2 core Here is the patch to JBD to handle 64 bit block numbers, originally from Zach Brown. This patch is useful only after adding support for 64-bit block numbers in the filesystem. Signed-off-by: Badari Pulavarty Signed-off-by: Zach Brown Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0d856e8bd6e697cb44b2b4dd038f3bec576a70e Author: Randy Dunlap Date: Wed Oct 11 01:21:07 2006 -0700 [PATCH] ext4: clean up comments in ext4-extents patch Signed-off-by: Randy Dunlap Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 471d4011a9862efff02094388b8fe8cd67683c38 Author: Suparna Bhattacharya Date: Wed Oct 11 01:21:06 2006 -0700 [PATCH] ext4: uninitialised extent handling Make it possible to add file preallocation support in future as an RO_COMPAT feature by recognizing uninitialized extents as holes and limiting extent length to keep the top bit of ee_len free for marking uninitialized extents. Signed-off-by: Suparna Bhattacharya Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f65e6fba163dfd0f962efb7d8f5528b6872e2b15 Author: Alex Tomas Date: Wed Oct 11 01:21:05 2006 -0700 [PATCH] ext4: 48bit physical block number support in extents Signed-off-by: Alex Tomas Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a5b2ecdd1fa63a8f25bd769223bc1c2564ce45d Author: Mingming Cao Date: Wed Oct 11 01:21:05 2006 -0700 [PATCH] ext4: switch fsblk to sector_t Redefine ext3 in-kernel filesystem block type (ext3_fsblk_t) from unsigned long to sector_t, to allow kernel to handle >32 bit ext3 blocks. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a86c61812637c7dd0c57e29880cffd477b62f2e7 Author: Alex Tomas Date: Wed Oct 11 01:21:03 2006 -0700 [PATCH] ext3: add extent map support On disk extents format: /* * this is extent on-disk structure * it's used at the bottom of the tree */ struct ext3_extent { __le32 ee_block; /* first logical block extent covers */ __le16 ee_len; /* number of blocks covered by extent */ __le16 ee_start_hi; /* high 16 bits of physical block */ __le32 ee_start; /* low 32 bigs of physical block */ }; Signed-off-by: Alex Tomas Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3fcc8137ce4296ad6ab94f88bd60cbe03d21527 Author: Dave Kleikamp Date: Wed Oct 11 01:21:02 2006 -0700 [PATCH] jbd2: cleanup ext4_jbd.h To allow ext4 to build during the transition from jbd to jbd2, we have both ext4_jbd.h and ext4_jbd2.h in the tree. We no longer need the former. Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dab291af8d6307a3075c3d67d0cc8f98e646cb94 Author: Mingming Cao Date: Wed Oct 11 01:21:01 2006 -0700 [PATCH] jbd2: enable building of jbd2 and have ext4 use it rather than jbd Reworked from a patch by Mingming Cao and Randy Dunlap Signed-off-By: Randy Dunlap Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a920e9416b3469994860ab552dfd7fd5a5aff162 Author: Johann Lombardi Date: Wed Oct 11 01:21:00 2006 -0700 [PATCH] jbd2: rename slab jbd and jbd2 currently use the same slab names which must be unique. The patch below just renames jbd2's slabs. Signed-off-by: Johann Lombardi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7f4bccb729844a0fa873e224e3a6f7eeed095bb Author: Mingming Cao Date: Wed Oct 11 01:20:59 2006 -0700 [PATCH] jbd2: rename jbd2 symbols to avoid duplication of jbd symbols Mingming Cao originally did this work, and Shaggy reproduced it using some scripts from her. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 470decc613ab2048b619a01028072d932d9086ee Author: Dave Kleikamp Date: Wed Oct 11 01:20:57 2006 -0700 [PATCH] jbd2: initial copy of files from jbd This is a simple copy of the files in fs/jbd to fs/jbd2 and /usr/incude/linux/[ext4_]jbd.h to /usr/include/[ext4_]jbd2.h Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02ea2104c55b625cf5b5d9ba8586a4fc17920f5c Author: Mingming Cao Date: Wed Oct 11 01:20:56 2006 -0700 [PATCH] ext4: enable building of ext4 Originally part of a patch from Mingming Cao and Randy Dunlap. Reorganized by Shaggy. Signed-off-by: Randy Dunlap Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 617ba13b31fbf505cc21799826639ef24ed94af0 Author: Mingming Cao Date: Wed Oct 11 01:20:53 2006 -0700 [PATCH] ext4: rename ext4 symbols to avoid duplication of ext3 symbols Mingming Cao originally did this work, and Shaggy reproduced it using some scripts from her. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac27a0ec112a089f1a5102bc8dffc79c8c815571 Author: Dave Kleikamp Date: Wed Oct 11 01:20:50 2006 -0700 [PATCH] ext4: initial copy of files from ext3 Start of the ext4 patch series. See Documentation/filesystems/ext4.txt for details. This is a simple copy of the files in fs/ext3 to fs/ext4 and /usr/incude/linux/ext3* to /usr/include/ex4* Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 502717f4e112b18d9c37753a32f675bec9f2838b Author: Chen, Kenneth W Date: Wed Oct 11 01:20:46 2006 -0700 [PATCH] hugetlb: fix linked list corruption in unmap_hugepage_range() commit fe1668ae5bf0145014c71797febd9ad5670d5d05 causes kernel to oops with libhugetlbfs test suite. The problem is that hugetlb pages can be shared by multiple mappings. Multiple threads can fight over page->lru in the unmap path and bad things happen. We now serialize __unmap_hugepage_range to void concurrent linked list manipulation. Such serialization is also needed for shared page table page on hugetlb area. This patch will fixed the bug and also serve as a prepatch for shared page table. Signed-off-by: Ken Chen Cc: Hugh Dickins Cc: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97c7801cd5b0bb6a38c16108a496235474dc6310 Author: Rafael J. Wysocki Date: Wed Oct 11 01:20:45 2006 -0700 [PATCH] swsusp: Use suspend_console Add suspend_console() and resume_console() to the suspend-to-disk code paths so that the users of netconsole can use swsusp with it. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dea20a3fbdd08e5ae2a0b33d2577c794a3764a11 Author: Heiko Carstens Date: Wed Oct 11 01:20:44 2006 -0700 [PATCH] Disable DETECT_SOFTLOCKUP for s390 We got several false bug reports because of enabled CONFIG_DETECT_SOFTLOCKUP. Disable soft lockup detection on s390, since it doesn't work on a virtualized architecture. Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c37e108d156101dcde7ec7033eabe7abe83366bc Author: Aneesh Kumar K.V Date: Wed Oct 11 01:20:43 2006 -0700 [PATCH] use struct irq_chip instead of struct hw_interrupt_type hw_interrupt_type is deprecated in favour of struct irq_chip. [mingo@elte.hu: do x86_64 too] Acked-by: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1db11ea65eaf1e7f6a70805fe52bc0aef53f68ef Author: Luca Tettamanti Date: Wed Oct 11 01:20:41 2006 -0700 [PATCH] Fix menuconfig build failure due to missing stdbool.h scripts/kconfig/lxdialog/util.c fails to build because it uses true/false without including stdbool.h: kronos:~/src/linux-2.6$ make O=../linux-build-git menuconfig GEN /home/kronos/src/linux-build/Makefile HOSTCC scripts/kconfig/lxdialog/util.o /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c: In function 'set_classic_theme': /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:68: error: 'true' undeclared (first use in this function) /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:68: error: (Each undeclared identifier is reported only once /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:68: error: for each function it appears in.) /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:70: error: 'false' undeclared (first use in this function) /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c: In function 'set_blackbg_theme': /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:101: error: 'true' undeclared (first use in this function) /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:102: error: 'false' undeclared (first use in this function) /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c: In function 'set_bluetitle_theme': /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:144: error: 'true' undeclared (first use in this function) make[2]: *** [scripts/kconfig/lxdialog/util.o] Error 1 make[1]: *** [menuconfig] Error 2 make: *** [menuconfig] Error 2 Add to dialog.h to fix the breakage. Signed-off-by: Luca Tettamanti Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b888132b0ff29ca0733589a594c243ed612438eb Author: Mel Gorman Date: Wed Oct 11 01:20:40 2006 -0700 [PATCH] mm: remove memmap_zone_idx() memmap_zone_idx() is not used anymore. It was required by an earlier version of account-for-memmap-and-optionally-the-kernel-image-as-holes.patch but not any more. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6391af174ad75f72e92043c1dd8302660a2fec58 Author: Mel Gorman Date: Wed Oct 11 01:20:39 2006 -0700 [PATCH] mm: use symbolic names instead of indices for zone initialisation Arch-independent zone-sizing is using indices instead of symbolic names to offset within an array related to zones (max_zone_pfns). The unintended impact is that ZONE_DMA and ZONE_NORMAL is initialised on powerpc instead of ZONE_DMA and ZONE_HIGHMEM when CONFIG_HIGHMEM is set. As a result, the the machine fails to boot but will boot with CONFIG_HIGHMEM turned off. The following patch properly initialises the max_zone_pfns[] array and uses symbolic names instead of indices in each architecture using arch-independent zone-sizing. Two users have successfully booted their powerpcs with it (one an ibook G4). It has also been boot tested on x86, x86_64, ppc64 and ia64. Please merge for 2.6.19-rc2. Credit to Benjamin Herrenschmidt for identifying the bug and rolling the first fix. Additional credit to Johannes Berg and Andreas Schwab for reporting the problem and testing on powerpc. Signed-off-by: Mel Gorman Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e0fadfcf62e252d2b14de0e0927eb2830c0c28c Author: Haavard Skinnemoen Date: Wed Oct 11 01:20:37 2006 -0700 [PATCH] IRQ: Fix AVR32 breakage Make the necessary changes to AVR32 required by the irq regs stuff. Signed-off-by: Haavard Skinnemoen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41716c7c21b15e7ecf14f0caf1eef3980707fb74 Author: Eric Sesterhenn Date: Wed Oct 11 01:20:37 2006 -0700 [PATCH] null dereference in fs/jbd/journal.c Since commit d1807793e1e7e502e3dc047115e9dbc3b50e4534 we dereference a NULL pointer. Coverity id #1432. We set journal to NULL, and use it directly afterwards. Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e491092e442b3f8c0d90d470b398fdb74703ec7 Author: Andrew Morton Date: Wed Oct 11 01:20:35 2006 -0700 [PATCH] revert "nvidiafb: use generic ddc reading" Olaf reports that this gave him a black screen. Cc: Olaf Hering Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75e9de18f079a51fa987ef0703112d5bc125fdb7 Author: Christian Borntraeger Date: Wed Oct 11 15:31:52 2006 +0200 [S390] stacktrace bug. The latest kernel 2.6.19-rc1 triggers a bug in the s390 specific stack trace code when compiled with gcc 3.4. This patch fixes the latest lock dependency validator code (2.6.19-rc1) on s390 gcc 3.4. The variable sp was fixed to r15 (which is the stack pointer in the s390 abi) and assigned new values to r15. Therefore, gcc 3.4 assigns a new value to r15 and does not restore it on exit (r15 is supposed to be call save) - the kernel stack is broken. Avoid trouble by not assigning any new value to sp (r15). Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 12975aef62836e9f3e179afaaded8045f8a25ac4 Author: Cornelia Huck Date: Wed Oct 11 15:31:47 2006 +0200 [S390] cio: remove casts from/to (void *). Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit e7769b48a0216d7262fe2ba59b1b3697be462cbb Author: Cornelia Huck Date: Wed Oct 11 15:31:41 2006 +0200 [S390] cio: Remove grace period for vary off chpid. The grace period handling introduced needless complexity. It didn't help the dasd driver (which can handle terminated I/O just well), and it doesn't help for long running channel programs (which won't complete during the grace period anyway). Terminating I/O using a path that just disappeared immediately is much more consistent with what the user expects. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 789642680518b28e7dc13f96061460a8238ec622 Author: Cornelia Huck Date: Wed Oct 11 15:31:38 2006 +0200 [S390] cio: Use ccw_dev_id and subchannel_id in ccw_device_private Use the proper structures to identify device and subchannel. Change get_disc_ccwdev_by_devno() to get_disc_ccwdev_by_dev_id(). Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 715d854bc215bbcca35097176d674c3ac58a085c Author: Melissa Howland Date: Wed Oct 11 15:31:34 2006 +0200 [S390] monwriter kzalloc size. Fix length on kzalloc for data buffer so as to not overwrite unallocated storage. Signed-off-by: Melissa Howland Signed-off-by: Martin Schwidefsky commit 08983787d2ccab64cb790965ba89621d96cc22c1 Author: Cornelia Huck Date: Wed Oct 11 15:31:30 2006 +0200 [S390] cio: add missing KERN_INFO printk header. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 9d0a57cbdb4976f382eb1c03baee338e467b6592 Author: Heiko Carstens Date: Wed Oct 11 15:31:26 2006 +0200 [S390] irq change improvements. Remove the last few places where a pointer to pt_regs gets passed. Also make sure we call set_irq_regs() before irq_enter() and after irq_exit(). This doesn't fix anything but makes sure s390 looks the same like all other architectures. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 53e36ada37cb8b01cfbf674580a79edc0bb764c7 Author: Peter Korsgaard Date: Mon Oct 9 09:53:09 2006 +0200 [PATCH] pata-qdi: fix le32 in data_xfer The following tiny patch fixes a typo in qdi_data_xfer (le32 instead of le16). Signed-off-by: Peter Korsgaard Signed-off-by: Jeff Garzik commit a83068bbaca39197dca26287c16186baee615f0a Author: Jeff Garzik Date: Wed Oct 11 04:46:52 2006 -0400 [libata] sata_promise: add PCI ID Noticed by Steve Brown Signed-off-by: Jeff Garzik commit bbe1fe7ea3438f8c4447dbcd46a126581ed2ed41 Author: Eran Tromer Date: Tue Oct 10 14:29:25 2006 -0700 [PATCH] libata: return sense data in HDIO_DRIVE_CMD ioctl Make the HDIO_DRIVE_CMD ioctl in libata (ATA command pass through) return a few ATA registers to userspace, following the same convention as the drivers/ide implementation of the same ioctl. This is needed to support ATA commands like CHECK POWER MODE, which return information in nsectors. This fixes "hdparm -C" on SATA drives. Forcing the sense data read via the cc flag causes spurious check conditions, so we filter these out (following the ATA command pass-through specification T10/04-262r7). Signed-off-by: Eran Tromer Acked-by: Tejun Heo Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 4a1d2d81fa327d095a0a8a1f961bace5b0a2f7da Author: Helge Deller Date: Fri Oct 6 12:12:34 2006 -0600 [PATCH] Fix section mismatch in de2104x.c WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to .init.text:de_init_one from .data.rel.local after 'de_driver' (at offset 0x20) WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to .exit.text:de_remove_one from .data.rel.local after 'de_driver' (at offset 0x28) Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin Signed-off-by: Matthew Wilcox Signed-off-by: Jeff Garzik commit 6e532cfe49b6e961e1260642a44959b645e9ab54 Author: Stephen Hemminger Date: Mon Oct 9 15:49:27 2006 -0700 [PATCH] sky2: set lower pause threshold to prevent overrun Adjust the pause threshold on slower systems to keep from getting overrun. Since FIFO is 2K bytes, don't send XON pause until there is space for a full frame. Signed-off-by: Jeff Garzik commit 7bd656d12119708b37414bf909ab2995473da818 Author: Stephen Hemminger Date: Mon Oct 9 14:40:38 2006 -0700 [PATCH] sky2: revert pci express extensions The pci express error handling extensions don't work unless PCI access is via mmconfig. Otherwise, all accesses to pci config registers greater than 256 fail. Since the sky2 driver has other ways of getting to PCI config space, it works around this short coming, but the pci_find_ext_capablity doesn't work. This backs out commit 91aeb3edbcf4e6ed72d138ac8c22fd68e6d717c3 Go back to hardcoding, since we know where the error registers are anyway. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=7222 Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 370de6cdc2ed27c41b313c031e4258ffa32272bc Author: Stephen Hemminger Date: Thu Oct 5 15:49:53 2006 -0700 [PATCH] skge: version 1.9 Want to be able to track downstream impact of fiber related fixes. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 5d5c8e03786691d0d083142b922edce8609c0fd5 Author: Stephen Hemminger Date: Thu Oct 5 15:49:52 2006 -0700 [PATCH] skge: better flow control negotiation Do flow control negotiation properly. Don't let auto negotiation status limit renegotiation. Separate desired pause values from the result of auto negotiation. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 4b67be999ed5bfb1bfe4cc502d37d59b4f6b6b7f Author: Stephen Hemminger Date: Thu Oct 5 15:49:51 2006 -0700 [PATCH] skge: pause mapping for fiber Do correct mapping of pause and duplex when using 1000BaseX fiber versions of the board. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit a1bc9b875be597cdf147db2748ba7ddc6b0f0fbe Author: Stephen Hemminger Date: Thu Oct 5 15:49:50 2006 -0700 [PATCH] skge: fix stuck irq when fiber down The PHY interrupt from the internal fiber is getting stuck on when the link is down. Add code to handle the transition and mask it. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 647519100105fb4ddfe6455e820093999c08c4be Author: Linas Vepstas Date: Tue Oct 10 16:22:29 2006 -0500 [PATCH] powerpc/cell spidernet release all descrs Bugfix: rx descriptor release function fails to visit the last entry while walking receive descriptor ring. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 348bc2a6e306dc3e875cee3389e1405963ace617 Author: Linas Vepstas Date: Tue Oct 10 16:21:10 2006 -0500 [PATCH] powerpc/cell spidernet DMA direction fix The ring buffer descriptors are DMA-accessed bidirectionally, but are not declared in this way. Fix this. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 66c097165cf6d4196e798145fb33c768164fb361 Author: Linas Vepstas Date: Tue Oct 10 16:19:34 2006 -0500 [PATCH] powerpc/cell spidernet variable name change Cosmetic patch: give the variable holding the numer of descriptors a more descriptive name, so to avoid confusion. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit a664ccf430547696951bf3949f5a2de5079ece5a Author: Linas Vepstas Date: Tue Oct 10 16:18:18 2006 -0500 [PATCH] powerpc/cell spidernet reduce DMA kicking The current code attempts to start the TX dma every time a packet is queued. This is too conservative, and wastes CPU time. This patch changes behaviour to call the kick-dma function less often, only when the tx queue is at risk of emptying. This reduces cpu usage, improves performance. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 499eea18722e43f0ee15e11ac16ffcbd10b70b24 Author: Linas Vepstas Date: Tue Oct 10 16:15:29 2006 -0500 [PATCH] powerpc/cell spidernet Remove a dummy register read that is not needed. This reduces CPU usage notably during transmit. Signed-off-by: Linas Vepstas Cc: Arnd Bergmann Cc: James K Lewis Signed-off-by: Jeff Garzik commit 9cc7bf7edf50a8a6b456b337aff97fe780ae369b Author: Linas Vepstas Date: Tue Oct 10 16:14:29 2006 -0500 [PATCH] powerpc/cell spidernet refine locking The transmit side of the spider ethernet driver currently places locks around some very large chunks of code. This results in a fair amount of lock contention is some cases. This patch makes the locks much more fine-grained, protecting only the cirtical sections. One lock is used to protect three locations: the queue head and tail pointers, and the queue low-watermark location. Signed-off-by: Linas Vepstas Cc: Arnd Bergmann Cc: James K Lewis Signed-off-by: Jeff Garzik commit 68a8c609b3071c2441fa64f584d15311f2c10e61 Author: Linas Vepstas Date: Tue Oct 10 16:13:05 2006 -0500 [PATCH] powerpc/cell spidernet NAPI polling info. This patch moves transmit queue cleanup code out of the interrupt context, and into the NAPI polling routine. Signed-off-by: Linas Vepstas Acked-by: Arnd Bergmann Cc: James K Lewis Signed-off-by: Jeff Garzik commit 204e5fa17c7ba45a89989f8da6dfe8e54d64b79b Author: Linas Vepstas Date: Tue Oct 10 16:11:33 2006 -0500 [PATCH] powerpc/cell spidernet low watermark patch. Implement basic low-watermark support for the transmit queue. Hardware low-watermarks allow a properly configured kernel to continously stream data to a device and not have to handle any interrupts at all in doing so. Correct zero-interrupt operation can be actually observed for this driver, when the socket buffer is made large enough. The basic idea of a low-watermark interrupt is as follows. The device driver queues up a bunch of packets for the hardware to transmit, and then kicks the hardware to get it started. As the hardware drains the queue of pending, untransmitted packets, the device driver will want to know when the queue is almost empty, so that it can queue some more packets. If the queue drains down to the low waterark, then an interrupt will be generated. However, if the kernel/driver continues to add enough packets to keep the queue partially filled, no interrupt will actually be generated, and the hardware can continue streaming packets indefinitely in this mode. The impelmentation is done by setting the DESCR_TXDESFLG flag in one of the packets. When the hardware sees this flag, it will interrupt the device driver. Because this flag is on a fixed packet, rather than at fixed location in the queue, the code below needs to move the flag as more packets are queued up. This implementation attempts to keep the flag at about 1/4 from "empty". Signed-off-by: Linas Vepstas Signed-off-by: James K Lewis Acked-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit b21606a773faffc2b3ec326325c433bdf37ecbdf Author: Linas Vepstas Date: Tue Oct 10 16:09:40 2006 -0500 [PATCH] powerpc/cell spidernet incorrect offset Bugfix -- the rx chain is in memory after the tx chain -- the offset being used was wrong, resulting in memory corruption when the size of the rx and tx rings weren't exactly the same. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 98b9040c747e50fe02ad616c9d5fee9aa4017cd1 Author: Linas Vepstas Date: Tue Oct 10 16:08:42 2006 -0500 [PATCH] powerpc/cell spidernet stop error printing patch. Turn off mis-interpretation of the queue-empty interrupt status bit as an error. Signed-off-by: Linas Vepstas Signed-off-by: James K Lewis Acked-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit 37aad7500bf7064bf150ea1f234303f4173f7b24 Author: Linas Vepstas Date: Tue Oct 10 16:06:53 2006 -0500 [PATCH] powerpc/cell spidernet fix error interrupt print The print message associated with the descriptor chain end interrupt prints a bogs value. Fix that. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 43932d938d5a193bf9602b0ac8aa6783ba78b1aa Author: Linas Vepstas Date: Tue Oct 10 16:05:00 2006 -0500 [PATCH] powerpc/cell spidernet bogus rx interrupt bit The current receive interrupt mask sets a bogus bit that doesn't even belong to the definition of this register. Remove it. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 313ef4b76c96ef427a7613d89df550aa5d02bf21 Author: Linas Vepstas Date: Tue Oct 10 16:04:00 2006 -0500 [PATCH] Spidernet stop queue when queue is full. This patch adds a call to netif_stop_queue() when there is no more room for more packets on the transmit queue. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit ded8028a0b61075d841c33a412da5c869140d7aa Author: Linas Vepstas Date: Tue Oct 10 16:02:54 2006 -0500 [PATCH] Spidernet fix register field definitions This patch fixes the names of a few fields in the DMA control register. There is no functional change. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 917a5b8e648f420105158023ae0317eb0e77a2d5 Author: Linas Vepstas Date: Tue Oct 10 16:01:51 2006 -0500 [PATCH] powerpc/cell spidernet add missing netdev watchdog Set the netdev watchdog timer. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 808999c9a4749dc67c39bf52f712d0c27aa00e67 Author: Linas Vepstas Date: Tue Oct 10 16:01:00 2006 -0500 [PATCH] powerpc/cell spidernet zlen min packet length Polite device drivers pad short packets to 60 bytes, so that mean-spirited users don't accidentally DOS some other OS that can't handle short packets. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit c3fee4c55915c42b3278b65c91f9be8cee13426e Author: Linas Vepstas Date: Tue Oct 10 16:00:04 2006 -0500 [PATCH] powerpc/cell spidernet force-end fix Bugfix: when cleaning up the transmit queue upon device close, be sure to walk the entire queue. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit e2874f2e8c3695953b9ec26d396d678a7128ee64 Author: Linas Vepstas Date: Tue Oct 10 15:59:02 2006 -0500 [PATCH] Spidernet module parm permissions The module param permsissions should bw read-only, not writable. From: James K Lewis Signed-off-by: James K Lewis Signed-off-by: Linas Vepstas Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit a02d601dd59d08a77563499cc05b48603df8f4a4 Author: Linas Vepstas Date: Tue Oct 10 15:57:26 2006 -0500 [PATCH] powerpc/cell spidernet burst alignment patch. This patch increases the Burst Address alignment from 64 to 1024 in the Spidernet driver. This improves transmit performance for large packets. From: James K Lewis Signed-off-by: James K Lewis Signed-off-by: Linas Vepstas Acked-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit 90f10841180e9b7938f63db69e90dacb7d21bbe5 Author: Linas Vepstas Date: Tue Oct 10 15:56:04 2006 -0500 [PATCH] powerpc/cell spidernet ethtool -i version number info. This patch adds version information as reported by ethtool -i to the Spidernet driver. From: James K Lewis Signed-off-by: James K Lewis Signed-off-by: Linas Vepstas Acked-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit bff0a55f34e62970203c4af9c8ef4dc7d73e2f96 Author: Jan-Bernd Themann Date: Thu Oct 5 16:53:14 2006 +0200 [PATCH] ehea: fix port state notification, default queue sizes This patch includes a bug fix for the port state notification and fixes the default queue sizes. Signed-off-by: Jan-Bernd Themann Signed-off-by: Jeff Garzik commit 08093c8fd66ef7a8c2f887812cc98c54f5f12703 Author: Jan-Bernd Themann Date: Thu Oct 5 16:53:12 2006 +0200 [PATCH] ehea: firmware (hvcall) interface changes This eHEA patch covers required changes related to Anton Blanchard's new hvcall interface. Signed-off-by: Jan-Bernd Themann Signed-off-by: Jeff Garzik commit 5f77113c01d8a9f8193769d2ca73763047af39ef Author: Andrew Morton Date: Tue Oct 10 14:33:30 2006 -0700 [PATCH] ibmveth irq fix drivers/net/ibmveth.c:939: error: too many arguments to function `ibmveth_interrupt' Cc: Jeff Garzik Cc: Anton Blanchard Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 6f62768344e46520ae585f3e201c9d3e497b028f Author: Michael Buesch Date: Tue Oct 10 14:33:26 2006 -0700 [PATCH] b44: fix eeprom endianess issue This fixes eeprom read on big-endian architectures. readw returns the data in CPU order. With cpu_to_le16 we convert it to little endian, because "ptr" is a pointer to a _byte_ arrray. See the cast above. A byte array is little endian. The bug is: Reading u16 values with readw, casting them into an u8 array and accessing this u8 array as an u8 (byte) array. The correct fix is to swap the CPU-ordering value returned by readw into little endian, as the u8 array is little endian. This compiles to nothing on little endian hardware (so it does not change b44 code on LE hardware), but _fixes_ code on BE hardware. Signed-off-by: Michael Buesch Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 12f417ee95bf98cd3e42d2a771f7c6d360159b9d Author: Deepak Saxena Date: Tue Oct 10 14:33:22 2006 -0700 [PATCH] Update smc91x driver with ARM Versatile board info We need to specify a Versatile-specific SMC_IRQ_FLAGS value or the new generic IRQ layer will complain thusly: No IRQF_TRIGGER set_type function for IRQ 25 () Signed-off-by: Deepak Saxena Cc: Jeff Garzik Cc: Russell King Cc: Nicolas Pitre Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 438dd926260f11ff01fc3441ac6dd4c412d20ea4 Author: Steve French Date: Wed Oct 11 03:49:30 2006 +0000 [CIFS] Fix leaps year calculation for years after 2100 Signed-off-by: Steve French commit 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 Author: Linus Torvalds Date: Tue Oct 10 17:14:44 2006 -0700 ACPI: Allow setting SCI_EN bit in PM1_CONTROL register This is needed by at least the Mac Mini's, which (incorrectly) come back from suspend with SCI_EN clear. Thanks to Frédéric Riss for hunting this down. Acked-by: Frédéric Riss Cc: Pavel Machek Cc: Len Brown Cc: Arjan van de Ven Signed-off-by: Linus Torvalds commit 0968cf51b6f2ca8a951de4b976370189cf43bbdd Author: Jeff Garzik Date: Tue Oct 10 02:58:14 2006 -0400 [PATCH] firmware/dcdbas: fix bug in error cleanup The error path path mistakenly called sysfs_create_group() rather than sysfs_remove_group(). They take the same arguments, so it's easy to cut-n-paste such a bug. Signed-off-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 15e541feb340bc2a4caaf707ee5ad71a47fdd068 Author: Jeff Garzik Date: Tue Oct 10 01:40:55 2006 -0400 [PATCH] irda: donauboe fixes, cleanups - fix: toshoboe_invalid_dev() was recently removed, but not all callers were updated, causing the obvious linker error. Remove caller, because the check (like the one removed) isn't used. - fix: propagate request_irq() return value - cleanup: remove void* casts - cleanup: remove impossible ASSERTs Signed-off-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 107c3a73e0ee037322efa00fa3cb45b3b7eb6069 Author: Al Viro Date: Sun Aug 13 15:38:04 2006 -0400 [PATCH] endianness annotations in s2io Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 44aa5359be589f9cbe9cf0d5c97e22b27a04c7d3 Author: Al Viro Date: Sun Aug 13 01:54:30 2006 -0400 [PATCH] ufs endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3524de1c7953e7a22c43b9214ffc3680af6f8edb Author: Al Viro Date: Sat Dec 24 14:39:13 2005 -0500 [PATCH] fs/partitions endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit d136fe7243081a45a141bb297a7b7a627ab60fa9 Author: Alexey Dobriyan Date: Wed Dec 28 22:27:10 2005 +0300 [PATCH] Finish annotations of struct vlan_ethhdr Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit d02d48d8650bf3e2011f25373dbcf87f3c19f16b Author: Al Viro Date: Sat Dec 24 14:33:09 2005 -0500 [PATCH] isofs endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6ca1584173d0320f47464092eb180a17259cc3f9 Author: Al Viro Date: Sat Dec 24 14:32:38 2005 -0500 [PATCH] smbfs endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2ef1031282cd401b47a5f7f7477fe9ae69aff058 Author: Al Viro Date: Sat Dec 24 14:31:53 2005 -0500 [PATCH] hpfs endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 31b1f85b71b0b69afba89a60989097cd805f13c3 Author: Al Viro Date: Sat Dec 24 14:31:04 2005 -0500 [PATCH] fs/fat endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a9721f3152bc2be6702807705902e06abdd6e3bb Author: Al Viro Date: Sat Dec 24 14:28:55 2005 -0500 [PATCH] befs: endianness annotations split the data structures that exist in host- and disk-endian variants, annotate the fields of disk-endian ones, propagate changes. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e5201c58cd81066ecd0210bcc6c02e71200040a3 Author: Al Viro Date: Sat Dec 24 03:09:03 2005 -0500 [PATCH] befs: missing fs32_to_cpu() in debug.c inode->mode is disk-endian Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1151895f8076584e061092afffb110b90cb38a68 Author: Al Viro Date: Sat Dec 24 01:32:03 2005 -0500 [PATCH] befs: introduce on-disk endian types Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit af10b0084dff530fb7232a0f8bbc4499e9c58574 Author: Al Viro Date: Sat Dec 24 01:13:13 2005 -0500 [PATCH] befs: prepare to sanitizing headers pulled includes of endian.h from fs/befs/*.c to befs.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 88c124d847d0fc60531e45323752665b01fc14f0 Author: Al Viro Date: Fri Dec 23 20:56:46 2005 -0500 [PATCH] befs: remove bogus typedef Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7359bbfd85751de23079cc26cd248635aebe840b Author: Alexey Dobriyan Date: Fri Dec 23 01:18:25 2005 +0300 [PATCH] chelsio: add endian annotations Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit d08f74e58cad8f1844f6e01636a76dd52d41bb0f Author: Alexey Dobriyan Date: Fri Dec 23 01:12:25 2005 +0300 [PATCH] serpent: fix endian warnings Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 56052d525a05ba9e53d4f11be2d5deee64924514 Author: Alexey Dobriyan Date: Thu Dec 1 17:10:40 2005 -0500 [PATCH] cdrom: add endianness annotations Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 70f38912935fd4aa3fea1ddf87ed1cee63109cc5 Author: Al Viro Date: Tue Oct 10 22:49:57 2006 +0100 [PATCH] use %p for pointers Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 3c5c6658d2f1385cf06cdc00db9f7f124a35fb25 Author: Al Viro Date: Tue Oct 10 22:49:47 2006 +0100 [PATCH] use %zu for size_t Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 59bd59842617565b27acb0b55388363211123b9c Author: Al Viro Date: Tue Oct 10 22:49:37 2006 +0100 [PATCH] missed const in prototype Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cfbdbab0634cafae2c43371396e5443cf4d5d7bc Author: Al Viro Date: Tue Oct 10 22:49:27 2006 +0100 [PATCH] net/sunrpc/auth_gss/svcauth_gss.c endianness regression Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 86b95c12139785a0f4c17cb7b4cb865e7084cd34 Author: Al Viro Date: Tue Oct 10 22:49:17 2006 +0100 [PATCH] strndup() would better take size_t, not int Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5e7ddac75deaa2887e2b03441f9bed67ea8648d8 Author: Al Viro Date: Tue Oct 10 22:49:07 2006 +0100 [PATCH] ptrdiff_t is %t, not %z Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 1af9892811ad3bf2abb31566bfb2ec0b5070a66a Author: Al Viro Date: Tue Oct 10 22:48:57 2006 +0100 [PATCH] cpuset ANSI prototype Signed-off-by: Al Viro Acked-by: Paul Jackson Signed-off-by: Linus Torvalds commit e6c6e640b8b258dc7f60533e81f050d15fc0a9af Author: Al Viro Date: Tue Oct 10 22:48:47 2006 +0100 [PATCH] fs/inode.c NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 663d1ba2f1f66db43ab95350f965c1d9f2e3e5bc Author: Al Viro Date: Tue Oct 10 22:48:37 2006 +0100 [PATCH] em28xx NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ba674cfcbdb93cb560a4ae4d2c8b53cfbddc2d22 Author: Al Viro Date: Tue Oct 10 22:48:27 2006 +0100 [PATCH] __user annotations: loop.c Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a6ded1b0605376e18a17cb01977819bcf2677cdc Author: Al Viro Date: Tue Oct 10 22:48:17 2006 +0100 [PATCH] openprom NULL noise removal Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 03dc55064117508ad474f3eede3a77bf9fbb636f Author: Al Viro Date: Tue Oct 10 22:48:07 2006 +0100 [PATCH] trivial iomem annotations: sata_promise Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 20241ad409fbc42d9e7f92f5fdb4783b7f1b36eb Author: Al Viro Date: Tue Oct 10 22:47:57 2006 +0100 [PATCH] gfp annotations: radix_tree_root struct radix_tree_root has unused upper bits of ->gfp_mask reused for tags bitmap. Annotated. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fa1f5ea860af34d74c1475eddde3364e71fac15d Author: Al Viro Date: Tue Oct 10 22:47:47 2006 +0100 [PATCH] gfp annotations: scsi_error Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 86f93336543314ffc46787845b631029cf11d6f8 Author: Al Viro Date: Tue Oct 10 22:47:37 2006 +0100 [PATCH] ptrace32 trivial __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 29756fa3287ff702535e459e7ca8c6038f6e9ae3 Author: Al Viro Date: Tue Oct 10 22:47:27 2006 +0100 [PATCH] trivial iomem annotations: istallion Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4370df9782a8456039cf85d2b833c2c2097f3ded Author: Al Viro Date: Tue Oct 10 22:47:17 2006 +0100 [PATCH] acpi NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e4cad1b5a4851c90c1bcf460062074a2fa10815b Author: Al Viro Date: Tue Oct 10 22:47:07 2006 +0100 [PATCH] passing pointer to setup_timer() should be via unsigned long Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ba2397efe10ba728c7ff22b179e218c292227c13 Author: Al Viro Date: Tue Oct 10 22:46:57 2006 +0100 [PATCH] make kernel/relay.c __user-clean Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fb136e97840872638cb08588c4c9b9fff7f7c456 Author: Al Viro Date: Tue Oct 10 22:46:47 2006 +0100 [PATCH] fix misannotation in ioc4.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit afc12d30a74415a49a6ce36d89f82641b46c499b Author: Al Viro Date: Tue Oct 10 22:46:37 2006 +0100 [PATCH] mtd: remove several bogus casts to void * in iounmap() argument Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a9f627c9df2b6a242cdc25d46f87191941cd0844 Author: Al Viro Date: Tue Oct 10 22:46:27 2006 +0100 [PATCH] ia64/sn __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cfa7fd72ca03ac2324e8e469bd4b9ecc6f53394c Author: Al Viro Date: Tue Oct 10 22:46:17 2006 +0100 [PATCH] ia64/hp NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ba46df984b8e8114c3cf19c51670fab084bd4196 Author: Al Viro Date: Tue Oct 10 22:46:07 2006 +0100 [PATCH] __user annotations: futex Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 28c4dadd3a7221f5b9cd5c7d03c499788b193353 Author: Al Viro Date: Tue Oct 10 22:45:57 2006 +0100 [PATCH] tipc __user annotations Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 47b16539e1072afd2c964b97be4a95b5cf2ff801 Author: Al Viro Date: Tue Oct 10 22:45:47 2006 +0100 [PATCH] drivers/dma trivial annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c714de5dcf41cee869c4a74e8783c6d9be459ef6 Author: Al Viro Date: Tue Oct 10 22:45:37 2006 +0100 [PATCH] devio __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cb04e6b61985d7fafcb9529e5fcff4689f0961d3 Author: Al Viro Date: Tue Oct 10 22:45:27 2006 +0100 [PATCH] hwdep_compat missed __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 04b1add1ab9121898b7d63570aad2a9c7ee9cfa3 Author: Al Viro Date: Tue Oct 10 22:45:17 2006 +0100 [PATCH] misc sata __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 98ae6ccd8e15aeac1c624615c044deecf46a359a Author: Al Viro Date: Tue Oct 10 22:45:07 2006 +0100 [PATCH] fix misannotations in loop.c Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit aa7677d40072a97a861390f0ed1a8c25ce312201 Author: Al Viro Date: Tue Oct 10 22:44:57 2006 +0100 [PATCH] NULL noise removal: advansys Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 48343273e846d2612b7977f2503fd97503996fa0 Author: Al Viro Date: Tue Oct 10 22:44:47 2006 +0100 [PATCH] __iomem annotations in sunzilog Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 1acc04cd4c0b54ada85d0dd5d7c5efc3441261bf Author: Al Viro Date: Tue Oct 10 22:44:37 2006 +0100 [PATCH] dccp __user annotations Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 6aae8738473b7447284fe370d4e6816c02b4511b Author: Al Viro Date: Tue Oct 10 22:44:27 2006 +0100 [PATCH] drivers/s390 misc sparse annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 90cbad65911b5952a03111423347a6ab38236e0b Author: Al Viro Date: Tue Oct 10 22:44:17 2006 +0100 [PATCH] more fs/compat.c __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1e0dbafd30b2e1cd17fd141f4cfd633078524e8c Author: Al Viro Date: Tue Oct 10 22:44:07 2006 +0100 [PATCH] advansys __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2cbe19d48af198f0070470a2d836828de24fe163 Author: Michael S. Tsirkin Date: Mon Oct 9 18:06:32 2006 +0200 IB/mthca: Fix off-by-one in mthca SRQ creation All HCAs (not just mem-free) need a spare SRQ entry, so bump srq->max by 1 in all cases. Noted by Jack Morgenstein Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 73fbe8be73512b8a3ffa3d20c9d7f531af99679c Author: Roland Dreier Date: Tue Oct 10 12:50:38 2006 -0700 IPoIB: Check for DMA mapping error for TX packets Signed-off-by: Roland Dreier commit 1031bfb93adf641436b2192170525b76e2eb25bd Author: Roland Dreier Date: Tue Oct 10 12:50:38 2006 -0700 RDMA/amso1100: Fix build with debugging off Since pr_debug() has changed from a macro to an inline function when DEBUG is not defined, its arguments now need to be defined even when debugging is off. Therefore to_event_str() and to_qp_state_str() need to be moved out of #ifdef DEBUG. The compiler will throw the definitions away if DEBUG is not defined, but it needs to be able to see that the functions exist. Signed-off-by: Roland Dreier commit 82a9c16a10521a0ceadbd27a549f6e8d5e70e0ab Author: Sean Hefty Date: Wed Oct 4 11:37:25 2006 -0700 IB/cm: Send DREP in response to unmatched DREQ Currently a DREP is only sent in response to a DREQ if a connection has been found matching the DREQ, and it is in the proper state. Once a DREP is sent, the local connection moves into timewait. Duplicate DREQs received while in this state result in re-sending the DREP. However, it's likely that the local connection will enter and exit timewait before the remote side times out a lost DREP and resends a DREQ. To handle this, we send a DREP in response to a DREQ, even if a local connection is not found. This avoids maintaining disconnected id's in timewait states for excessively long times, just to handle a lost DREP. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 8575329d4f8596519d86830f622d2c30601f3ef3 Author: Sean Hefty Date: Wed Oct 4 11:29:59 2006 -0700 IB/cm: Fix timewait crash after module unload If the ib_cm module is unloaded while id's are still in timewait, the CM will destroy the work queue used to process timewait. Once the id's exit timewait, their timers will fire, leading to a crash trying to access the destroyed work queue. We need to track id's that are in timewait, and cancel their deferred work on module unload. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit a8bf4e7717142b0688a726dd07501a6a7783792a Author: Jack Morgenstein Date: Wed Oct 4 13:56:34 2006 +0200 IB/mthca: Query port fix Fill in "max_vl_num" (encoded according to VLCap field in the PortInfo MAD) and "init_type_reply" values in the ib_query_port() verb. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 01cb9bcbd34b7ba768a7f05375faf43becdb8a60 Author: Ishai Rabinovitz Date: Wed Oct 4 15:28:56 2006 +0200 IB/srp: Enable multiple connections to the same target Enable multiple concurrent connections to the same SRP target: 1) Use port GUID instead of node GUID in the initiator port identifier. This allows connections to be made from multiple HCA ports at the same time. 2) Let the user specify the identifier extention when adding the device. This allows userspace to make multiple connections even from the same port, if it wants too. Without this, only one connection can be made from any given HCA, even if it has multiple ports, because we don't use multi-channel mode, so targets will only allow one connection from a given initiator port ID. Signed-off-by: Ishai Rabinovitz Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 9b0af401aae336975e620fccdd294bb763424f3f Author: Ishai Rabinovitz Date: Tue Oct 10 09:51:14 2006 -0700 IB/srp: Remove redundant memset() scsi_host_alloc() already allocates with kzalloc(), so the struct Scsi_Host is zeroed out, including the private data portion. Remove the redundant memset that zeros this out again in the SRP initiator. Signed-off-by: Ishai Rabinovitz Signed-off-by: Roland Dreier commit e52e6080ca10e0a8ce2a35c86965945cdfa8ed7e Author: Tom Tucker Date: Tue Oct 3 09:46:41 2006 -0500 RDMA/amso1100: Add spinlocks to serialize ib_post_send/ib_post_recv The AMSO driver was not thread-safe in the post WR code and had code that would sleep if the WR post FIFO was full. Since these functions can be called on interrupt level I changed the sleep to a udelay. Signed-off-by: Tom Tucker Signed-off-by: Roland Dreier commit 833abf7fe011c3dfe9bcab405856b73deab17062 Author: Paul Mundt Date: Tue Oct 10 18:33:10 2006 +0900 sh: Zero-out coherent buffer in consistent_alloc(). Be sure to zero out the buffer, this was causing occasional problems under heavier PCI tests. Signed-off-by: Paul Mundt commit 10270613fb4d5a44c335cfa13e9626bf5743c01d Author: Benjamin Herrenschmidt Date: Tue Oct 10 11:47:31 2006 +1000 [POWERPC] Fix windfarm platform device usage The windfarm code uses a struct device_driver instead of platform_driver, which can cause crashes if any of the callbacks are called (like on module removal). This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 9f2545c11869868fd3cde7098d99e690891e442c Author: Benjamin Herrenschmidt Date: Tue Oct 10 11:45:45 2006 +1000 [POWERPC] Fix i2c-powermac platform device usage i2c-powermac was written & merged right after Russell King's changes adding platform_driver... which I missed. Thus it still used struct device, causing crashes when hitting sleep/wakeup callbacks (it happened to work by luck so far, until early/late callbacks got added). This causes crashes on sleep/wakeup on PowerBooks with 2.6.19. The patch fixes it by using a proper platform_driver. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit d6a29252ad120457cd544d44b2fbea46a00734a7 Author: Paul Mackerras Date: Tue Oct 10 13:51:00 2006 +1000 [POWERPC] Fix secondary CPU startup on old "powersurge" SMP powermacs On the old "powersurge" SMP powermacs, the second CPU is started up by sending it an IPI, which has the side effect of stopping the timebase clock (so the secondary CPU's timebase can be synchronized with the primary's). The routine that did this used udelay, which will hang forever when the timebase is stopped, since udelay now spins until the timebase reaches a certain value. The end result is that the kernel would hang when bringing up the second CPU. This fixes it by using a simple loop which just does a fixed number of iterations to generate the delay. These old systems were all clocked at around 200 MHz or so, so a fixed number of iterations is acceptable. Signed-off-by: Paul Mackerras commit ebf7a227dd1d810203a19642655d2fa293f395dd Author: Nick Piggin Date: Tue Oct 10 04:36:54 2006 +0200 [PATCH] mm: bug in set_page_dirty_buffers This was triggered, but not the fault of, the dirty page accounting patches. Suitable for -stable as well, after it goes upstream. Unable to handle kernel NULL pointer dereference at virtual address 0000004c EIP is at _spin_lock+0x12/0x66 Call Trace: [<401766e7>] __set_page_dirty_buffers+0x15/0xc0 [<401401e7>] set_page_dirty+0x2c/0x51 [<40140db2>] set_page_dirty_balance+0xb/0x3b [<40145d29>] __do_fault+0x1d8/0x279 [<40147059>] __handle_mm_fault+0x125/0x951 [<401133f1>] do_page_fault+0x440/0x59f [<4034d0c1>] error_code+0x39/0x40 [<08048a33>] 0x8048a33 Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds commit 39e3eb7265b8698e5f607a317af13c9478274736 Author: Al Viro Date: Mon Oct 9 12:48:42 2006 +0100 [POWERPC] ARCH=ppc pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Paul Mackerras commit 8de242e60a441f177dd51b323894b17d3d63e9f2 Author: Benjamin Herrenschmidt Date: Mon Oct 9 13:28:59 2006 +1000 [POWERPC] Update maple defconfig This updates the Maple defconfig to 4 CPUs (along with current defaults) to support the "tigerwood" 970MP evaluation board. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 1e1b20a119ac45a290bbc6261f69a2a6a2cc064a Author: Benjamin Herrenschmidt Date: Mon Oct 9 13:27:28 2006 +1000 [POWERPC] Fix Maple secondary IDE interrupt The IDE driver will pick up the PCI IRQ for both channels on Maple despite the fact that it's in legacy mode. This works around it by "hiding" the PCI IRQ of the AMD8111 IDE controller when it's configured in legacy mode on the Maple platform, thus causing the driver to call pci_get_legacy_ide_irq() which will return the correct interrupts for both channels. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit c10af8c38da7a0bc9010d6609237c1ab6d2da12c Author: Benjamin Herrenschmidt Date: Mon Oct 9 13:25:15 2006 +1000 [POWERPC] Make U4 PCIe work on maple The Maple support code was missing code for U4/CPC945 PCIe. This adds it, enabling it to work on tigerwood boards, and possibly also js21 using SLOF. Also disable an obsolete firmware workaround. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 020533ef24309803789ab8b325b1a6463388decf Author: Geoff Levand Date: Sat Oct 7 15:33:53 2006 -0700 [POWERPC] cell: fix default zImage build target Change CONFIG_PPC_CELL to CONFIG_PPC_IBM_CELL_BLADE in the powerpc boot makefile. CONFIG_PPC_CELL is used to build the generic cell processor support, and is not an indication of platform. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit dcf9065122660f4e3df02a47a75dc702d5531244 Author: Michael Ellerman Date: Sat Sep 30 11:54:09 2006 +1000 [POWERPC] Fix boot wrapper invocation if CROSS_COMPILE contains spaces My CROSS_COMPILE is "ccache /opt/compilers/blah", which confuses the boot wrapper script. Quote CROSS_COMPILE and CROSS32_COMPILE so they can safely contain spaces. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit f583ffce1aac783fd16d5d75cd69ac5ebb8f4933 Author: Paul Mackerras Date: Tue Oct 10 11:47:07 2006 +1000 [POWERPC] Fix xmon IRQ handler for pt_regs removal Signed-off-by: Paul Mackerras commit 078830eaa8abccd1e95d3effce5b29273bb5ed09 Author: Martin Habets Date: Mon Oct 9 18:10:16 2006 -0700 [SPARC32]: Fix prom.c build warning Fix these 2.6.19-rc1 build warnings: CC arch/sparc/kernel/prom.o arch/sparc/kernel/prom.c: In function `of_set_property': arch/sparc/kernel/prom.c:246: warning: passing arg 2 of `prom_setprop' discards qualifiers from pointer target type arch/sparc/kernel/prom.c: In function `build_one_prop': arch/sparc/kernel/prom.c:446: warning: unused variable `len' arch/sparc/kernel/prom.c:480: warning: ignoring return value of `prom_getproperty', declared with attribute warn_unused_result Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit 79bf06248b69b937f3a917281b4a8520a66c7582 Author: David S. Miller Date: Thu Oct 5 02:08:59 2006 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 4b75eb2bd30707c1af76145fd3a4ec2d890e1870 Author: David S. Miller Date: Thu Oct 5 02:07:32 2006 -0700 [SPARC64]: Fix of_device bus_id settings. They have to be unique system-wide, so use "NAME@NODE" as the string pattern of the non-root nodes. Thanks to Andrew Morton for fixing the error value checking in bus_add_device() which made this problem finally noticable. Signed-off-by: David S. Miller commit 99ae1c83b5107cd91e45d4d3c7bf096cdff0cf06 Author: David S. Miller Date: Wed Oct 4 17:31:00 2006 -0700 [SPARC64]: Update MAINTAINERS entry. ultralinux@vger is deprecated, folks should use sparclinux@vger for both sparc ports. Eddie, Anton, and Jakub haven't been active in sparc64 maintainence for years, so best to remove them as reports do nothing more than fill up their mailboxes :) Signed-off-by: David S. Miller commit b0ac3f50b8f2cd992ffd36d22c82eabdf075e9c4 Author: Dave Jones Date: Mon Oct 9 19:13:51 2006 -0400 [HEADERS] Put linux/config.h out of its misery. Signed-off-by: Dave Jones commit e04582b7bc70b40c57287cdc24f81964ee88f565 Author: Atsushi Nemoto Date: Mon Oct 9 00:10:01 2006 +0900 [MIPS] Make sure cpu_has_fpu is used only in atomic context Make sure cpu_has_fpu (which uses smp_processor_id()) is used only in atomic context. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f5c70dd7f384db4c524c35288d9be3ed61ac41a9 Author: Atsushi Nemoto Date: Sun Aug 20 22:55:52 2006 +0900 [MIPS] Fix build errors related to wbflush.h on tx4927/tx4938. TX49 CPUs have a SYNC instruction so that CONFIG_CPU_HAS_WB is no longer needed. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 5536b2351425136e629bd9fc18135c6e21e125c2 Author: Ralf Baechle Date: Mon Oct 9 16:34:41 2006 +0100 [MIPS] Alchemy: nuke usbdev; it's useless as is ... Signed-off-by: Ralf Baechle commit 0118c3ca9e7518b06a10e9d7f4bd15957df45783 Author: Ralf Baechle Date: Mon Jun 5 11:54:41 2006 +0100 [MIPS] Malta: Fix build for non-MIPS32/64 configuration. Signed-off-by: Ralf Baechle commit 12a0a703b3f07e5b01c81fe4f5d2a221c9318f16 Author: Ralf Baechle Date: Mon Oct 9 23:20:47 2006 +0100 [RTC] Consistently use of tabs for formatting. commit 0e8f8f54c1537d22eb0168622a5f6aef4040da6a Author: Ralf Baechle Date: Sat Jul 8 01:07:40 2006 +0200 [MIPS] NUMA: Register all nodes before cpus or sysfs will barf. Signed-off-by: Ralf Baechle commit 18965513fdc3af976f000f231ee216500d707c11 Author: Ralf Baechle Date: Mon Oct 9 23:20:46 2006 +0100 [MIPS] qtronix: remove driver. Another leftover of removing support for the ITE8172. Signed-off-by: Ralf Baechle commit f431baa55abf8adeed0c718b51deacbc151f58f1 Author: Atsushi Nemoto Date: Mon Oct 9 01:24:23 2006 +0900 [MIPS] ret_from_irq adjustment Make sure that RA on top of interrupt stack is an address of ret_from_irq, so that dump_stack etc. can trace info interrupted context. Also this patch fixes except_vec_vi_handler and __smtc_ipi_vector which seems broken. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 441ee341ad63572f39cb8074e31806b5b1471d0b Author: Ralf Baechle Date: Fri Jun 2 11:48:11 2006 +0100 [MIPS] Fix RM9000 wait instruction detection. Only revisions < 4.0 don't have a functional wait instruction. From Thomas Koeller (Thomas.Koeller@baslerweb.com). Signed-off-by: Ralf Baechle commit 81e859ac1eef300c1b2ff49a2f2da8ee4ce1e844 Author: Geert Uytterhoeven Date: Mon Oct 9 22:27:42 2006 +0200 [PATCH] m68k/MVME167: SERIAL167 tty flip buffer updates Compile fixes related to changed tty flip buffer handling. Signed-off-by: Kars de Jong Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit ea62aa1b6f6d31b53a34a6f5271ed85735ccc0bc Author: Geert Uytterhoeven Date: Mon Oct 9 22:27:42 2006 +0200 [PATCH] m68k/MVME167: SERIAL167 is no longer broken - SERIAL167 is no longer broken - Removed some unused variables from the driver to fix compiler warnings Signed-off-by: Kars de Jong Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 2ed0ce5b57950a620155433c62a5a02a067f1376 Author: Geert Uytterhoeven Date: Mon Oct 9 22:23:56 2006 +0200 [PATCH] m68k/Apollo: Remove obsolete arch/m68k/apollo/dma.c Remove unused arch/m68k/apollo/dma.c, which was obsoleted by the move to the generic DMA API. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 69961c375288bdab7604e0bb1c8d22999bb8a347 Author: Geert Uytterhoeven Date: Mon Oct 9 22:23:31 2006 +0200 [PATCH] m68k/Atari: Interrupt updates Misc Atari fixes: - initialize correct number of atari irqs - silence vbl interrupt until it's used by atafb - use mdelay() to read clock if necessary Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit da96d0b58adddf3bdeaa9644ac74f0dcc9039407 Author: Geert Uytterhoeven Date: Mon Oct 9 22:22:37 2006 +0200 [PATCH] m68k/HP300: Enable HIL configuration options Enable HIL configuration options on HP300 Signed-off-by: Kars de Jong Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 6fb8296aa1681e74b2aa3c59169d9014e6a0dfc3 Author: Geert Uytterhoeven Date: Mon Oct 9 22:02:31 2006 +0200 [PATCH] m68k: more syscall updates Add missing syscalls Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 6aabd6af4aaf6d794f67226934ad731eb1765e5d Author: Geert Uytterhoeven Date: Mon Oct 9 22:02:25 2006 +0200 [PATCH] m68k: syscall updates Add some missing system calls (recent udev needs them) Signed-off-by: Kars de Jong Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit d3696cf7370583b272ff2f09524c9d37a83c71b2 Author: Eric W. Biederman Date: Sun Oct 8 23:41:59 2006 -0600 [PATCH] x86_64 irq: Scream but don't die if we receive an unexpected irq Due to code bugs or misbehaving hardware it is possible that we can receive an interrupt that we have not mapped into a linux irq. Calling BUG when that happens is very rude, and if the problem is mild enough prevents anything else from getting done. So instead of calling BUG just scream loudly about the problem and continue running. We don't have enough knowledge to know which interrupt triggered this behavior so we don't acknowledge it. This will likely prevent a recurrence of the problem by jamming up the works with an unacknowledged interrupt. If the interrupt was something important it is quite possible that nothing productive will happen past this point. But it is now at least possible to keep working if the kernel can survive without the interrupt we dropped on the floor. Solutions like irqpoll should generally make dropped irqs non-fatal. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 659564c8adfe1765476beee8d55cd18986946892 Author: Bill Nottingham Date: Mon Oct 9 16:10:48 2006 -0400 [PATCH] Introduce vfs_listxattr This patch moves code out of fs/xattr.c:listxattr into a new function - vfs_listxattr. The code for vfs_listxattr was originally submitted by Bill Nottingham to Unionfs. Sorry about that. The reason for this submission is to make the listxattr code in fs/xattr.c a little cleaner (as well as to clean up some code in Unionfs.) Currently, Unionfs has vfs_listxattr defined in its code. I think that's very ugly, and I'd like to see it (re)moved. The logical place to put it, is along side of all the other vfs_*xattr functions. Overall, I think this patch is benefitial for both kernel.org kernel and Unionfs. Signed-off-by: Josef "Jeff" Sipek Acked-by: Al Viro Signed-off-by: Linus Torvalds commit e069d79d23739977800c3b8495853b735f77ef30 Author: Al Viro Date: Mon Oct 9 20:29:43 2006 +0100 [PATCH] tifm __iomem annotations, NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 97c4965d970587a1cc4264c1cffbf0ea9c1e35e8 Author: Al Viro Date: Mon Oct 9 20:29:03 2006 +0100 [PATCH] mos7840 annotations __user annotations, NULL noise removal, %p use for pointers Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5a42b81f03b756116f982e72838bc358bc4e460f Author: Al Viro Date: Mon Oct 9 20:28:03 2006 +0100 [PATCH] s390 traps.c __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c8adf94a4806b4ae49a3057d434471a0b01096e3 Author: Al Viro Date: Mon Oct 9 20:26:58 2006 +0100 [PATCH] hppfs: readdir callback missed in prototype change Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 38d6fd26ea7f291141039fe340a581dc6f770fc0 Author: Al Viro Date: Mon Oct 9 20:27:30 2006 +0100 [PATCH] dlm gfp_t annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5c09d96b34ac9b95ab4606e51ddb34ed0f19faf1 Author: Al Viro Date: Mon Oct 9 20:24:49 2006 +0100 [PATCH] wrong order of arguments in copy_to_user() in ncpfs Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8dc42f9e037e5fb7b01c1334b7752b9355f5293a Author: Al Viro Date: Mon Oct 9 16:26:47 2006 +0100 [PATCH] mv64630_pic NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7c84ace9bcd90e38ebf88b304a8ed4fed7ff3574 Author: Al Viro Date: Mon Oct 9 16:23:09 2006 +0100 [PATCH] trivial iomem annotations (arch/powerpc/platfroms/parsemi/pci.c) Signed-off-by: Al Viro Acked-by: Olof Johansson Signed-off-by: Linus Torvalds commit f3d2ab41b5e2dfb2fc8679b786476327cea2f249 Author: Al Viro Date: Mon Oct 9 16:22:09 2006 +0100 [PATCH] extern doesn't make sense on a definition of function... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a23b7cb998f18101f9b0f505d81e6c68a7830a05 Author: Al Viro Date: Mon Oct 9 12:47:31 2006 +0100 [PATCH] more ia64 irq handlers Cast to (void *) in request_irq() argument is stupid and only hides problems... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 041a6baec5a9260ad8b71c43a7ea1de95dfa974c Author: Al Viro Date: Mon Oct 9 12:46:52 2006 +0100 [PATCH] fallout from alpha pt_regs patches missed irq handler in sys_titan and forgotten prototype update. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 63540ba3691600759c6732f800dcf0fe8075960b Author: Al Viro Date: Mon Oct 9 11:51:14 2006 +0100 [PATCH] sparc64 irq pt_regs fallout Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 40220c1a192f51695f806d75b1f9970f0f17a6e8 Author: David Howells Date: Mon Oct 9 12:19:47 2006 +0100 IRQ: Use the new typedef for interrupt handler function pointers Use the new typedef for interrupt handler function pointers rather than actually spelling out the full thing each time. This was scripted with the following small shell script: #!/bin/sh egrep -nHrl -e 'irqreturn_t[ ]*[(][*]' $* | while read i do echo $i perl -pi -e 's/irqreturn_t\s*[(]\s*[*]\s*([_a-zA-Z0-9]*)\s*[)]\s*[(]\s*int\s*,\s*void\s*[*]\s*[)]/irq_handler_t \1/g' $i || exit $? done Signed-Off-By: David Howells commit 58ba81dba77eab43633ea47d82e96245ae3ff666 Author: Al Viro Date: Mon Oct 9 02:11:47 2006 +0100 [PATCH] m68k/kernel/dma.c assumes !MMU_SUN3 Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1622605cf6e15bfdc55a3dc78b792018edded435 Author: Al Viro Date: Mon Oct 9 02:09:49 2006 +0100 [PATCH] arm: it's OK to pass pointer to volatile as iounmap() argument... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 832504933757ba7913bf64cd574326e014215b41 Author: Linus Torvalds Date: Sun Oct 8 17:28:25 2006 -0700 Fix extraneous '&' in recent NFS client cleanup We should pass "wait_event_interruptible()" the wait-queue itself, not the pointer to it. The magic macro will pointerize it internally. Signed-off-by: Linus Torvalds commit 7bea96fd22a8fd19f90817405b4abe032317a0e3 Author: Al Viro Date: Sun Oct 8 22:49:34 2006 +0100 [PATCH] uml pt_regs fixes Real fix for UML pt_regs stuff. Note set_irq_regs() logics in there... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 27f768192fe2d96936cef5d4713e228daee07ae2 Author: Ralf Baechle Date: Mon Oct 9 00:03:05 2006 +0100 [MIPS] Cleanup unnecessary inclusions. Signed-off-by: Ralf Baechle commit 6dab2f4564b3dc8747452e256fb779f320ff5650 Author: Ralf Baechle Date: Mon Oct 9 00:00:31 2006 +0100 [MIPS] DEC: pt_regs fixes for buserror handlers Signed-off-by: Ralf Baechle commit 65542070de7d6cd307657a71ab1712a6c58c0889 Author: Ralf Baechle Date: Sun Oct 8 23:56:13 2006 +0100 [MIPS] Fix return type of gt64120_irq. Signed-off-by: Ralf Baechle commit d864b96bb08f88d000cf8f78b5bac93fe631d0f5 Author: Ralf Baechle Date: Sun Oct 8 21:32:40 2006 +0100 [MIPS] Ocelot C: Build fix - ll_mv64340_irq takes no more regs argument. Signed-off-by: Ralf Baechle commit de4f742b96f286ac20c04dd9c53897a05b412843 Author: Ralf Baechle Date: Sun Oct 8 20:50:12 2006 +0100 [MIPS] Jazz defconfig file. Signed-off-by: Ralf Baechle commit 06e80113c765119e73394a5878c137f2d09a4dcd Author: Ralf Baechle Date: Sun Oct 8 19:35:00 2006 +0100 [MIPS] Jazz: build fix - include Signed-off-by: Ralf Baechle commit 3bdcdd681b64fa92934039ff0d217414720a4b1e Author: Ralf Baechle Date: Sun Oct 8 19:28:44 2006 +0100 [MIPS] Jazz: Remove warning. After 7 years probably somebody test this ;) Signed-off-by: Ralf Baechle commit 2cf69e765a99baacf0121f3312ec84ff1031961d Author: Ralf Baechle Date: Sun Oct 8 19:19:11 2006 +0100 [MIPS] Jazz: Fix I/O port resources. struct resource members were shuffeled a while ago. Signed-off-by: Ralf Baechle commit d62801e961e148313910ec430e230e488fadc196 Author: Ralf Baechle Date: Sun Oct 8 17:38:18 2006 +0100 [MIPS] DEC: pt_regs fixes for dec_intr_halt. Signed-off-by: Ralf Baechle commit b104189c203a47219e51ab179e50fd0c73ccea3b Author: Ralf Baechle Date: Mon Oct 9 00:15:27 2006 +0100 handle_sysrq lost its pt_regs * argument Signed-off-by: Ralf Baechle commit e24bb60e11e3fe9858b71874a4ac59333adbc4fc Author: Linus Torvalds Date: Sun Oct 8 15:38:22 2006 -0700 Revert "[POWERPC] Don't get PCI IRQ from OF for devices with no IRQ" This reverts commit 41550c5128150175197257b6ceab2cd50dea7b51. Quoth Ben Herrenschmidt: "Please revert this one for now. It seems to break G5s :( Looks like PCI cells inside Apple IO ASICs don't have a PCI_INTERRUPT_LINE set. I need to figure out a better fix." Signed-off-by: Linus Torvalds commit 0bae89ec8b1519dae67036637942f5b5bbaa9424 Author: Trond Myklebust Date: Sun Oct 8 14:33:24 2006 -0400 [PATCH] NFS: Fix typo in nfs_get_client() Commit ca4aa09635516258f158a7bc1594a794e4c34864 fixed waiting for the structure to get initialised, but it is also possible to break out of the loop while still in TASK_INTERRUPTIBLE. Replace the whole thing by wait_event_interruptible, which is much more readable, and doesn't suffer from these problems. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit cb1055fb1b79775d398038ad8dcd2c7581f141d8 Author: Al Viro Date: Sun Oct 8 15:08:45 2006 +0100 [PATCH] linux/io.h needs types.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9288d1a3c7ed0abaa7976844e5d42bbd4fa0eae3 Author: Al Viro Date: Sun Oct 8 15:05:14 2006 +0100 [PATCH] missing forward declaration of pt_regs (asm-m68k/signal.h) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a8f47c45aee6efa5ef7ec209b90681b091bd3d2c Author: Al Viro Date: Sun Oct 8 15:04:15 2006 +0100 [PATCH] missing include of scatterlist.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 97432886617825d412bcedadf5e5b308f931caad Author: Al Viro Date: Sun Oct 8 15:01:14 2006 +0100 [PATCH] missing include in pdaudiocf_irq Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9da3b1ad7b074effd56729f9fc01cc5abf6503cc Author: Al Viro Date: Sun Oct 8 15:00:44 2006 +0100 [PATCH] misc ppc pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 28431146993e0ab3a2a592af8541543fe0cc2c8e Author: Al Viro Date: Sun Oct 8 15:00:12 2006 +0100 [PATCH] misc arm pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5dcded1b0b4f1537bb6dff453fb805517756c94b Author: Al Viro Date: Sun Oct 8 14:59:19 2006 +0100 [PATCH] missed ia64 pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2f116cbf369ec3148cef9821f6c7f2b8fb78a071 Author: Al Viro Date: Sun Oct 8 14:45:28 2006 +0100 [PATCH] alpha pt_regs cleanups: collapse set_irq_regs() in titan_dispatch_irqs() titan_dispatch_irqs() always gets get_irq_regs() as argument; kill the argument and collapse set_irq_regs() in body. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4fa1970a23bf8fc68e86b65a87c32556e20a6be6 Author: Al Viro Date: Sun Oct 8 14:44:38 2006 +0100 [PATCH] alpha pt_regs cleanups: machine_check() do set_irq_regs() in caller, kill pt_regs argument. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3dbb8c62897f96bbf5d4e4fe649e5d3791fc33c5 Author: Al Viro Date: Sun Oct 8 14:37:32 2006 +0100 [PATCH] alpha pt_regs cleanups: handle_irq() isa_no_iack_sc_device_interrupt() always gets get_irq_regs() as argument; kill that argument. All but two callers of handle_irq() pass get_irq_regs() as argument; convert the remaining two, kill set_irq_regs() inside handle_irq(). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7ca56053b29633ef08b14e5ca16c663363edac36 Author: Al Viro Date: Sun Oct 8 14:36:08 2006 +0100 [PATCH] alpha pt_regs cleanups: device_interrupt callers of ->device_interrupt() do set_irq_regs() now; pt_regs argument removed, remaining uses of regs in instances of ->device_interrupt() are switched to get_irq_regs() and will be gone in the next patch. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8dab42a96781a1100a6b5cc6a66953fc51c30bc1 Author: Al Viro Date: Sun Oct 8 14:33:33 2006 +0100 [PATCH] m68k pt_regs fixes, part 2 Fallout from previous patch: - actually add include/asm-m68k/irq_regs.h - missed the prototype of sun3_sched_init() NB: git diff without argumentgs sucks when you've added some files... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7a39f52202a70ff6834e37053e2ee55c7d351621 Author: Al Viro Date: Sun Oct 8 14:32:15 2006 +0100 [PATCH] sparc32 rwlock fix read_trylock() is broken on sparc32 (doesn't build and didn't work right, actually). Proposed fix: - make "writer holds lock" distinguishable from "reader tries to grab lock" - have __raw_read_trylock() try to acquire the mutex (in LSB of lock), terminating spin if we see that there's writer holding it. Then do the rest as we do in read_lock(). Thanks to Ingo for discussion... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6d24c8dc2e656b02807aa0506405727d34c0376c Author: Al Viro Date: Sun Oct 8 08:23:28 2006 -0400 [PATCH] sparc64 pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 0d84438d98777b0f9425d39121c42f47a06878ca Author: Al Viro Date: Sun Oct 8 14:30:44 2006 +0100 [PATCH] sparc32 pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c7111c1318ee8890f385813f232fdb32643e2653 Author: Eric W. Biederman Date: Sun Oct 8 07:47:55 2006 -0600 [PATCH] x86_64 irq: Allocate a vector across all cpus for genapic_flat. The problem we can't take advantage of lowest priority delivery mode if the vectors are allocated for only one cpu at a time. Nor can we work around hardware that assumes lowest priority delivery mode is always used with several cpus. So this patch introduces the concept of a vector_allocation_domain. A set of cpus that will receive an irq on the same vector. Currently the code for implementing this is placed in the genapic structure so we can vary this depending on how we are using the io_apics. This allows us to restore the previous behaviour of genapic_flat without removing the benefits of having separate vector allocation for large machines. This should also fix the problem report where a hyperthreaded cpu was receving the irq on the wrong hyperthread when in logical delivery mode because the previous behaviour is restored. This patch properly records our allocation of the first 16 irqs to the first 16 available vectors on all cpus. This should be fine but it may run into problems with multiple interrupts at the same interrupt level. Except for some badly maintained comments in the code and the behaviour of the interrupt allocator I have no real understanding of that problem. Signed-off-by: Eric W. Biederman Acked-by: Muli Ben-Yehuda Signed-off-by: Linus Torvalds commit b940d22d58c41b2ae491dca9232850f6f38f3653 Author: Eric W. Biederman Date: Sun Oct 8 07:43:46 2006 -0600 [PATCH] i386/x86_64: Remove global IO_APIC_VECTOR Which vector an irq is assigned to now varies dynamically and is not needed outside of io_apic.c. So remove the possibility of accessing the information outside of io_apic.c and remove the silly macro that makes looking for users of irq_vector difficult. The fact this compiles ensures there aren't any more pieces of the old CONFIG_PCI_MSI weirdness that I failed to remove. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 7da5d406792eedb5341a8c20296470b2e67743e7 Author: Eric W. Biederman Date: Sun Oct 8 07:41:19 2006 -0600 [PATCH] i386/x86_64: FIX pci_enable_irq to set dev->irq to the irq number In commit ace80ab796ae30d2c9ee8a84ab6f608a61f8b87b I removed the weird logic that used the vector number as the irq number when MSI was defined. However pci_enable_irq was using a different test in the io_apic_assign_irqs path and I missed it :( This patch removes the wrong code so no one hits this problem. This code is only active when a specific set of boot command line parameters is specified which likely explains why no one has notices this earlier. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit ca4aa09635516258f158a7bc1594a794e4c34864 Author: Trond Myklebust Date: Sun Oct 8 14:33:24 2006 -0400 [PATCH] NFS: Fix typo in nfs_get_client() NFS_CS_INITING > NFS_CS_READY, so instead of waiting for the structure to get initialised, we currently immediately jump out of the loop without ever sleeping. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit b7a7179dcae6cecfaaa8384f8c088fb7823c6c90 Author: Stefan Richter Date: Fri Oct 6 19:49:52 2006 +0200 ieee1394: nodemgr: fix startup of knodemgrd Revert a thinko in commit d2f119fe319528da8c76a1107459d6f478cbf28c: When knodemgrd starts, it needs to sleep until host->generation was incremented above its initial value of 0. My wrong logic caused it to start sending requests when the bus wasn't completely ready. Seen as "AT dma reset ctx=0, aborting transmission" messages in 2.6.19-rc1. Signed-off-by: Stefan Richter commit f1d08f71974dcf68ce4510a2dfaeb798b05df2c0 Author: Yoichi Yuasa Date: Sat Oct 7 13:41:51 2006 +0900 [MIPS] Fix DECserial build error by IRQ hander change Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 937a801576f954bd030d7c4a5a94571710d87c0b Author: Ralf Baechle Date: Sat Oct 7 19:44:33 2006 +0100 [MIPS] Complete fixes after removal of pt_regs argument to int handlers. Signed-off-by: Ralf Baechle commit 31aa36658a123263a9a69896e348b9600e050679 Author: Karl-Johan Karlsson Date: Sun Oct 8 01:15:02 2006 +0200 [MIPS] Show actual CPU information in /proc/cpuinfo Currently, /proc/cpuinfo contains several copies of the information for whatever processor we happen to be scheduled on. This patch makes it contain the proper information for each CPU, which is particularly useful on mixed R12k/R10k IP27 machines. Signed-off-by: Karl-Johan Karlsson Signed-off-by: Ralf Baechle commit 5c90d528b21cb9506713f92730f33246b80ecc25 Author: Scott Ashcroft Date: Fri Oct 6 16:54:54 2006 +0100 [MIPS] Cobalt: Time runs too quickly A kernel built with HZ==250 runs about 4 four times too quickly on a Cobalt RaQ2. Signed-off-by: Scott Ashcroft Signed-off-by: Ralf Baechle commit 59d6ab86a6b1097d5e5eae5d820f8e2661009324 Author: Ralf Baechle Date: Fri Oct 6 17:36:20 2006 +0100 [MIPS] Update Malta config. Signed-off-by: Ralf Baechle commit 9c8e7f5cc965d30006c917ab19221e06fcc5a4f9 Author: Al Viro Date: Sat Oct 7 16:29:18 2006 +0100 [PATCH] m32r pt_regs fixes ... and now with irq_regs.h not forgotten... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8774cb815f2492a95b90a927f93a2de555753b32 Author: Al Viro Date: Sat Oct 7 14:17:31 2006 +0100 [PATCH] minimal alpha pt_regs fixes Signed-off-by: Al Viro Acked-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 2850bc273776cbb1b510c5828e9e456dffb50a32 Author: Al Viro Date: Sat Oct 7 14:16:45 2006 +0100 [PATCH] m68k pt_regs fixes m68k_handle_int() split in two functions: __m68k_handle_int() takes pt_regs * and does set_irq_regs(); m68k_handle_int() doesn't get pt_regs *. Places where we used to call m68k_handle_int() recursively with the same pt_regs have simply lost the second argument, the rest is switched to __m68k_handle_int(). The rest of patch is just dropping pt_regs * where needed. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 00079e04fe478cd3c59ae2106ef2fbe779e67024 Author: Eric Eric Sesterhenn Date: Fri Oct 6 22:19:45 2006 -0700 [PATCH] reiserfs: null pointer dereferencing in reiserfs_read_bitmap_block null pointer dereferencing in reiserfs_read_bitmap_block. Signed-off-by: Alexander Zarochentsev Cc: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c339d4541995df2fd3ca31a84c042e7afe9b3c1 Author: Rafael J. Wysocki Date: Fri Oct 6 22:19:44 2006 -0700 [PATCH] swsusp: Make userland suspend work on SMP again Unfortunately one of the recent changes in swsusp has broken the userland suspend on SMP. Fix it. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcbd4ec4c258f88d4cfd3c309c8a56faff061340 Author: Christoph Lameter Date: Fri Oct 6 22:19:44 2006 -0700 [PATCH] slab: remove wrongly placed BUG_ON Init list is called with a list parameter that is not equal to the cachep->nodelists entry under NUMA if more than one node exists. This is fully legitimatei. One may want to populate the list fields before switching nodelist pointers. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40a5f7ca07f8e1d77acdba5ae0c11c15cb7520c1 Author: Olaf Hering Date: Fri Oct 6 23:06:48 2006 +0200 [POWERPC] PReP fixup after irq changes Compile fixes for PReP in ARCH=ppc. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit f5a924581a4e7b9bc29a49ee1397dcaaacd5f25f Author: Olaf Hering Date: Fri Oct 6 22:52:16 2006 +0200 [POWERPC] SPU fixup after irq changes Remove struct pt_regs * from remaining spu irq functions. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 35a84c2f56e0f77ea2c5a4327b17104705f4c8c7 Author: Olaf Hering Date: Sat Oct 7 22:08:26 2006 +1000 [POWERPC] Fix up after irq changes Remove struct pt_regs * from all handlers. Also remove the regs argument from get_irq() functions. Compile tested with arch/powerpc/config/* and arch/ppc/configs/prep_defconfig Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit c7753f18711782738936f224aaa421468e87f6ed Author: Matthew Wilcox Date: Sat Oct 7 06:01:11 2006 -0600 [PARISC] More pt_regs removal Remove pt_regs from ipi_interrupt and timer_interrupt. Inline smp_do_timer() into its only caller, and unify the SMP and non-SMP paths. Fixes a profiling bug. Signed-off-by: Matthew Wilcox commit bbd6330ea1154fc13a351263160d4f9cca2ff5d9 Author: Matthew Wilcox Date: Fri Oct 6 23:45:09 2006 -0400 [PARISC] pdc_init no longer exists Just a stale prototype Signed-off-by: Matthew Wilcox commit 09690b18b7b9696bb719b246e77c7af9952da12c Author: Kyle McMartin Date: Thu Oct 5 23:45:45 2006 -0400 [PARISC] Make firmware calls irqsafe-ish... There's no reason why we shouldn't be using _irqsave instead of _irq for any of these calls. fwiw, this fixes the "start_kernel(): bug: interrupts were enabled early" message displayed on bootup recently. Signed-off-by: Kyle McMartin Signed-off-by: Matthew Wilcox commit ba0e427f215b1c58881a737f46d30ae03b83178c Author: Matthew Wilcox Date: Wed Oct 4 22:57:28 2006 -0600 [PA-RISC] Fix boot breakage Conditionals were the wrong way around. Turns out I was booting the wrong kernel when testing the original fix. Signed-off-by: Matthew Wilcox commit e11e30a063b515e95fb590f1558b5fea21273c63 Author: Matthew Wilcox Date: Sat Oct 7 05:11:07 2006 -0600 [PARISC] Use set_irq_regs Actually set the irq_regs pointer. Signed-off-by: Matthew Wilcox commit be577a5220b25e0a6e3fbf96bbfc8b31d63e9ea9 Author: Matthew Wilcox Date: Fri Oct 6 20:47:23 2006 -0600 Build fixes for struct pt_regs removal Signed-off-by: Matthew Wilcox commit 1224f373c974eacc46fe5e1073422c794d0b0d34 Author: Stephen Rothwell Date: Fri Oct 6 13:55:26 2006 +1000 [POWERPC] Fix iseries/smp.c for irq breakage Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 27db2d0cb9b56210dc1e29bc89a7413f3ae67b91 Author: Stephen Rothwell Date: Fri Oct 6 13:54:28 2006 +1000 [POWERPC] Fix viocons for irq breakage Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit b75f3f751c17e01544bd6706e54efae35d66d446 Author: Stephen Rothwell Date: Fri Oct 6 13:53:12 2006 +1000 [POWERPC] Update iseries_defconfig This make sure that an iseries_defconfig does not inlude other platforms. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 2b00b254debd707571f20149dbd4b45264a120e5 Author: Olof Johansson Date: Thu Oct 5 21:16:48 2006 -0500 [POWERPC] Fix fsl_soc build breaks Hrm, there's no way this ever built at time of merge. There's a missing } and the wrong type on phy_irq. Also, another const for get_property(). CC arch/powerpc/sysdev/fsl_soc.o arch/powerpc/sysdev/fsl_soc.c: In function 'fs_enet_of_init': arch/powerpc/sysdev/fsl_soc.c:625: error: assignment of read-only variable 'phy_irq' arch/powerpc/sysdev/fsl_soc.c:625: warning: assignment makes integer from pointer without a cast arch/powerpc/sysdev/fsl_soc.c:661: warning: assignment discards qualifiers from pointer target type arch/powerpc/sysdev/fsl_soc.c:684: error: subscripted value is neither array nor pointer arch/powerpc/sysdev/fsl_soc.c:687: error: subscripted value is neither array nor pointer arch/powerpc/sysdev/fsl_soc.c:722: warning: ISO C90 forbids mixed declarations and code arch/powerpc/sysdev/fsl_soc.c:728: error: invalid storage class for function 'cpm_uart_of_init' arch/powerpc/sysdev/fsl_soc.c:798: error: initializer element is not constant arch/powerpc/sysdev/fsl_soc.c:798: error: expected declaration or statement at end of input make[1]: *** [arch/powerpc/sysdev/fsl_soc.o] Error 1 Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 268f3be177ce93791da38facc34126b5038cd851 Author: Steve French Date: Fri Oct 6 21:47:09 2006 +0000 [CIFS] readdir (ffirst) enablement of accurate timestamps from legacy servers Signed-off-by: Steve French commit d150ad7bd946f066c98a9725685109dcffae0cba Author: Andrew Morton Date: Fri Oct 6 13:28:09 2006 -0700 [PATCH] x86_64 irq_regs fix smp_apic_timer_interrupt() needs to stack the pt_regs* for profile_tick. If any other of those APIC interrupt handlers want to run get_irq_regs() then their C entrypoint handlers will need the same treatment. Cc: Andi Kleen Cc: David Howells Signed-off-by: Andrew Morton Acked-by: Andrew Vasquez Signed-off-by: Linus Torvalds commit e630015504cdd4d166c371fec39b8ca258fcbc0e Author: Linus Torvalds Date: Fri Oct 6 13:11:15 2006 -0700 ARM: fix up nested irq regs usage This should fix up the per-cpu irq register pointer if we have nested hardware interrupts. Signed-off-by: Linus Torvalds commit e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 Author: Frederik Deweerdt Date: Fri Oct 6 18:58:24 2006 +0000 [PATCH] ixp4xxdefconfig arm fixes With the following patch, the ixp4xxdefconfig builds correctly. I'll test some more configs if I get some time. Signed-off-by: Frederik Deweerdt Signed-off-by: Linus Torvalds commit b7696ee3c050a76a6cebccdbadfc93896b336e44 Author: Olaf Hering Date: Fri Oct 6 20:53:10 2006 +0200 [PATCH] fix mesh compile errors after irq changes drivers/scsi/mesh.c:469: error: too many arguments to function 'mesh_interrupt' drivers/scsi/mesh.c:507: error: too many arguments to function 'mesh_interrupt' Signed-off-by: Olaf Hering Signed-off-by: Linus Torvalds commit d87dbede030d17770aa6a6170e70ab6f8044e5ae Author: Jeff Garzik Date: Fri Oct 6 15:04:35 2006 -0400 drivers/isdn/act2000: kill irq2card_map Eliminate irq->card lookup table, by properly passing the card pointer via request_irq() like other drivers. Signed-off-by: Jeff Garzik commit 8f4aff6cb178b0a580ee206e7cca63e2d31f4a4e Author: Jeff Garzik Date: Fri Oct 6 15:03:04 2006 -0400 drivers/net/eepro: kill dead code The irq2dev_map has not been used for a long time. Signed-off-by: Jeff Garzik commit c7bec5aba52392aa8d675b8722735caf4a8b7265 Author: Jeff Garzik Date: Fri Oct 6 15:00:58 2006 -0400 Various drivers' irq handlers: kill dead code, needless casts - Eliminate casts to/from void* - Eliminate checks for conditions that never occur. These typically fall into two classes: 1) Checking for 'dev_id == NULL', then it is never called with NULL as an argument. 2) Checking for invalid irq number, when the only caller (the system) guarantees the irq handler is called with the proper 'irq' number argument. Signed-off-by: Jeff Garzik commit c31f28e778ab299a5035ea2bda64f245b8915d7c Author: Jeff Garzik Date: Fri Oct 6 14:56:04 2006 -0400 drivers/net: eliminate irq handler impossible checks, needless casts - Eliminate check for irq handler 'dev_id==NULL' where the condition never occurs. - Eliminate needless casts to/from void* Signed-off-by: Jeff Garzik commit 5a078351d2d0a7ae834087de3637eb42cfd209e3 Author: Jaroslav Kysela Date: Fri Oct 6 20:28:26 2006 +0200 [ALSA] version 1.0.13 Signed-off-by: Jaroslav Kysela commit 8a238c7b6a2ec1852419e8fb8b8b0457c55c47e6 Author: Amol Lad Date: Fri Oct 6 16:45:19 2006 +0200 [ALSA] sound/pci/au88x0/au88x0.c: ioremap balanced with iounmap Signed-off-by: Amol Lad Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit a9edfc60227a1dc5c741666ff252a6055b73b184 Author: Karsten Wiese Date: Fri Oct 6 16:08:27 2006 +0200 [ALSA] Handle file operations during snd_card disconnects using static file->f_op Alsa used to kmalloc one file->f_op per file per disconnecting snd_card. This led to oopses sometimes when file->f_op was freed before __fput() finished. Patch adds a virtual device for disconnect: VDD. VDD consists of: LIST_HEAD(shutdown_files) protected by DEFINE_SPINLOCK(shutdown_mutex) static struct file_operations snd_shutdown_f_ops and functions assigned to it Additions to struct snd_monitor_file to specify if instance is hidden by VDD or not. A VDD's instance is created in snd_card_disconnect() under the card->files_lock. cleaned up in snd_card_file_remove() under the card->files_lock. Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4130d59b1ac6e32c130bd59dbce5eb30fede0197 Author: Arnaud Patard Date: Wed Oct 4 18:21:05 2006 +0200 [ALSA] emu10k1: Fix outl() in snd_emu10k1_resume_regs() The emu10k1 driver saves the A_IOCFG and HCFG register on suspend and restores it on resumes. Unfortunately, this doesn't work as the arguments to outl() are reversed. Signed-off-by: Arnaud Patard Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 635bbb355ebb735647ca49fb649a6a7edea9b3ed Author: Karsten Wiese Date: Wed Oct 4 17:17:32 2006 +0200 [ALSA] Repair snd-usb-usx2y for usb 2.6.18 urb->start_frame rolls over beyond MAX_INT now. This is for stable kernel and stable alsa. Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 9b08c2aa54948361da0e2d26b47e3bcb8f8911e8 Author: Karsten Wiese Date: Wed Oct 4 17:16:46 2006 +0200 [ALSA] Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check() Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check() substream can be NULL...... in mainline, bug was introduced by: 2006-06-22 [ALSA] Add O_APPEND flag support to PCM Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 104326f8df9925317cca64b84249d3eac5de7c74 Author: Florin Malita Date: Fri Sep 29 12:55:25 2006 +0200 [ALSA] Dereference after free in snd_hwdep_release() snd_card_file_remove() may free hw->card so we can't dereference hw->card->module after that. Coverity ID 1420. Signed-off-by: Florin Malita Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 92b93d31718a3ccbbcf911d2f570bb345c496d66 Author: Eric Sesterhenn Date: Thu Sep 28 12:35:48 2006 +0200 [ALSA] Fix memory leak in sound/isa/es18xx.c Fixed a memory leak in the error patch. Signed-off-by: Eric Sesterhenn Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f3838ba9204cd8af83c4358379221af66d77714e Author: Dan Cyr Date: Tue Sep 26 15:32:35 2006 +0200 [ALSA] hda-intel - New pci id for Nvidia MCP61 Added the new PCI id to support Nvidia MCP61 in snd-hda-intel driver. Signed-off-by: Dan Cyr Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7a99795477ca758a4b29ef3595edde2e067af85a Author: Tobin Davis Date: Tue Sep 26 15:30:10 2006 +0200 [ALSA] Add new subdevice ids for hda-intel This patch adds a couple of device ids for Acer laptops. In both cases, the owners got the driver working by adding 'model=acer' to their modprobe.conf files. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2aedbda6f9a51f0a2130c150676a5c99c81fa7a2 Author: Luke Zhang Date: Tue Sep 26 15:28:41 2006 +0200 [ALSA] WM9712 fixes for ac97_patch.c This patch by Luke Zhang fixes a couple of issues with the WM9712 support in ac97_patch.c Changes:- o Fix Out3 ZC switch invert. o Extend capture volume control to 6 bits. o Change Mic 1 volume mask to 5 bits (31). o Add Mic 2 volume. Signed-off-by: Luke Zhang Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 476d1205d182e12a74f4197ccc9092ea6a80e15b Author: Sasha Khapyorsky Date: Tue Sep 26 15:27:38 2006 +0200 [ALSA] hda/patch_si3054: new codec vendor IDs There are additional IDs for Si3054 codec based HDA modems. Most of them were discovered on discuss@linmodems.org list - Thanks to MarvS and all linmodems.org folks. Signed-off-by: Sasha Khapyorsky Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 815a965b0e6d925646e1f6012175830ef21e0d21 Author: Jiri Kosina Date: Fri Oct 6 11:11:56 2006 +0200 [PATCH] make kernels with CONFIG_X86_GENERIC and !CONFIG_SMP compilable CONFIG_X86_GENERIC is not exclusively CONFIG_SMP, as mach-default/ could be compiled also for UP archs. The patch fixes compilation error in include/asm/mach-summit/mach_apic.h in case CONFIG_X86_GENERIC && !CONFIG_SMP Signed-off-by: Jiri Kosina Acked-by: Keith Mannthey Signed-off-by: Linus Torvalds commit 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 Author: Linus Torvalds Date: Fri Oct 6 10:53:39 2006 -0700 Initial blind fixup for arm for irq changes Untested, but this should fix up the bulk of the totally mechanical issues, and should make the actual detail fixing easier. Signed-off-by: Linus Torvalds commit 86d91bab4806191a8126502d80d729c2a4765ebe Author: Jeff Garzik Date: Fri Oct 6 13:32:44 2006 -0400 arch/i386/kernel/time: don't shadow 'irq' function arg Signed-off-by: Jeff Garzik commit 8c1addbc752660e95bbf2128d66b8e5bb38d5fc7 Author: Tony Luck Date: Fri Oct 6 10:09:41 2006 -0700 [IA64] Fix breakage from irq change A few missed spots in ia64-land from this gigantic commit: 7d12e780e003f93433d49ce78cfedf4b4c52adc5 Signed-off-by: Tony Luck commit 96e1a87392293cf895ea99ab70758453897c7bbf Author: Pekka Enberg Date: Fri Oct 6 00:44:06 2006 -0700 [PATCH] um: irq changes break build Fixup broken UML build due to 7d12e780e003f93433d49ce78cfedf4b4c52adc5 "IRQ: Maintain regs pointer globally rather than passing to IRQ handlers". Cc: David Howells Cc: Jeff Dike Cc: Paolo "Blaisorblade" Giarrusso Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6b0a9f87b82f25fa35206ec04b5160372eabab4 Author: NeilBrown Date: Fri Oct 6 00:44:05 2006 -0700 [PATCH] knfsd: tidy up up meaning of 'buffer size' in nfsd/sunrpc There is some confusion about the meaning of 'bufsz' for a sunrpc server. In some cases it is the largest message that can be sent or received. In other cases it is the largest 'payload' that can be included in a NFS message. In either case, it is not possible for both the request and the reply to be this large. One of the request or reply may only be one page long, which fits nicely with NFS. So we remove 'bufsz' and replace it with two numbers: 'max_payload' and 'max_mesg'. Max_payload is the size that the server requests. It is used by the server to check the max size allowed on a particular connection: depending on the protocol a lower limit might be used. max_mesg is the largest single message that can be sent or received. It is calculated as the max_payload, rounded up to a multiple of PAGE_SIZE, and with PAGE_SIZE added to overhead. Only one of the request and reply may be this size. The other must be at most one page. Cc: Greg Banks Cc: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5842730de179405d80649231faa0b3f254477434 Author: NeilBrown Date: Fri Oct 6 00:44:04 2006 -0700 [PATCH] md: fix bug where new drives added to an md array sometimes don't sync properly This fixes a bug introduced in 2.6.18. If a drive is added to a raid1 using older tools (mdadm-1.x or raidtools) then it will be included in the array without any resync happening. It has been submitted for 2.6.18.1. Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec5a19dd935eb3793e1f6ed491e8035b3d7b1df9 Author: Pierre Ossman Date: Fri Oct 6 00:44:03 2006 -0700 [PATCH] mmc: multi sector write transfers SD cards extend the protocol by allowing the host to query a card how many blocks were successfully stored on the medium. This allows us to safely write chunks of blocks at once. Signed-off-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45e02b5b52e43aa7a674f64ca3470b9ee51fc9fd Author: Maciej W. Rozycki Date: Fri Oct 6 00:44:02 2006 -0700 [PATCH] swarm: Actually initialize the IDE driver This is required for the SWARM GenBus IDE interface to be recognized. Signed-off-by: Maciej W. Rozycki Cc: Ralf Baechle Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3260259f0084e51ce21503b130473b78871e7077 Author: Henne Date: Fri Oct 6 00:44:01 2006 -0700 [PATCH] sched: fix a kerneldoc error on is_init() Fix a kerneldoc warning and reorderd the description for is_init(). Signed-off-by: Henrik Kretzschmar Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1662d32cea96a8711bd61094ff090979478f0fd4 Author: Jim Cromie Date: Fri Oct 6 00:43:59 2006 -0700 [PATCH] MAINTAINERS: take over scx200-* and pc8736* drivers Add MAINTAINERS entries for new scx200_hrt and pc8736x_gpio drivers, and take over maintenance of scx200_gpio, authored by Christer Weinigel (which I've hacked at), who no longer has the hardware. Also take over hwmon/pc87360, authored by Jean Delvare, who's dropped maintenance to dedicate more time to hwmon subsystem. Signed-off-by: Jim Cromie Cc: Jean Delvare Cc: Christer Weinigel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a666ecfbf512dbd63a60f65d2ad6733a9a1b12ee Author: Jan Blunck Date: Fri Oct 6 00:43:58 2006 -0700 [PATCH] Fix typo in "syntax error if percpu macros are incorrectly used" patch Trivial typo fix in the "syntax error if percpu macros are incorrectly used" patch. I misspelled "identifier" in all places. D'Oh! Thanks to Dirk Mueller to point this out. Signed-off-by: Jan Blunck Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc366708b3b022050f139347a44c65a102e4835d Author: Al Viro Date: Fri Oct 6 00:43:58 2006 -0700 [PATCH] m68k: dma_alloc_coherent() has gfp_t as the last argument annotate, fix the bogus argument of vmap() in it. Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e7c4ea83efa9d6269bcbf17611f83aeef71c096 Author: Roman Zippel Date: Fri Oct 6 00:43:57 2006 -0700 [PATCH] m68k: fix NBPG define The recent header cleanup removed PAGE_SIZE from the exported information as it depends on the configuration. BTW This has possibly other consequences, as the core dump code is using PAGE_SIZE directly, which may need fixing as well. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ef308946fa8390136130a886b0d9a57867a747a Author: Roman Zippel Date: Fri Oct 6 00:43:56 2006 -0700 [PATCH] m68k: small system.h cleanup avoid unnecessary xchg() use in set_mb() Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c04c28a656c1717fbe617efc40edabca3a85ca3 Author: Roman Zippel Date: Fri Oct 6 00:43:56 2006 -0700 [PATCH] m68k: fix typo in __generic_copy_to_user Jump to the correct exit label after exception Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6359fd783251238dbbf70b7c2fc745db25cf51f Author: Roman Zippel Date: Fri Oct 6 00:43:55 2006 -0700 [PATCH] m68k: cleanup string functions - cleanup asm of string functions - deinline strncat()/strncmp() - provide non-inlined strcpy() Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7236e978a3883406ca06ee79e0739743c7c92a85 Author: Roman Zippel Date: Fri Oct 6 00:43:54 2006 -0700 [PATCH] provide tickadj define Provide a tickadj compatibility define for archs still using it. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f7bbbe50b8a28f4dfaa4cea939ddb50198c4a99 Author: Benjamin Herrenschmidt Date: Fri Oct 6 00:43:53 2006 -0700 [PATCH] page fault retry with NOPAGE_REFAULT Add a way for a no_page() handler to request a retry of the faulting instruction. It goes back to userland on page faults and just tries again in get_user_pages(). I added a cond_resched() in the loop in that later case. The problem I have with signal and spufs is an actual bug affecting apps and I don't see other ways of fixing it. In addition, we are having issues with infiniband and 64k pages (related to the way the hypervisor deals with some HV cards) that will require us to muck around with the MMU from within the IB driver's no_page() (it's a pSeries specific driver) and return to the caller the same way using NOPAGE_REFAULT. And to add to this, the graphics folks have been following a new approach of memory management that involves transparently swapping objects between video ram and main meory. To do that, they need installing PTEs from a no_page() handler as well and that also requires returning with NOPAGE_REFAULT. (For the later, they are currently using io_remap_pfn_range to install one PTE from no_page() which is a bit racy, we need to add a check for the PTE having already been installed afer taking the lock, but that's ok, they are only at the proof-of-concept stage. I'll send a patch adding a "clean" function to do that, we can use that from spufs too and get rid of the sparsemem hacks we do to create struct page for SPEs. Basically, that provides a generic solution for being able to have no_page() map hardware devices, which is something that I think sound driver folks have been asking for some time too). All of these things depend on having the NOPAGE_REFAULT exit path from no_page() handlers. Signed-off-by: Benjamin Herrenchmidt Cc: Hugh Dickins Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ca4cb2418c04914e4661c059cf5b7b9262c645a Author: Pekka Enberg Date: Fri Oct 6 00:43:52 2006 -0700 [PATCH] slab: reduce numa text size Reduce the NUMA text size of mm/slab.o a little on x86 by using a local variable to store the result of numa_node_id(). text data bss dec hex filename 16858 2584 16 19458 4c02 mm/slab.o (before) 16804 2584 16 19404 4bcc mm/slab.o (after) [akpm@osdl.org: use better names] [pbadari@us.ibm.com: fix that] Cc: Christoph Lameter Signed-off-by: Pekka Enberg Signed-off-by: Badari Pulavarty Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da66b719d16f6ea3801b859c1ff35d5cd05c517d Author: David Brownell Date: Fri Oct 6 00:43:51 2006 -0700 [PATCH] ohci: don't play with IRQ regs This is a more correct fix for the way the ohci hcd was referencing pt_regs in the unlink paths. Signed-off-by: David Brownell Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit efbc52f945696702a97a78b12812093f61880c2c Author: Andrew Morton Date: Fri Oct 6 00:43:50 2006 -0700 [PATCH] irq_reqs: export __irq_regs Modules might want this. Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d69a892268c66c13fcb445a8274baa9d7befb7b5 Author: Andrew Morton Date: Fri Oct 6 00:43:49 2006 -0700 [PATCH] Fix WARN_ON / WARN_ON_ONCE regression Tim and Ananiev report that the recent WARN_ON_ONCE changes cause increased cache misses with the tbench workload. Apparently due to the access to the newly-added static variable. Rearrange the code so that we don't touch that variable unless the warning is going to trigger. Also rework the logic so that the static variable starts out at zero, so we can move it into bss. It would seem logical to mark the static variable as __read_mostly too. But it would be wrong, because that would put it back into the vmlinux image, and the kernel will never read from this variable in normal operation anyway. Unless the compiler or hardware go and do some prefetching on us? For some reason this patch shrinks softirq.o text by 40 bytes. Cc: Tim Chen Cc: Herbert Xu Cc: "Ananiev, Leonid I" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4899b8b16b302299cc91289f7b5bac295e9ab387 Author: Andrew Morton Date: Fri Oct 6 00:43:48 2006 -0700 [PATCH] kauditd_thread warning fix Squash this warning: kernel/audit.c: In function 'kauditd_thread': kernel/audit.c:367: warning: no return statement in function returning non-void We might as test kthread_should_stop(), although it's not very pointful at present. The code which starts this thread looks racy - the kernel could start multiple threads. Cc: Al Viro Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d195412c35fe777811bd58ad43fba3aacc67e15c Author: Andrew Morton Date: Fri Oct 6 00:43:48 2006 -0700 [PATCH] i386: irqs build fix Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc64bef5439c8e1fafea225054da4d8882c9d10c Author: Martin Schwidefsky Date: Fri Oct 6 16:38:48 2006 +0200 [S390] Use CONFIG_GENERIC_TIME and define TOD clock source. Fix too slow clock by using CONFIG_GENERIC_TIME and adding a clock source for the s390 time-of-day clock. As added benefit we get rid of the s390 specific definition of do_gettimeofday and do_settimeofday. Signed-off-by: Martin Schwidefsky commit 2033b0c330d50d3f1cccd207147a10ad7f4f47f8 Author: Heiko Carstens Date: Fri Oct 6 16:38:42 2006 +0200 [PATCH] sysrq: irq change build fix. drivers/char/sysrq.c: In function `sysrq_handle_crashdump': drivers/char/sysrq.c:98: warning: implicit declaration of function `get_irq_regs' Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 5a489b9846f688db7e69aa7ccb23c53459a9c20e Author: Heiko Carstens Date: Fri Oct 6 16:38:35 2006 +0200 [S390] irq change build fixes. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 7e8ae7bfe8354b1f1b98c5cd29db8965ca1e6391 Author: Cornelia Huck Date: Fri Oct 6 16:38:29 2006 +0200 [S390] cio: 0 is a valid chpid. In order to determine chpid validity, we need to check whether the corresponding path is specified in the pim. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 2d103d5a80846e96e1cb1ba5e635e8c37d30ada8 Author: Melissa Howland Date: Fri Oct 6 16:38:26 2006 +0200 [S390] monwriter buffer limit. Make max_bufs a global (per linux guest) limit. Signed-off-by: Melissa Howland Signed-off-by: Martin Schwidefsky commit d83682b3971d6707d6d668b3b62d416ab7dd1ab3 Author: Christian Borntraeger Date: Fri Oct 6 16:38:22 2006 +0200 [S390] ap bus poll thread priority. The ap bus is supposed to have a low priority. We must use 19 instead of -20, which is just the opposite. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit c1ce464d29e5bbf5819b2d7527b7d3030a6d65f1 Author: Geoff Levand Date: Thu Oct 5 11:35:16 2006 -0700 [POWERPC] Minor fix for bootargs property Avoid the use of an uninitialized stack variable when the powerpc device tree bootargs property is either missing or incorrectly defined. This also makes CONFIG_CMDLINE work properly under these conditions. This change adds a test for the existence of the bootargs property. early_init_dt_scan_chosen() tests for a zero length bootargs property in its CONFIG_CMDLINE processing, but the current implementation of of_get_flat_dt_prop() doesn't assign a value to the length when no property is found. Since an automatic variable is used, a stale value from the stack will be used in the test. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit 52aed7cd52ce8a1d576e26976c3950512e1af8b6 Author: Anton Blanchard Date: Fri Oct 6 02:54:07 2006 +1000 [POWERPC] Update MTFSF_L() comment David Woodhouse points out that the comment accompanying the MTFSF_L macro is misleading. We should make it clear that the L bit is ignored on older CPUS, not the entire instruction. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 3afbf5d6ef791be61d18329ae5302bbf1cd83723 Author: Brian King Date: Thu Oct 5 10:52:04 2006 -0500 [POWERPC] Update pSeries defconfig for SATA Since the ipr driver now supports SATA and depends on libata, enable libata to get built. Signed-off-by: Brian King Signed-off-by: Paul Mackerras commit 41550c5128150175197257b6ceab2cd50dea7b51 Author: Benjamin Herrenschmidt Date: Thu Oct 5 16:40:41 2006 +1000 [POWERPC] Don't get PCI IRQ from OF for devices with no IRQ This patch adds checking of the PCI_INTERRUPT_PIN register before using standard OF parsing to retreive PCI interrupts. The reason is that some PCI devices may have no PCI interrupt, though they may have interrupts attached via other means. In this case, we shall not use irq->pdev, but device-specific code can later retreive those interrupts instead. Without that patch, Maple and derivatives don't get the right interrupt for the second IDE channel as the linux IDE code fallsback to the PCI irq instead of trying to use the legacy ones for the on-board controller (which has no PCI_INTERRUPT_PIN). Having no PCI IRQ assign to it (as it doesn't request any) fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit c998de146061db17787c1a31a3db1989f1341fdf Author: Benjamin Herrenschmidt Date: Thu Oct 5 14:18:46 2006 +1000 [POWERPC] Fix zImage decompress location The zImage wrapper has a "hack" that force the decompression to happen above 20Mb for 64 bits kernels, to work around issues with some firmwares on the field. However, the new wrapper has a bug which makes that hack not work properly. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 9938c474f39e416091db9993954996266a3f2edf Author: Nathan Lynch Date: Wed Oct 4 22:28:00 2006 -0500 [POWERPC] linux,tce-size property is 32 bits The "linux,tce-size" property is only 32 bits (see prom_initialize_tce_table() in arch/powerpc/kernel/prom_init.c). Treating it as an unsigned long in iommu_table_setparms() leads to access beyond the end of the property's buffer, so we pass garbage to the memset() in that function. [boot]0020 XICS Init i8259 legacy interrupt controller initialized [boot]0021 XICS Done PID hash table entries: 4096 (order: 12, 32768 bytes) cpu 0x0: Vector: 300 (Data Access) at [c0000000fe783850] pc: c000000000035e90: .memset+0x60/0xfc lr: c000000000044fa4: .iommu_table_setparms+0xb0/0x158 sp: c0000000fe783ad0 msr: 9000000000009032 dar: c000000100000000 dsisr: 42010000 current = 0xc00000000450e810 paca = 0xc000000000411580 pid = 1, comm = swapper enter ? for help [link register ] c000000000044fa4 .iommu_table_setparms+0xb0/0x158 [c0000000fe783ad0] c000000000044f4c .iommu_table_setparms+0x58/0x158 (unreliable) [c0000000fe783b70] c00000000004529c .iommu_bus_setup_pSeries+0x1c4/0x254 [c0000000fe783c00] c00000000002b8ac .do_bus_setup+0x3c/0xe4 [c0000000fe783c80] c00000000002c924 .pcibios_fixup_bus+0x64/0xd8 [c0000000fe783d00] c0000000001a2d5c .pci_scan_child_bus+0x6c/0x10c [c0000000fe783da0] c00000000002be28 .scan_phb+0x17c/0x1b4 [c0000000fe783e40] c0000000003cfa00 .pcibios_init+0x58/0x19c [c0000000fe783ec0] c0000000000094b4 .init+0x1e8/0x3d8 [c0000000fe783f90] c000000000026e54 .kernel_thread+0x4c/0x68 Signed-off-by: Nathan Lynch Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 74c37e8c9f626ed000388bebdc781a8e35ee4ab7 Author: Timur Tabi Date: Wed Oct 4 11:03:44 2006 -0500 [POWERPC] Add DTS for MPC8349E-mITX board Add the DTS for the Freescale MPC 8349E-mITX reference board. Contact Vitesse for the driver for the VSC 7385. Signed-off-by: Timur Tabi Signed-off-by: Paul Mackerras commit 13a2eea1461f5d54cc5d58334fbde4bf4cc9cb23 Author: Nick Piggin Date: Wed Oct 4 17:25:44 2006 +0200 [POWERPC] Fix harmless typo Fix a typo. Noticed by the unlikely profiler. Signed-off-by: Nick Piggin Signed-off-by: Paul Mackerras commit 3211be5c6a61946c75318069611699c90b10e0f8 Author: Paul Mackerras Date: Fri Oct 6 21:09:40 2006 +1000 [PPC] Fix some irq breakage with ARCH=ppc Signed-off-by: Paul Mackerras commit 0f13804ae9d894c1fbd90bde38ae2aa0f01b0edd Author: Paul Mundt Date: Fri Oct 6 17:55:25 2006 +0900 sh: Convert IPR-IRQ to IRQ chip. One more initial conversion.. Signed-off-by: Paul Mundt commit 525ccc452c79db41874c5edac3f67618a0997d6f Author: Paul Mundt Date: Fri Oct 6 17:35:48 2006 +0900 sh: Convert INTC2 IRQ handler to irq_chip. More struct irq_chip conversions, this time the INTC2 handlers. Signed-off-by: Paul Mundt commit 580410005daecd8e9f0e1baa9ddadbb7f706e7e2 Author: Jamie Lenehan Date: Fri Oct 6 15:36:15 2006 +0900 sh: Fix pr_debug statements for sh4 Fix a problem uncovered by the recent change to always check the arguments to pr_debug. The sh7751 was using the wrong name for the PCI IO base address. Signed-off-by: Jamie Lenehan Signed-off-by: Paul Mundt commit 257440b00ba42a96522255029aa9406ffb7e2f62 Author: Paul Mundt Date: Fri Oct 6 15:33:00 2006 +0900 sh: Convert r7780rp IRQ handler to IRQ chip. Simple conversion of the R7780RP IRQ handler to struct irq_chip. Signed-off-by: Paul Mundt commit 35f3c5185b1e28e6591aa649db8bf4fa16f1a7f3 Author: Paul Mundt Date: Fri Oct 6 15:31:16 2006 +0900 sh: Updates for IRQ handler changes. Trivial fixes for build breakage introduced by IRQ handler changes. Signed-off-by: Paul Mundt commit a700f3594d63a85af196ac64984f7375d903afad Author: Paul Mundt Date: Wed Oct 4 13:27:32 2006 +0900 sh: Kill off timer_ops get_frequency(). We're not using this anywhere these days, kill it off. Signed-off-by: Paul Mundt commit 458821452642fd5dc2377b73cd1323fd4a9653e7 Author: Paul Mundt Date: Wed Oct 4 13:21:45 2006 +0900 sh: First step at generic timeofday support. At the moment we wrap GENERIC_TIME around our existing timer API. As boards start providing their own clocksources, they're able to select GENERIC_TIME accordingly and optimize out most of the timer API. Once the current timers have been reworked as proper clocksource drivers, the rest of the place holders for the timer API can go away and we can flip on GENERIC_TIME unconditionally. Signed-off-by: Paul Mundt commit 49f19ce401edfff937c448dd74c22497da361889 Author: Olof Johansson Date: Thu Oct 5 20:31:10 2006 -0500 [PATCH] powerpc: irq change build breaks Fix up some of the buildbreaks from the irq handler changes. Signed-off-by: Olof Johansson Signed-off-by: Linus Torvalds commit c1a26e7d40fb814716950122353a1a556844286b Author: Peter Osterlund Date: Thu Oct 5 21:17:50 2006 +0200 [PATCH] UDF: Fix mounting read-write The UDF filesystem can't be mounted in read-write mode any more, because of forgotten braces. Signed-off-by: Peter Osterlund [ Duh! ] Signed-off-by: Linus Torvalds commit 4b0ff1a94cba36a35734c84f377e49cacc77f293 Author: Randy Dunlap Date: Thu Oct 5 19:07:26 2006 +0200 [PATCH] x86-64: Fix compilation without CONFIG_KALLSYMS Include linux/kallsyms.h unconditionally for print_symbol(). Signed-off-by: Randy Dunlap Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d7a297baa6edea94167163bed808c6a8933bd5aa Author: Frederik Deweerdt Date: Thu Oct 5 20:49:18 2006 +0000 [PATCH] fix qla{2,4} build error commit 0181944fe647cae18d545ac1167df3d15d393701 adds a 'extended_error_logging' global variable to qla2xxx which is defined by qla4xxx too. Trying to build both drivers results in the following error: LD drivers/scsi/built-in.o drivers/scsi/qla4xxx/built-in.o: In function `qla4xxx_slave_configure': drivers/scsi/qla4xxx/ql4_os.c:1433: multiple definition of `extended_error_logging' drivers/scsi/qla2xxx/built-in.o:drivers/scsi/qla2xxx/qla_os.c:2166: first defined here make[2]: *** [drivers/scsi/built-in.o] Error 1 make[1]: *** [drivers/scsi] Error 2 make: *** [drivers] Error 2 The following patch simply adds a qla2_ (qla4_ respectively) prefix to the variable name. Signed-off-by: Frederik Deweerdt Signed-off-by: Linus Torvalds commit 88271e9e43e65537c6390af3718a60c45c787e8f Author: Ingo Molnar Date: Thu Oct 5 18:47:22 2006 +0200 [PATCH] i386: fix rwsem build bug on CONFIG_M386=y CONFIG_M386 turns on spinlock-based generic rwsems - which surprises the semaphore.S rwsem stubs. Tested both with and without CONFIG_M386. Reported-by: Klaus Knopper Triaged-by: Adrian Bunk Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen commit 7d0b0e8ddbdda58a852ccff010c0339a38552cc7 Author: Andi Kleen Date: Thu Oct 5 18:47:22 2006 +0200 [PATCH] x86-64: Annotate interrupt frame backlink in interrupt handlers Add correct CFI annotation to the backlink on top of the interrupt stack. Signed-off-by: Andi Kleen commit 0a5ace2ab08d45cd78d7ef0067cdcd5c812ac54f Author: Andi Kleen Date: Thu Oct 5 18:47:22 2006 +0200 [PATCH] x86-64: Fix FPU corruption This reverts an earlier patch that was found to cause FPU state corruption. I think the corruption happens because unlazy_fpu() can cause FPU exceptions and when it happens after the current switch some processing would affect the state in the wrong process. Thanks to Douglas Crosher and Tom Hughes for testing. Cc: jbeulich@novell.com Signed-off-by: Andi Kleen commit 51ec28e1b2cb267a09a0b8eac1ccf8d61b7268bf Author: Andi Kleen Date: Thu Oct 5 18:47:22 2006 +0200 [PATCH] x86: Terminate the kernel stacks for the unwinder Always make sure RIP/EIP is 0 in the registers stored on the top of the stack of a kernel thread. This makes sure the unwinder code won't try a fallback but knows the stack has ended. AK: this patch is a bit mysterious. in theory they should be terminated anyways, but it seems to fix at least one crash. Anyways double termination probably doesn't hurt. Signed-off-by: Andi Kleen commit f015c6c4d733f68cbc1c5d231bb158abaa5c9606 Author: Andi Kleen Date: Thu Oct 5 18:47:22 2006 +0200 [PATCH] i386: Fix PCI BIOS config space access Got broken by a earlier change. Also add a printk when no pci config method could be found. Cc: gregkh@suse.de Signed-off-by: Andi Kleen commit 70d666d6ae9724c0a08434c20f8830c90a635bd3 Author: Jon Mason Date: Thu Oct 5 18:47:21 2006 +0200 [PATCH] x86-64: Calgary IOMMU: print PCI bus numbers in hex Make the references to the bus number in hex instead of decimal, as that is the way that lspci prints out the bus numbers. Signed-off-by: Jon Mason Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen commit d8d2bedf6002bf40b07fc5989dd9dbe56609fe3e Author: Jon Mason Date: Thu Oct 5 18:47:21 2006 +0200 [PATCH] x86-64: Calgary IOMMU: Update Jon's contact info Also add copyright for work done after leaving IBM. Signed-off-by: Jon Mason Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen commit 76fd231717453e06347ad17b3fc1707c6918d172 Author: Jon Mason Date: Thu Oct 5 18:47:21 2006 +0200 [PATCH] x86-64: Calgary IOMMU: Fix off by one when calculating register space location The purpose of the code being modified is to determine the location of the calgary chip address space. This is done by a magical formula of FE0MB-8MB*OneBasedChassisNumber+1MB*(RioNodeId-ChassisBase) to find the offset where BIOS puts it. In this formula, OneBasedChassisNumber corresponds to the NUMA node, and rionodeid is always 2 or 3 depending on which chip in the system it is. The problem was that we had an off by one error that caused us to account some busses to the wrong chip and thus give them the wrong address space. Fixes RH bugzilla #203971. Signed-off-by: Jon Mason Signed-off-bu: Muli Ben-Yehuda Signed-off-by: Andi Kleen commit dedc9937e876cb5430bca6a1dccfcc2ff22f8b7c Author: Jon Mason Date: Thu Oct 5 18:47:21 2006 +0200 [PATCH] x86-64: Calgary IOMMU: deobfuscate calgary_init calgary_init's for loop does not correspond to the actual device being checked, which makes its upperbound check for array overflow useless. Changing this to a do-while loop is the correct way of doing this. There should be no possibility of spinning forever in this loop, as pci_get_device states that it will go through all iterations, then return NULL (thus breaking the loop). Signed-off-by: Jon Mason Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen commit 814eadcefe79a2977a11ba135c4763a402112746 Author: Andi Kleen Date: Thu Oct 5 18:47:21 2006 +0200 [PATCH] i386: Update defconfig Signed-off-by: Andi Kleen commit a7441a39a3c62addd6ce10497c101057f4d69184 Author: Andi Kleen Date: Thu Oct 5 18:47:21 2006 +0200 [PATCH] x86-64: Update defconfig Signed-off-by: Andi Kleen commit 7d12e780e003f93433d49ce78cfedf4b4c52adc5 Author: David Howells Date: Thu Oct 5 14:55:46 2006 +0100 IRQ: Maintain regs pointer globally rather than passing to IRQ handlers Maintain a per-CPU global "struct pt_regs *" variable which can be used instead of passing regs around manually through all ~1800 interrupt handlers in the Linux kernel. The regs pointer is used in few places, but it potentially costs both stack space and code to pass it around. On the FRV arch, removing the regs parameter from all the genirq function results in a 20% speed up of the IRQ exit path (ie: from leaving timer_interrupt() to leaving do_IRQ()). Where appropriate, an arch may override the generic storage facility and do something different with the variable. On FRV, for instance, the address is maintained in GR28 at all times inside the kernel as part of general exception handling. Having looked over the code, it appears that the parameter may be handed down through up to twenty or so layers of functions. Consider a USB character device attached to a USB hub, attached to a USB controller that posts its interrupts through a cascaded auxiliary interrupt controller. A character device driver may want to pass regs to the sysrq handler through the input layer which adds another few layers of parameter passing. I've build this code with allyesconfig for x86_64 and i386. I've runtested the main part of the code on FRV and i386, though I can't test most of the drivers. I've also done partial conversion for powerpc and MIPS - these at least compile with minimal configurations. This will affect all archs. Mostly the changes should be relatively easy. Take do_IRQ(), store the regs pointer at the beginning, saving the old one: struct pt_regs *old_regs = set_irq_regs(regs); And put the old one back at the end: set_irq_regs(old_regs); Don't pass regs through to generic_handle_irq() or __do_IRQ(). In timer_interrupt(), this sort of change will be necessary: - update_process_times(user_mode(regs)); - profile_tick(CPU_PROFILING, regs); + update_process_times(user_mode(get_irq_regs())); + profile_tick(CPU_PROFILING); I'd like to move update_process_times()'s use of get_irq_regs() into itself, except that i386, alone of the archs, uses something other than user_mode(). Some notes on the interrupt handling in the drivers: (*) input_dev() is now gone entirely. The regs pointer is no longer stored in the input_dev struct. (*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does something different depending on whether it's been supplied with a regs pointer or not. (*) Various IRQ handler function pointers have been moved to type irq_handler_t. Signed-Off-By: David Howells (cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit) commit da482792a6d1a3fbaaa25fae867b343fb4db3246 Author: David Howells Date: Thu Oct 5 13:06:34 2006 +0100 IRQ: Typedef the IRQ handler function type Typedef the IRQ handler function type. Signed-Off-By: David Howells (cherry picked from 1356d1e5fd256997e3d3dce0777ab787d0515c7a commit) commit 57a58a9435aef3e0342ba4b2c97e0ddfea6f2c7f Author: David Howells Date: Thu Oct 5 13:06:34 2006 +0100 IRQ: Typedef the IRQ flow handler function type Typedef the IRQ flow handler function type. Signed-Off-By: David Howells (cherry picked from 8e973fbdf5716b93a0a8c0365be33a31ca0fa351 commit) commit 2f614fe04f4463ff22234133319067d7361f54e5 Author: Jeff Garzik Date: Thu Oct 5 07:10:38 2006 -0400 [netdrvr] b44: handle excessive multicast groups If there are more than B44_MCAST_TABLE_SIZE groups in the dev->mc_list, it will only listen to the first B44_MCAST_TABLE_SIZE that it sees. This change makes the driver go into RXCONFIG_ALLMULTI mode if there are more than B44_MCAST_TABLE_SIZE groups being subscribed to, similar to other network drivers. Noticed by Bill Helfinstine Signed-off-by: Jeff Garzik commit 39984a9fad0c642182f426d7771332d46f222103 Author: Karsten Keil Date: Fri Sep 29 23:28:42 2006 -0700 [PATCH] bonding: fix deadlock on high loads in bond_alb_monitor() In bond_alb_monitor the bond->curr_slave_lock write lock is taken and then dev_set_promiscuity maybe called which can take some time, depending on the network HW. If a network IRQ for this card come in the softirq handler maybe try to deliver more packets which end up in a request to the read lock of bond->curr_slave_lock -> deadlock. This issue was found by a test lab during network stress tests, this patch disable the softirq handler for this case and solved the issue. Signed-off-by: Karsten Keil Acked-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 46767aeba58ca9357a2309765201bad38d8f5e9b Author: Alan Cox Date: Fri Sep 29 18:26:47 2006 +0100 [PATCH] libata: Don't believe bogus claims in the older PIO mode register Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 0a07bc645e818b88559d99f52ad45e35352e8228 Author: Peter Zijlstra Date: Tue Sep 19 14:55:22 2006 +0200 [PATCH] forcedeth: hardirq lockdep warning BUG: warning at kernel/lockdep.c:1816/trace_hardirqs_on() (Not tainted) Call Trace: show_trace dump_stack trace_hardirqs_on :forcedeth:nv_nic_irq_other handle_IRQ_event __do_IRQ do_IRQ ret_from_intr DWARF2 barf default_idle cpu_idle rest_init start_kernel _sinittext These 3 functions nv_nic_irq_tx(), nv_nic_irq_rx() and nv_nic_irq_other() are reachable from IRQ context and process context. Make use of the irq-save/restore spinlock variant. (Compile tested only, since I do not have the hardware) Signed-off-by: Peter Zijlstra Cc: Jeff Garzik Cc: Ingo Molnar Cc: Arjan van de Ven Cc: Dave Jones Cc: Andrew Morton Signed-off-by: Jeff Garzik commit 70fbf32703a9c4d3403663d1fc24fd8afc76d56f Author: Maxime Bizon Date: Tue Oct 3 10:27:10 2006 -0700 [PATCH] mv643xx_eth: Fix ethtool stats Some stats reported by ethtool -S on mv643xx_eth device are cleared between each call. This patch fixes it. Signed-off-by: Maxime Bizon Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit 751ae21c6cd1493e3d0a4935b08fb298b9d89773 Author: Santiago Leon Date: Tue Oct 3 12:24:45 2006 -0500 [PATCH] ibmveth: fix int rollover panic This patch fixes a nasty bug that has been sitting there since the very first versions of the driver, but is generating a panic because we changed the number of 2K buffers for 2.6.16. The consumer_index and producer_index are u32's that get incremented on every buffer emptied and replenished respectively. We use the {producer,consumer}_index mod'ed with the size of the pool to pick out an entry in the free_map. The problem happens when the u32 rolls over and the number of the buffers in the pool is not a perfect divisor of 2^32. i.e. if the number of 2K buffers is 0x300, before the consumer_index rolls over, our index to the free map = 0xffffffff mod 0x300 = 0xff. The next time a buffer is emptied, we want the index to the free map to be 0x100, but 0x0 mod 0x300 is 0x0. This patch assigns the mod'ed result back to the consumer and producer indexes so that they never roll over. The second chunk of the patch covers the unlikely case where the consumer_index has just been reset to 0x0 and the hypervisor is not able to accept that buffer. Signed-off-by: Santiago Leon Signed-off-by: Jeff Garzik commit 03a85d0907b2455c772b8fb179b0c07a66b00ddb Author: Santiago Leon Date: Tue Oct 3 12:24:39 2006 -0500 [PATCH] ibmveth: rename proc entry name This patch changes the name of the proc file for each ibmveth adapter from the network device name to the slot number in the virtual bus. The proc file is created when the device is probed, so a change in the name of the device will not be reflected in the name of the proc file giving problems when identifying and removing the adapter. The slot number is a property that does not change through the life of the adapter so we use that instead. Signed-off-by: Santiago Leon Signed-off-by: Jeff Garzik commit 4347ef15f76dca33ae8da769d6900a468253bda2 Author: Santiago Leon Date: Tue Oct 3 12:24:34 2006 -0500 [PATCH] ibmveth: kdump interrupt fix This patch fixes a race that panics the kernel when opening the device after a kdump. Without this patch there is a window where the hypervisor can send an interrupt before all the structures for the kdump ibmveth module are ready (because the hypervisor is not aware that the partition crashed and that the virtual driver is reloading). We close this window by disabling the interrupts before registering the adapter to the hypervisor. This patch depends on the "ibmveth: Harden driver initilisation" patch. Signed-off-by: Santiago Leon Signed-off-by: Jeff Garzik commit 6b4223748895ed5b200c8049231567ea399fc0c2 Author: Santiago Leon Date: Tue Oct 3 12:24:28 2006 -0500 [PATCH] ibmveth: Add netpoll function This patch adds the net poll controller function to ibmveth to support netconsole and netdump. Signed-off-by: Santiago Leon Signed-off-by: Jeff Garzik commit bbedefccc6b0da43cfaf785dac89c88bc59cb6ed Author: Michael Ellerman Date: Tue Oct 3 12:24:23 2006 -0500 [PATCH] ibmveth: Harden driver initilisation This patch has been floating around for a while now, Santi originally sent it in March: http://www.spinics.net/lists/netdev/msg00471.html After a kexec the ibmveth driver will fail when trying to register with the Hypervisor because the previous kernel has not unregistered. So if the registration fails, we unregister and then try again. We don't unconditionally unregister, because we don't want to disturb the regular code path for 99% of users. Signed-off-by: Michael Ellerman Acked-by: Anton Blanchard Signed-off-by: Santiago Leon Signed-off-by: Jeff Garzik commit 489b10c1f63fafcb89c330a0603694652068132a Author: Stephen Hemminger Date: Tue Oct 3 16:39:12 2006 -0700 [PATCH] sky2: incorrect length on receive packets The previous change to do fragmented receive (post 2.6.18) introduced a bug where packets are passed up with size set to the size of the receive buffer not the actual received data. IP silently trims this so it didn't show up right away. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 1a70d6529ad9f5978af846440f8a809784d6e813 Author: Steve French Date: Mon Oct 2 05:59:18 2006 +0000 [CIFS] Fix compiler warning with previous patch Signed-off-by: Steve French commit 947a50679570ef7a66e3e3107e95943a1cb14d08 Author: Steve French Date: Mon Oct 2 05:55:25 2006 +0000 [CIFS] Fix typo Signed-off-by: Steve French commit b815f1e559e7cbdf3e561cf0c7cffc4a4a57a013 Author: Steve French Date: Mon Oct 2 05:53:29 2006 +0000 [CIFS] Allow for 15 minute TZs (e.g. Nepal) and be more explicit about not setting time on close Signed-off-by: Guenter Kukkukk Signed-off-by: Steve French commit 203cf2fc13a5db1fb202c294948fa9cb43bf69fa Author: Steve French Date: Sun Oct 1 19:59:41 2006 +0000 [CIFS] Fix readdir of large directories for backlevel servers (were not setting all of resume key) Signed-off-by: Steve French commit 18f75ca0dc0d5b6a2ec15d89d517b3c67e0f1c87 Author: Steve French Date: Sun Oct 1 03:13:01 2006 +0000 [CIFS] Allow LANMAN21 support even in both POSIX non-POSIX path Signed-off-by: Guenter Kukkukk Signed-off-by: Steve French commit de7ed55dbb2f2c44be669d56c4adf28cbffb26ce Author: Steve French Date: Sat Sep 30 13:25:52 2006 +0000 [CIFS] Make use of newer QFSInfo dependent on capability bit instead of whether we negotiated legacy lanman dialect so we do not keep retrying for mount to WindowsME Signed-off-by: Steve French commit 9ac00b7d96045fa3ce573e0ad5cdc0350ad8e1d2 Author: Steve French Date: Sat Sep 30 04:13:17 2006 +0000 [CIFS] Do not send newer QFSInfo to legacy servers which can not support it Fix dialect negotiation to save off when we have negotiated lanman. This allows us to avoid sending some somewhat newer requests that the server can not handle and go directly to the older version (infolevel) of the same call. Make sure we try to negotiate a level which allows us to get the server OS (which we check so we can detect Win9x vs. other legacy servers and eventually work around the Win9x DOS time bug (they reverse date/time fields). Signed-off-by: Steve French commit f46d3e11903e452924ef2996aa9aca2aae4427e2 Author: Steve French Date: Sat Sep 30 01:08:55 2006 +0000 [CIFS] Fix typo in name of new cifs_show_stats Signed-off-by: Steve French commit 175ec9e11cf18f8373b32f7a33e75a4cf7ce25e3 Author: Steve French Date: Sat Sep 30 01:07:38 2006 +0000 [CIFS] Rename server time zone field Server time zone is not really a time zone, rather a time adjustement in seconds. CC: Guenter Kukkukk Signed-off-by: Steve French commit 25ee4a98c662317a7973f3053567d4ec51857511 Author: Steve French Date: Sat Sep 30 00:54:23 2006 +0000 [CIFS] Handle legacy servers which return undefined time zone Signed-off-by: Guenter Kukkukk Signed-off-by: Steve French commit bf97d28711e2dc4dc947faa6477cd1b36b91a2da Author: Steve French Date: Thu Sep 28 21:34:06 2006 +0000 [CIFS] CIFS support for /proc//mountstats part 1 Signed-off-by: Steve French commit a3ab41f10e2f5087e515da358680c88dd61d4832 Author: Steve French Date: Thu Sep 28 20:52:08 2006 +0000 [CIFS] Fix build break ifdef in wrong place Signed-off-by: Steve French commit e10847ed499cb86bf8ce12f3a686be8a98f8e140 Author: Steve French Date: Thu Sep 28 20:49:01 2006 +0000 [CIFS] More removing of unused functions Signed-off-by: Steve French commit 2eaf55862e8eb03999169d84f21eadffc88a36ce Author: Steve French Date: Thu Sep 28 20:41:48 2006 +0000 [CIFS] Remove unused prototypes Signed-off-by: Steve French commit e33c74d06e2b46a5f187ec7f60248da774c84e72 Author: Steve French Date: Thu Sep 28 20:35:48 2006 +0000 [CIFS] Fix build break Signed-off-by: Steve French commit 2cd646a2d1d5e0e46aa4bb55b1847b0cb35bd855 Author: Steve French Date: Thu Sep 28 19:43:08 2006 +0000 [CIFS] Remove static and unused symbols Most cases of the ones found by Shaggy by "make namespacecheck" could be removed or made static Ack: Dave Kleikamp Signed-off-by: Steve French commit 1bd5bbcb6531776a8f73e2cc6287fc4dd542e1c7 Author: Steve French Date: Thu Sep 28 03:35:57 2006 +0000 [CIFS] Legacy time handling for Win9x and OS/2 part 1 Signed-off-by: Steve French commit 0889a9441d98af7951c5377647413d79c84c9efa Author: Steve French Date: Sat Sep 23 22:11:07 2006 +0000 CIFS: Use SEEK_END instead of hardcoded value Signed-off-by: Josef 'Jeff' Sipek Signed-off-by: Steve French