commit c03296a868ae7c91aa2d8b372184763b18f16d7a tree 57ff0b44a412b78fe598a49cc28b3cebf51f1154 parent e3f749c4af69c4344d89f11e2293e3790eb4eaca parent 913e4a75572354995b330f57082d9a86250cd75f author Linus Torvalds Mon, 06 Feb 2006 15:46:39 -0800 committer Linus Torvalds Mon, 06 Feb 2006 15:46:39 -0800 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 913e4a75572354995b330f57082d9a86250cd75f tree d7652ef6b9bc0cf3e579deaf9483e5f61f03c20b parent 27ee6e0592c7d624836835dd8d2f0f74e9d289f6 author Russ Anderson Fri, 03 Feb 2006 14:47:15 -0600 committer Tony Luck Mon, 06 Feb 2006 09:28:10 -0800 [IA64-SGI] Shub2 BTE address fix After converting the cpu physical address to shub2 physical addressing, the address was run through TO_PHYS() which clobbered a high node offset bit causing the BTE to fail on shub2 nodes with large memory. This fix corrects that problem. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit 27ee6e0592c7d624836835dd8d2f0f74e9d289f6 tree 55370cbbcade1e674d60175e143f1e3441ceebaf parent 7c6c66362941df847957766ad133ff5fde67579c parent 103ec0910d6b9401b7f72ba3ac71fed88306d2d0 author Tony Luck Mon, 06 Feb 2006 09:23:51 -0800 committer Tony Luck Mon, 06 Feb 2006 09:23:51 -0800 Pull sn-recursive-flags-for-select-builds into release branch commit e3f749c4af69c4344d89f11e2293e3790eb4eaca tree b418be396db3ec7486767b93239da208662017bb parent 410c05427a69f53851637ccb85c2212131409fbd author Herbert Xu Sun, 05 Feb 2006 20:23:33 -0800 committer David S. Miller Sun, 05 Feb 2006 20:23:33 -0800 [PPP]: Fixed hardware RX checksum handling When we pull the PPP protocol off the skb, we forgot to update the hardware RX checksum. This may lead to messages such as dsl0: hw csum failure. Similarly, we need to clear the hardware checksum flag when we use the existing packet to store the decompressed result. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 410c05427a69f53851637ccb85c2212131409fbd tree baaa6598d79f94decad1d29857b5fcbfaea20d97 parent 7a21ef6fe902ac0ad53b45af6851ae5ec3a64299 author Greg KH Sun, 05 Feb 2006 14:16:08 -0800 committer Linus Torvalds Sun, 05 Feb 2006 14:20:14 -0800 [PATCH] USB: Fix GPL markings on usb core functions. I thought we had fixed up all non-gpl USB drivers, and was wrong to do this. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 7a21ef6fe902ac0ad53b45af6851ae5ec3a64299 tree 1e8c690f6fb644c8ce8873c7907ef0ed934446df parent c265c46bbb8c53db0bd084261ab2996c6d74aebf author Linus Torvalds Sun, 05 Feb 2006 11:26:38 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:26:38 -0800 mm/slab.c (non-NUMA): Fix compile warning and clean up code The non-NUMA case would do an unmatched "free_alien_cache()" on an alien pointer that had never been allocated. It might not matter from a code generation standpoint (since in the non-NUMA case, the code doesn't actually _do_ anything), but it not only results in a compiler warning, it's really really ugly too. Fix the compiler warning by just having a matching dummy allocation. That also avoids an unnecessary #ifdef in the code. Signed-off-by: Linus Torvalds commit c265c46bbb8c53db0bd084261ab2996c6d74aebf tree 7eb8a877df7e2e89f6d907037becb55de740f21a parent 98bd0c07b60e029cf53eb76c027c27548dd66e9b parent 7f7ff6bf0279ccb3d56f2b07c4cc88327c932a80 author Linus Torvalds Sun, 05 Feb 2006 11:10:54 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:10:54 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 98bd0c07b60e029cf53eb76c027c27548dd66e9b tree 8542c44cc8d1f05a533fb82e04173549196f112d parent 5e375bc7d586e0df971734a5a5f1f080ffd89b68 parent 7918d212df31fb7ddfb317c5a8dccdcec647d754 author Linus Torvalds Sun, 05 Feb 2006 11:10:29 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:10:29 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 5e375bc7d586e0df971734a5a5f1f080ffd89b68 tree 274d5ac5c9bf0e157c67461bd0e609c495e7b2e4 parent 4be68a783d25b4dab0ef4077a4c6b13161a2d6e4 author Robb, Sam Sat, 04 Feb 2006 23:28:06 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:54 -0800 [PATCH] kconfig: detect if -lintl is needed when linking conf,mconf On a system where libintl.h is present, but the NLS functionality is supplied by a separate library instead of the system C library, an attempt to "make config" or "make menuconfig" will fail with link errors, ex: scripts/kconfig/mconf.o:mconf.c:(.text+0xf63): undefined reference to `_libintl_gettext' This patch attempts to correct the problem by detecting whether or not NLS support requires linking with libintl. Signed-off-by: Samuel J Robb Cc: Roman Zippel Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4be68a783d25b4dab0ef4077a4c6b13161a2d6e4 tree af7be4624c765688ce95d65a900c0fde87416958 parent 911b0ad25d167fede6aadc05065b414ec7ab5086 author Adrian Bunk Sat, 04 Feb 2006 23:28:05 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:54 -0800 [PATCH] i386: HIGHMEM64G must depend on X86_CMPXCHG64 Due to the usage of set_64bit in include/asm-i386/pgtable-3level.h, HIGHMEM64G must depend on X86_CMPXCHG64. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 911b0ad25d167fede6aadc05065b414ec7ab5086 tree 8e85fd8a70a75aa8b2d18b89b2ebd8fc843c361c parent b53e8f68e07fb8f3ba9ab1812c9c186c09a50c16 author Takashi Iwai Sat, 04 Feb 2006 23:28:05 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:54 -0800 [PATCH] Fix "value computed is not used" compile warnings with gcc-4.1 Fix gcc4.1 compile warnings "value computed is not used" with set_current_state() and set_task_state() on i386/SMP and x86-64. Signed-off-by: Takashi Iwai Cc: Nick Piggin Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b53e8f68e07fb8f3ba9ab1812c9c186c09a50c16 tree 5227b7093fd0a0e319c086ccf93917331e076148 parent fe38d8553ccb5237bf0eddda9e94fbca7288551c author Chuck Ebbert <76306.1226@compuserve.com> Sat, 04 Feb 2006 23:28:04 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:53 -0800 [PATCH] i386: print kernel version in register dumps Show first field of kernel version in register dumps like x86_64 does. Changes output from e.g.: (2.6.16-rc1) to: (2.6.16-rc1 #12) Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe38d8553ccb5237bf0eddda9e94fbca7288551c tree 4ebdcf473fcf7e429536e86346c258514671f044 parent 170aa3d02614ae621d54af10555e2f48977ae8de author Chuck Ebbert <76306.1226@compuserve.com> Sat, 04 Feb 2006 23:28:03 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:53 -0800 [PATCH] i386 cpu hotplug: don't access freed memory i386 CPU init code accesses freed init memory when booting a newly-started processor after CPU hotplug. The cpu_devs array is searched to find the vendor and it contains pointers to freed data. Fix that by: 1. Zeroing entries for freed vendor data after bootup. 2. Changing Transmeta, NSC and UMC to all __init[data]. 3. Printing a warning (once only) and setting this_cpu to a safe default when the vendor is not found. This does not change behavior for AMD systems. They were broken already but no error was reported. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 170aa3d02614ae621d54af10555e2f48977ae8de tree c1a93a5c95ccc2225639a7c878f6c16b7c317924 parent f55eab822b93864ef4eef3bd7eadac2a727c914b author Ulrich Drepper Sat, 04 Feb 2006 23:28:02 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:53 -0800 [PATCH] namei.c: unlock missing in error case Signed-off-by: Ulrich Drepper Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f55eab822b93864ef4eef3bd7eadac2a727c914b tree ab5103610ecc7699a7307c157c517f2ad790e3a7 parent 4484ebf12bdb0ebcdc6e8951243cbab3d7f6f4c1 author Trond Myklebust Sat, 04 Feb 2006 23:28:01 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:53 -0800 [PATCH] VFS: Ensure LOOKUP_CONTINUE flag is preserved by link_path_walk() When walking a path, the LOOKUP_CONTINUE flag is used by some filesystems (for instance NFS) in order to determine whether or not it is looking up the last component of the path. It this is the case, it may have to look at the intent information in order to perform various tasks such as atomic open. A problem currently occurs when link_path_walk() hits a symlink. In this case LOOKUP_CONTINUE may be cleared prematurely when we hit the end of the path passed by __vfs_follow_link() (i.e. the end of the symlink path) rather than when we hit the end of the path passed by the user. The solution is to have link_path_walk() clear LOOKUP_CONTINUE if and only if that flag was unset when we entered the function. Signed-off-by: Trond Myklebust Cc: Al Viro Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4484ebf12bdb0ebcdc6e8951243cbab3d7f6f4c1 tree 9feabea0bac1e6401742bc95bf381e36d2651fbc parent ca3b9b91735316f0ec7f01976f85842e0bfe5c6e author Ravikiran G Thirumalai Sat, 04 Feb 2006 23:27:59 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:53 -0800 [PATCH] NUMA slab locking fixes: fix cpu down and up locking This fixes locking and bugs in cpu_down and cpu_up paths of the NUMA slab allocator. Sonny Rao reported problems sometime back on POWER5 boxes, when the last cpu on the nodes were being offlined. We could not reproduce the same on x86_64 because the cpumask (node_to_cpumask) was not being updated on cpu down. Since that issue is now fixed, we can reproduce Sonny's problems on x86_64 NUMA, and here is the fix. The problem earlier was on CPU_DOWN, if it was the last cpu on the node to go down, the array_caches (shared, alien) and the kmem_list3 of the node were being freed (kfree) with the kmem_list3 lock held. If the l3 or the array_caches were to come from the same cache being cleared, we hit on badness. This patch cleans up the locking in cpu_up and cpu_down path. We cannot really free l3 on cpu down because, there is no node offlining yet and even though a cpu is not yet up, node local memory can be allocated for it. So l3s are usually allocated at keme_cache_create and destroyed at kmem_cache_destroy. Hence, we don't need cachep->spinlock protection to get to the cachep->nodelist[nodeid] either. Patch survived onlining and offlining on a 4 core 2 node Tyan box with a 4 dbench process running all the time. Signed-off-by: Alok N Kataria Signed-off-by: Ravikiran Thirumalai Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca3b9b91735316f0ec7f01976f85842e0bfe5c6e tree fc58744ab0371adb5942462ceab3fa70d0ef9375 parent 2e1217cf96b54d3b2d0162930608159e73507fbf author Ravikiran G Thirumalai Sat, 04 Feb 2006 23:27:58 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:53 -0800 [PATCH] NUMA slab locking fixes: irq disabling from cahep->spinlock to l3 lock Earlier, we had to disable on chip interrupts while taking the cachep->spinlock because, at cache_grow, on every addition of a slab to a slab cache, we incremented colour_next which was protected by the cachep->spinlock, and cache_grow could occur at interrupt context. Since, now we protect the per-node colour_next with the node's list_lock, we do not need to disable on chip interrupts while taking the per-cache spinlock, but we just need to disable interrupts when taking the per-node kmem_list3 list_lock. Signed-off-by: Alok N Kataria Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e1217cf96b54d3b2d0162930608159e73507fbf tree ac4eba17cc9cec38e003a4bbabb5dae63934f4ac parent 64b4a954b03a1153fb8ae38d6ffbd991e01a1e80 author Ravikiran G Thirumalai Sat, 04 Feb 2006 23:27:56 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:53 -0800 [PATCH] NUMA slab locking fixes: move color_next to l3 colour_next is used as an index to add a colouring offset to a new slab in the cache (colour_off * colour_next). Now with the NUMA aware slab allocator, it makes sense to colour slabs added on the same node sequentially with colour_next. This patch moves the colouring index "colour_next" per-node by placing it on kmem_list3 rather than kmem_cache. This also helps simplify locking for CPU up and down paths. Signed-off-by: Alok N Kataria Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64b4a954b03a1153fb8ae38d6ffbd991e01a1e80 tree 0436a6f23e46d9fcb6caf5b1216fe212be3fbc3f parent fe1dcbc4f311c2e6c23b33c0fa8572461618ab3e author Christoph Lameter Sat, 04 Feb 2006 23:27:55 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:53 -0800 [PATCH] hugetlb: add comment explaining reasons for Bus Errors I just spent some time researching a Bus Error. Turns out that the huge page fault handler can return VM_FAULT_SIGBUS for various conditions where no huge page is available. Add a note explaining the reasoning in the source. Signed-off-by: Christoph Lameter Acked-by: William Lee Irwin III Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe1dcbc4f311c2e6c23b33c0fa8572461618ab3e tree 189e935ff275bba20629e46e2832bd523acf6cff parent bc5e483da61eb5ab8d24b4a919fb512e5886d02c author Andrew Morton Sat, 04 Feb 2006 23:27:54 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:53 -0800 [PATCH] jbd: fix transaction batching Ben points out that: When writing files out using O_SYNC, jbd's 1 jiffy delay results in a significant drop in throughput as the disk sits idle. The patch below results in a 4-5x performance improvement (from 6.5MB/s to ~24-30MB/s on my IDE test box) when writing out files using O_SYNC. So optimise the batching code by omitting it entirely if the process which is doing a sync write is the same as the one which did the most recent sync write. If that's true, we're unlikely to get any other processes joining the transaction. (Has been in -mm for ages - it took me a long time to get on to performance testing it) Numbers, on write-cache-disabled IDE: /usr/bin/time -p synctest -n 10 -uf -t 1 -p 1 dir-name Unpatched: 40 seconds Patched: 35 seconds Batching disabled: 35 seconds This is the problematic single-process-doing-fsync case. With multiple fsyncing processes the numbers are AFACIT unaltered by the patch. Aside: performance testing and instrumentation shows that the transaction batching almost doesn't help (testing with synctest -n 1 -uf -t 100 -p 10 dir-name on non-writeback-caching IDE). This is because by the time one process is running a synchronous commit, a bunch of other processes already have a transaction handle open, so they're all going to batch into the same transaction anyway. The batching seems to offer maybe 5-10% speedup with this workload, but I'm pretty sure it was more important than that when it was first developed 4-odd years ago... Cc: "Stephen C. Tweedie" Cc: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc5e483da61eb5ab8d24b4a919fb512e5886d02c tree 06ab71794171e9839f3e50674a115d017b35b8ab parent 165a2c1d514892ae917cdf80be9e5269015c1034 author Andrew Morton Sat, 04 Feb 2006 23:27:51 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:52 -0800 [PATCH] reiserfs_get_acl() build fix With CONFIG_REISERFS_FS_XATTR=y, CONFIG_REISERFS_FS_POSIX_ACL=n: fs/reiserfs/xattr.c: In function `reiserfs_check_acl': fs/reiserfs/xattr.c:1330: called object is not a function Cc: Chris Mason Cc: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 165a2c1d514892ae917cdf80be9e5269015c1034 tree c092522208b8a8dad09fd9ad4cd116edb6ce6cbe parent c2b507fda390b8ae90deba9b8cdc3fe727482193 author Hugh Dickins Sat, 04 Feb 2006 23:27:51 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:52 -0800 [PATCH] x86: fix stack trace facility level dump_stack() on page allocation failure presently has an irritating habit of shouting just "====" at everyone: please stop it. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c2b507fda390b8ae90deba9b8cdc3fe727482193 tree 6c839e9682fd1610dc6a9fb7cca9df2899ff05ca parent 5c0d5d262aa4c5e93f9f5de298cf25d6d8b558c4 author Stephen Smalley Sat, 04 Feb 2006 23:27:50 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:52 -0800 [PATCH] selinux: require SECURITY_NETWORK Make SELinux depend on SECURITY_NETWORK (which depends on SECURITY), as it requires the socket hooks for proper operation even in the local case. Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c0d5d262aa4c5e93f9f5de298cf25d6d8b558c4 tree 9ec671c1b012effe22726a6a5d5a4e20d2dcfc33 parent 5c55ac9bbca22ee134408f83de5f2bda3b1b2a53 author Dave Jones Sat, 04 Feb 2006 23:27:49 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:52 -0800 [PATCH] missing license tag in intermodule It may suck something awful, but it shouldn't taint the kernel. Signed-off-by: Dave Jones Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c55ac9bbca22ee134408f83de5f2bda3b1b2a53 tree 31b0cdd704204a9c02c6c7e9cc3e6035526d76f5 parent e1bc89bc9991e994f2b3c60d9ad2fdb5ad9b10fc author Phillip Susi Sat, 04 Feb 2006 23:27:48 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:52 -0800 [PATCH] pktcdvd: Allow larger packets The pktcdvd driver uses a compile time macro constant to define the maximum supported packet length. I changed this from 32 sectors to 128 sectors because that allows over 100 MB of additional usable space on a 700 MB cdrw, and increases throughput. Note that you need a modified cdrwtool program that can format a CDRW disc with larger packets to benefit from this change. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1bc89bc9991e994f2b3c60d9ad2fdb5ad9b10fc tree 22816d5b1979961ec60507e8b6783a02c7fdb283 parent b566ccefd7814e4fa403de81aea299bdc11ceed5 author Peter Osterlund Sat, 04 Feb 2006 23:27:47 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:52 -0800 [PATCH] pktcdvd: Don't waste kernel memory Allocate memory for read-gathering at open time, when it is known just how much memory is needed. This avoids wasting kernel memory when the real packet size is smaller than the maximum packet size supported by the driver. This is always the case when using DVD discs. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b566ccefd7814e4fa403de81aea299bdc11ceed5 tree 1e18f19a677562fa28a2dadb3a0d0f644db7c8f0 parent 11edefd8c828961686a2ea0093da0e19b3f5a3bf author Adrian Bunk Sat, 04 Feb 2006 23:27:45 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:52 -0800 [PATCH] Let CDROM_PKTCDVD_WCACHE depend on EXPERIMENTAL Unless the help text is outdated, this seems to be logical. Signed-off-by: Adrian Bunk Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11edefd8c828961686a2ea0093da0e19b3f5a3bf tree 0d9222240cf29b5da012a8b53373d27a3d4015a8 parent a460ad62260def15c42130de253d6cfc32528a2f author Peter Osterlund Sat, 04 Feb 2006 23:27:45 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:52 -0800 [PATCH] pktcdvd: remove version string The version information is not useful for a driver that is maintained in Linus' kernel tree. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a460ad62260def15c42130de253d6cfc32528a2f tree 6fd5b90db456ae6a333a224b8c1c975474bb3c27 parent bd576c9523fbf23e94fb7dbe05d2ae1cf96864e4 author Phillip Susi Sat, 04 Feb 2006 23:27:44 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:52 -0800 [PATCH] pktcdvd: Fix overflow for discs with large packets The pktcdvd driver was using an 8 bit field to store the packet length obtained from the disc track info. This causes it to overflow packet length values of 128KB or more. I changed the field to 32 bits to fix this. The pktcdvd driver defaulted to its maximum allowed packet length when it detected a 0 in the track info field. I changed this to fail the operation and refuse to access the media. This seems more sane than attempting to access it with a value that almost certainly will not work. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd576c9523fbf23e94fb7dbe05d2ae1cf96864e4 tree 0433ff1a1d417c29f94f05cb6ed83fca32eb7a62 parent 62cfe7efc4e6ba44b0903c53f09d37de59160afa author Chuck Ebbert <76306.1226@compuserve.com> Sat, 04 Feb 2006 23:27:42 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:51 -0800 [PATCH] sched: only print migration_cost once per boot migration_cost prints after every CPU hotplug event. Make it print only once at boot. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62cfe7efc4e6ba44b0903c53f09d37de59160afa tree 20cd9287e5acf9d057d1b0784df8514bdec3da90 parent 7128ec2a747d7a5f3c764c37bef17081ccc2374c author Stephen Smalley Sat, 04 Feb 2006 23:27:42 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:51 -0800 [PATCH] MAINTAINERS/CREDITS: Update SELinux contact info Update my contact info. Please apply. Signed-off-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7128ec2a747d7a5f3c764c37bef17081ccc2374c tree 10781a63d46811789e1cd26964f1d0a9eb963ce2 parent e22bec266cd6f540da2a61db216914c3473135cc author Miklos Szeredi Sat, 04 Feb 2006 23:27:40 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:51 -0800 [PATCH] fuse: fix request_end() vs fuse_reset_request() race The last fix for this function in fact opened up a much more often triggering race. It was uncommented tricky code, that was buggy. Add comment, make it less tricky and fix bug. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e22bec266cd6f540da2a61db216914c3473135cc tree 9b84d8ecefa37a63929b34af78ca1b344eaeab49 parent 238e7db9357bfe1ce3d6f7ac1e60e595e9d46b7b author Markus Lidel Sat, 04 Feb 2006 23:27:39 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:51 -0800 [PATCH] Fix i2o_scsi oops on abort Fix http://bugzilla.kernel.org/show_bug.cgi?id=5923 When a scsi command failed, an oops would result. Back-to-back SMART queries would make the Seagate drives unhappy. The second SMART query would timeout, and the command would be aborted. Acked-by: Markus Lidel Cc: Kenny Simpson Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 238e7db9357bfe1ce3d6f7ac1e60e595e9d46b7b tree 3688c8145e4bfa61a387137dafc966470569d2b8 parent 9a7a67af8bb02106f0fb01dd9d237332f874be9a author Tejun Heo Sat, 04 Feb 2006 23:27:38 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:51 -0800 [PATCH] block: request_queue->ordcolor must not be flipped on SOFTBARRIER q->ordcolor must not be flipped on SOFTBARRIER. Signed-off-by: Tejun Heo Acked-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a7a67af8bb02106f0fb01dd9d237332f874be9a tree 6ad56122d38d118e6d53caa94a60037291294a25 parent 88a2a4ac6b671a4b0dd5d2d762418904c05f4104 author Jens Axboe Sat, 04 Feb 2006 23:27:38 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:51 -0800 [PATCH] fix ordering on requeued request drainage Previously, if a fs request which was being drained failed and got requeued, blk_do_ordered() didn't allow it to be reissued, which causes queue stall. This patch makes blk_do_ordered() use the sequence of each request to determine whether a request can be issued or not. This fixes the bug and simplifies code. Signed-off-by: Tejun Heo Acked-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88a2a4ac6b671a4b0dd5d2d762418904c05f4104 tree 8c30052a0d7fadec37c785a42a71b28d0a9c5fcf parent cef5076987dd545ac74f4efcf1c962be8eac34b0 author Eric Dumazet Sat, 04 Feb 2006 23:27:36 -0800 committer Linus Torvalds Sun, 05 Feb 2006 11:06:51 -0800 [PATCH] percpu data: only iterate over possible CPUs percpu_data blindly allocates bootmem memory to store NR_CPUS instances of cpudata, instead of allocating memory only for possible cpus. As a preparation for changing that, we need to convert various 0 -> NR_CPUS loops to use for_each_cpu(). (The above only applies to users of asm-generic/percpu.h. powerpc has gone it alone and is presently only allocating memory for present CPUs, so it's currently corrupting memory). Signed-off-by: Eric Dumazet Cc: "David S. Miller" Cc: James Bottomley Acked-by: Ingo Molnar Cc: Jens Axboe Cc: Anton Blanchard Acked-by: William Irwin Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cef5076987dd545ac74f4efcf1c962be8eac34b0 tree d404e17d44665c39006d6a5f25cd6b02819a4772 parent 5b7b644ca9a12396a46fad825a973fb8bed17102 author Linus Torvalds Sun, 05 Feb 2006 10:51:57 -0800 committer Linus Torvalds Sun, 05 Feb 2006 10:51:57 -0800 Revert "[PATCH] x86_64: Fix the node cpumask of a cpu going down" This reverts commit 10f4dc8b27ac42f930ac55adb8c521264dc997f8. Quoth Andi Kleen: "Kiran decided that it makes the problem worse than it was before. Fixing it fully requires more work which is too much for 2.6.16. So please revert that commit for now." Signed-off-by: Linus Torvalds commit 7f7ff6bf0279ccb3d56f2b07c4cc88327c932a80 tree a32593c2b0f8c0429b6f61c965a65634d7936a38 parent 3794689dba4288f2ab6ec74657a07c41031ac376 author David S. Miller Sat, 04 Feb 2006 02:49:23 -0800 committer David S. Miller Sun, 05 Feb 2006 00:15:12 -0800 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 3794689dba4288f2ab6ec74657a07c41031ac376 tree f9db8435cf4012b2cee8fb80118dee5c908bd9af parent 5b7b644ca9a12396a46fad825a973fb8bed17102 author David S. Miller Sat, 04 Feb 2006 02:49:03 -0800 committer David S. Miller Sun, 05 Feb 2006 00:15:11 -0800 [SPARC64]: Add .gitignore file for sparc64 boot images. Signed-off-by: David S. Miller commit 7918d212df31fb7ddfb317c5a8dccdcec647d754 tree f3742fc5901dc7a367d6b6d6d47b09782c01eb43 parent 0047c65a60fa3b6607b55e058ea6a89f39cb3f28 author Patrick McHardy Sat, 04 Feb 2006 02:19:46 -0800 committer David S. Miller Sat, 04 Feb 2006 23:51:29 -0800 [NETFILTER]: Fix check whether dst_entry needs to be released after NAT After DNAT the original dst_entry needs to be released if present so the packet doesn't skip input routing with its new address. The current check for DNAT in ip_nat_in is reversed and checks for SNAT. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0047c65a60fa3b6607b55e058ea6a89f39cb3f28 tree 27fd894c370f7930e38c9e0e83cf9b572b51f4ba parent 878c41ce5747e1b417bdd92a694c33dc4bd6ec02 author Patrick McHardy Sat, 04 Feb 2006 02:19:09 -0800 committer David S. Miller Sat, 04 Feb 2006 23:51:28 -0800 [NETFILTER]: Prepare {ipt,ip6t}_policy match for x_tables unification The IPv4 and IPv6 version of the policy match are identical besides address comparison and the data structure used for userspace communication. Unify the data structures to break compatiblity now (before it is released), so we can port it to x_tables in 2.6.17. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 878c41ce5747e1b417bdd92a694c33dc4bd6ec02 tree fac206db8511afd50f8486dd8de8a4a3a7528c74 parent e55f1bc5dcb60a47764f6eabd1501d2cb98fb2c4 author Patrick McHardy Sat, 04 Feb 2006 02:17:55 -0800 committer David S. Miller Sat, 04 Feb 2006 23:51:27 -0800 [NETFILTER]: Fix ip6t_policy address matching Fix two bugs in ip6t_policy address matching: - misorder arguments to ip6_masked_addrcmp, mask must be the second argument - inversion incorrectly applied to the entire expression instead of just the address comparison Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e55f1bc5dcb60a47764f6eabd1501d2cb98fb2c4 tree e1737c03ad3d4843601d2eeef99f46d9064abfe0 parent ee4bb818ae35f68d1f848eae0a7b150a38eb4168 author Patrick McHardy Sat, 04 Feb 2006 02:17:26 -0800 committer David S. Miller Sat, 04 Feb 2006 23:51:26 -0800 [NETFILTER]: Check policy length in policy match strict mode Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ee4bb818ae35f68d1f848eae0a7b150a38eb4168 tree 85a6ba60fc5782d77779f466f1ad5f2ec4330914 parent df4e9574a36748c3a4d9b03ffca6b42321a797a9 author Kirill Korotaev Sat, 04 Feb 2006 02:16:56 -0800 committer David S. Miller Sat, 04 Feb 2006 23:51:25 -0800 [NETFILTER]: Fix possible overflow in netfilters do_replace() netfilter's do_replace() can overflow on addition within SMP_ALIGN() and/or on multiplication by NR_CPUS, resulting in a buffer overflow on the copy_from_user(). In practice, the overflow on addition is triggerable on all systems, whereas the multiplication one might require much physical memory to be present due to the check above. Either is sufficient to overwrite arbitrary amounts of kernel memory. I really hate adding the same check to all 4 versions of do_replace(), but the code is duplicate... Found by Solar Designer during security audit of OpenVZ.org Signed-Off-By: Kirill Korotaev Signed-Off-By: Solar Designer Signed-off-by: Patrck McHardy Signed-off-by: David S. Miller commit df4e9574a36748c3a4d9b03ffca6b42321a797a9 tree 7710a26a7b5b491eafe6d1d7fef896b25631c248 parent 19ea7302df2eb4f2ad7f29af814d8cf55fc8b9c9 author Samir Bellabes Sat, 04 Feb 2006 02:16:06 -0800 committer David S. Miller Sat, 04 Feb 2006 23:51:23 -0800 [NETFILTER]: nf_conntrack: fix incorrect memset() size in FTP helper This memset() is executing with a bad size. According to Yasuyuki Kozakai, this memset() can be deleted, as 'ftp' is declared in global area. Signed-off-by: Samir Bellabes Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 19ea7302df2eb4f2ad7f29af814d8cf55fc8b9c9 tree b8dcef5684d443cb83c745129facec8f00b5a048 parent 6f169300787ddb07326cc0338434a162dbab8539 author Yasuyuki Kozakai Sat, 04 Feb 2006 02:15:36 -0800 committer David S. Miller Sat, 04 Feb 2006 23:51:22 -0800 [NETFILTER]: iptables: fix typos in ipt_connbytes.h Fix some typos that make iptables userspace compilation fail. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6f169300787ddb07326cc0338434a162dbab8539 tree 010f9f7e2af3fec48393a1e2b1137ef2f442326a parent a706124d0a4d9daaf6b705d01de3aff18deecea8 author Patrick McHardy Sat, 04 Feb 2006 02:14:51 -0800 committer David S. Miller Sat, 04 Feb 2006 23:51:21 -0800 [NETFILTER]: Fix missing src port initialization in tftp expectation mask Reported by David Ahern , netfilter bugzilla #426. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a706124d0a4d9daaf6b705d01de3aff18deecea8 tree f462b07dabcc529267afbf417acb16b08aded47d parent ad2ad0f96546d6d56b2665bcc863c33ae57c49c4 author Patrick McHardy Sat, 04 Feb 2006 02:14:24 -0800 committer David S. Miller Sat, 04 Feb 2006 23:51:20 -0800 [NETFILTER]: nfnetlink_queue: fix packet marking over netlink The packet marked is the netlink skb, not the queued skb. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ad2ad0f96546d6d56b2665bcc863c33ae57c49c4 tree 9c5f6357bd7a0ecb4748acfaf19a04ea3149707b parent c2db292438c20c3f13db6e5563e0ce5b449bedac author Patrick McHardy Sat, 04 Feb 2006 02:13:57 -0800 committer David S. Miller Sat, 04 Feb 2006 23:51:19 -0800 [NETFILTER]: Fix undersized skb allocation in ipt_ULOG/ebt_ulog/nfnetlink_log The skb allocated is always of size nlbufsize, even if that is smaller than the size needed for the current packet. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c2db292438c20c3f13db6e5563e0ce5b449bedac tree 775c7aa2e2e6069cb238833e5328a7b42b23041a parent ddc8d029ac6813827849801bce2d8c8813070db6 author Holger Eitzenberger Sat, 04 Feb 2006 02:13:14 -0800 committer David S. Miller Sat, 04 Feb 2006 23:51:18 -0800 [NETFILTER]: ULOG/nfnetlink_log: Use better default value for 'nlbufsiz' Performance tests showed that ULOG may fail on heavy loaded systems because of failed order-N allocations (N >= 1). The default value of 4096 is not optimal in the sense that it actually allocates _two_ contigous physical pages. Reasoning: ULOG uses alloc_skb(), which adds another ~300 bytes for skb_shared_info. This patch sets the default value to NLMSG_GOODSIZE and adds some documentation at the top. Signed-off-by: Holger Eitzenberger Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ddc8d029ac6813827849801bce2d8c8813070db6 tree f0ae3607018873a8ed3594b9d81f155aed75b906 parent 34f9a2e4deb760ddcb94cd0cd4f9ce18070d53d9 author Yasuyuki Kozakai Sat, 04 Feb 2006 02:12:14 -0800 committer David S. Miller Sat, 04 Feb 2006 23:51:17 -0800 [NETFILTER]: nf_conntrack: check address family when finding protocol module __nf_conntrack_{l3}proto_find() doesn't check the passed protocol family, then it's possible to touch out of the array which has only AF_MAX items. Spotted by Pablo Neira Ayuso. Signed-off-by: Yasuyuki Kozakai Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 34f9a2e4deb760ddcb94cd0cd4f9ce18070d53d9 tree 8ab1f53445e3b422b72987e2e99d13ffe13dab0c parent b633ad5fbf9e534142208700c58a530a4091eaab author Pablo Neira Ayuso Sat, 04 Feb 2006 02:11:41 -0800 committer David S. Miller Sat, 04 Feb 2006 23:51:16 -0800 [NETFILTER]: ctnetlink: add MODULE_ALIAS for expectation subsystem Add load-on-demand support for expectation request. eg. conntrack -L expect Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit b633ad5fbf9e534142208700c58a530a4091eaab tree e848b88ce0b820bd1193c8a3d0ecea4eb5a39be0 parent fa60cf7f64a00c16e95717e8dccdb128877e342a author Marcus Sundberg Sat, 04 Feb 2006 02:11:09 -0800 committer David S. Miller Sat, 04 Feb 2006 23:51:15 -0800 [NETFILTER]: ctnetlink: Fix subsystem used for expectation events The ctnetlink expectation events should use the NFNL_SUBSYS_CTNETLINK_EXP subsystem, not NFNL_SUBSYS_CTNETLINK. Signed-off-by: Marcus Sundberg Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit fa60cf7f64a00c16e95717e8dccdb128877e342a tree ec8ca75f79971c6bd2b3754b6207a4adce51e37c parent 5b7b644ca9a12396a46fad825a973fb8bed17102 author Herbert Xu Sat, 04 Feb 2006 02:09:34 -0800 committer David S. Miller Sat, 04 Feb 2006 23:51:14 -0800 [ICMP]: Fix extra dst release when ip_options_echo fails When two ip_route_output_key lookups in icmp_send were combined I forgot to change the error path for ip_options_echo to not drop the dst reference since it now sits before the dst lookup. To fix it we simply jump past the ip_rt_put call. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 5b7b644ca9a12396a46fad825a973fb8bed17102 tree 39d6a2b1644e4c5ab17da7e82a09f37a65211b23 parent 14c3f8558717adb192c364f58b0d63dfc850ecca author Jon Mason Fri, 03 Feb 2006 21:51:59 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:15 -0800 [PATCH] x86_64: IOMMU printk cleanup This patch contains a printk reorder to remove the current problem of displaying "PCI-DMA: Disabling IOMMU." and then "PCI-DMA: using GART IOMMU" 20 lines later in dmesg. It also constains a printk reorder in swiotlb to state swiotlb enablement prior to describing the location of the bounce buffers, and a printk reorder to state gart enablement prior to describing the aperature. Also constains a whitespace cleanup in arch/x86_64/kernel/setup.c Tested (along with patch 2/2) on dual opteron with gart enabled, iommu=soft, and iommu=off. Signed-off-by: Jon Mason Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 14c3f8558717adb192c364f58b0d63dfc850ecca tree 16e04e07d4212217e597d79432ad03c2b3856855 parent 3777a95903953c55f2309a89679b73c19ae5535b author Andi Kleen Fri, 03 Feb 2006 21:51:56 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:15 -0800 [PATCH] x86_64: Let impossible CPUs point to reference per cpu data Hack for 2.6.16. In 2.6.17 all code that uses NR_CPUs should be audited and changed to only touch possible CPUs. Don't mark the reference per cpu data init data (so it stays around after boot) and point all impossible CPUs to it. This way they reference some valid - although shared memory. Usually this is only initialization like INIT_LIST_HEADs and there won't be races because these CPUs never run. Still somewhat hackish. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3777a95903953c55f2309a89679b73c19ae5535b tree 45a922a1ff82fc0f3d2a3865bfcb23d68c12792c parent 7f66ae48de27bc9506cff0f2991d74901a0c2f8d author Andi Kleen Fri, 03 Feb 2006 21:51:53 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:15 -0800 [PATCH] i386/x86-64: Don't ack the APIC for bad interrupts when the APIC is not enabled It's bad juju to touch the APIC when it hasn't been enabled. I also moved ack_bad_irq for x86-64 out of line following i386. Signed-off-by: Andi Kleen Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 7f66ae48de27bc9506cff0f2991d74901a0c2f8d tree ec38f237d1b32f051ce4eed4e1a5bdcae148f6c7 parent d646bce4c77af72f5a293a96fbf14174c9f2a9c2 author Ashok Raj Fri, 03 Feb 2006 21:51:50 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:15 -0800 [PATCH] x86_64: Dont record local apic ids when they are disabled in MADT Some broken BIOS's had processors disabled, but same apic id as a valid processor. This causes acpi_processor_start() to think this disabled cpu is ok, and croak. So we dont record bad apicid's anymore. http://bugzilla.kernel.org/show_bug.cgi?id=5930 Signed-off-by: Ashok Raj Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d646bce4c77af72f5a293a96fbf14174c9f2a9c2 tree c931154a172dd17a242c455c23d21c2adf7240df parent 91522a964b295e7bccb173218cc00adadfc77bbf author Jan Beulich Fri, 03 Feb 2006 21:51:47 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:15 -0800 [PATCH] x86_64: minor odering correction to dump_pagetable() Checking of the validity of pointers should be consistently done before dereferencing the pointer. Signed-Off-By: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 91522a964b295e7bccb173218cc00adadfc77bbf tree c31d9a47b3ef774c20d29a94ffe26ee157d9c7ee parent 0c3749c41f5eee0da36bbf92b2793338b4d8574f author Jan Beulich Fri, 03 Feb 2006 21:51:44 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:15 -0800 [PATCH] x86_64: small fix for CFI annotations Conditionalize two unwind directives to match other similarly conditional code. Signed-Off-By: Jan Beulich Cc: Jim Houston Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0c3749c41f5eee0da36bbf92b2793338b4d8574f tree 3af004c5533ab04297004f5ec40da4c6801b8fda parent 099f318b8d97490e58c595eb1b6d3415da5ccc03 author Andi Kleen Fri, 03 Feb 2006 21:51:41 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:15 -0800 [PATCH] x86_64: Calibrate APIC timer using PM timer On some broken motherboards (at least one NForce3 based AMD64 laptop) the PIT timer runs at a incorrect frequency. This patch adds a new option "apicpmtimer" that allows to use the APIC timer and calibrate it using the PMTimer. It requires the earlier patch that allows to run the main timer from the APIC. Specifying apicpmtimer implies apicmaintimer. The option defaults to off for now. I tested it on a few systems and the resulting APIC timer frequencies were usually a bit off, but always <1%, which should be tolerable. TBD figure out heuristic to enable this automatically on the affected systems TBD perhaps do it on all NForce3s or using DMI? Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 099f318b8d97490e58c595eb1b6d3415da5ccc03 tree 48a621571d97cf72b0ade93033ef6d68d2b676b8 parent 16acc0cd8f1aac63ddf5228c5bc29cf7d31627f4 author Andi Kleen Fri, 03 Feb 2006 21:51:38 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:14 -0800 [PATCH] x86_64: Don't allow kprobes on __switch_to kprobes cannot deal with the funny calling conventions when it runs on a different stack when it returns. If someone wants to instrument context switch they can add a probe to schedule() instead. Cc: jkenisto@us.ibm.com, prasanna@in.ibm.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 16acc0cd8f1aac63ddf5228c5bc29cf7d31627f4 tree c1e6ae0b4f666a3e85b12b9280d1bff63104cf9e parent a1002a48e1af5ff8d02bfe79536e6fce3a0ec369 author Zach Brown Fri, 03 Feb 2006 21:51:35 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:14 -0800 [PATCH] x86_64: align per-cpu section to configured cache bytes Align the start of the per-cpu section to the configured number of bytes in a cache line. This stops a BUG_ON() from triggering in load_module() when DEFINE_PER_CPU() is used in a module and the section isn't cacheline-aligned. Rusty also found this and sent a patch in a while ago (http://lkml.org/lkml/2004/10/19/17), I don't know what came of that. Signed-off-by: Zach Brown Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a1002a48e1af5ff8d02bfe79536e6fce3a0ec369 tree 0e6988d51b37185dac2e9b92d86091fb224c75ff parent 1de6bf33bc4601d856c286ad5c7d515468e24bbb author Kevin VanMaren Fri, 03 Feb 2006 21:51:32 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:14 -0800 [PATCH] x86_64: When allocation of merged SG lists fails in the IOMMU don't merge [ AK: I redid Kevin's fix to be simpler, but the idea and original analysis of the problem is from Kevin] This avoid allocation failures on some SATA systems like Nvidia CK8 when the IOMMU gets fragmented. Modern SATA devices have quite large queues (128 entries) and the FS with ext2/3 is good enough now that it often passes whole 128 page sg lists down to the driver. These require 512K of continuous free space in the IOMMU aperture to map when merged. When the IOMMU is fragmented this could lead to spurious IO errors due to failing mappings. Short term fix is to just try to map the SG list again unmerged page by page - this way fragmentation doesn't matter anymore. The code for that was already there, but it just wasn't enabled for the merge case. According to Kevin at least the Nvidia device doesn't seem to benefit from merging much anyways, so the only slowdown is from trying to do an unnecessary merge attempt. Kevin plans to implement better fragmentation avoidance in the future, but that wouldn't be 2.6.16 material. TBD: should add some statistic counters to count how often that really happens. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1de6bf33bc4601d856c286ad5c7d515468e24bbb tree 7ce51e6a5592ee90b065963d8a72e754e58c5e4a parent d22fe808449cd3b5bacd5c0d447e3675f9ab7619 author Andi Kleen Fri, 03 Feb 2006 21:51:29 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:14 -0800 [PATCH] x86_64: Fix zero mcfg entry workaround on x86-64 I broke this earlier when moving the patch from i386 to x86-64. Need to return the virtual address here, not the physical address. This fixes some boot time crashes on x86-64. Cc: gregkh@suse.de Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d22fe808449cd3b5bacd5c0d447e3675f9ab7619 tree 25aa14735359aa4fe24a28439efa672850828bbf parent 7ded56895c11a656408b6ff21086ae04a6a7cda0 author Andi Kleen Fri, 03 Feb 2006 21:51:26 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:14 -0800 [PATCH] x86_64: Do more checking in the SRAT header code - Check if the processor/memory affinity entries are long enough according to the ACPI 3.0 spec. - Ignore memory affinity entries that define a zero length region. All based on BIOS issues found in the field @) Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7ded56895c11a656408b6ff21086ae04a6a7cda0 tree e12b7105ee50a86573594b803e55270abf5dbc3c parent 396bd50fed9c91f7aa1ac66f4b2880ca58c332ff author Ashok Raj Fri, 03 Feb 2006 21:51:23 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:14 -0800 [PATCH] x86_64: data/functions wrongly marked as __init with cpu hotplug. attached patch is 2 more cases i found via running the reference_init.pl script. These were easy to spot just knowing the file names. There is one another about init/main.c that i cant exactly zero in. (partly because i dont know how to interpret the data thats spewed out of the tool). Signed-off-by: Ashok Raj Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 396bd50fed9c91f7aa1ac66f4b2880ca58c332ff tree 4af5353b10a1e67087815a6e838614f02bd7cbc3 parent 9391a3f9c7f17bdd82adf9a98905450642cc8970 author Shaohua Li Fri, 03 Feb 2006 21:51:20 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:14 -0800 [PATCH] x86_64: mark two routines as __cpuinit SIgned-off-by: Shaohua Li Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9391a3f9c7f17bdd82adf9a98905450642cc8970 tree b3bba1689a0af3233a5d055e43ec5a67a8e775f0 parent 00ac59adfca8f2f339beb0b67054e786c275553e author Andi Kleen Fri, 03 Feb 2006 21:51:17 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:14 -0800 [PATCH] x86_64: Clear more state when ignoring empty node in SRAT parsing Might fix boot failures on systems with empty PXMs in SRAT Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 00ac59adfca8f2f339beb0b67054e786c275553e tree 96489ebcdebec957f94de44940e10b3935bc3c18 parent 9e8c34edfd7ae97d0e3391f34d9d26a0167912bf author Chen, Kenneth W Fri, 03 Feb 2006 21:51:14 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:14 -0800 [PATCH] x86_64: Fix memory policy build without CONFIG_HUGETLBFS > mm/mempolicy.c: In function `huge_zonelist': > mm/mempolicy.c:1045: error: `HPAGE_SHIFT' undeclared (first use in this function) > mm/mempolicy.c:1045: error: (Each undeclared identifier is reported only once > mm/mempolicy.c:1045: error: for each function it appears in.) > make[1]: *** [mm/mempolicy.o] Error 1 Need to wrap huge_zonelist function with CONFIG_HUGETLBFS. Signed-off-by: Ken Chen Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9e8c34edfd7ae97d0e3391f34d9d26a0167912bf tree 7b26b9b3939d32f69af5c133e99de6f730e04b16 parent 7115125057cf72dcc0b9ded1e12128e1abfa8586 author Andi Kleen Fri, 03 Feb 2006 21:51:11 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:13 -0800 [PATCH] x86_64: Remove rogue default y in EDAC Kconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7115125057cf72dcc0b9ded1e12128e1abfa8586 tree 9b619a2f45d665a1fdc2af08dc43bacbf38e18a5 parent 10f4dc8b27ac42f930ac55adb8c521264dc997f8 author Andi Kleen Fri, 03 Feb 2006 21:51:08 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:13 -0800 [PATCH] x86_64: Remove CONFIG_INIT_DEBUG It has been enabled by default for some time now and is cheap enough so it doesn't matter anyways. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 10f4dc8b27ac42f930ac55adb8c521264dc997f8 tree 88d56b784d7ae5d84fd5e486f666b779c161d8af parent 7bcd3f34e262bbebffa954d80eab3a84f053da31 author Ravikiran G Thirumalai Fri, 03 Feb 2006 21:51:05 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:13 -0800 [PATCH] x86_64: Fix the node cpumask of a cpu going down Currently, x86_64 and ia64 arches do not clear the corresponding bits in the node's cpumask when a cpu goes down or cpu bring up is cancelled. This is buggy since there are pieces of common code where the cpumask is checked in the cpu down code path to decide on things (like in the slab down path). PPC does the right thing, but x86_64 and ia64 don't (This was the reason Sonny hit upon a slab bug during cpu offline on ppc and could not reproduce on other arches). This patch fixes it for x86_64. I won't attempt ia64 as I cannot test it. Credit for spotting this should go to Alok. Signed-off-by: Alok N Kataria Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7bcd3f34e262bbebffa954d80eab3a84f053da31 tree f0765da9eaa8024a2b1d67d3e43730cb32f99fa7 parent 6bca52b544489b626c7d0db801df6b4aa3d5adb5 author Andi Kleen Fri, 03 Feb 2006 21:51:02 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:13 -0800 [PATCH] x86_64: Undo the earlier changes to remove unrolled copy/memset functions They cause quite bad performance regressions on Netburst This is temporary until we can get new optimized functions for these CPUs. This undoes changes that were done in 2.6.15 and in 2.6.16-rc1, essentially bringing the code back to 2.6.14 level. Only change is I renamed the X86_FEATURE_K8_C flag to X86_FEATURE_REP_GOOD and fixed the check for the flag and also fixed some comments. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6bca52b544489b626c7d0db801df6b4aa3d5adb5 tree 6011b1cec5ffae37ed499013908e38cbdeaf651b parent 0dd2ea9af8f0eca43cf6200baa182b3aba307049 author Andi Kleen Fri, 03 Feb 2006 21:50:59 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:13 -0800 [PATCH] x86_64: Fix swiotlb dma_alloc_coherent fallback This avoids BUG_ONs in the low level allocator when an illegal GFP mask is added. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0dd2ea9af8f0eca43cf6200baa182b3aba307049 tree 68d19724e9c50e14ea7d900493a9af37ff26c948 parent 6f3814cd2fb5ea4d53a7fa5b0635d68fa4036c1b author Shaohua Li Fri, 03 Feb 2006 21:50:56 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:13 -0800 [PATCH] x86_64: [PATCH] timer resume At resume time, TSC's value or something similar might be changed a lot against suspend time. This could make system gets a very big lost ticks. See http://bugzilla.kernel.org/show_bug.cgi?id=5825 Signed-off-by: Shaohua Li Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6f3814cd2fb5ea4d53a7fa5b0635d68fa4036c1b tree 8a0ad07a141e00243f3a65f2a026c8c6f0ce8c11 parent 73dea47faeb96d54a984b9d7f4de564816966354 author Andi Kleen Fri, 03 Feb 2006 21:50:53 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:13 -0800 [PATCH] x86_64: Automatically enable apicmaintimer on ATI boards They all have problems with IRQ 0 routing, so just use the APIC on them. Can be overwritten with "noapicmaintimer" Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 73dea47faeb96d54a984b9d7f4de564816966354 tree 6b1f090e9071e281367bc106c1b2ab05cb43e459 parent 76b461c21468f41837283b7888d55f1c0671f719 author Andi Kleen Fri, 03 Feb 2006 21:50:50 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:13 -0800 [PATCH] x86_64: Allow to run main time keeping from the local APIC interrupt Another piece from the no-idle-tick patch. This can be enabled with the "apicmaintimer" option. This is mainly useful when the PIT/HPET interrupt is unreliable. Note there are some systems that are known to stop the APIC timer in C3. For those it will never work, but this case should be automatically detected. It also only works with PM timer right now. When HPET is used the way the main timer handler computes the delay doesn't work. It should be a bit more efficient because there is one less regular interrupt to process on the boot processor. Requires earlier bugfix from Venkatesh Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 76b461c21468f41837283b7888d55f1c0671f719 tree 3df6a35fe789dbc70db4ae6e32c8e694079e97d8 parent 226d780909f71bebfa4dfffa21493244aa22dfdc author Venkatesh Pallipadi Fri, 03 Feb 2006 21:50:47 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:13 -0800 [PATCH] x86_64: Only switch to IPI broadcast timer on Intel when C3 is supported Bug in apic timer removal on C3 patch. We should switch to IPI from APIC timer only when C3 state is valid. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 226d780909f71bebfa4dfffa21493244aa22dfdc tree ae9f0ff1e2b62076585825379c3b859ad3f3a1af parent eddb6fb9a54cdc8c7c37e056a2b4bbbc8a128a36 author Andi Kleen Fri, 03 Feb 2006 21:50:44 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:12 -0800 [PATCH] x86_64: Define pmtmr_ioport to 0 when PM_TIMER is not available Avoids some ifdef mess later. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit eddb6fb9a54cdc8c7c37e056a2b4bbbc8a128a36 tree c8b9a0773518f45aa86d861fce959c3c4f946b06 parent 2f01942536d8c686a3f6b3b38f1257caa2fb763e author Andi Kleen Fri, 03 Feb 2006 21:50:41 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:12 -0800 [PATCH] x86_64: Disallow kprobes on NMI handlers A kprobe executes IRET early and that could cause NMI recursion and stack corruption. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2f01942536d8c686a3f6b3b38f1257caa2fb763e tree b2304fcb39d1709dd90061ac9be975a15a22beae parent 53ea68ecea11bcbb3451c2758ce181bd97b569a9 author Andi Kleen Fri, 03 Feb 2006 21:50:38 +0100 committer Linus Torvalds Sat, 04 Feb 2006 16:43:12 -0800 [PATCH] x86_64: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 53ea68ecea11bcbb3451c2758ce181bd97b569a9 tree 4e754db2a21db5b90a1650f2993d0b76c00cbd53 parent 89a2fa5f2139be35e214bcf86a8291d6a1da75f2 author Stephen Smalley Fri, 03 Feb 2006 08:21:12 -0500 committer Linus Torvalds Fri, 03 Feb 2006 18:31:33 -0800 [PATCH] SELinux: fix size-128 slab leak Remove private inode tests from security_inode_alloc and security_inode_free, as we otherwise end up leaking inode security structures for private inodes. Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Linus Torvalds commit 89a2fa5f2139be35e214bcf86a8291d6a1da75f2 tree 850ea412b013360bcace751db91cac6fb0067535 parent 27266a18dc56611e2f2ec4e8aced0fe221e9b4b8 parent 68ee3eb8295c9c164071fcbd367c419121bd55f8 author Linus Torvalds Fri, 03 Feb 2006 18:17:47 -0800 committer Linus Torvalds Fri, 03 Feb 2006 18:17:47 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6 commit 27266a18dc56611e2f2ec4e8aced0fe221e9b4b8 tree 838a597782ea49356da72298626574e22351522d parent f3e39e67b9b6ad6a51d13be902e8341f13b93531 parent 9a8ffccf3d282ee749210232465f61e1c48b7a86 author Linus Torvalds Fri, 03 Feb 2006 15:51:48 -0800 committer Linus Torvalds Fri, 03 Feb 2006 15:51:48 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-serial commit f3e39e67b9b6ad6a51d13be902e8341f13b93531 tree dd0d21776b936fdff1bd1e1ba762fc47e94259cf parent 1a56f54c351d8d2e276aefc4f4094037c178d6c7 parent e92251762d02a46177d4105d1744041e3f8bc465 author Linus Torvalds Fri, 03 Feb 2006 15:51:13 -0800 committer Linus Torvalds Fri, 03 Feb 2006 15:51:13 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-mmc commit 1a56f54c351d8d2e276aefc4f4094037c178d6c7 tree 88abb7801141db3d03079bd0ef2a903cbf3a1aba parent d1ffa5669cd834f901141756e63195f48c1bfbf9 parent 2c4c6b27028b38204de8ade505f925d53d234422 author Linus Torvalds Fri, 03 Feb 2006 15:50:35 -0800 committer Linus Torvalds Fri, 03 Feb 2006 15:50:35 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit d1ffa5669cd834f901141756e63195f48c1bfbf9 tree f0bed266c1f3fef528bbced56b48aac63e0a26b1 parent d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f parent 6eff5790d57a5c9c01489c95946881808a4b2a2c author Linus Torvalds Fri, 03 Feb 2006 15:21:40 -0800 committer Linus Torvalds Fri, 03 Feb 2006 15:21:40 -0800 Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2 commit 2c4c6b27028b38204de8ade505f925d53d234422 tree 87ed99e0cf5109a822f76cc625f920ca9dc8acd8 parent 83f755f5a66a5393c3ae8925719fde0c740ac04e author Russell King Fri, 03 Feb 2006 23:03:21 +0000 committer Russell King Fri, 03 Feb 2006 23:03:21 +0000 [ARM] Remove ARCH_CAMELOT from at91 defconfigs ARCH_CAMELOT (excalibur) got removed; remove it from the AT91 defconfigs Signed-off-by: Russell King commit 9a8ffccf3d282ee749210232465f61e1c48b7a86 tree d876e49754fc796473a115fe7b679febd5fc646a parent 9c0f4755bd5a117595761c95b93c29e8d9ca07b5 author Russell King Fri, 03 Feb 2006 22:05:42 +0000 committer Russell King Fri, 03 Feb 2006 22:05:42 +0000 [SERIAL] 8250: limit range of runtime ports Prevent SERIAL_8250_RUNTIME_UARTS being larger than SERIAL_8250_NR_UARTS. Signed-off-by: Russell King commit 6eff5790d57a5c9c01489c95946881808a4b2a2c tree 2b96da58c99b27945e8c9bffb0ae48a97c4231be parent 1a1974fd4533afdb73873cdacb942d9a79ff7c9b author Mark Fasheh Wed, 18 Jan 2006 10:31:47 -0800 committer Mark Fasheh Fri, 03 Feb 2006 14:05:14 -0800 [PATCH] ocfs2: don't wait on recovery when locking journal The mount path had incorrectly asked the locking code to wait for recovery completion, which deadlocks things because recovery waits for mount to complete first. Signed-off-by: Mark Fasheh commit 1a1974fd4533afdb73873cdacb942d9a79ff7c9b tree 2ca6e62b007f54a4b4d755bb98ad9692e4547395 parent 3d0f89bb169482d26d5aa4e82e763077e7e9bc4d author Eric Sesterhenn / snakebyte Fri, 27 Jan 2006 10:32:24 +0100 committer Mark Fasheh Fri, 03 Feb 2006 14:03:09 -0800 [PATCH] BUG_ON() Conversion in fs/configfs/ this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 3d0f89bb169482d26d5aa4e82e763077e7e9bc4d tree 2d2317ce1417202322e3f715534fab80394bd5d2 parent 62ca3d2603571dc2b1b4c1368e19d44b599062e2 author Joel Becker Wed, 25 Jan 2006 13:31:07 -0800 committer Mark Fasheh Fri, 03 Feb 2006 14:01:05 -0800 configfs: Add permission and ownership to configfs objects. configfs always made item and attribute ownership root.root and permissions based on a umask of 022. Add ->setattr() to allow chown(2)/chmod(2), and persist the changes for the lifetime of the items and attributes. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 62ca3d2603571dc2b1b4c1368e19d44b599062e2 tree 8fe17f9846fcadfc508ebfa92b4196b3a934719e parent 215c7f9fa11d3fc6ccd2df242d259c721ec7ae6a author Joel Becker Fri, 27 Jan 2006 11:04:12 -0800 committer Mark Fasheh Fri, 03 Feb 2006 13:59:05 -0800 configfs: Clean up MAINTAINERS entry Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit 215c7f9fa11d3fc6ccd2df242d259c721ec7ae6a tree 873d9a2d1b345567c1c6b51f8aab83b034fff922 parent ebdec83ba46c123fe3bfdcaacf62d0dfe8fe4187 author Mark Fasheh Wed, 01 Feb 2006 16:42:10 -0800 committer Mark Fasheh Fri, 03 Feb 2006 13:55:26 -0800 [PATCH] ocfs2: fix compile warnings Fix a couple of compile warnings found when compiling on a ppc64 build box. Signed-off-by: Mark Fasheh commit ebdec83ba46c123fe3bfdcaacf62d0dfe8fe4187 tree acd18f3170c1de8295375cadb0a33fa23066524e parent b4c7f538508adcde7a0a5162faec0b2ab19b90bd author Eric Sesterhenn / snakebyte Fri, 27 Jan 2006 10:32:52 +0100 committer Mark Fasheh Fri, 03 Feb 2006 13:54:22 -0800 [PATCH] BUG_ON() Conversion in fs/ocfs2/ this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn Signed-off-by: Mark Fasheh commit b4c7f538508adcde7a0a5162faec0b2ab19b90bd tree 143ce7f02ffa904cf770960c495d672b81710f21 parent c74ec2f77a7763a4a56c6cb13ecab961e1bbb456 author Adrian Bunk Sat, 14 Jan 2006 20:55:10 +0100 committer Mark Fasheh Fri, 03 Feb 2006 13:47:21 -0800 [PATCH] fs/ocfs2/dlm/dlmrecovery.c must #include fs/ocfs2/dlm/dlmrecovery.c does now use msleep(), and does therefore need to #include for getting the prototype of this function. Signed-off-by: Adrian Bunk Signed-off-by: Mark Fasheh commit c74ec2f77a7763a4a56c6cb13ecab961e1bbb456 tree aa1ce70fae2b098a4e452fd065581268ba8a6d5c parent e2faea4ce340f199c1957986c4c3dc2de76f5746 author Arjan van de Ven Fri, 13 Jan 2006 21:54:23 -0800 committer Mark Fasheh Fri, 03 Feb 2006 13:47:21 -0800 [PATCH] ocfs2: Semaphore to mutex conversion. Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Mark Fasheh commit e2faea4ce340f199c1957986c4c3dc2de76f5746 tree 2336b06cf270b3cff2ff39ba75fc67639dc63df9 parent 0d419a6a95ee158675aa184c6c3e476b22d02145 author Kurt Hackel Thu, 12 Jan 2006 14:24:55 -0800 committer Mark Fasheh Fri, 03 Feb 2006 13:47:20 -0800 [PATCH] ocfs2/dlm: fixes * fix a hang which can occur during shutdown migration * do not allow nodes to join during recovery * when restarting lock mastery, do not ignore nodes which come up * more than one node could become recovery master, fix this * sleep to allow some time for heartbeat state to catch up to network * extra debug info for bad recovery state problems * make DLM_RECO_NODE_DATA_DONE a valid state for non-master recovery nodes * prune all locks from dead nodes on $RECOVERY lock resources * do NOT automatically add new nodes to mle nodemaps until they have properly joined the domain * make sure dlm_pick_recovery_master only exits when all nodes have synced * properly handle dlmunlock errors in dlm_pick_recovery_master * do not propagate network errors in dlm_send_begin_reco_message * dead nodes were not being put in the recovery map sometimes, fix this * dlmunlock was failing to clear the unlock actions on DLM_DENIED Signed-off-by: Kurt Hackel Signed-off-by: Mark Fasheh commit 0d419a6a95ee158675aa184c6c3e476b22d02145 tree e57df9cbddc68e9b6e2f702537328b619529c783 parent 251b6eccbeff4f0f8a3509769b327705e899f5dd author J. Bruce Fields Wed, 11 Jan 2006 16:55:00 -0500 committer Mark Fasheh Fri, 03 Feb 2006 13:47:19 -0800 [OCFS2] Documentation Fix Update ocfs2.txt to add "cluster aware lockf" under missing features. Signed-off-by: J. Bruce Fields Signed-off-by: Mark Fasheh commit 251b6eccbeff4f0f8a3509769b327705e899f5dd tree 7da835c3bebc8150a1a1ae6abb681a1e1a9c5f36 parent aee93ac4b7ad461255939248d0d51566cff77e05 author Mark Fasheh Tue, 10 Jan 2006 15:41:43 -0800 committer Mark Fasheh Fri, 03 Feb 2006 13:47:19 -0800 [OCFS2] Make ip_io_sem a mutex ip_io_sem is now ip_io_mutex. Signed-off-by: Mark Fasheh commit aee93ac4b7ad461255939248d0d51566cff77e05 tree c5b1bda905d89548bd052eaf040da6eb287ee44b parent 0c6c98fb187524935a93fdd4f9a7193e7b110782 author Jeff Mahoney Mon, 09 Jan 2006 12:36:40 -0500 committer Mark Fasheh Fri, 03 Feb 2006 13:47:18 -0800 [PATCH] ocfs2/dlm: fix compilation on ia64 Including results in compilation failure on ia64 due to not including Including corrects the problem. Please apply. Signed-off-by: Jeff Mahoney Signed-off-by: Mark Fasheh commit 0c6c98fb187524935a93fdd4f9a7193e7b110782 tree d26e99e927cecafb3f56611fab83f7d0d5c8f39f parent 8c5a950c9693aa24828d16dd7bc38bced3f37d48 author Adrian Bunk Sat, 07 Jan 2006 20:07:02 +0100 committer Mark Fasheh Fri, 03 Feb 2006 13:47:18 -0800 [PATCH] OCFS2: __init / __exit problem Functions called by __init funtions mustn't be __exit. Reported by Jan-Benedict Glaw . Signed-off-by: Adrian Bunk Signed-off-by: Mark Fasheh commit 8c5a950c9693aa24828d16dd7bc38bced3f37d48 tree 22ae4a6459d2f8d7a46bb8adac11aec65460dbb4 parent 826eeb53a6f264842200d3311d69107d2eb25f5e author Joel Becker Fri, 06 Jan 2006 13:46:31 -0800 committer Mark Fasheh Fri, 03 Feb 2006 13:47:17 -0800 o Remove confusing Kconfig text for CONFIGFS_FS. Signed-off-by: Joel Becker Signed-off-by: Mark Fasheh commit d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f tree 8c21cc2ceaa11b7a6b023da6c8794f1e24eb0354 parent d540c7428d297ab041e6cac72b9045e7b8f93f2b parent 0dec456d1fe73e0539625f0973ee8ef8fb805943 author Linus Torvalds Fri, 03 Feb 2006 08:33:06 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:33:06 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit d540c7428d297ab041e6cac72b9045e7b8f93f2b tree 6a8dd4040568124b2ff6ff375f2ef00f347f531c parent 9ea244b4b545ecb323d042a0df5c080edefcd1fc author Adrian Bunk Fri, 03 Feb 2006 03:05:00 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:13 -0800 [PATCH] IDE: always enable CONFIG_PDC202XX_FORCE Remove the CONFIG_PDC202XX_FORCE=n case. Signed-off-by: Adrian Bunk Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ea244b4b545ecb323d042a0df5c080edefcd1fc tree 65e219ea529ac8089fa5415d8b350cf0fd3c62e5 parent 0c866b5103ad65de04a2a211f8db56820179cb53 author Loren M. Lang Fri, 03 Feb 2006 03:04:59 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:12 -0800 [PATCH] RocketPoint 1520 [hpt366] fails clock stabilization I just purchased a HighPoint Rocket 1520 SATA controller. There seems to be no libata driver (yet), but there is an ide driver, hpt366. When the driver gets loaded, it causes a kernel NULL pointer dereference in pci_bus_clock_list. It seems to be because the driver is waiting for clock stabilization in init_hpt37x() which never comes. The driver just continues on with the pci drvdata set to NULL, instead of a valid clock entry. The following patch prevents the NULL dereference from happening, but instead exit with an error. Acked-by: Bartlomiej Zolnierkiewicz Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c866b5103ad65de04a2a211f8db56820179cb53 tree 5858b7b9a41cc9f72d2e3d6cdd0e2ca29271e07b parent f7ad836c4442e1d146b11cf359432aa68c7ed95d author Alan Cox Fri, 03 Feb 2006 03:04:58 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:12 -0800 [PATCH] ide: set latency when resetting it821x out of firmware mode Signed-off-by: Alan Cox Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7ad836c4442e1d146b11cf359432aa68c7ed95d tree e2cb81f7447a2be5ab85da7c6eef1624fe764eca parent a7ff7d41fec06c518caa82a818a70610a29d0e75 author Jean Delvare Fri, 03 Feb 2006 03:04:57 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:12 -0800 [PATCH] ide-disk: Restore missing space in log message Restore a missing space in a log message, which was accidentally removed by a previous change: 3e087b575496b8aa445192f58e7d996b1cdfa121 Signed-off-by: Jean Delvare Cc: Tejun Heo Cc: Jens Axboe Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7ff7d41fec06c518caa82a818a70610a29d0e75 tree 3da27f3fa33d6bd61d690e89c44e6acf0b008394 parent 6842f8c8dac7c06cbf0aac87824f1ff337be31cb author Adrian Bunk Fri, 03 Feb 2006 03:04:56 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:12 -0800 [PATCH] drivers/ide/ide-io.c: make __ide_end_request() static Since there's no longer any external user, we can make __ide_end_request() static. Signed-off-by: Adrian Bunk Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6842f8c8dac7c06cbf0aac87824f1ff337be31cb tree 7e1e185607d4c6134963d6106af7b3f311c9e976 parent 9810933701a09f9c4dd0ad963d5ec2efb7df07b7 author Ingo Molnar Fri, 03 Feb 2006 03:04:55 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:12 -0800 [PATCH] solve false-positive soft lockup messages during IDE init Signed-off-by: Ingo Molnar Acked-by: Bartlomiej Zolnierkiewicz Cc: Alan Cox Cc: Rogio Brito Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9810933701a09f9c4dd0ad963d5ec2efb7df07b7 tree a82e186d96e443099fc67d9788943befcba996b3 parent 3b6ce2497f091620dd4c172fc11d867a9b072dc5 author Richard Purdie Fri, 03 Feb 2006 03:04:55 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:12 -0800 [PATCH] stop CompactFlash devices being marked as removable This patch stops CompactFlash devices being marked as removable. They are not removable (as defined by Linux) as the media and device are inseparable. When a card is removed, the whole device is removed from the system and never sits in a media-less state. This stops some nasty udev device creation/destruction loops. Further, once this change is made, there is no need for ide to can be removed from ide_drive_t. Signed-off-by: Richard Purdie Acked-by: Bartlomiej Zolnierkiewicz Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b6ce2497f091620dd4c172fc11d867a9b072dc5 tree ed2a92b744a129847e5c42ec26c9eeae04074de8 parent d57d39c81271a0808eabcf7bdc409312b5262b69 author Andreas Mohr Fri, 03 Feb 2006 03:04:54 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:11 -0800 [PATCH] ide Kconfig fixes CONFIG_BLK_DEV_IDECS docu mentions everything and the kitchen sink, yet fails to list the most important/widespread (IMHO) device: Compact Flash PCMCIA adapters. This incomplete description recently caused me to deselect the ide_cs module, causing great pain soon thereafter when I realized why I had actually enabled it some years ago. Updates: - make sure to mention Compact Flash adapters - fix some random typos in ide Kconfig Signed-off-by: Andreas Mohr Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d57d39c81271a0808eabcf7bdc409312b5262b69 tree 7c3bd49624969c0d4e67a75acc8676945a900cc3 parent b7bed9ec44cb282425f56033e5fb5448086cd758 author Bjorn Helgaas Fri, 03 Feb 2006 03:04:53 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:11 -0800 [PATCH] ia64: drop arch-specific IDE MAX_HWIFS definition There's no reason MAX_HWIFS needs to be ia64-specific, so set MAX_HWIFS from CONFIG_IDE_MAX_HWIFS. This reduces the default from 10 to 4, but I don't think that's a problem. Signed-off-by: Bjorn Helgaas Acked-by: Bartlomiej Zolnierkiewicz Cc: Alan Cox Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7bed9ec44cb282425f56033e5fb5448086cd758 tree e41cbb456d0e313997b7e16f7a3fed9848530aaf parent 12fc1d7b4b08a80776de3073439a09f54ce31f8f author Jason Gaston Fri, 03 Feb 2006 03:04:52 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:11 -0800 [PATCH] piix: add Intel ICH8M device IDs Signed-off-by: Jason Gaston Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12fc1d7b4b08a80776de3073439a09f54ce31f8f tree d98b6605704016950afab7cf60c60cafc78e5b60 parent db9a369ec172c8251dbc6f7bf6bf13f6c5b6e7f5 author Jayachandran C Fri, 03 Feb 2006 03:04:51 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:11 -0800 [PATCH] IPMI: fix issues reported by Coverity in ipmi_msghandler.c While looking to the report by Coverity in ipmi, I came across the following issue: The IPMI message handler relies on two defines which are the same -one in include/linux/ipmi.h #define IPMI_NUM_CHANNELS 0x10 and one in drivers/char/ipmi/ipmi_msghandler. #define IPMI_MAX_CHANNELS 16 These are used interchangeably in ipmi_msghandler.c, but since the array addr->channels[] is of size IPMI_MAX_CHANNELS, I have made a patch that uses IPMI_MAX_CHANNELS for all the checks for the array index. NOTE: You could probably remove the line that defines IPMI_NUM_CHANNELS from ipmi.h, or move IPMI_MAX_CHANNELS to ipmi.h Signed-off-by: Jayachandran C. Cc: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db9a369ec172c8251dbc6f7bf6bf13f6c5b6e7f5 tree 66d4b2367e7f308efd11b354d47b398796c4986c parent 99603966f5b44693901ea68cef2c1c21ce6a49c3 author Jayachandran C Fri, 03 Feb 2006 03:04:50 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:11 -0800 [PATCH] UDF: Fix issues reported by Coverity in namei.c This patch fixes an issue in fs/udf/namei.c reported by Coverity: Error reported(1776) CID: 1776 Checker: UNUSED_VALUE (help) File: fs/udf/namei.c Function: udf_lookup Description: Pointer returned from "udf_find_entry" is never used Patch description: remove unused variable fi. Signed-off-by: Jayachandran C. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99603966f5b44693901ea68cef2c1c21ce6a49c3 tree 3d2e45673794c8d5d6a3627ec1843dc14cb994eb parent 7656f328f68b351a8bb71ad465cedc8d0a039f9e author KAMBAROV, ZAUR Fri, 03 Feb 2006 03:04:49 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:11 -0800 [PATCH] coverity: udf/balloc.c null deref fix It's doing if (obh) else dereference obh So presumably `obh' is never null in there. This defect was found automatically by Coverity Prevent, a static analysis tool. Signed-off-by: Zaur Kambarov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7656f328f68b351a8bb71ad465cedc8d0a039f9e tree 178a98c7619a943f06f3c5a286add5140d7b8229 parent ddca2488a2a69421924485bbcec39b512b580d0e author Vincent Hanquez Fri, 03 Feb 2006 03:04:48 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:11 -0800 [PATCH] debugfs: hard link count wrong Fix incorrect nlink of root inode for filesystems that use simple_fill_super(). Signed-off-by: Vincent Hanquez Cc: Greg KH Cc: Heiko Carstens Cc: Al Viro Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddca2488a2a69421924485bbcec39b512b580d0e tree 97a6798ce4481c485a4d258e656be08c90636299 parent def9391c561c60e9d0aab58abca5404acef1de4b author Karsten Keil Fri, 03 Feb 2006 03:04:48 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:11 -0800 [PATCH] i4l: warning fixes drivers/isdn/hisax/hscx_irq.c: In function `hscx_interrupt': drivers/isdn/hisax/hscx_irq.c:201: warning: comparison is always 1 due to width of bit-field It's due to (PACKET_NOACK != bcs->tx_skb->pkt_type) pkt_type is only three bit wide. I think this should fix it for the moment, pkt_type 7 is not used yet and this is only used internal in hisax. Signed-off-by: Karsten keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit def9391c561c60e9d0aab58abca5404acef1de4b tree c5c8f5785290d2e7d255b065ebfe9df6e9713316 parent 6d94074f0804143eac6bce72dc04447c0040e7d8 author Andrew Morton Fri, 03 Feb 2006 03:04:47 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:10 -0800 [PATCH] ip2main.c warning fixes With Eric's "i386: Add a temporary to make put_user more type safe" patch we get a pile of warnings out of ip2m1in.c: drivers/char/ip2main.c: In function `ip2_ipl_ioctl': drivers/char/ip2main.c:2910: warning: assignment makes integer from pointer without a cast drivers/char/ip2main.c:2911: warning: assignment makes integer from pointer without a cast drivers/char/ip2main.c:2912: warning: assignment makes integer from pointer without a cast etc. This ioctl is copying the kernel virtual address of a large number of functions out to userspace. Heaven knows why. Rather than fixing the warnings, I think we'll just nuke that code. The patch also fixes a couple of `defined but not used' warnings. Cc: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d94074f0804143eac6bce72dc04447c0040e7d8 tree 2833a03682e12d81d4bd849435cd9f95e64e9350 parent 353368dffb56b066cbe00264581a56caf0241b29 author Davi Arnaut Fri, 03 Feb 2006 03:04:46 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:10 -0800 [PATCH] Fix keyctl usage of strnlen_user() In the small window between strnlen_user() and copy_from_user() userspace could alter the terminating `\0' character. Signed-off-by: Davi Arnaut Cc: David Howells Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 353368dffb56b066cbe00264581a56caf0241b29 tree 3792cc37a8269804f213ecd0c1e9a3948fb44109 parent 3b641407a1447759ac8159180e90ed2e4387a0b6 author Eric W. Biederman Fri, 03 Feb 2006 03:04:45 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:10 -0800 [PATCH] edac_mc: Remove include of version.h By including version.h edac_mc was rebuilding on every incremental build. Which defeats the point of incremental builds. Signed-off-by: Eric W. Biederman Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b641407a1447759ac8159180e90ed2e4387a0b6 tree 1cf86560c28701cdff32366a5070781319da53a1 parent e60e5c50aa5389db86e96fc52d02bc7db3d23f4a author OGAWA Hirofumi Fri, 03 Feb 2006 03:04:44 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:10 -0800 [PATCH] fat: Fix truncate() write ordering The truncate() should write the file size before writing the new EOF entry. This patch fixes it. This bug was pointed out by Machida Hiroyuki. Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e60e5c50aa5389db86e96fc52d02bc7db3d23f4a tree dcf9d09c7fed328628750023fecaf3eef4ad8624 parent 5b00226d4d3aa7969d84e16f857ea100465d9c98 author OGAWA Hirofumi Fri, 03 Feb 2006 03:04:43 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:10 -0800 [PATCH] Trivial optimization of ll_rw_block() The ll_rw_block() needs to get ref-count only if it submits a buffer(). This patch avoids the needless get/put of ref-count. Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b00226d4d3aa7969d84e16f857ea100465d9c98 tree bb40304b944606518b723e5f1ce136f13effb2f2 parent 514a01b880d28a3029d9e35de72ad8d2f95b31d0 author OGAWA Hirofumi Fri, 03 Feb 2006 03:04:42 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:10 -0800 [PATCH] fat: Replace an own implementation with ll_rw_block(SWRITE,) This patch replaces an own implementation with LL_RW_BLOCK(SWRITE,) which was newly added. Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 514a01b880d28a3029d9e35de72ad8d2f95b31d0 tree df6db749acdf0548bde145d2467ebfc894a736a9 parent 808249ceba49cdb3054c0aa5b75a61862d6cab94 author Andrew Morton Fri, 03 Feb 2006 03:04:41 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:10 -0800 [PATCH] uninline __sigqueue_free() Five callsites. I dunno how all this crap got back in there :( Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 808249ceba49cdb3054c0aa5b75a61862d6cab94 tree 246d11a687db3e8a775e746ed8f0da1aeedae70c parent 546cfdf47f2ea2438b01f8626a60b87f9d8d1e53 author Paul Fulghum Fri, 03 Feb 2006 03:04:41 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:09 -0800 [PATCH] new tty buffering locking fix Change locking in the new tty buffering facility from using tty->read_lock, which is currently ignored by drivers and thus ineffective. New locking uses a new tty buffering specific lock enforced centrally in the tty buffering code. Two drivers (esp and cyclades) are updated to use the tty buffering functions instead of accessing tty buffering internals directly. This is required for the new locking to work. Minor checks for NULL buffers added to tty_prepare_flip_string/tty_prepare_flip_string_flags Signed-off-by: Paul Fulghum Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 546cfdf47f2ea2438b01f8626a60b87f9d8d1e53 tree 35c6ccd5a5469f98a36432daad158f991aa844a5 parent 2c5d81a58106fa333467beab5f11dafab07b3e66 author Alexey Dobriyan Fri, 03 Feb 2006 03:04:40 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:09 -0800 [PATCH] ipmi: mem_{in,out}[bwl] => intf_mem_{in,out}[bwl] On mips: drivers/char/ipmi/ipmi_si_intf.c:1274: error: conflicting types for 'mem_inb' include/asm/io.h:436: error: previous definition of 'mem_inb' was here Don't look at line 436 unless you really know what you're doing. Move those static functions out of more or less generic namespace. Signed-off-by: Alexey "## should be banned" Dobriyan Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c5d81a58106fa333467beab5f11dafab07b3e66 tree 7fabac3f87c1c0d385569cbc127df36e5ff6a05f parent bb3b9cf122eb097ed9fe8ae50e1b0dbba9bbe447 author Fernando Luis Vazquez Cao Fri, 03 Feb 2006 03:04:39 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:09 -0800 [PATCH] Compilation of kexec/kdump broken The compilation of kexec/kdump seems to be broken for x86_64. Remove the dependency of kexec on CONFIG_IA32_EMULATION. Signed-off-by: Fernando Vazquez Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb3b9cf122eb097ed9fe8ae50e1b0dbba9bbe447 tree 4032cc19712ff78f532d2071f15a317e026da15b parent 9d9c0531c91755a90b646b27bb722d59ee3eb46d author Paul E. McKenney Fri, 03 Feb 2006 03:04:38 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:09 -0800 [PATCH] Fix comment to synchronize_sched() Fix to broken comment to synchronize_rcu() noted by Keith Owens. Also add sentence noting that synchronize_sched() and synchronize_rcu() are not necessarily identical. Signed-off-by: Paul E. McKenney Cc: Keith Owens Cc: Stephen Hemminger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d9c0531c91755a90b646b27bb722d59ee3eb46d tree 662992e8d6336171f6c09a13f57c96ddb017b9d3 parent 69dcc99199fe29b0a29471a3488d39d9d33b25fc author Herbert Poetzl Fri, 03 Feb 2006 03:04:37 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:09 -0800 [PATCH] quota: fix error code for ext2_new_inode() The quota check in ext2_new_inode() returns ENOSPC where it should return EDQUOT instead. Signed-off-by: Herbert Pötzl Acked-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69dcc99199fe29b0a29471a3488d39d9d33b25fc tree 4232ad9a782dee6abfe7fa20c95a49249195de8f parent 66ac5a294db70aa377c0d7bbdb0c4e3ef2349b7b author Zhang, Yanmin Fri, 03 Feb 2006 03:04:36 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:09 -0800 [PATCH] Export cpu topology in sysfs The patch implements cpu topology exportation by sysfs. Items (attributes) are similar to /proc/cpuinfo. 1) /sys/devices/system/cpu/cpuX/topology/physical_package_id: represent the physical package id of cpu X; 2) /sys/devices/system/cpu/cpuX/topology/core_id: represent the cpu core id to cpu X; 3) /sys/devices/system/cpu/cpuX/topology/thread_siblings: represent the thread siblings to cpu X in the same core; 4) /sys/devices/system/cpu/cpuX/topology/core_siblings: represent the thread siblings to cpu X in the same physical package; To implement it in an architecture-neutral way, a new source file, driver/base/topology.c, is to export the 5 attributes. If one architecture wants to support this feature, it just needs to implement 4 defines, typically in file include/asm-XXX/topology.h. The 4 defines are: #define topology_physical_package_id(cpu) #define topology_core_id(cpu) #define topology_thread_siblings(cpu) #define topology_core_siblings(cpu) The type of **_id is int. The type of siblings is cpumask_t. To be consistent on all architectures, the 4 attributes should have deafult values if their values are unavailable. Below is the rule. 1) physical_package_id: If cpu has no physical package id, -1 is the default value. 2) core_id: If cpu doesn't support multi-core, its core id is 0. 3) thread_siblings: Just include itself, if the cpu doesn't support HT/multi-thread. 4) core_siblings: Just include itself, if the cpu doesn't support multi-core and HT/Multi-thread. So be careful when declaring the 4 defines in include/asm-XXX/topology.h. If an attribute isn't defined on an architecture, it won't be exported. Thank Nathan, Greg, Andi, Paul and Venki. The patch provides defines for i386/x86_64/ia64. Signed-off-by: Zhang, Yanmin Cc: Ingo Molnar Cc: Nick Piggin Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66ac5a294db70aa377c0d7bbdb0c4e3ef2349b7b tree 15af88490e32c4d2f0c8a7350da701595a746b07 parent f0c00257d63463fa9d692e632fae037d6c0e67b0 author Alexey Dobriyan Fri, 03 Feb 2006 03:04:35 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:08 -0800 [PATCH] ixj: fix writing silence check j->write_buffer_rp is a pointer. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0c00257d63463fa9d692e632fae037d6c0e67b0 tree 94ca16b28d70eb96155974909560cced8a3cf383 parent 6bf8d889ed453f709dedacabdcf5db47470fdae9 author Peter Williams Fri, 03 Feb 2006 03:04:33 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:08 -0800 [PATCH] lib: Fix bug in int_sqrt() for 64 bit longs The implementation of int_sqrt() assumes that longs have 32 bits. On systems that have 64 bit longs this will result in gross errors when the argument to the function is greater than 2^32 - 1 on such systems. I doubt whether any such use is currently made of int_sqrt() but the attached patch fixes the problem anyway. Signed-off-by: Peter Williams Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6bf8d889ed453f709dedacabdcf5db47470fdae9 tree f28c0b85f67393eca83757853a9c4a13d0d56ea0 parent 1374ae8b9a3789695962a0f3fd4c6eb7aff881bc author Herbert Poetzl Fri, 03 Feb 2006 03:04:32 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:08 -0800 [PATCH] quota: remove unused sync_dquots_dev() The already removed sync_dquots_dev(dev,type) is still defined in the no-quota case. Signed-off-by: Herbert Pötzl Acked-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1374ae8b9a3789695962a0f3fd4c6eb7aff881bc tree 7bed559af16279923855624ee9a52f6d102b7fb7 parent 0a577ce34f703c885f807e2abc77dff02c7857af author Adrian Bunk Fri, 03 Feb 2006 03:04:31 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:08 -0800 [PATCH] drivers/serial/jsm/: cleanups - jsm_driver.c: remove the now unused jsm_rawreadok module_param - jsm_tty.c: remove a now unused variable Is there any problem with removing the now useless jsm_rawreadok module_param? Signed-off-by: Adrian Bunk Cc: V. Ananda Krishnan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a577ce34f703c885f807e2abc77dff02c7857af tree a2bfd15ca0ffe4ecc65c769008c9bfa8e0b107c9 parent 7d95c8f27d9be65bf160f1edaf653d33dfceb58c author V. Ananda Krishnan Fri, 03 Feb 2006 03:04:30 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:07 -0800 [PATCH] jsm: update for tty buffering revamp Signed-off-by: V. Ananda Krishnan Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d95c8f27d9be65bf160f1edaf653d33dfceb58c tree 2e232ef2fccb1e6c81616bd9f3a56a0676549a8a parent 8b3e09e19932835fb77c63aaf3b1af6117e78871 author dean gaudet Fri, 03 Feb 2006 03:04:30 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:07 -0800 [PATCH] fcntl F_SETFL and read-only IS_APPEND files There is code in setfl() which attempts to preserve the O_APPEND flag on IS_APPEND files... however IS_APPEND files could also be opened O_RDONLY and in that case setfl() should not require O_APPEND... coreutils 5.93 tail -f attempts to set O_NONBLOCK even on regular files... unfortunately if you try this on an append-only log file the result is this: fcntl64(3, F_GETFL) = 0x8000 (flags O_RDONLY|O_LARGEFILE) fcntl64(3, F_SETFL, O_RDONLY|O_NONBLOCK|O_LARGEFILE) = -1 EPERM (Operation not permitted) I offer up the patch below as one way of fixing the problem... i've tested it fixes the problem with tail -f but haven't really tested beyond that. (I also reported the coreutils bug upstream... it shouldn't fail imho... ) Signed-off-by: dean gaudet Cc: Al Viro Acked-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b3e09e19932835fb77c63aaf3b1af6117e78871 tree d98125db1fe2ee0c82426cac98c954cd62842e88 parent 15d8ec7d08fbb7876e292b42bc92da8d82df7ea9 author Markus Lidel Fri, 03 Feb 2006 03:04:29 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:07 -0800 [PATCH] I2O: fix and workaround for Motorola/Freescale controller - This controller violates the I2O spec for the I/O registers. The patch contains a workaround which moves the registers to the proper location. (originally author: Matthew Starzewski) - If a message frame is beyond the mapped address range a error is returned. Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15d8ec7d08fbb7876e292b42bc92da8d82df7ea9 tree 7e9f217d0022728ed3205abc403e05620993ff9e parent 35dc8161d0a6fa5e654bcb3d6240acc9ecb0a259 author Markus Lidel Fri, 03 Feb 2006 03:04:28 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:07 -0800 [PATCH] I2O: don't disable PCI device if it is enabled before probing If PCI device is enabled before probing, it will not be disabled at exit. Signed-off-by: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35dc8161d0a6fa5e654bcb3d6240acc9ecb0a259 tree 0c688ffc3adc127f5cf9f35ff93e6072e1f42438 parent 835417967c10b6dfaffdffddba59196196e5d431 author Jeff Moyer Fri, 03 Feb 2006 03:04:27 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:07 -0800 [PATCH] fix O_DIRECT read of last block in a sparse file Currently, if you open a file O_DIRECT, truncate it to a size that is not a multiple of the disk block size, and then try to read the last block in the file, the read will return 0. The problem is in do_direct_IO, here: /* Handle holes */ if (!buffer_mapped(map_bh)) { char *kaddr; ... if (dio->block_in_file >= i_size_read(dio->inode)>>blkbits) { /* We hit eof */ page_cache_release(page); goto out; } We shift off any remaining bytes in the final block of the I/O, resulting in a 0-sized read. I've attached a patch that fixes this. I'm not happy about how ugly the math is getting, so suggestions are more than welcome. I've tested this with a simple program that performs the steps outlined for reproducing the problem above. Without the patch, we get a 0-sized result from read. With the patch, we get the correct return value from the short read. Signed-off-by: Jeff Moyer Cc: Badari Pulavarty Cc: Suparna Bhattacharya Cc: Mingming Cao Cc: Joel Becker Cc: "Chen, Kenneth W" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 835417967c10b6dfaffdffddba59196196e5d431 tree 086fdbcd063c7f7615067323f73751c9f9d2d15e parent a18546110ed6bec483d55bfffccb2487dfbd77af author Carsten Otte Fri, 03 Feb 2006 03:04:25 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:07 -0800 [PATCH] ext2: print xip mount option in ext2_show_options In case we have CONFIG_FS_XIP, ext2_show_options shows "xip" if EXT2_MOUNT_XIP mount flag is set. Signed-off-by: Carsten Otte Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a18546110ed6bec483d55bfffccb2487dfbd77af tree 7363fe19d01ac7fd7c8de7cbee874999c78ab232 parent 0d38b049fe8df77c8e9dc48d0fd84555739fbb1a author schwab@suse.de Fri, 03 Feb 2006 03:04:24 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:07 -0800 [PATCH] disable per cpu intr in /proc/stat Don't compute and display the per-irq sums on ia64 either, too much overhead for mostly useless figures. Cc: Olaf Hering Acked-by: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d38b049fe8df77c8e9dc48d0fd84555739fbb1a tree 8a4a72ab172202f29ba0c2020cb44d7f893cdf43 parent fe85a998ca64a067e58ca9240ec54a95994d78ee author Randy Dunlap Fri, 03 Feb 2006 03:04:24 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:06 -0800 [PATCH] edac: use C99 initializers (sparse warnings) drivers/edac/e752x_edac.c:1042:7: warning: obsolete struct initializer, use C99 syntax Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe85a998ca64a067e58ca9240ec54a95994d78ee tree 6856b5b7e8aa8724abe9103737c71ef055e158c8 parent 778116920e89b91b19d2b488a0d6fe63cf43379c author Randy Dunlap Fri, 03 Feb 2006 03:04:23 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:06 -0800 [PATCH] cpuset: fix sparse warning kernel/cpuset.c:644:38: warning: non-ANSI function declaration of function 'cpuset_update_task_memory_state' Signed-off-by: Randy Dunlap Acked-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 778116920e89b91b19d2b488a0d6fe63cf43379c tree 43a8144d5f19baec1e9f5a4616702be8299488fc parent 0ef3b49cc24963a11125971b8deaa8b46209d113 author Arnaud Giersch Fri, 03 Feb 2006 03:04:22 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:06 -0800 [PATCH] parport: remove dead address in MAINTAINERS Remove dead address for David Campbell in MAINTAINERS. Signed-off-by: Arnaud Giersch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ef3b49cc24963a11125971b8deaa8b46209d113 tree bb568031614c455c6cd471232da96bec8f8eeea7 parent 88fc3897e3219e63ae6e2d180a6c87d033ef9f3b author Arnaud Giersch Fri, 03 Feb 2006 03:04:21 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:06 -0800 [PATCH] parport: fix documentation Fix documentation to actually match the code. Signed-off-by: Arnaud Giersch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88fc3897e3219e63ae6e2d180a6c87d033ef9f3b tree 4443e273b15c2f07229d65b90df2ae3579afb80d parent 034b91a3b66cf9d2983ac45f73162395c0936c36 author George Anzinger Fri, 03 Feb 2006 03:04:20 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:06 -0800 [PATCH] Normalize timespec for negative values in ns_to_timespec - In case of a negative nsec value the result of the division must be normalized. - Remove inline from an exported function. Signed-off-by: George Anzinger Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 034b91a3b66cf9d2983ac45f73162395c0936c36 tree d8d731e5ef3dbe3cea129c48d5c1bc245414f189 parent 05818a004a84951fd383694f3b35d89eb49fa308 author Latchesar Ionkov Fri, 03 Feb 2006 03:04:20 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:06 -0800 [PATCH] v9fs: fix corner cases when flushing request When v9fs_mux_rpc sends a 9P message, it may be put in the queue of unsent request. If the user process receives a signal, v9fs_mux_rpc sets the request error to ERREQFLUSH and assigns NULL to request's send message. If the message was still in the unsent queue, v9fs_write_work would produce an oops while processing it. The patch makes sure that requests that are being flushed are moved to the pending requests queue safely. If a request is being flushed, don't remove it from the list of pending requests even if it receives a reply before the flush is acknoledged. The request will be removed during from the Rflush handler (v9fs_mux_flush_cb). Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05818a004a84951fd383694f3b35d89eb49fa308 tree a9c18d8cbcd565ac5d1bf833af8d5161dbca18d3 parent 93c615feffbcea4f09ecee154f46062f6041776e author Latchesar Ionkov Fri, 03 Feb 2006 03:04:18 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:06 -0800 [PATCH] v9fs: v9fs_put_str fix v9fs_put_str used to store pointer to the source string, instead of the cbuf copy. This patch corrects it. Signed-off-by: Latchesar Ionkov Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93c615feffbcea4f09ecee154f46062f6041776e tree e2f125d960d288cad271b72173f8cfd4476bcc11 parent 8e75f744289f0a1c38b669e39a489af460640881 author Latchesar Ionkov Fri, 03 Feb 2006 03:04:17 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:06 -0800 [PATCH] v9fs: symlink support fixes Two symlink fixes, v9fs_readlink didn't copy the last character of the symlink name, v9fs_vfs_follow_link incorrectly called strlen of newly allocated buffer instead of PATH_MAX. Signed-off-by: Latchesar Ionkov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e75f744289f0a1c38b669e39a489af460640881 tree a9e7e67187d6076698dfc466752e161f7cbb0031 parent bd3bfeb58aeddb660dc600ded2fa9243e0c2d12b author Arnaud Giersch Fri, 03 Feb 2006 03:04:16 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:05 -0800 [PATCH] parport: add parallel port support for SGI O2 Add support for the built-in parallel port on SGI O2 (a.k.a. IP32). Define a new configuration option: PARPORT_IP32. The module is named parport_ip32. Hardware support for SPP, EPP and ECP modes along with DMA support when available are currently implemented. Signed-off-by: Arnaud Giersch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd3bfeb58aeddb660dc600ded2fa9243e0c2d12b tree 0e28c95b1f94f10e0bceb9a424b6a293b8b3ec7a parent abffa7da99b78caaf81a2f519bf9cbd1e8dcbc1d author Felix Oxley Fri, 03 Feb 2006 03:04:15 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:05 -0800 [PATCH] fs/jffs/intrep.c: 255 is unsigned char Signed-off-by: Felix Oxley Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abffa7da99b78caaf81a2f519bf9cbd1e8dcbc1d tree f28e90613a3f01b9d867adecab778ade0c4fbf85 parent 74adb52797a7cde217a8ceeaf254a5441a42a72c author Domen Puncer Fri, 03 Feb 2006 03:04:14 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:05 -0800 [PATCH] drivers/isdn/sc/ioctl.c: copy_from_user() size fix A few lines above the patch we have: char *srec; srec = kmalloc(SCIOC_SRECSIZE, GFP_KERNEL); sizeof pointer is probably not meant here. Signed-off-by: Domen Puncer Signed-off-by: Alexey Dobriyan Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74adb52797a7cde217a8ceeaf254a5441a42a72c tree 805ec25448f1c4bf88b35ade8c2885687a6dc66a parent dfa08592ca0440d793ecc8dfc6277dd2aa4b8dda author Tobias Klauser Fri, 03 Feb 2006 03:04:13 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:05 -0800 [PATCH] umem: check pci_set_dma_mask return value correctly Signed-off-by: Tobias Klauser Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfa08592ca0440d793ecc8dfc6277dd2aa4b8dda tree 93bcf1323962aba32957093d6f04c0c8cdbb41fe parent 9d923a0603b5909a6758cfaec503955775cb7ab1 author Andreas Gruenbacher Fri, 03 Feb 2006 03:04:13 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:05 -0800 [PATCH] Fix two ext[23] uninitialized warnings There is a code path that passed size to ext2_xattr_set (ext3_xattr_set_handle) before initializing it. The callees don't use the value in that case, but gcc cannot tell. Always initialize size to get rid of the warnings. Signed-off-by: Andreas Gruenbacher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d923a0603b5909a6758cfaec503955775cb7ab1 tree 5aa12488890ed9d4be2fb86eb54622d4d4a61f94 parent 90cbc45b1d8a81e661a981ddd69f95d6915f1574 author Andreas Schwab Fri, 03 Feb 2006 03:04:12 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:05 -0800 [PATCH] ufs: fix char vs. __s8 clash in ufs Fix this warning: fs/ufs/super.c: In function ‘ufs_fill_super’: fs/ufs/super.c:858: warning: case label value exceeds maximum value for type which happens because __s8 != char. These macros are used for struct ufs_super_block.fs_clean which is declared as __s8. Signed-off-by: Andreas Schwab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90cbc45b1d8a81e661a981ddd69f95d6915f1574 tree 0355d353a44bb7efcd1a36969dfcb3bc70c5e0b1 parent 23332c2e9da16b717f18fd95bc90211a663aa6ee author Dave Jones Fri, 03 Feb 2006 03:04:11 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:05 -0800 [PATCH] EDAC config cleanup The AMD76x chipsets aren't used in 64-bit, so don't offer the driver to the user. Signed-off-by: Dave Jones Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23332c2e9da16b717f18fd95bc90211a663aa6ee tree 873e445688472fd1726c0e48113f63a585d03b39 parent 8145916996b91d42b8bb4b0fcd508af295222c7c author Tong Li Fri, 03 Feb 2006 03:04:09 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:04 -0800 [PATCH] OProfile: fixed x86_64 incorrect kernel call graphs Fix the problem in kernel 2.6.15.1 (and early versions) that OProfile on x86_64 does not correctly collect the stack traces for kernel functions. The original code in valid_kernel_stack() in arch/i386/oprofile/backtrace.c assumes that the frame pointer (headaddr) should be greater than stack (i.e., regs). This assumption is wrong for x86_64 because NMIs in x86_64 use a seperate stack different from the kernel stack. Therefore, the variable stack now points to some location on the NMI stack, which turns out to be at a higher address than the frame pointer (headaddr) on the kernel stack. The correct comparison here should be between headaddr and regs->rsp for x86_64. Signed-off-by: Tong Li Cc: John Levon Cc: Philippe Elie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8145916996b91d42b8bb4b0fcd508af295222c7c tree 298ec43ab4e40888d142ffd5e84be67c80e07c9f parent 84542838a3829f34630c589c1eb570656c455a1c author Alan Cox Fri, 03 Feb 2006 03:04:08 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:04 -0800 [PATCH] Fix some ucLinux breakage from the tty updates Breakage reported by Adrian Bunk Untested (no hardware) Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84542838a3829f34630c589c1eb570656c455a1c tree 401218ce579c354427522d116f67d0bc1cb706ed parent 47ba87e0b1269698801310bfd1716b0538282405 author Alan Cox Fri, 03 Feb 2006 03:04:07 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:04 -0800 [PATCH] rio cleanups INKERNEL is always defined HOST is never defined therefore RTA is also never defined Strip the relevant garbage out of the headers on this basis. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47ba87e0b1269698801310bfd1716b0538282405 tree be429e822401e9f1a213b008b5e6e2f538754888 parent 09114eb8c53d2d3b2ff9523e011cb68b2e245dce author Marcelo Tosatti Fri, 03 Feb 2006 03:04:06 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:04 -0800 [PATCH] make "struct d_cookie" depend on CONFIG_PROFILING Shrinks "struct dentry" from 128 bytes to 124 on x86, allowing 31 objects per slab instead of 30. Cc: John Levon Cc: Philippe Elie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09114eb8c53d2d3b2ff9523e011cb68b2e245dce tree c66d4590814072f91d74f185c798a3935d933209 parent e295cfcb2907ae4c5df57f5d4ada1ce6f3ae4657 author Evgeniy Dushistov Fri, 03 Feb 2006 03:04:06 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:04 -0800 [PATCH] ufs: fix hang during `rm' This fixes the code like this: bh = sb_find_get_block (sb, tmp + j); if ((bh && DATA_BUFFER_USED(bh)) || tmp != fs32_to_cpu(sb, *p)) { retry = 1; brelse (bh); goto next1; } bforget (bh); sb_find_get_block() ordinarily returns a buffer_head with b_count>=2, and this code assume that in case if "b_count>1" buffer is used, so this caused infinite loop. (akpm: that is-the-buffer-busy code is incomprehensible. Good riddance. Use of block_truncate_page() seems sane). Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e295cfcb2907ae4c5df57f5d4ada1ce6f3ae4657 tree a28ca6bf5ba0c3e1e03e12eb5067727028bb6452 parent 19dfe31c29e0ebb88cf1cd2211da3e2ff2a26d52 author Evgeniy Dushistov Fri, 03 Feb 2006 03:04:04 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:04 -0800 [PATCH] ufs: fix oops with `ufs1' type "rm" command, on file system with "ufs1" type cause system hang up. This is, in fact, not so bad as it seems to be, because of after that in "kernel control path" there are 3-4 places which may cause "oops". So the first patch fix oopses, and the second patch fix "kernel hang up". "oops" appears because of reading of group's summary info partly wrong, and access to not first group's summary info cause "oops". Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19dfe31c29e0ebb88cf1cd2211da3e2ff2a26d52 tree ac41d7f180f0453f58c87313d2ba74f00135016a parent 8c17e1eb05977283bc7ad94d16ace3a0d586921a author Andrew Morton Fri, 03 Feb 2006 03:04:04 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:03 -0800 [PATCH] sx.c printk warning fixes drivers/char/sx.c: In function `sx_set_real_termios': drivers/char/sx.c:934: warning: long unsigned int format, different type arg (arg 2) drivers/char/sx.c:961: warning: long unsigned int format, different type arg (arg 2) drivers/char/sx.c:976: warning: long unsigned int format, different type arg (arg 2) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c17e1eb05977283bc7ad94d16ace3a0d586921a tree 717a9bed6c94bda73b738f2a9610ff4a7b09dea3 parent f4f64e9ded28bcdb2cb57438bd1721579f8b28c0 author Andrew Morton Fri, 03 Feb 2006 03:04:03 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:03 -0800 [PATCH] quota_v2: printk warning fixes fs/quota_v2.c: In function `v2_check_quota_file': fs/quota_v2.c:39: warning: int format, different type arg (arg 2) fs/quota_v2.c:39: warning: int format, different type arg (arg 3) Cc: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4f64e9ded28bcdb2cb57438bd1721579f8b28c0 tree 08d9f88145bc100fc54904d6519f5a71ef2abbe7 parent d35c602870ece3166cff3d25fbc687a7f707acf3 author Andrew Morton Fri, 03 Feb 2006 03:04:02 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:03 -0800 [PATCH] parport_serial: printk warning fix drivers/parport/parport_serial.c: In function `parport_register': drivers/parport/parport_serial.c:334: warning: unsigned int format, different type arg (arg 3) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d35c602870ece3166cff3d25fbc687a7f707acf3 tree 345bb168a75e37848921428c29b01d65a75479d1 parent 3636641bb2c7a806c1099ca092ec8cd180063f9b author Vitaly Fertman Fri, 03 Feb 2006 03:04:01 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:03 -0800 [PATCH] someone broke reiserfs V3 mount options, this fixes it Signed-off-by: Hans Reiser Signed-off-by: Vitaly Fertman Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3636641bb2c7a806c1099ca092ec8cd180063f9b tree cea6933f946da514169009e5e3b02c48de60aab1 parent 145046d31ecf9f4f1ba80c8d21225158f6d1738c author Adrian Bunk Fri, 03 Feb 2006 03:04:00 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:03 -0800 [PATCH] don't allow users to set CONFIG_BROKEN=y Do not allow people to create configurations with CONFIG_BROKEN=y. The sole reason for CONFIG_BROKEN=y would be if you are working on fixing a broken driver, but in this case editing the Kconfig file is trivial. Never ever should a user enable CONFIG_BROKEN. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 145046d31ecf9f4f1ba80c8d21225158f6d1738c tree a95112bb148b8accf8a04c5b5f931ab1fd5de680 parent de6c642ca9566ed358e1cde5fa0e25f7788a5566 author Randy Dunlap Fri, 03 Feb 2006 03:03:59 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:03 -0800 [PATCH] parport: fix printk format warning Fix printk format warning: drivers/parport/probe.c:205: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' Signed-off-by: Randy Dunlap Signed-off-by: Arnaud Giersch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de6c642ca9566ed358e1cde5fa0e25f7788a5566 tree efba9a9cc23f0f7351a7ea01c29bcdd400698744 parent 5423980245c56fd968840b6d36bbddc2719084e4 author Alan Cox Fri, 03 Feb 2006 03:03:58 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:02 -0800 [PATCH] SBC EPX does not check/claim I/O ports it uses (2nd Edition) Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5423980245c56fd968840b6d36bbddc2719084e4 tree 2a2b4616145ca641935eea84f31ae73aa7293ecc parent 8d1d0340da3fc7d1a8d9198e74e97d2db6c3f86f author Andrew Morton Fri, 03 Feb 2006 03:03:58 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:02 -0800 [PATCH] sx.c warning fixes drivers/char/sx.c: In function `sx_set_real_termios': drivers/char/sx.c:934: warning: int format, long unsigned int arg (arg 2) drivers/char/sx.c:961: warning: unsigned int format, tcflag_t arg (arg 2) drivers/char/sx.c:976: warning: unsigned int format, tcflag_t arg (arg 2) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d1d0340da3fc7d1a8d9198e74e97d2db6c3f86f tree f2af2677f96339ae550f5c55deb3bb8f259cb854 parent 490d6ab170c94a7a59870f528d765131b8963e79 author Steffen Klassert Fri, 03 Feb 2006 03:03:57 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:02 -0800 [PATCH] 3c59x: collision statistic fix Count the total number of packets with collisions during transmission in vp->stats.collisions. Signed-off-by: Steffen Klassert Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 490d6ab170c94a7a59870f528d765131b8963e79 tree 909deca0ac2476a839b446de382a4866dccf0196 parent bcc68b8616bcac47dbfc414398e382b3b10faf4c author Zach Brown Fri, 03 Feb 2006 03:03:56 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:02 -0800 [PATCH] list.h: don't evaluate macro args multiple times I noticed that list.h init functions were evaluating macro arguments multiple times and thought it might be nice to protect the unsuspecting caller. Converting the macros to inline functions seems to reduce code size, too. A i386 defconfig build with gcc 3.3.3 from fc4: text data bss dec hex filename 3573148 565664 188828 4327640 4208d8 vmlinux.before 3572177 565664 188828 4326669 42050d vmlinux add/remove: 0/0 grow/shrink: 11/144 up/down: 88/-1016 (-928) There was no difference in checkstack output. Signed-off-by: Zach Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bcc68b8616bcac47dbfc414398e382b3b10faf4c tree b636e8378c1823d75f2f6512cb2eb6c4f52d2dd9 parent 54e8ce463a7e21dbe9dad57723ed47653ee5db15 author Alexey Dobriyan Fri, 03 Feb 2006 03:03:54 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:02 -0800 [PATCH] include/asm-*/bitops.h: fix more "~0UL >> size" typos "[PATCH] m68knommu: fix find_next_zero_bit in bitops.h" fixed a typo in m68knommu implementation of find_next_zero_bit(). grep(1) shows that cris, frv, h8300, v850 are also affected. Signed-off-by: Alexey Dobriyan Cc: Mikael Starvik Cc: David Howells Cc: Yoshinori Sato Cc: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54e8ce463a7e21dbe9dad57723ed47653ee5db15 tree fff09c6b173bfbf1657edad2bca53db9e2f2bb53 parent 501fe31df4bb94999fbe9bb42f05527df5525683 author Keith Owens Fri, 03 Feb 2006 03:03:53 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:02 -0800 [PATCH] Tell kallsyms_lookup_name() to ignore type U entries When one module exports a function symbol and another module uses that symbol then kallsyms shows the symbol twice. Once from the consumer with a type of 'U' and once from the provider with a type of 't' or 'T'. On most architectures, both entries have the same address so it does not matter which one is returned by kallsyms_lookup_name(). But on architectures with function descriptors, the 'U' entry points to the descriptor, not to the code body, which is not what we want. IA64 # grep -w qla2x00_remove_one /proc/kallsyms a000000208c25ef8 U qla2x00_remove_one [qla2300] <= descriptor a000000208bf44c0 t qla2x00_remove_one [qla2xxx] <= function body Tell kallsyms_lookup_name() to ignore type U entries in modules. Signed-off-by: Keith Owens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 501fe31df4bb94999fbe9bb42f05527df5525683 tree 01cf726e2ac5ced909582228156e884b35e367b5 parent cd2d2bf657ef1f376def6f8281202f20800fee7d author Cornelia Huck Fri, 03 Feb 2006 03:03:52 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:01 -0800 [PATCH] s390: fix to_channelpath macro Fix broken to_channelpath macro (fortunately worked in all current cases...). Signed-off-by: Cornelia Huck Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd2d2bf657ef1f376def6f8281202f20800fee7d tree dcce983ab8bdd4881aecaf5b5435e951014caaab parent 6ff290a0c0dec40eb6f80efbb0ac88f518bbb2a7 author Heiko Carstens Fri, 03 Feb 2006 03:03:52 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:01 -0800 [PATCH] s390: fix compat syscall wrapper Patch 9ad11ab48b1ad618bf47076e9e579f267f5306c2 changes the type of the first argument of some compat syscalls from int to unsigned int. Add these changes to the s390 compat wrapper as well. Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ff290a0c0dec40eb6f80efbb0ac88f518bbb2a7 tree 2104a0923095681204896057429afabd3e700314 parent 6d7bfd14e593455a0801c62db86f82912c52c3a1 author Heiko Carstens Fri, 03 Feb 2006 03:03:51 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:01 -0800 [PATCH] s390: compile fix: missing defines in asm-s390/io.h Compile fix: add missing __raw_read* and __raw_write* defines to include/asm-s390/io.h. These are mandatory since patch c27a0d75b33c030965cc97d3d7f571107a673fb4 was merged. Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d7bfd14e593455a0801c62db86f82912c52c3a1 tree 364541b34fcafa5b47d7ee04a930471d969906d0 parent 12c3a54848a6eba2b38cd92ba5925433d223332b author Jan Glauber Fri, 03 Feb 2006 03:03:50 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:01 -0800 [PATCH] s390: timer interface visibility Avoid visibility of kernel internal interface to user space. Signed-off-by: Jan Glauber Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12c3a54848a6eba2b38cd92ba5925433d223332b tree 79f06b7bfc761610d38a2bd27774d691e45ca55f parent d237bf49261ed812a17f7123fea9b80ef673ca0f author Stefan Weinhuber Fri, 03 Feb 2006 03:03:49 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:01 -0800 [PATCH] s390: dasd extended error reporting module The DASD extended error reporting is a facility that allows to get detailed information about certain problems in the DASD I/O. This information can be used to implement fail-over applications that can recover these problems. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d237bf49261ed812a17f7123fea9b80ef673ca0f tree e0ac0c126e5705cc7f9116211994195bfca2d652 parent 75b84e94aa9fa74bda9a393b55ef6778b90eb1a8 author Thibaut VARENE Fri, 03 Feb 2006 03:03:48 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:01 -0800 [PATCH] ide: restore support for AEC6280M cards in aec62xx.c This patch adds missing initialization sequence, necessary to get the "Macintosh" version of AEC6280 cards to work in Linux. Without this patch, the driver hangs for several minutes trying to initialize the card and the kernel is left in an unstable state. This patch has been tested fine on ppc and i386. Signed-off-by: Thibaut VARENE Acked-by: Bartlomiej Zolnierkiewicz Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75b84e94aa9fa74bda9a393b55ef6778b90eb1a8 tree 80554e6194e28d5ee4ec99392794f4635bcecba8 parent f434baf4c6ae4a392b7c34843825af0894c89db2 author Martin Michlmayr Fri, 03 Feb 2006 03:03:47 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:01 -0800 [PATCH] Fix compilation errors in maps/dc21285.c CC drivers/mtd/maps/dc21285.o drivers/mtd/maps/dc21285.c: In function `dc21285_copy_to_32': drivers/mtd/maps/dc21285.c:113: error: invalid lvalue in increment drivers/mtd/maps/dc21285.c: In function `dc21285_copy_to_16': drivers/mtd/maps/dc21285.c:124: error: invalid lvalue in increment drivers/mtd/maps/dc21285.c: In function `dc21285_copy_to_8': drivers/mtd/maps/dc21285.c:134: error: invalid lvalue in increment make[3]: *** [drivers/mtd/maps/dc21285.o] Error 1 Signed-off-by: Martin Michlmayr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f434baf4c6ae4a392b7c34843825af0894c89db2 tree 1b2773fde539d62d3a19ba11ac5828d3fb20340d parent c9ab8b68e2abb1eff7ac0f8d118a8765130b967d author Akinobu Mita Fri, 03 Feb 2006 03:03:46 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:00 -0800 [PATCH] fix generic_fls64() Noticed by Rune Torgersen. Fix generic_fls64(). tcp_cubic is using fls64(). Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9ab8b68e2abb1eff7ac0f8d118a8765130b967d tree f316acae1a19f539bd30437b172de6987d1f4ca0 parent c0c1633bdb844ec5b4ac15c97ab8927d80550c42 author Linas Vepstas Fri, 03 Feb 2006 03:03:45 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:00 -0800 [PATCH] Documentation: Updated PCI Error Recovery This patch is a cleanup/restructuring/clarification of the PCI error handling doc. It should look rather professional at this point. Signed-off-by: Linas Vepstas Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0c1633bdb844ec5b4ac15c97ab8927d80550c42 tree 8f70444139c8564c0f1e88e1f33adda036ae6a96 parent 278ff9537030bbb292b33504f5e1f6e0126793eb author Dave Jones Fri, 03 Feb 2006 03:03:44 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:00 -0800 [PATCH] Fix build failure in recent pm_prepare_* changes. kernel/power/power.h:49: error: static declaration of 'pm_prepare_console' follows non-static declaration include/linux/suspend.h:46: error: previous declaration of 'pm_prepare_console' was here kernel/power/power.h:50: error: static declaration of 'pm_restore_console' follows non-static declaration include/linux/suspend.h:47: error: previous declaration of 'pm_restore_console' was here Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 278ff9537030bbb292b33504f5e1f6e0126793eb tree 0087828bdf4d9a4fb57c9bcafd068ff058b39797 parent e65cefe87beda627c0bfba39b387ee4bffedc93c author Ananth N Mavinakayanahalli Fri, 03 Feb 2006 03:03:43 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:00 -0800 [PATCH] Kprobes: Fix deadlock in function-return probes When two function-return probes are inserted on kfree()[1] and the second on say, sys_link()[2], and later [2] is unregistered, we have a deadlock as kfree is called with the kretprobe_lock held and the function-return probe on kfree will also try to grab the same lock. However, we can move the kfree() during unregistration to outside the spinlock as we are sure that no instances from the free list will be used after synchronized_sched() returns during the unregistration process. Thanks to Masami Hiramatsu for spotting this. Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e65cefe87beda627c0bfba39b387ee4bffedc93c tree f44c1d29edcfe271261bd1a36ba9ec12db53489e parent 8ed75463b969f72fd724ba0c01107fa443522321 author Adrian Bunk Fri, 03 Feb 2006 03:03:42 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:00 -0800 [PATCH] kernel/kprobes.c: fix a warning #ifndef ARCH_SUPPORTS_KRETPROBES kernel/kprobes.c:353: warning: 'pre_handler_kretprobe' defined but not used Signed-off-by: Adrian Bunk Acked-by: Ananth N Mavinakayanahalli Acked-by: "Keshavamurthy, Anil S" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ed75463b969f72fd724ba0c01107fa443522321 tree 4d14d9a4374ea981e3e3f5e94cc292c392fff222 parent 29fc7e3e70a05e9eea28afb6707a39c1a53e2f66 author NeilBrown Fri, 03 Feb 2006 03:03:41 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:00 -0800 [PATCH] md: Make sure rdev->size gets set for version-1 superblocks Sometimes it doesn't so make the code more like the version-0 code which works. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29fc7e3e70a05e9eea28afb6707a39c1a53e2f66 tree 4e8bc28c717116ade3cd723a921f3260656327aa parent 284ae7cab0f7335c9e0aa8992b28415ef1a54c7c author NeilBrown Fri, 03 Feb 2006 03:03:41 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:32:00 -0800 [PATCH] md: Assorted little md fixes - version-1 superblock + The default_bitmap_offset is in sectors, not bytes. + the 'size' field in the superblock is in sectors, not KB - raid0_run should return a negative number on error, not '1' - raid10_read_balance should not return a valid 'disk' number if ->rdev turned out to be NULL - kmem_cache_destroy doesn't like being passed a NULL. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 284ae7cab0f7335c9e0aa8992b28415ef1a54c7c tree bc74bef37ecdceed31a15b4aefd1defccecf4a40 parent ab11f89929b785daaa428801bd8b7e65241d7913 author NeilBrown Fri, 03 Feb 2006 03:03:40 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:31:59 -0800 [PATCH] md: Handle overflow of mdu_array_info_t->size better mdu_array_info_t->size is 'int', which isn't big enough for the size (in KB of each component in) some arrays. So rather than a random overflow, set size to -1 when it cannot be set correctly. To update aspect on an array, userspace will sometimes: get_array_info change one field set_array_info in this case, we don't want the '-1' in 'size' to change to size, or look like a size change at all. So test for that in update_array_info. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab11f89929b785daaa428801bd8b7e65241d7913 tree 490adc87a0dafd1085ce872818e19285c09c576a parent 1989e20cc1e7491232795f9dac9b745e4329dfd8 author Linas Vepstas Fri, 03 Feb 2006 03:03:38 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:31:59 -0800 [PATCH] Clean up Documentation/driver-model/overview.txt Edits to the driver-model documentation for grammar, clarity and content. These docs haven't been updated in years, and some of the technical content and discussion has become stale; this patch updates these. In addition, some of the language is awkward. Fix this. (I'm trying to cleanup the other files in this directory also, patches for these will come a bit later). Signed-off-by: Linas Vepstas Acked-by: Patrick Mochel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1989e20cc1e7491232795f9dac9b745e4329dfd8 tree 0cc80048b8068bde1088246db3dff3bf42ecf4a7 parent 826eeb53a6f264842200d3311d69107d2eb25f5e author Michal Ostrowski Fri, 03 Feb 2006 03:03:37 -0800 committer Linus Torvalds Fri, 03 Feb 2006 08:31:59 -0800 [PATCH] Fix RocketPort driver Call "ld->receive_buf" using the start of the character and flag buffers, rather than the ends. Signed-off-by: Michal Ostrowski Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0dec456d1fe73e0539625f0973ee8ef8fb805943 tree 56d37da8d8e37154030d3f45224ae852195977e6 parent 6e2be3ea4fab4d1c02e369719311e8d7ae6cc7c1 author Stephen Hemminger Thu, 02 Feb 2006 20:40:09 -0800 committer David S. Miller Thu, 02 Feb 2006 20:40:09 -0800 [NET]: Add CONFIG_NETDEBUG to suppress bad packet messages. If you are on a hostile network, or are running protocol tests, you can easily get the logged swamped by messages about bad UDP and ICMP packets. This turns those messages off unless a config option is enabled. Signed-off-by: Stephen Hemminger Acked-by: Dave Jones Signed-off-by: David S. Miller commit 6e2be3ea4fab4d1c02e369719311e8d7ae6cc7c1 tree e8f036af13821f9e5ee5062fa50f3c30a5c4ebee parent 7faa006f94fda56a587242b2a22fa19abf840222 author David S. Miller Thu, 02 Feb 2006 17:29:59 -0800 committer David S. Miller Thu, 02 Feb 2006 17:29:59 -0800 [TG3]: Update driver version and release date. Signed-off-by: David S. Miller commit 7faa006f94fda56a587242b2a22fa19abf840222 tree b1354b391829bc3f1d83fd3121167318f8472147 parent 3f330317ab4973178423aba750d6d0ca5ce0024a author Michael Chan Thu, 02 Feb 2006 17:29:28 -0800 committer David S. Miller Thu, 02 Feb 2006 17:29:28 -0800 [TG3]: Flush tg3_reset_task() Make sure tg3_reset_task() is flushed in the close and suspend paths as noted by Jeff Garzik. In the close path, calling flush_scheduled_work() may cause deadlock if linkwatch_event() is on the workqueue. linkwatch_event() will try to get the rtnl_lock() which is already held by tg3_close(). So instead, we set a flag in tg3_reset_task() and tg3_close() polls the flag until it is cleared. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 3f330317ab4973178423aba750d6d0ca5ce0024a tree 177b1a3f213410bc526fda0cdb1b0568ea282d82 parent f00c401b9b5f0a90e2eb05705f5988fbda0b082b author Pablo Neira Ayuso Thu, 02 Feb 2006 17:15:41 -0800 committer David S. Miller Thu, 02 Feb 2006 17:15:41 -0800 [TEXTSEARCH]: Fix broken good shift array calculation in Boyer-Moore The current logic does not calculate correctly the good shift array: Let x be the pattern that is being searched. Let y be the block of data. The good shift array aligns the segment: x[i+1 ... m-1] = y[i+j+1 ... j+m-1] with its rightmost occurrence in x that fulfils x[i] neq y[i+j]. In previous version, the good shift array for the pattern ANPANMAN is: [1, 8, 3, 8, 8, 8, 8, 8] and should be: [1, 8, 3, 6, 6, 6, 6, 6] Signed-off-by: Pablo Neira Ayuso Signed-off-by: David S. Miller commit f00c401b9b5f0a90e2eb05705f5988fbda0b082b tree 0ab0be0da08318dd87b5c9190247f6381ceb0abb parent 95f7daf1c058dc6afbc2d33b6a65ce1bae132dc8 author Horms Thu, 02 Feb 2006 17:03:18 -0800 committer David S. Miller Thu, 02 Feb 2006 17:03:18 -0800 [IPV4]: Remove suprious use of goto out: in icmp_reply This seems to be an artifact of the follwoing commit in February '02. e7e173af42dbf37b1d946f9ee00219cb3b2bea6a In a nutshell, goto out and return actually do the same thing, and both are called in this function. This patch removes out. Signed-Off-By: Horms Signed-off-by: David S. Miller commit 95f7daf1c058dc6afbc2d33b6a65ce1bae132dc8 tree 47b6d056cba5339643ac39775864aeb904f0f848 parent 6f4b6ec1cffcbb12cc47244381496d59b6a5a790 author Horms Thu, 02 Feb 2006 17:02:25 -0800 committer David S. Miller Thu, 02 Feb 2006 17:02:25 -0800 [IPV4]: Document icmp_errors_use_inbound_ifaddr sysctl Taken largely from the commit of the patch that added this feature: 1c2fb7f93cb20621772bf304f3dba0849942e5db I'm not sure about the ordering of the options in sysctl.txt, so I took a wild guess about where it fits. Signed-Off-By: Horms Signed-off-by: David S. Miller commit 6f4b6ec1cffcbb12cc47244381496d59b6a5a790 tree d43bba50024fcbe32faae70a5574aba45f2709ab parent f8addb3215bf58154f189017d934dfc06b62c75e author Herbert Xu Thu, 02 Feb 2006 17:01:13 -0800 committer David S. Miller Thu, 02 Feb 2006 17:01:13 -0800 [IPV6]: Fix illegal dst locking in softirq context. On Tue, Jan 31, 2006 at 10:24:32PM +0100, Ingo Molnar wrote: > > [] _write_lock+0x8/0x10 > [] inet6_destroy_sock+0x25/0x100 > [] tcp_v6_destroy_sock+0x12/0x20 > [] inet_csk_destroy_sock+0x4a/0x150 > [] tcp_rcv_state_process+0xd4c/0xdd0 > [] tcp_v4_do_rcv+0xa9/0x340 > [] tcp_v4_rcv+0x8eb/0x9d0 OK this is definitely broken. We should never touch the dst lock in softirq context. Since inet6_destroy_sock may be called from that context due to the asynchronous nature of sockets, we can't take the lock there. In fact this sk_dst_reset is totally redundant since all IPv6 sockets use inet_sock_destruct as their socket destructor which always cleans up the dst anyway. So the solution is to simply remove the call. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit f8addb3215bf58154f189017d934dfc06b62c75e tree 408ad5d1eac85858c44b68b957ae235a4ce41eed parent 27852c26baab8b95fc9a2b3e8a18770ecd553f10 author Herbert Xu Thu, 02 Feb 2006 16:59:16 -0800 committer David S. Miller Thu, 02 Feb 2006 16:59:16 -0800 [IPV4] multipath_wrandom: Fix softirq-unsafe spin lock usage The spin locks in multipath_wrandom may be obtained from either process context or softirq context depending on whether the packet is locally or remotely generated. Therefore we need to disable BH processing when taking these locks. This bug was found by Ingo's lock validator. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 27852c26baab8b95fc9a2b3e8a18770ecd553f10 tree f07d3c696598ce6e7181ee30344bce899971e062 parent 4641e7a334adf6856300a98e7296dfc886c446af author Vlad Yasevich Thu, 02 Feb 2006 16:57:31 -0800 committer David S. Miller Thu, 02 Feb 2006 16:57:31 -0800 [SCTP]: Fix 'fast retransmit' to send a TSN only once. SCTP used to "fast retransmit" a TSN every time we hit the number of missing reports for the TSN. However the Implementers Guide specifies that we should only "fast retransmit" a given TSN once. Subsequent retransmits should be timeouts only. Also change the number of missing reports to 3 as per the latest IG(similar to TCP). Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 4641e7a334adf6856300a98e7296dfc886c446af tree 39030c280f6fbfa183c2ce5a0db37118ce5a7810 parent 42c5e15f18d63c1ecf79d52bdaf4ea31cd22416d author Herbert Xu Thu, 02 Feb 2006 16:55:45 -0800 committer David S. Miller Thu, 02 Feb 2006 16:55:45 -0800 [IPV6]: Don't hold extra ref count in ipv6_ifa_notify Currently the logic in ipv6_ifa_notify is to hold an extra reference count for addrconf dst's that get added to the routing table. Thus, when addrconf dst entries are taken out of the routing table, we need to drop that dst. However, addrconf dst entries may be removed from the routing table by means other than __ipv6_ifa_notify. So we're faced with the choice of either fixing up all places where addrconf dst entries are removed, or dropping the extra reference count altogether. I chose the latter because the ifp itself always holds a dst reference count of 1 while it's alive. This is dropped just before we kfree the ifp object. Therefore we know that in __ipv6_ifa_notify we will always hold that count. This bug was found by Eric W. Biederman. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 42c5e15f18d63c1ecf79d52bdaf4ea31cd22416d tree 1f93d1430321312857a93157276aa94c2b5db14d parent 1113a7e92e483074c6235da59460759e33b9b144 author Stephen Hemminger Thu, 02 Feb 2006 16:53:26 -0800 committer David S. Miller Thu, 02 Feb 2006 16:53:26 -0800 [NET] snap: needs hardware checksum fix The SNAP code pops off it's 5 byte header, but doesn't adjust the checksum. This would cause problems when using device that does IP over SNAP and hardware receive checksums. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 7c6c66362941df847957766ad133ff5fde67579c tree d9f548837ca949603aef0d25739fff514e631e2f parent 9a52bbed905fa41ca10f4db2e845b588f0fdfbef author Robin Holt Thu, 02 Feb 2006 12:30:21 -0600 committer Tony Luck Thu, 02 Feb 2006 13:37:46 -0800 [IA64-SGI] Fix XPC code which sleeps with spin_lock_irqsave(). During some testing, we got a warning about trying to allocate memory while holding a lock. This fixes that problem. Signed-off-by: Robin Holt Acked-by: Dean Nelson Signed-off-by: Tony Luck commit 9a52bbed905fa41ca10f4db2e845b588f0fdfbef tree 6caee8f97528a14af745d50a7cec452342d96d5f parent 2fcc3db0ccee9b47df7a4f732e6624f4f643c035 author Jes Sorensen Thu, 02 Feb 2006 05:50:05 -0500 committer Tony Luck Thu, 02 Feb 2006 13:36:50 -0800 [IA64-SGI] include/asm-ia64/sn/intr.h more sn2 housekeeping House keeping - eliminate unneeded parenthesis in macro defines. Signed-off-by: Jes Sorensen Signed-off-by: Tony Luck commit 2fcc3db0ccee9b47df7a4f732e6624f4f643c035 tree ead470915fdf782c1357ddc07baac22ec4136a6e parent 41db6112a5558bd09c8ec5b0e61566db11f0d86d author Jes Sorensen Thu, 02 Feb 2006 05:15:51 -0500 committer Tony Luck Thu, 02 Feb 2006 13:35:59 -0800 [IA64-SGI] sn2 housekeeping Maintenance patch: - Add missing __init calls - Do not zero initialize global variables - No need to typecast function call returns to void - Some formatting Signed-off-by: Jes Sorensen Signed-off-by: Tony Luck commit 41db6112a5558bd09c8ec5b0e61566db11f0d86d tree 9d17f274bc6bc9737c911bc0010fec790d7b7892 parent a58786917ce23c2a26c3e099c3cdba32a35eeceb parent 466575f4e975db1207c5e1a7be34aeaec6ddba1e author Tony Luck Thu, 02 Feb 2006 13:30:59 -0800 committer Tony Luck Thu, 02 Feb 2006 13:30:59 -0800 Pull sgi-drivers-makefile-cleanup into release branch commit a58786917ce23c2a26c3e099c3cdba32a35eeceb tree 4740de51febbe16934d24d94cb80432a7547cb26 parent af14aca90e0cdfccd71f9947c45b6ea2cf321dcb author Bjorn Helgaas Mon, 30 Jan 2006 16:32:31 -0700 committer Tony Luck Thu, 02 Feb 2006 13:25:54 -0800 [IA64] avoid broken SAL_CACHE_FLUSH implementations If SAL_CACHE_FLUSH drops interrupts, complain about it and fall back to using PAL_CACHE_FLUSH instead. This is to work around a defect in HP rx5670 firmware: when an interrupt occurs during SAL_CACHE_FLUSH, SAL drops the interrupt but leaves it marked "in-service", which leaves the interrupt (and others of equal or lower priority) masked. Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck commit af14aca90e0cdfccd71f9947c45b6ea2cf321dcb tree fe071a17a7c08b6f4ca4b80e3643a97d640bcf20 parent a80dcc0b9660b01a2cc1c0faa8f6095970f38730 author Kyle McMartin Sat, 28 Jan 2006 00:02:52 -0500 committer Tony Luck Thu, 02 Feb 2006 13:23:55 -0800 [IA64] Remove stale comment from ia64/Kconfig Somehow I doubt this comment is meant to be here anymore... It's been floating after the L1_CACHE_SHIFT entry since before Linux moved to bitkeeper. Signed-off-by: Kyle McMartin Signed-off-by: Tony Luck commit a80dcc0b9660b01a2cc1c0faa8f6095970f38730 tree 6daa36d0ba71642872e775de6d39a61146a89ffd parent 689388bbf8c5c1966b6a67fa427299f90cf83b99 author Mark Maule Fri, 27 Jan 2006 13:59:07 -0600 committer Tony Luck Thu, 02 Feb 2006 13:23:02 -0800 [IA64-SGI] disable msi for all altix pci devices Temporary patch to make pci_enable_msi() fail gracefully on altix. Will be removed after 2.6.16 releases and the msi abstraction patches start flowing. Signed-off-by: Mark Maule Signed-off-by: Tony Luck commit 689388bbf8c5c1966b6a67fa427299f90cf83b99 tree c6d84992dbdba3705ece5e9f2cd512e59503d771 parent f8efa27662532ad5adb2790bfc3f4c78e019cfad author Mark Maule Fri, 27 Jan 2006 11:55:34 -0600 committer Tony Luck Thu, 02 Feb 2006 13:22:15 -0800 [IA64-SGI] fix smp_affinity redirection when using CONFIG_PCI_MSI Redirecting interrupts using smp_affinity on altix does not work on kernels built with CONFIG_PCI_MSI. The problem is that move_irq() turns into a noop if MSI is built in. This patch calls move_native_irq() instead of move_irq() to get around that. Signed-off-by: Mark Maule Signed-off-by: Tony Luck commit f8efa27662532ad5adb2790bfc3f4c78e019cfad tree 848c4935674ed965256ef328a6b69316ebad6a8c parent df080e7c94c8f4b8334614159fa079aaeece5670 author Chen, Kenneth W Thu, 26 Jan 2006 18:24:59 -0800 committer Tony Luck Thu, 02 Feb 2006 13:20:42 -0800 [IA64] remove staled comments in asm/system.h With the recent optimization made to wrap_mmu_context function, we don't hold tasklist_lock anymore when wrapping context id. The comments in asm/system.h must fall through the crack earlier. Remove staled comments. I believe it is still beneficial to unlock the runqueue lock across context switch. So leave __ARCH_WANT_UNLOCKED_CTXSW on. Signed-off-by: Ken Chen Signed-off-by: Tony Luck commit df080e7c94c8f4b8334614159fa079aaeece5670 tree a2108d6db9a3b7d2124645bd63bb025ef3c8a5e4 parent 0271fc2db6260dd46f196191e24281af2fddb879 parent 61a34a024fcd61ef7207405b2e4cef2c073b220c author Tony Luck Thu, 02 Feb 2006 13:16:29 -0800 committer Tony Luck Thu, 02 Feb 2006 13:16:29 -0800 Pull update-tlbflush-sn into release branch commit 9c0f4755bd5a117595761c95b93c29e8d9ca07b5 tree 33737024ea3ad4dd9d1cfe4a043fb947f00059db parent 3ec9c59449744dcc390d593a017d30671546fd9e author Atsushi Nemoto Thu, 02 Feb 2006 20:53:39 +0000 committer Russell King Thu, 02 Feb 2006 20:53:39 +0000 [SERIAL] initialize spinlock for port failed to setup console It seems serial_core intend to initialize port->lock just once for each ports. This is done in uart_set_options() for console, and in uart_add_one_port() for other ports. But there is a case the port->lock is not initialized by serial_core. If the setup function for the console was failed, it will not call uart_set_options() but the port is marked as console (uart_console(port) returns 1). It can happen if console was PCI port which can not detected at the time of register_console. This patch is to initialize port->lock for such console port. With this change, most of spin_lock_init() (some of them are labeled "Temporary fix.") in low-level serial drivers can be omitted. Signed-off-by: Atsushi Nemoto Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 3ec9c59449744dcc390d593a017d30671546fd9e tree c478df4c56fcf92ae614463542b27b6f40f7a6a1 parent b4103333d7904310d34de18d85e51e3d74f00a3b author Andrey Panin Thu, 02 Feb 2006 20:15:09 +0000 committer Russell King Thu, 02 Feb 2006 20:15:09 +0000 [SERIAL] SIIG 8-port serial boards support This patch adds support for SIIG 8-port boards. These boards have 4 ports in separate bars and another 4 ports in the single bar. Because of this strange port arrangement these cards need special setup function. Fortunately no other SIIG cards have more than 4 port, so this setup function could be used for them too. Signed-off-by: Andrey Panin Signed-off-by: Russell King commit e92251762d02a46177d4105d1744041e3f8bc465 tree 4696c14854b2a5f3982a613fed63e01d941727f3 parent a6df590dd8b7644c8e298e3b13442bcd6ceeb739 author Russell King Thu, 02 Feb 2006 12:23:12 +0000 committer Russell King Thu, 02 Feb 2006 12:23:12 +0000 [MMC] Add MMC command type flags Some hosts need to know the command type, so pass it via a set of flags in cmd->flags. Signed-off-by: Russell King commit 83f755f5a66a5393c3ae8925719fde0c740ac04e tree 077f98ab5fe9a9af548a5efbe1b67730c193ad9f parent 0ca5bc3de715f6e031d44ffecdd2d127891eccf5 author Lucas Correia Villa Real Wed, 01 Feb 2006 21:24:24 +0000 committer Russell King Wed, 01 Feb 2006 21:24:24 +0000 [ARM] 3286/2: S3C2400 - adds to the table of supported CPUs Patch from Lucas Correia Villa Real Oops, sorry for the typo on name_s3c2400, a new patch is attached. About GSTATUS1, S3C2400 doesn't have that register, so it's not safe to use that memory address to identify its CPU. Signed-off-by: Lucas Correia Villa Real Signed-off-by: Russell King commit 0ca5bc3de715f6e031d44ffecdd2d127891eccf5 tree ec963c52b7c60d1cd6862798f5bdfce87387082b parent 7610dfa3723e87705964b29db9775620d96bf618 author Lucas Correia Villa Real Wed, 01 Feb 2006 21:24:23 +0000 committer Russell King Wed, 01 Feb 2006 21:24:23 +0000 [ARM] 3284/1: S3C2400 - adds support to GPIO Patch from Lucas Correia Villa Real This patch adds support to GPIO on the S3C2400, which is going to be used by the GP32 machine and the SMDK2400 development board. Signed-off-by: Lucas Correia Villa Real Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 7610dfa3723e87705964b29db9775620d96bf618 tree 14e05b6c04bd4d0971320d425a30cd71d72a4866 parent 18afea04f1dfc5d52fd2579cd17adc3956acd4ad author Russ Dill Wed, 01 Feb 2006 21:07:28 +0000 committer Russell King Wed, 01 Feb 2006 21:07:28 +0000 [ARM] 3295/1: Fix oprofile init return value Patch from Russ Dill The oprofile init code was broken in commit c6b9da. The new logic will always return -ENODEV. This fixes oprofile_arch_init to return 0 on success, and return the return value of spec->init() if applicable. Signed-off-by: Russ Dill Signed-off-by: Russell King commit 18afea04f1dfc5d52fd2579cd17adc3956acd4ad tree 45b56a2a6c16662bfd135637295798a9fba3ac69 parent 8a052e0bc25ff52f17b3dff150846ca9eb969162 author Nicolas Pitre Wed, 01 Feb 2006 19:26:01 +0000 committer Russell King Wed, 01 Feb 2006 19:26:01 +0000 [ARM] 3294/1: don't invalidate individual BTB entries on ARMv6 Patch from Nicolas Pitre Doing so adds a much larger cost to the loop than the cost implied by simply invalidating the whole BTB at once. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 8a052e0bc25ff52f17b3dff150846ca9eb969162 tree 607355bc9ce1ac2d6f5611287cf89fa473d48d02 parent 62500d1f8eadff078cca462dc4df035a29180383 author Nicolas Pitre Wed, 01 Feb 2006 19:26:01 +0000 committer Russell King Wed, 01 Feb 2006 19:26:01 +0000 [ARM] 3293/1: don't invalidate the whole I-cache with xscale_coherent_user_range Patch from Nicolas Pitre The mini I-cache issue is valid only for kernel space since debuggers would not fly if they used user space addresses for their stubs. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 62500d1f8eadff078cca462dc4df035a29180383 tree 774ad280d77841292b0fb7bd1fe6f99251aa38c2 parent afe5df208e6ecd09b7d1acf36eb2cf945842bee5 author Richard Purdie Wed, 01 Feb 2006 19:26:00 +0000 committer Russell King Wed, 01 Feb 2006 19:26:00 +0000 [ARM] 3292/1: Fix memory corruption in asm-arm/checksum.h: ip_fast_csum() Patch from Richard Purdie ip_fast_csum() accesses memory via a pointer (iph) within an asm function. To prevent memory corruption when the function is inlined, it needs "memory" on the clobber list. This fixes ip checksum errors reported by a Zaurus user. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit afe5df208e6ecd09b7d1acf36eb2cf945842bee5 tree 8724b581df17f8c9bbfd38563788845335a77e8f parent f27f218cdfb12c9d2b285ec4a0bce588b5c531d3 author Richard Purdie Wed, 01 Feb 2006 19:25:59 +0000 committer Russell King Wed, 01 Feb 2006 19:25:59 +0000 [ARM] 3291/1: PXA27x: Correct get_clk_frequency_khz turbo flag handling Patch from Richard Purdie The turbo flag is in bit 0 of the CLKCFG register, not bit 1. This patch corrects this so get_clk_frequency_khz returns a correct value. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit f27f218cdfb12c9d2b285ec4a0bce588b5c531d3 tree 38e2663bb2cfe2f4af663b837288d6d6b069bafb parent a6df590dd8b7644c8e298e3b13442bcd6ceeb739 author Catalin Marinas Wed, 01 Feb 2006 19:25:58 +0000 committer Russell King Wed, 01 Feb 2006 19:25:58 +0000 [ARM] 3290/1: Fix the FIFO size detection Patch from Catalin Marinas AACI reports TX FIFO full after the first write to it if the AC97 is not enabled. This patch enables the AC97 probing before the check for the TX FIFO size. The patch also adds a warning if the TX FIFO size is not multiple of 16. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 68ee3eb8295c9c164071fcbd367c419121bd55f8 tree 63fa7c1e4637042f0da3b43b996d714e3f1ff2cc parent a2ba82cd7de281721a875a73a5a5894882760fab author Kyle McMartin Sun, 29 Jan 2006 20:25:49 -0700 committer Kyle McMartin Mon, 30 Jan 2006 00:53:14 -0500 [PARISC] New syscalls (inotify, *at, pselect6/ppoll, migrate_pages) Wire up some new syscalls that have been merged upstream, o inotify o openat et al o pselect6/ppoll o migrate_pages Signed-off-by: Kyle McMartin commit a2ba82cd7de281721a875a73a5a5894882760fab tree dd38f58c17a6a6b0630bbff13d8efeeae9979dad parent f671c45df23005692daa200aba768c642fb14ef2 author Kyle McMartin Fri, 27 Jan 2006 23:59:36 -0700 committer Kyle McMartin Sun, 29 Jan 2006 19:33:40 -0500 [PARISC] Simplify DISCONTIGMEM in Kconfig parisc was previously displaying both the mm/Kconfig memory model menu, and its own prompt. Remove prompt and have CONFIG_64BIT toggle between DISCONTIGMEM and FLATMEM. Also remove the EXPERIMENTAL from discontigmem support... It's been running fine for months (years?) now. Signed-off-by: Kyle McMartin commit 61a34a024fcd61ef7207405b2e4cef2c073b220c tree bd4b43256189c4656a838311d69e49183b4d676a parent 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 author Jack Steiner Thu, 26 Jan 2006 15:03:41 -0800 committer Tony Luck Thu, 26 Jan 2006 15:03:41 -0800 [IA64-SGI] Update TLB flushing code for SN platform This patch finishes support for SHUB2 (the new chipset). Most of the changes are performance related. A few changes are workarounds for "interesting" chipset features. Some temporary debugging code has also been deleted. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 466575f4e975db1207c5e1a7be34aeaec6ddba1e tree 37c0053f75f824d2df33c6f9962d6b4b102c1c8c parent 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 author Jes Sorensen Thu, 19 Jan 2006 04:54:00 -0500 committer Tony Luck Thu, 26 Jan 2006 13:22:03 -0800 [PATCH] drivers/sn/ must be entered for CONFIG_SGI_IOC3 Actually I think this is more appropriate so we don't end up with 17 cases that add drivers/sn to the build lib. Include drivers/sn when CONFIG_IA64_SGI_SN2 or CONFIG_IA64_GENERIC is enabled. Acked-by: Dave Jones Signed-off-by: Jes Sorensen Signed-off-by: Tony Luck commit 103ec0910d6b9401b7f72ba3ac71fed88306d2d0 tree f55019b6236cdde4dca5b176495265e8096f0a9b parent 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 author Keith Owens Wed, 18 Jan 2006 15:38:14 +1100 committer Tony Luck Thu, 26 Jan 2006 13:17:34 -0800 [IA64-SGI] Recursive flags do not work for selective builds arch/ia64/sn/Makefile sets CPPFLAGS, expecting that setting to propogate to all the subdirectories. For a normal build with its recursive descent it does work, but doing a selective build like 'make arch/ia64/sn/kernel/io_init.i' does not do a recursive descent, it goes directly to arch/ia64/sn/kernel/Makefile so the flags do not get set. To support selective builds, set the flags in all the subordinate Makefiles. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit f671c45df23005692daa200aba768c642fb14ef2 tree fbc882669f06171cd1a8be2ad7b99f062a6e1e57 parent 16541c8745e28f62b3dcb6cb354b73c9c01ea178 author Kyle McMartin Sun, 15 Jan 2006 14:10:29 -0500 committer Kyle McMartin Sun, 22 Jan 2006 20:57:42 -0500 [PARISC] Arch-specific compat signals Add enough arch-specific compat signals code to enable parisc64 to compile and boot out of the mainline tree. There are likely still many dragons here, but this is a start to squashing the last big difference between the mainline tree and the parisc-linux tree. The remaining bugs can be squashed as they come up. Signed-off-by: Kyle McMartin commit 16541c8745e28f62b3dcb6cb354b73c9c01ea178 tree 6ac1bd2fec52c395a4e2809736b14cc366726725 parent 81a3de3efd61c2483a303cf0b6227525d2f28df7 author Kyle McMartin Sat, 21 Jan 2006 21:55:06 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:57 -0500 [PARISC] Clean up printk in superio.c Clean up some of the messages printed by the superio driver by defining a prefix instead of duplicating it in every message. Also some small coding style cleanups. Signed-off-by: Kyle McMartin commit 81a3de3efd61c2483a303cf0b6227525d2f28df7 tree 038a7c16bab46260fa2e9cce6890ab4e042fc332 parent 1bcdd8548286743e1d6b3d53c96a90c6da975620 author Helge Deller Sun, 15 Jan 2006 12:11:50 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:55 -0500 [PARISC] Use DEBUG_KERNEL to catch used-after-free __init data Use CONFIG_DEBUG_KERNEL to catch kernel code which tries to access __init data after it is freed. When CONFIG_DEBUG_KERNEL is not set this also cleans up a WARN_ON at boot time. Also remove some dead code from mm/init.c Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 1bcdd8548286743e1d6b3d53c96a90c6da975620 tree b244aa416992bbd06c4153ec2c97022629826ef2 parent a2bb214dcd1db862fdb6421e21f1cff0c3535162 author Helge Deller Fri, 13 Jan 2006 13:21:06 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:54 -0500 [PARISC] Add CONFIG_DEBUG_RODATA to protect read-only data Add the parisc version of the "mark rodata section read only" patches. Based on code from and Signed-off-by Arjan van de Ven , Ingo Molnar , Andi Kleen , Andrew Morton , Linus Torvalds . Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit a2bb214dcd1db862fdb6421e21f1cff0c3535162 tree 9b02ac6c10ebe82d47fbffc8b990808fa8919274 parent 85509c00073d4bdd1f4b7796180a15198f2e62da author Matthew Wilcox Tue, 17 Jan 2006 11:43:48 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:52 -0500 [PARISC] Remove {,un}lock_kernel from perf ioctl Remove the lock_kernel/unlock_kernel pair in the ioctl method. It plainly wasn't protecting anything. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 85509c00073d4bdd1f4b7796180a15198f2e62da tree 0249b9515dac45bd2adb645e05706eee0ef807e3 parent 526110f8c8d2326413e2de5496d196ee9d4856ad author Kyle McMartin Tue, 17 Jan 2006 22:33:32 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:50 -0500 [PARISC] Add chassis_power_off routine Define a chassis_power_off routine that machines which have a way to turn off the power supply can hook into. Formerly they were using pm_power_off, which is now being used by generic code. Make lasi.c use chassis_power_off instead of pm_power_off. Note, all machines need to call machine_power_off so that the switch can power off the machine, though halt -p may not necessarily be able to work properly on the machine. Signed-off-by: Kyle McMartin commit 526110f8c8d2326413e2de5496d196ee9d4856ad tree f233775851b14064d3ec942a5d32515f16df4175 parent 9073315bbc3e2149d8ffcc4b86932ca6497c94ce author Kyle McMartin Fri, 13 Jan 2006 22:05:21 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:48 -0500 [PARISC] Remove obsolete _hlt cruft Remove a bunch of obsolete code from process.c, these routines were likely imported from the i386 version of process.c when the port started. The routines are only used in floppy.c, which I seriously doubt will ever work on parisc, due to architectural assumptions. Signed-off-by: Kyle McMartin commit 9073315bbc3e2149d8ffcc4b86932ca6497c94ce tree 830ef74fc9ca5be7019fece4cdd586d9f3926856 parent 2e13b31e5b0ff0b1f1e3359ebf8ca46c356e9391 author Kyle McMartin Fri, 13 Jan 2006 22:05:21 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:46 -0500 [PARISC] Move pm_power_off export to process.c Move the EXPORT_SYMBOL() of pm_power_off from parisc_ksyms.c to the location of its definition in process.c Signed-off-by: Kyle McMartin commit 2e13b31e5b0ff0b1f1e3359ebf8ca46c356e9391 tree f6bbc910ab5df736eb979ee5178f611f33f686b1 parent 96629c0b111dbb31d14338a55b7f650e9c490284 author Kyle McMartin Tue, 17 Jan 2006 08:33:01 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:44 -0500 [PARISC] atomic64 support Implement atomic64_t so atomic_long_t works on parisc. Also clean up some of the coding style in atomic.h, and make sure ATOMIC_INIT is cast properly. Signed-off-by: Kyle McMartin commit 96629c0b111dbb31d14338a55b7f650e9c490284 tree d60fb9813eb0f6a0bfa528eccf1d16d2a696fabb parent 10992092a8a6e445199f30e56789322851479019 author Helge Deller Sun, 15 Jan 2006 11:52:22 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:43 -0500 [PARISC] Clean up compiler warning in pci.c Avoid compiler warning for unused variables on 32bit kernels by conditionalizing the local variables on CONFIG_64BIT. PCI_HOST_ADDR() only uses the hba argument on 64bit compiles. Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 10992092a8a6e445199f30e56789322851479019 tree 22bee56057fd82642b641e0c2ae72bb7d0f2508d parent 370361f884c032216ece841ac5328393b136f0bb author Kyle McMartin Fri, 13 Jan 2006 22:05:21 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:41 -0500 [PARISC] Use F_EXTEND() for COMMAND_GLOBAL Instead of wrapping the define of COMMAND_GLOBAL in #ifdef __LP64__ use the F_EXTEND() macro defined in asm/io.h, which is the preferred way of extending mmio space addresses for either 32 or 64 bit machines. Signed-off-by: Kyle McMartin commit 370361f884c032216ece841ac5328393b136f0bb tree acc941df08f10c51bae4a976d1ba93585de3c389 parent c475eea2929a7f0dac21d20e10562a491fcf7c45 author James Bottomley Wed, 11 Jan 2006 15:11:30 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:39 -0500 [PARISC] Fix floating point invalid exception trap handler Fix our trap handler to issue the correct floating point exception for both types of invalid trap. Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit c475eea2929a7f0dac21d20e10562a491fcf7c45 tree c26fc757139765e338181f52e3b3d4177f969ea1 parent c742842223269eb8eb4b86ac05ad07e6e156526b author Helge Deller Sun, 15 Jan 2006 12:11:50 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:37 -0500 [PARISC] Drop unused do_check_pgt_cache() Drop the unused do_check_pgt_cache routine from mm/init.c and its prototype in asm/pgalloc.h Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit c742842223269eb8eb4b86ac05ad07e6e156526b tree 8d851f54bde748f33ba5be4b0d23189fa696a652 parent 2c9aadabf454fb07b8f7533096e22bf005dd08df author Thibaut VARENE Wed, 11 Jan 2006 13:59:53 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:35 -0500 [PARISC] pdc_stable version 0.22 pdc_stable v0.22, changes since v0.10: o renamed root subsystem from 'pdc' to 'stable' o split 'info' into several files, one per PDC field o implemented 'autoboot' and 'autosearch' write calls to toggle these flags o grant read permission to all users on "safe" files o more code cleanup (removed duplicate code) o avoid bad stable storage clobbering by write locking critical sections o print consistent data as well o SMP cleanups Signed-off-by: Thibaut VARENE Signed-off-by: Kyle McMartin commit 2c9aadabf454fb07b8f7533096e22bf005dd08df tree fdc041a98022f348808aab1084b3ef2a39c71ee8 parent cb6fc18e9ca615f03d18e60c49855b434ca2e51e author Grant Grundler Thu, 19 Jan 2006 23:38:03 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:34 -0500 [PARISC] Remove unnecessary extern declarations from asm/pci.h Remove two unnecessary extern declarations from asm/pci.h. They collide with what gcc4.0 assumed was static (and should be static). Found by Joel Soete. Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin commit cb6fc18e9ca615f03d18e60c49855b434ca2e51e tree c35af13054f8eeb7a24c928edf55fdc69c912562 parent a1c744439591b1d4350f0926615d501e7cfbb708 author Helge Deller Tue, 17 Jan 2006 12:40:40 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:31 -0500 [PARISC] Use kzalloc and other janitor-style cleanups Helge, o Convert a bunch of kmalloc/memset uses to kzalloc. o pci.c: Add some __read_mostly annotations. o pci.c: Move constant pci_post_reset_delay to asm/pci.h o grfioctl.h: Add A4450A to comment of CRT_ID_VISUALIZE_EG. o Add some consts to perf.c/perf_images.h Matthew, o sticore.c: Add some consts to suppress compile warnings. Signed-off-by: Helge Deller Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit a1c744439591b1d4350f0926615d501e7cfbb708 tree 3c1f1bd9a3e8f876233d05f247a922246a6ed0df parent ce33941f027bc1853ceb43d04d6204f45181703d author Matthew Wilcox Tue, 17 Jan 2006 11:05:35 -0700 committer Kyle McMartin Sun, 22 Jan 2006 20:26:29 -0500 [PARISC] Update b180_defconfig Update b180_defconfig to be more usable on other similar machines. Enabling Lasi 82596, Harmony, Mux console, CCIO, HPPB, etc., means this config is suitable for not only BXXX machines, but also CXXX and JXXX class machines. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit ce33941f027bc1853ceb43d04d6204f45181703d tree 3c55fe5a797f5e128a748d0c7a133b1fca03a384 parent 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 author Matthew Wilcox Tue, 10 Jan 2006 20:47:49 -0500 committer Kyle McMartin Sat, 21 Jan 2006 20:46:31 -0500 [PARISC] Make flush_tlb_all_local take a void * Make flush_tlb_all_local take a void * so it doesn't have to be cast when using on_each_cpu(). This becomes a problem when on_each_cpu is a macro. Also remove the prototype of flush_tlb_all_local from .c files. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin