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 B