commit 2664b25051f7ab96b22b199aa2f5ef6a949a4296 Author: Linus Torvalds Date: Mon Jan 16 23:44:47 2006 -0800 Linux v2.6.16-rc1 commit f4caf1606d3bbe3a790997e3dc5bb2779c6b7daf Author: Alan Cox Date: Mon Jan 16 17:27:38 2006 +0000 [PATCH] Remove unused code from rioctrl.c (Last for this batch of work) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 1384cee55d326e806158cea4b983ef2a9d26e035 Author: Alan Cox Date: Mon Jan 16 17:25:42 2006 +0000 [PATCH] Remove rio_table.c unused code Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 542ea6c37c2a77f7523c0703c326b8a9af2892bc Author: Alan Cox Date: Mon Jan 16 17:24:47 2006 +0000 [PATCH] Remove unused code from rio_linux.c Signed-off-by: Linus Torvalds commit 283c9d546ed7506b03f0d9da4441145aa5f2f6f9 Author: Alan Cox Date: Mon Jan 16 17:21:25 2006 +0000 [PATCH] Remove unused CHECK code from riocmd.c Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 8b03de1f667a5c15d1e4d50318a27a67669f8980 Author: Alan Cox Date: Mon Jan 16 17:19:52 2006 +0000 [PATCH] Remove unused code from rioroute.h Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit f099bfb7089735ad1760b3c6938069af10a88cc0 Author: Alan Cox Date: Mon Jan 16 17:18:05 2006 +0000 [PATCH] Remove unused code from rioboot.h Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit c7306c02874bf4d22bc0b1dbea34282d0b9a3df1 Author: Alan Cox Date: Mon Jan 16 17:14:25 2006 +0000 [PATCH] Remove unused code from rioboot Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit a6176eeab0ef1750ce21790a6c6f61ba6c9ffc63 Author: Alan Cox Date: Mon Jan 16 17:11:50 2006 +0000 [PATCH] Remove #if 0 and other long dead code from rio_tty Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 925d70d64bfeccb669c0750943585944abb28b51 Author: Alan Cox Date: Mon Jan 16 17:10:23 2006 +0000 [PATCH] Remove long dead #if 0 code from rio_param Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 09979236d6dc6a51c21131c4a8c0be7e1992a398 Author: Alan Cox Date: Mon Jan 16 17:07:54 2006 +0000 [PATCH] Remove old firmware headers from rio drivers Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 3918276ce5e3f5473428f307194fef422c0b12b8 Author: Alan Cox Date: Mon Jan 16 17:05:55 2006 +0000 [PATCH] Remove rtahw.h from rio driver (unused file) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 169da21f403adf6698ef9bbb759e27c1f496b2b5 Author: Alan Cox Date: Mon Jan 16 17:03:49 2006 +0000 [PATCH] Remove file riscos.h from rio driver (unused file) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit a09be029bbf8ceded3d9dd9715df70f1f8297b80 Author: Alan Cox Date: Mon Jan 16 17:02:43 2006 +0000 [PATCH] Remove file riowinif.h from rio driver (unused file) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 69da7f9a63679a8af67325c572a3bd1338c05df8 Author: Alan Cox Date: Mon Jan 16 17:01:41 2006 +0000 [PATCH] Remove riotime.h from rio driver (unused file) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 8618751503b66f1c2b1f8e715ffc006fa91c2400 Author: Alan Cox Date: Mon Jan 16 16:59:40 2006 +0000 [PATCH] Remove file riolocks.h from rio driver (unused file) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 0d336ceb1e35e12ec26936be421da99eeff0a3de Author: Alan Cox Date: Mon Jan 16 16:58:38 2006 +0000 [PATCH] Remove proto.h from rio driver (unused file) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 735f88c62ec8df5a3ec730c1bbf47907d76b6f75 Author: Alan Cox Date: Mon Jan 16 16:57:18 2006 +0000 [PATCH] Remove poll.h from rio driver (unused file) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 009c4cb8aa0a32548c5aaec5b7b49b307fb6bf6a Author: Alan Cox Date: Mon Jan 16 16:56:16 2006 +0000 [PATCH] Remove mesg.h from rio driver (unused file) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 125ca8fb5bbab8ff726bb538120b553f30cd136f Author: Alan Cox Date: Mon Jan 16 16:54:30 2006 +0000 [PATCH] Remove mca.h from rio driver (unused file) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 67abbfe7deccf4a800fb246f9cecd6b7836ab150 Author: Alan Cox Date: Mon Jan 16 16:53:38 2006 +0000 [PATCH] Remove internal firmware building files from rio Signed-off-by: Linus Torvalds commit b52a90dbe654c89bb9a50c90462a69931701428f Author: Alan Cox Date: Mon Jan 16 16:52:36 2006 +0000 [PATCH] Remove hosthw.h from rio (unused file) Signed-off-by: Linus Torvalds commit 85ae2f9cabbb029b0fce3fa8c641de7f0983e308 Author: Alan Cox Date: Mon Jan 16 16:51:37 2006 +0000 [PATCH] Remove formpkt.h from rio (unused file) Signed-off-by: Linus Torvalds commit bed445d41e0ca4b09ffbb82274fb79fb444030e7 Author: Alan Cox Date: Mon Jan 16 16:50:07 2006 +0000 [PATCH] Remove enable.h from rio (unused file) Signed-off-by: Linus Torvalds commit e67f76a6b1ab418b8232791d99ee728a395bd335 Author: Alan Cox Date: Mon Jan 16 16:49:15 2006 +0000 [PATCH] Remove enable.h from rio driver (unused file) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 0d233681274013a554194ce8e2fe8945cd49979f Author: Alan Cox Date: Mon Jan 16 16:48:12 2006 +0000 [PATCH] Remove debug.h from rio.h (unused file) Signed-off-by: Linus Torvalds commit 4198d8c3687418f245d7b351fd34702fb7fe0668 Author: Alan Cox Date: Mon Jan 16 16:47:14 2006 +0000 [PATCH] Remove data.h from rio driver (unused file) Signed-off-by: Linus Torvalds commit 98da212f0d22cb6ef7fee96e62572c763194c77b Author: Alan Cox Date: Mon Jan 16 16:46:17 2006 +0000 [PATCH] Remove chan.h from rio driver (unused file) Signed-off-by: Linus Torvalds commit e8a9858aa2af3d14a37eafc6182d3b12923be41c Author: Alan Cox Date: Mon Jan 16 16:45:18 2006 +0000 [PATCH] Remove cmd.h from rio driver (unused file) Signed-off-by: Linus Torvalds commit f504fb59c7e356d00ac56933a4462a6ba74d0c1d Author: Alan Cox Date: Mon Jan 16 16:44:05 2006 +0000 [PATCH] Remove brates.h from rio driver (unused file) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 4f4e2dc3ce46d279a311e5250ac3cbd394279c31 Author: Xose Vazquez Perez Date: Sat Jan 14 19:56:28 2006 +0100 [PATCH] README updated Replace old information with newer from kernel.org Signed-off-by: Linus Torvalds commit a462e9ff524f33da3e504fc71b8dd2b7584e4f28 Author: Dmitry Torokhov Date: Sun Jan 15 23:32:53 2006 -0500 [PATCH] Fix compile warning in bt8xx module Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit ea13dbc89caecd982500894d4238766a6bd3c8f4 Author: Ingo Molnar Date: Mon Jan 16 10:59:41 2006 +0100 [PATCH] kernel/hrtimer.c sparse warning fix fix the following sparse warning: kernel/hrtimer.c:665:34: warning: incorrect type in argument 2 (different address spaces) kernel/hrtimer.c:665:34: expected void const *from kernel/hrtimer.c:665:34: got struct timespec [noderef] * kernel/hrtimer.c:664:2: warning: dereference of noderef expression Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 2ddb55f091a9c74a297d72b50f8310c0c8ed7d1d Author: Ravikiran G Thirumalai Date: Tue Jan 17 07:03:47 2006 +0100 [PATCH] x86_64: Fix VSMP build Patch fixes a build problem with CONFIG_X86_VSMP. The vSMP bits probably gathered some fuzz on its way to mainline, and safe_halt() which was outside the #endif (CONFIG_X86_VSMP) somehow got inside the !CONFIG_X86_VSMP condition, hence being undefined and breaking CONFIG_X86_VSMP builds. Patch takes safe_halt() and halt() macros out of the #endif Signed-off-by: Ravikiran Thirumalai Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit c09b42404d29c8a9266f8186632330dc8474bf2e Author: Matt Tolentino Date: Tue Jan 17 07:03:44 2006 +0100 [PATCH] x86_64: add __meminit for memory hotplug Add __meminit to the __init lineup to ensure functions default to __init when memory hotplug is not enabled. Replace __devinit with __meminit on functions that were changed when the memory hotplug code was introduced. Signed-off-by: Matt Tolentino Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 44df75e629106efcada087cead6c3f33ed6bcc60 Author: Matt Tolentino Date: Tue Jan 17 07:03:41 2006 +0100 [PATCH] x86_64: add x86-64 support for memory hot-add Add x86-64 specific memory hot-add functions, Kconfig options, and runtime kernel page table update functions to make hot-add usable on x86-64 machines. Also, fixup the nefarious conditional locking and exports pointed out by Andi. Tested on Intel and IBM x86-64 memory hot-add capable systems. Signed-off-by: Matt Tolentino Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8817210d4d968e58f7d93db2eecd17b20dd03d40 Author: Andi Kleen Date: Tue Jan 17 07:03:38 2006 +0100 [PATCH] x86_64: Flexmap for 32bit and randomized mappings for 64bit Another try at this. For 32bit follow the 32bit implementation from Ingo - mappings are growing down from the end of stack now and vary randomly by 1GB. Randomized mappings for 64bit just vary the normal mmap break by 1TB. I didn't bother implementing full flex mmap for 64bit because it shouldn't be needed there. Cc: mingo@elte.hu Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 562795fe5770d0c7ee7fe269890e37d9fd475fdf Author: Andi Kleen Date: Tue Jan 17 07:03:35 2006 +0100 [PATCH] x86_64: Remove elf32_map in 32bit ELF loader It's identical to the standard elf_map. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f0cf5d1a34725f3eab39120204da4afa43874269 Author: Jan Beulich Date: Tue Jan 17 07:03:32 2006 +0100 [PATCH] x86_64: eliminate empty_bad_{page,{pte,pmd}_table} ... as they are no longer needed. Since there were hard-coded numbers in the file, the patch also adds a mechanism to avoid these (otherwise potential future changes would again and again require adjusting these numbers). Signed-Off-By: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0addb142afa12a9bdf6cc53d3e86670c59c82d8f Author: Andi Kleen Date: Tue Jan 17 07:03:29 2006 +0100 [PATCH] x86_64: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 17115e0388ece8d7141c0282c88e7dfc61953f92 Author: NeilBrown Date: Mon Jan 16 22:14:57 2006 -0800 [PATCH] md: Clear clevel whenever level is set. The 'level' of an md array can be set as either a number of a string. When one is set, the other must be marked 'undefined'. This wasn't being done in one place: where new arrays are created. Result: if md1 is a raid1, it is stopped and a raid5 is created there, it might still appear to be a raid1. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c2645830e29c082217662e7486572e9637e9f1d Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Mon Jan 16 22:14:55 2006 -0800 [PATCH] elevator=as back-compatibility As of 2.6.15 you need to use "anticipatory" instead of "as". Fix that up so that `elevator=as' still works. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Cc: Nick Piggin Cc: Jens Axboe Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5aeebe01cb2ba1bca4cd9b8a6e77386bd7499dc2 Author: Lennert Buytenhek Date: Mon Jan 16 22:14:53 2006 -0800 [PATCH] cs89x0: credit Dmitry Pervushin Credit Dmitry Pervushin for the PNX010X platform support. Signed-off-by: Lennert Buytenhek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 095da6cbb6a1c54c19b11190218eb0fbac666b6d Author: Miklos Szeredi Date: Mon Jan 16 22:14:52 2006 -0800 [PATCH] fuse: fix bitfield race Fix race in setting bitfields of fuse_conn. Spotted by Andrew Morton. The two fields ->connected and ->mounted were always changed with the fuse_lock held. But other bitfields in the same structure were changed without the lock. In theory this could lead to losing the assignment of even the ones under lock. The chosen solution is to change these two fields to be a full unsigned type. The other bitfields aren't "important" enough to warrant the extra complexity of full locking or changing them to bitops. For all bitfields document why they are safe wrt. concurrent assignments. Also make the initialization of the 'num_waiting' atomic counter explicit. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bacac382fbf53f717ca7f83558e45cce44e67df9 Author: Miklos Szeredi Date: Mon Jan 16 22:14:47 2006 -0800 [PATCH] fuse: update documentation for sysfs Add documentation for new attributes in sysfs. Also describe the filesystem. Signed-off-by: Miklos Szeredi Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1aa96a52e9594fb16296c0d76c2066773d62933 Author: Miklos Szeredi Date: Mon Jan 16 22:14:46 2006 -0800 [PATCH] fuse: use asynchronous READ requests for readpages This patch changes fuse_readpages() to send READ requests asynchronously. This makes it possible for userspace filesystems to utilize the kernel readahead logic instead of having to implement their own (resulting in double caching). Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 361b1eb55ea84181505c7f0674ca1205da1127ab Author: Miklos Szeredi Date: Mon Jan 16 22:14:45 2006 -0800 [PATCH] fuse: READ request initialization Add a separate function for filling in the READ request. This will make it possible to send asynchronous READ requests as well as synchronous ones. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b9a04693fa2d9e60933154e4c4aca83c219ef0a Author: Miklos Szeredi Date: Mon Jan 16 22:14:44 2006 -0800 [PATCH] fuse: move INIT handling to inode.c Now the INIT requests can be completely handled in inode.c and the fuse_send_init() function need not be global any more. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64c6d8ed4c55f0a99b1b81558851da80c8d58244 Author: Miklos Szeredi Date: Mon Jan 16 22:14:42 2006 -0800 [PATCH] fuse: add asynchronous request support Add possibility for requests to run asynchronously and call an 'end' callback when finished. With this, the special handling of the INIT and RELEASE requests can be cleaned up too. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69a53bf267fa58b89aa659d121dfe38436562a30 Author: Miklos Szeredi Date: Mon Jan 16 22:14:41 2006 -0800 [PATCH] fuse: add connection aborting Add ability to abort a filesystem connection. With the introduction of asynchronous reads, the ability to interrupt any request is not enough to dissolve deadlocks, since now waiting for the request completion (page unlocked) is independent of the actual request, so in a deadlock all threads will be uninterruptible. The solution is to make it possible to abort all requests, even those currently undergoing I/O to/from userspace. The natural interface for this is 'mount -f mountpoint', but that only works as long as the filesystem is attached. So also add an 'abort' attribute to the sysfs view of the connection. Signed-off-by: Miklos Szeredi Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0cd5b88553acf0611474dbaf8e43770eed268060 Author: Miklos Szeredi Date: Mon Jan 16 22:14:38 2006 -0800 [PATCH] fuse: add number of waiting requests attribute This patch adds the 'waiting' attribute which indicates how many filesystem requests are currently waiting to be completed. A non-zero value without any filesystem activity indicates a hung or deadlocked filesystem. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f543f253f3aa721a24557d7df8259145bb01b734 Author: Miklos Szeredi Date: Mon Jan 16 22:14:35 2006 -0800 [PATCH] fuse: make fuse connection a kobject Kobjectify fuse_conn, and make it visible under /sys/fs/fuse/connections. Lacking any natural naming, connections are numbered. This patch doesn't add any attributes, just the infrastructure. Signed-off-by: Miklos Szeredi Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ba7cbba100bdaca7316d71d6c6298e61191f8b2 Author: Miklos Szeredi Date: Mon Jan 16 22:14:34 2006 -0800 [PATCH] fuse: extend semantics of connected flag The ->connected flag for a fuse_conn object previously only indicated whether the device file for this connection is currently open or not. Change it's meaning so that it indicates whether the connection is active or not: now either umount or device release will clear the flag. The separate ->mounted flag is still needed for handling background requests. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d77a1d5b611742c538364f041ff4610d27b14fe7 Author: Miklos Szeredi Date: Mon Jan 16 22:14:31 2006 -0800 [PATCH] fuse: introduce list for requests under I/O Create a new list for requests in the process of being transfered to/from userspace. This will be needed to be able to abort all requests even those currently under I/O Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83cfd4935124b165e942c317dc3e9ebb0a3e6a63 Author: Miklos Szeredi Date: Mon Jan 16 22:14:31 2006 -0800 [PATCH] fuse: introduce unified request state The state of request was made up of 2 bitfields (->sent and ->finished) and of the fact that the request was on a list or not. Unify this into a single state field. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6383bdaa2ed2d461d9f4d369dfaa9d610fc972e3 Author: Miklos Szeredi Date: Mon Jan 16 22:14:29 2006 -0800 [PATCH] fuse: miscellaneous cleanup - remove some unneeded assignments - use kzalloc instead of kmalloc + memset - simplify setting sb->s_fs_info - in fuse_send_init() use fuse_get_request() instead of do_get_request() helper Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bfc016d2e2fff71c6843257f0fd0b60876331ed Author: Miklos Szeredi Date: Mon Jan 16 22:14:28 2006 -0800 [PATCH] fuse: uninline some functions Inline keyword is unnecessary in most cases. Clean them up. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3bebd94bbe4e59dfa23d85b0296a4ce8ebcc6c7 Author: Miklos Szeredi Date: Mon Jan 16 22:14:27 2006 -0800 [PATCH] fuse: handle error INIT reply Handle the case when the INIT request is answered with an error. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f43b155a5a8a95b06bc0b4474fbb7311c7e9709a Author: Miklos Szeredi Date: Mon Jan 16 22:14:26 2006 -0800 [PATCH] fuse: fix request_end() This function used the request object after decrementing its reference count and releasing the lock. This could in theory lead to all sorts of problems. Fix and simplify at the same time. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 222f1d69183f10d70a37de5785698fe0aa363c12 Author: Miklos Szeredi Date: Mon Jan 16 22:14:25 2006 -0800 [PATCH] fuse: fuse_copy_finish() order fix fuse_copy_finish() must be called before request_end(), since the later might sleep, and no sleeping is allowed between fuse_copy_one() and fuse_copy_finish() because of kmap_atomic()/kunmap_atomic() used in them. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f87fd4c2a0c4f3baad28057360b36a59591ef751 Author: Miklos Szeredi Date: Mon Jan 16 22:14:23 2006 -0800 [PATCH] add /sys/fs This patch adds an empty /sys/fs, which filesystems can use. Signed-off-by: Miklos Szeredi Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e6e1db4ac7acfe3e38bbef9eba59233ba7f6b9a Author: Bob Copeland Date: Mon Jan 16 22:14:20 2006 -0800 [PATCH] partitions: Read Rio Karma partition table The Rio Karma portable MP3 player has its own proprietary partition table. The partition layout is similar to a DOS boot sector but it begins at a different offset and uses a different magic number (0xAB56 instead of 0xAA55). Add support for it to enable mounting the device. Signed-off-by: Bob Copeland Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cad8244840d1a148f638925758afd1cdf81fc839 Author: Paul Mundt Date: Mon Jan 16 22:14:19 2006 -0800 [PATCH] sh: Move CPU subtype configuration to its own Kconfig Currently the CPU subtype options are cluttering up arch/sh/Kconfig somewhat. Given that, this moves all of that in to its own arch/sh/mm/Kconfig. Things like cache configuration are also moved to this new location. This also adds support for strict CPU tuning on newer cores, which requires the addition of as-option. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa01666df35cd769c0957d4b3ae6ee99d680ab88 Author: Paul Mundt Date: Mon Jan 16 22:14:18 2006 -0800 [PATCH] sh: Simple timer framework This builds on some of the clock framework code to support a simple system timer interface. Signed-off-by: Paul Mundt Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36ddf31b689a8c11d424e43565d2aa440b77bbf4 Author: Paul Mundt Date: Mon Jan 16 22:14:17 2006 -0800 [PATCH] sh: Simplistic clock framework This adds a relatively simplistic clock framework for sh. The initial goal behind this is to clean up the arch/sh/kernel/time.c mess and to get the CPU subtype-specific frequency setting and calculation code moved somewhere more sensible. This only deals with the core clocks at the moment, though it's trivial for other drivers to define their own clocks as desired. Signed-off-by: Paul Mundt Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b66c1a3919abb40f9bd8fb92a0d9fd77eb899c54 Author: Paul Mundt Date: Mon Jan 16 22:14:15 2006 -0800 [PATCH] sh: I/O routine cleanups and ioremap() overhaul This introduces a few changes in the way that the I/O routines are defined on SH, specifically so that things like the iomap API properly wrap through the machvec for board-specific quirks. In addition to this, the old p3_ioremap() work is converted to a more generic __ioremap() that will map through the PMB if it's available, or fall back on page tables for everything else. An alpha-like IO_CONCAT is also added so we can start to clean up the board-specific io.h mess, which will be handled in board update patches.. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf3a00f88c926635932c91afd90b4a0907dfbe78 Author: Paul Mundt Date: Mon Jan 16 22:14:14 2006 -0800 [PATCH] sh: IRQ handler updates This moves the various IRQ controller drivers into a new subdirectory, and also extends the INTC2 IRQ handler to also deal with SH7760 and SH7780 interrupts, rather than just ST-40. The old CONFIG_SH_GENERIC has also been removed from the IRQ definitions, as new ports are expected to be based off of CONFIG_SH_UNKNOWN. Since there are plenty of incompatible machvecs, CONFIG_SH_GENERIC doesn't make sense anymore. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d44190eae97ad4c9ce30f1084e1b0dabd646df5 Author: kogiidena Date: Mon Jan 16 22:14:10 2006 -0800 [PATCH] sh: kexec() support This adds kexec() support for SH. Signed-off-by: kogiidena Signed-off-by: Paul Mundt Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d831770b154a057562236e8cf50905c8f1ae1b0 Author: Paul Mundt Date: Mon Jan 16 22:14:09 2006 -0800 [PATCH] sh: DMA updates This extends the current SH DMA API somewhat to support a proper virtual channel abstraction, and also works to represent this through the driver model by giving each DMAC its own platform device. There's also a few other minor changes to support a few new CPU subtypes, and make TEI generation for the SH DMAC configurable. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0025835cf20e07056b8521b8c1d7d0bfe07e81f1 Author: Paul Mundt Date: Mon Jan 16 22:14:08 2006 -0800 [PATCH] sh: consolidate hp620/hp680/hp690 targets into hp6xx Most of the reasons for keeping these separate before was due to hp690 discontig, and since we have a workaround for that now (abusing some shadow space so everything is magically contiguous), there's no reason to keep the targets separate. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ebdce726baf17eb66c5a1bf402ae6f161a082ed Author: Christoph Hellwig Date: Mon Jan 16 22:14:06 2006 -0800 [PATCH] fix up sbuslib for new fb_comapt_ioctl prototype After ages my fb ioctl prototype cleanup finally got in. Unfortunately the patch are so old that the sbus compat_ioctl helper didn't exist back then, so it's not covered. This patch should fix that issue. Signed-off-by: Christoph Hellwig Cc: "David S. Miller" Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f63776d0dccb6eb5f38beeac3eb9db735f7b5879 Author: Alexey Dobriyan Date: Mon Jan 16 22:14:05 2006 -0800 [PATCH] arm26: s/task_threas_info/task_thread_info/ Signed-off-by: Alexey Dobriyan Signed-off-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b142159fa5ffbad73b6927fafa5440148030f3f1 Author: Yoichi Yuasa Date: Mon Jan 16 22:14:01 2006 -0800 [PATCH] mips: add pm_power_off Adds pm_power_off() to MIPS. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f56a31ad616b13414cf764f620f75f45dac26e6 Author: Ingo Molnar Date: Mon Jan 16 22:14:00 2006 -0800 [PATCH] drivers/char/esp.c spinlock fix There's incorrect spinlock usage in espserial_init(): autoconfig() uses info->lock before it's initialized. The fix is to initialize the spinlock earlier. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd279197b1df6b46076991ca0e1f7faa8f3d8028 Author: Adrian Bunk Date: Mon Jan 16 22:13:59 2006 -0800 [PATCH] build kernel/intermodule.c only when required Build kernel/intermodule.c only when required. Signed-off-by: Adrian Bunk Cc: Sam Ravnborg Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3001aa826ea6a4de12b437188c2a095991d2d142 Author: Adrian Bunk Date: Mon Jan 16 22:13:58 2006 -0800 [PATCH] no longer mark MTD_OBSOLETE_CHIPS as BROKEN This patch removes the wrong dependency of MTD_OBSOLETE_CHIPS on BROKEN and marks the non-compiling MTD_AMDSTD and MTD_JEDEC drivers as BROKEN. Signed-off-by: Adrian Bunk Acked-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3868cca523e20a2600f6a9b1feebb69a6c8ccb68 Author: Alexey Dobriyan Date: Mon Jan 16 22:13:57 2006 -0800 [PATCH] arm26: kernel/irq.c: fix compilation It's trying to "continue;" in "if" statement. Signed-off-by: Alexey Dobriyan Acked-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 511c3a2beefbb7d263063f2fef48615fba2d7255 Author: Alexey Dobriyan Date: Mon Jan 16 22:13:56 2006 -0800 [PATCH] arm26: add L1_CACHE_SHIFT Fix reiserfs compilation as a side effect =) Signed-off-by: Alexey Dobriyan Acked-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96419b7c4d996d9f12ca9f7189f316ed2938074a Author: Adrian Bunk Date: Mon Jan 16 22:13:55 2006 -0800 [PATCH] fix arm26 THREAD_SIZE arm26 currently has a 256 kB THREAD_SIZE (sic). Looking at the comment in the code, this seems to be based on a misunderstanding. The comment says: this needs attention (see kernel/fork.c which gets a nice div by zero if this is lower than 8*32768 kernel/fork.c does: max_threads = mempages / (8 * THREAD_SIZE / PAGE_SIZE) Therefore, a division by 0 is impossible for all reasonable cases with THREAD_SIZE >= PAGE_SIZE. Since the minimum PAGE_SIZE Linux uses on the arm26 architecture is 16k, PAGE_SIZE should be sufficient for THREAD_SIZE. Signed-off-by: Adrian Bunk Signed-off-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6aa4c0ef388201745adadfc7855b8a871f0e6122 Author: Adrian Bunk Date: Mon Jan 16 22:13:53 2006 -0800 [PATCH] i386: remove gcc version check for CONFIG_REGPARM Since we do no longer support any gcc < 3.0, there's no need to check for it.. Signed-off-by: Adrian Bunk Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8dca6f33f026dc8a7fc2710b78a7521e899bd611 Author: Jonathan Corbet Date: Mon Jan 16 15:58:55 2006 -0700 [PATCH] hrtimer comment tweak Fix a comment which missed an update cycle somewhere. Signed-off-by: Jonathan Corbet Signed-off-by: Linus Torvalds commit 1f35f432b9d116f5be4c428d71d39ed9b7d6ff50 Author: Jens Axboe Date: Tue Jan 17 00:23:49 2006 +0100 [PATCH] Fix drivers/block/ps2esdi.c compile Looks like fallout from the geo stuff. commit 53493dcf6e9e27cc9379cbf8962642986927aea9 Author: Prarit Bhargava Date: Mon Jan 16 19:54:40 2006 -0800 [IA64] Cleanup of arch/ia64/sn and include/asm-ia64/sn Replace uintX_t declarations with uX declarations. Replace intX_t declarations with sX declarations. Signed-off-by: Prarit Bhargava Signed-off-by: Tony Luck commit 506eecde44d54e838c61c2af38630e8ebb16363e Author: Jody McIntyre Date: Mon Jan 16 19:21:57 2006 -0500 Actually remove amdtp.[ch], cmp.[ch]. The feature removal was done in 7301c8d3a05dc52d33598364da7c4eb6ab6357eb but these files were not removed for some reason. Signed-off-by: Jody McIntyre commit f15ac5801fdc1b217c3b8b5dbc63a09371d2ee4d Author: Xu, Anthony Date: Mon Jan 9 10:36:35 2006 +0800 [IA64] pal cache flush patch Because PAL spec has changed since 2002, you can goto http://developer.intel.com/design/itanium/manuals/iiasdmanual.htm to download new SDM, all PAL calls should be invoked with psr.ic=1, and it's caller's responsibility to handle possible tlb miss. Ia64_pal_cache_flush was written according to old spec, it is obsolete, and this patch has ia64_pal_cache_flush conform to new spec. Signed-off-by Anthony Xu Signed-off-by: Tony Luck commit 7b9c8ba2d634a0467a8a36018a28624563f34f47 Author: Kenji Kaneshige Date: Mon Jan 16 13:45:23 2006 +0900 [IA64] Stop multiple pci_claim_resource() call for the same resource This patch fixes the bug that pci_claim_resource() is called multiple times for the same P2P bridge's resource structures if P2P bridges require their own PCI I/O resources. Signed-off-by: Kenji Kaneshige Signed-off-by: Tony Luck commit 01ffe339e3a0ba5ecbeb2b3b5abac7b3ef90f374 Author: Nathan Scott Date: Tue Jan 17 09:02:07 2006 +1100 Make alloc_page_buffers() initialise buffer_heads using init_buffer(), like other routines here, to ensure buffers are correctly initialised with respect to b_private/b_end_io. Fixes an odd interaction between XFS and reiserfs. Signed-off-by: Nathan Scott commit 1681b8e1588f9119899e422181f728b197b1fe34 Author: Yasunori Goto Date: Sat Jan 7 11:50:38 2006 +0900 [IA64] Simple memory hot-add for ia64. First step to memory hotplug for ia64 (add only, all new memory is added to node 0, does not use ZONE_EASY_RECLAIM yet). Signed-off-by: Yasunori Goto Signed-off-by: Tony Luck commit f74e6670c4a788c9a0c52ab2036d8ac6be12f1d8 Author: Linus Torvalds Date: Mon Jan 16 11:33:09 2006 -0800 x86-64: fix initrd freeing The comparison of the initrd start address against "&_end" is unnecessary and incorrect. Make it match the x86 code that just compares the passed-in arguments. Signed-off-by: Linus Torvalds commit 5580eceed2014135231acb3e6906accf97e10f3c Author: Andi Kleen Date: Mon Jan 16 01:56:54 2006 +0100 [PATCH] x86_64: Increase NR_IRQ_VECTORS to 32 * NR_CPUS This prevents running out of GSIs on large Unisys ES7000 machines. Follows i386 Cc: "Protasevich, Natalie" Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ee408c79420b6a437332d6977fe33ab72c36dc97 Author: Andi Kleen Date: Mon Jan 16 01:56:51 2006 +0100 [PATCH] x86_64: Don't try to put kernel page tables beyond ZONE_DMA32. For not fully explained reasons it broke mem=... on several setups. Also minor cleanup. Cc: axboe@suse.de Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 142a64a650fa5786c2ecea3de5ae3d5a2de72312 Author: Andi Kleen Date: Mon Jan 16 01:56:48 2006 +0100 [PATCH] x86_64: set do_not_nx as cpuinitdata 'check_efer' uses 'do_not_nx'. Hotpluged CPU could wrongly disable NX. Signed-off-by: Shaohua Li Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5b74357328eb325c12ea76f043524e7924a021e4 Author: Shaohua Li Date: Mon Jan 16 01:56:45 2006 +0100 [PATCH] x86_64: lapic resume uses correct base address uses correct lapic base address. The set_fixmap appears useless. Signed-off-by: Shaohua Li Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e25db98d9ae542f95d139e316a6d490ceddd141e Author: Andi Kleen Date: Mon Jan 16 01:56:42 2006 +0100 [PATCH] x86_64: Only let user select PM timer support when EMBEDDED To avoid mistakes. I got a few reports where people got broken timing because they didn't have the PMTIMER fallback. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5f8efbb96f4b2679dcbd2c115380a47bd2089dcd Author: Andi Kleen Date: Mon Jan 16 01:56:39 2006 +0100 [PATCH] x86_64: Allow nesting of int3 by default for kprobes This unbreaks recursive kprobes which didn't work anymore due to an earlier patch which converted the debug entry point to use an IST. This also allows nesting of the debug entry point too. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit aa41eb9915de74fc6935792973bac4bd777ce218 Author: Andi Kleen Date: Mon Jan 16 01:56:36 2006 +0100 [PATCH] x86_64: Mark powernow k8 init functions as __cpuinit cpufreq init can be called when a CPU is set online. Need to make powernow-k8's initialisation functions __cpuinit to prevents oopses when a CPU is off/onlined on a AMD system Cc: trenn@suse.de Cc: mark.langsdorf@amd.com Cc: davej@redhat.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9179cb65780def28770a895a4bc8fa60e903ab80 Author: Stephane Eranian Date: Tue Jan 10 03:10:43 2006 -0800 [IA64] Perfmon for Montecito Add Montecito PMU description table for perfmon2 Signed-off-by: Stephane Eranian Signed-off-by: Tony Luck commit df9df036d356078679a60135fba65f79cd6153d0 Author: Sam Ravnborg Date: Mon Jan 16 12:46:07 2006 +0100 kbuild: fix 'make all install_modules install' The command 'make all modules_install install' would fail in a virgin tree - pointing at a non-existing directory under /lib/modules/xxx KERNELRELEASE is part of MODLIB and we need to create .kernelrelease before we can properly evaluate KERNELRELEASE, Changing MODLIB to the recursively expanded flavor let it pick up the correct KERNELRELEASE value. Reported by: "Hemmann, Volker Armin" Signed-off-by: Sam Ravnborg commit 2244cbd8a9185c197ec5ba5de175aec288697223 Author: Sam Ravnborg Date: Mon Jan 16 12:12:12 2006 +0100 kbuild: create .kernelrelease at *config step To enable 'make kernelrelease' earlier now create .kernelrelease when one of the *config targets are used. Also introduce KERNELVERSION - only user is kconfig. KERNELVERSION was needed to display kernel version in menuconfig - KERNELRELEASE is not valid until configuration has completed. kconfig files modified to use KERNELVERSION. Bug reported by: Rene Rebe Signed-off-by: Sam Ravnborg commit b7bfcf7cbd58d2a64aa46f3b4bec921e346e604f Author: Jens Axboe Date: Mon Jan 16 09:48:58 2006 +0100 [BLOCK] elevator: if specified scheduler is not found, fall back to default Signed-off-by: Jens Axboe commit 752a3b79630a290cbbe4731e7c61b75d4fbebc5c Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Mon Jan 16 09:47:37 2006 +0100 [BLOCK] elevator: Make elevator=as work again for anticipatory Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Jens Axboe commit 5a225791374dca35bba871a007c78a3d0b14b559 Author: Tejun Heo Date: Mon Jan 16 09:45:58 2006 +0100 barrier.txt got lost while the new barrier patchset was climbing up the ladder to the mainline. Add it back. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 107a09c44b65d5e2a5313edfda91c498df3b3f2a Author: Nathan Scott Date: Mon Jan 16 16:28:07 2006 +1100 [XFS] remove no-longer-needed IS_NOATIME macro, twas just a build workaround Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit c2e81432201d99cc48ff6492567fe05204cc8d7e Author: Nathan Scott Date: Mon Jan 16 16:21:34 2006 +1100 [XFS] mutex fallout - fix debug builds and remove no-longer-useful comment. Signed-off-by: Nathan Scott commit 54245702ab63a9a0b1ccf78bc37b57e778bb3bcc Author: Nathan Scott Date: Mon Jan 16 15:54:05 2006 +1100 [XFS] Fix symlink creation too, with respect to initialising SELinux context. SGI-PV: 946762 SGI-Modid: xfs-linux-melb:xfs-kern:24983a Signed-off-by: Nathan Scott commit 366cc64b0d9ac922ac4f0f54e06c13ec95249928 Author: Markus Rechberger Date: Sun Jan 15 21:04:27 2006 -0200 V4L/DVB (3390): Added remote control support for pinnacle pctv - Added remote control support for pinnacle pctv Signed-off-by: Markus Rechberger Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 17c37efbb5163e5df118510c7b4243b7d3b32ce2 Author: Michael Krufky Date: Sun Jan 15 19:04:04 2006 -0200 V4L/DVB (3389): Samsung TBMV30111IN has 6 entries - Samsung TBMV30111IN has 6 entries Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit de03d21b908bd4c49f1fe7b0c4dc5876551cf819 Author: Michael Krufky Date: Sun Jan 15 16:04:04 2006 -0200 V4L/DVB (3388): tuner_params->tda988x is currently unused, so disable - Tuner_params->tda988x is unused right now, so let's disable it for 2.6.16 - This is currently happening at the card level, but the plan is to move this configuration into the tuner_params configuration. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 01872c5d253298b9f360c7c9b9f33504b6ad5469 Author: Michael Krufky Date: Sun Jan 15 15:47:02 2006 -0200 V4L/DVB (3387): clean up some comments - clean up some comments Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 18adfe7ac0777c3cc364cccb6823aafe2a009aa3 Author: Ricardo Cerqueira Date: Sun Jan 15 15:33:02 2006 -0200 V4L/DVB (3386): fix some sound quality & distortion problems. - Fix some sound quality & distortion problems. Signed-off-by: Ricardo Cerqueira Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit cb8d1aa78e31d7f3511c0b3f25f5a61a4687235f Author: Hans Verkuil Date: Sun Jan 15 15:09:23 2006 -0200 V4L/DVB (3385): Return -EINVAL for unknown commands in msp3400 module. - Return -EINVAL for unknown commands. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 27487d44712aaa37710cc508d5bd6119f5e9f976 Author: Hans Verkuil Date: Sun Jan 15 15:04:52 2006 -0200 V4L/DVB (3384): Separate tv & radio freqs, fix cb/freq transmit order for tuners that need this. - Moved MSP_SET_MATRIX to v4l2-common.h - Fix typos and integer overflows in tea5767.c - Split old freq field into a tv_freq and a radio_freq. Prevents that a radio tuner is initialized with a tv frequency or vice versa. - When switching to radio mode initialize the tuner with the last used radio frequency (this was already done for the TV mode). As a result of these changes the tuner module now remembers the last set radio and TV frequencies, which is what you would expect to happen. - Move out of range frequencies to the closest valid frequency as per v4l2 API spec. - Fix incorrect initial radio frequency (multiplier is 16000, not 16) - Add boundary check for out of range frequencies. - Use new flag to check if the order of the CB and freq. depends on the last set frequency. That is needed for some tuners or you can get static as a result. The flag is added for those tuners where I know that the datasheet indicates that this is necessary. - For this new check use the last set div value, not the last frequency as radio frequencies are always much higher due to the 16000 multiplier. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8f0bb9c069fc487dadebe4cdd1e03f0df5ebf0e6 Author: Michael Krufky Date: Sun Jan 15 12:46:18 2006 -0200 V4L/DVB (3383): Move tda988x options into tuner_params struct. - Tda988x parameters should be defined per tuner_param_type, for each tuner_params array member. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 3527761cb403fba72a37c4e6a1fad76eeedd990c Author: Wim Van Sebroeck Date: Sun Jan 15 21:21:14 2006 +0100 [PATCH] MAINTAINERS: watchdog device drivers Add a MAINTAINER entry for the watchdog device drivers. Signed-off-by: Wim Van Sebroeck commit a073404272e8003816d9198f639b1bf11ff0a864 Author: Ian Campbell Date: Wed Nov 2 08:56:49 2005 +0000 [WATCHDOG] sa1100_wdt.c sparse cleanups The following makes drivers/char/watchdog/sa1100_wdt.c sparse clean. Signed-off-by: Ian Campbell Signed-off-by: Wim Van Sebroeck commit 296e0855b0f9a4ec9be17106ac541745a55b2ce1 Author: Sam Ravnborg Date: Sun Jan 15 20:02:31 2006 +0100 kbuild: fix make -jN with multiple targets with O=... The way multiple targets was handled with make O=... broke because for each high-level target make spawned a parallel make resulting in a broken build. Reported by Keith Owens Signed-off-by: Sam Ravnborg commit 6b4977ce0fb9a989ba24fd6b757d07a566abc23d Author: Kyle McMartin Date: Sun Jan 15 12:10:55 2006 -0500 [PATCH] Use atomic64_set for 64-bit case of atomic_long_set For some reason, the BITS_PER_LONG == 64 case of atomic_long_set was using atomic_set instead of atomic64_set. This does not jive with architectures which use an inline instead of a #define to implement their atomic_set() primitives. Signed-off-by: Kyle McMartin Signed-off-by: Linus Torvalds commit 69ff56c166629224e9fe914b8543021dc2f001f0 Author: Jean Delvare Date: Sun Jan 15 13:13:13 2006 +0100 [PATCH] Fix zoran_card compilation warning Fix the following warning which was introduced in 2.6.15-git8 by commit 7408187d223f63d46a13b6a35b8f96b032c2f623: CC [M] drivers/media/video/zoran_card.o drivers/media/video/zoran_card.c: In function `zr36057_init': drivers/media/video/zoran_card.c:1053: warning: assignment makes integer from pointer without a cast Signed-off-by: Jean Delvare Acked-by: Ronald S. Bultje Signed-off-by: Linus Torvalds commit ef0498a7bfbb5773e7ba4235207054b81ad5120e Author: Russell King Date: Sun Jan 15 17:03:45 2006 +0000 [ARM] Fix missing compiler.h include asm/mach/arch.h introduced a __deprecated, but didn't include compiler.h, causing: In file included from arch/arm/mach-at91rm9200/devices.c:13: include/asm/mach/arch.h:23: warning: no semicolon at end of struct or union include/asm/mach/arch.h:23: error: syntax error before 'phys_ram' include/asm/mach/arch.h:34: error: syntax error before ':' token include/asm/mach/arch.h:35: error: syntax error before ':' token include/asm/mach/arch.h:36: error: syntax error before ':' token include/asm/mach/arch.h:37: error: syntax error before ':' token include/asm/mach/arch.h:45: error: syntax error before '}' token Add the necessary include. Signed-off-by: Russell King commit 60f33b80443a3e7e79e2a3ddc625ab6246a61d3d Author: Sam Ravnborg Date: Sun Jan 15 15:28:35 2006 +0100 kconfig: get rid of stray a.o, support ncursesw scripts/kconfig/lxdialog/check-lxdialog.sh uses gcc to check for what libraries are present. Redirect output to /dev/null so we do not generate an a.out. Also included support for ncursesw - so if present prefer that instead of ncurses. The order is now (first is preferred): 1) ncursesw 2) ncurses 3) curses The latter is to support SunOS. Signed-off-by: Sam Ravnborg commit e0ad8486266c3415ab9c17f5c03c47edc7b93d7b Author: Andrew Morton Date: Sun Jan 15 06:45:20 2006 -0200 V4L/DVB (3375): git dvb callbacks fix - Not sure what went wrong here, but SND_PCI_PM_CALLBACKS got deleted. Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit e05b3b4adbaeea508bd1c195f1f2e22c8251176b Author: Paul Mackerras Date: Sun Jan 15 22:05:47 2006 +1100 powerpc/32: Restore previous version of 32-bit PCI code When I removed the powermac support from arch/ppc/kernel/pci.c, I overlooked the fact that that file is used in 32-bit ARCH=powerpc builds. To prevent problems in future, restore the original version of that file as arch/powerpc/kernel/pci_32.c, and use that. Signed-off-by: Paul Mackerras commit fabd23862ba34f217f154c225c59eb5267c4a5d1 Author: Mauro Carvalho Chehab Date: Sun Jan 15 08:12:14 2006 -0200 V4L/DVB (3381): Fix compilation with Alpha - BOOT_SIZE name is also used at alpha and were breaking compiling with allyesconfig. - All BOOT_* renamed to AV7110_BOOT* to fix and keep names with the same style. Thanks to Andrew Morton for pointing this. Signed-off-by: Mauro Carvalho Chehab commit 1e4baed379a2bff3c728ea34602d3432fb047af8 Author: Ingo Molnar Date: Sun Jan 15 07:52:23 2006 -0200 V4L/DVB (3380): Semaphore to mutex conversion on drivers/media - Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 7d83e8431ae531e907f09c277ab4ab4620092518 Author: Panagiotis Christeas Date: Sun Jan 15 07:01:54 2006 -0200 V4L/DVB (3378): Fix for lack of analog output on some cx88 boards - Workaround to fix a known regression at cx88-tvaudio.c - provide a module parameter workaround to always enable analog output. Signed-off-by: Panagiotis Christeas Signed-off-by: Mauro Carvalho Chehab commit a9cff90ed9a23e9f73963fe73b71ef7e5de3e822 Author: Adrian Bunk Date: Sun Jan 15 06:56:15 2006 -0200 V4L/DVB (3377): make some code static - This patch makes some needlessly global code static. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 15192b1d53506f739b36d37543c42619ac290ebc Author: Mauro Carvalho Chehab Date: Sun Jan 15 06:50:01 2006 -0200 V4L/DVB (3376): cx88 Kconfig fixes for cx88-alsa - Cx88 alsa is experimental. - Removed need of PCM OSS for an ALSA module. Signed-off-by: Mauro Carvalho Chehab commit 0f79c3637a871c6ebcf8b8c1762725152d5a18d7 Author: Hartmut Hackmann Date: Sat Jan 14 21:26:44 2006 -0200 V4L/DVB (3371): Turn frame locked sound on, basic support for FM radio with TDA8275(a) - Enabled audio PLL. This is mandatory for NICAM sound - modify FM IF frequency to 5.5MHz for SAA7133/35 if tuner is tda8290 Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab commit 436eddd035c0ff807f4c64551a5a6edc7fb299d0 Author: Tyler Trafford Date: Fri Jan 13 14:38:18 2006 -0200 V4L/DVB (3365): i2c ids for upd64031a saa717x upd64083 wm8739 - Add i2c ids for drivers: upd64031a saa717x upd64083 wm8739 Signed-off-by: Tyler Trafford Signed-off-by: Mauro Carvalho Chehab commit 820a8ce7931d18338e5c089725ec083518da1644 Author: Paul Mackerras Date: Sun Jan 15 17:33:52 2006 +1100 powerpc: Make ARCH=powerpc the default for 32-bit ppc This makes ARCH=powerpc the default on 32-bit powerpc machines, where uname -m returns ppc, as well as on 64-bit powerpc machines. Most people who would be likely to build their own kernels on 32-bit powerpc machines would be using powermacs or CHRP machines, both of which are supported with ARCH=powerpc now. Embedded ppc developers whose ports haven't been moved over to arch/powerpc yet will have to explicitly set ARCH=ppc now. Signed-off-by: Paul Mackerras commit a7fdd90bc43e3e9cb08bc1b13650024d419b89e5 Author: Paul Mackerras Date: Sun Jan 15 17:30:44 2006 +1100 [PATCH] ppc: Remove powermac support from ARCH=ppc This makes it possible to build kernels for PReP and/or CHRP with ARCH=ppc by removing the (non-building) powermac support. It's now also possible to select PReP and CHRP independently. Powermac users should now build with ARCH=powerpc instead of ARCH=ppc. (This does mean that it is no longer possible to build a 32-bit kernel for a G5.) Signed-off-by: Paul Mackerras commit caf5b04c82f05c65843b2d7189845d6c3df5a41e Author: Linus Torvalds Date: Sat Jan 14 22:08:28 2006 -0800 x86: Work around compiler code generation bug with -Os Some versions of gcc generate incorrect code for the inet_check_attr() function, apparently due to a totally bogus index -> pointer comparison transformation. At least "gcc version 4.0.1 20050727 (Red Hat 4.0.1-5)" from FC4 is affected, possibly others too. This changes the function subtly so that the buggy gcc transformation doesn't trigger. Signed-off-by: Linus Torvalds commit e8625d463560198cff7cb3eb22886c47d728d501 Author: Haren Myneni Date: Sat Jan 14 13:48:25 2006 -0800 [PATCH] powerpc: Kconfig changes for CRASH_DUMP Noticed in 2.6.15-git9 that CRASH_DUMP option is moved to top level. Moved CRASH_DUMP into "kernel options" next to KEXEC and this config option supports only for PPC64 at this time. Signed-off-by: Haren Myneni Signed-off-by: Paul Mackerras commit 4683b54c1dae749a0fb8d8ec46d84dd4fefe41d3 Author: Benjamin Herrenschmidt Date: Sat Jan 14 16:46:47 2006 +1100 [PATCH] powerpc: Update pmac32_defconfig Signed-off-by: Paul Mackerras commit a9df3d0f312f4b1aefec76ae5ee86cccbf7cd4e0 Author: Ingo Molnar Date: Sat Jan 14 13:21:33 2006 -0800 [PATCH] When CONFIG_CC_OPTIMIZE_FOR_SIZE, allow gcc4 to control inlining If optimizing for size (CONFIG_CC_OPTIMIZE_FOR_SIZE), allow gcc4 compilers to decide what to inline and what not - instead of the kernel forcing gcc to inline all the time. This requires several places that require to be inlined to be marked as such, previous patches in this series do that. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac893963030ad70e528dc23270d499d650546a38 Author: Peter Osterlund Date: Sat Jan 14 13:21:32 2006 -0800 [PATCH] pktcdvd: un-inline some functions Un-inline two functions in the pktcdvd driver. This makes the compiled code 172 bytes smaller on my system. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f16623569e2ec055b489462315f5296f153d119b Author: Arjan van de Ven Date: Sat Jan 14 13:21:31 2006 -0800 [PATCH] Mark some key VFS functions as __always_inline Mark a few VFS functions as mandatory inline (based on Al Viro's request); these must be inline due to stack usage issues during a recursive loop that happens during the recursive symlink resolution (symlink to a symlink to a symlink ..) This patch at this point does not change behavior and is for documentation purposes only (but this changes later in the series) Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 652050aec936fdd70ed9cbce1cd1ef30a7c9d117 Author: Ingo Molnar Date: Sat Jan 14 13:21:30 2006 -0800 [PATCH] mark several functions __always_inline Arjan van de Ven Mark a number of functions as 'must inline'. The functions affected by this patch need to be inlined because they use knowledge that their arguments are constant so that most of the function optimizes away. At this point this patch does not change behavior, it's for documentation only (and for future patches in the inline series) Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ab34fe76114b9538bfcaf3a9d112dee0feb5f17 Author: Ingo Molnar Date: Sat Jan 14 13:21:29 2006 -0800 [PATCH] enable unit-at-a-time optimisations for gcc4 Allow gcc4 compilers to optimize unit-at-a-time. This flag enables gcc to "see" the entire C file before making optimisation decisions such as inline, which results in gcc making better decisions. One of the immediate effects of this is that static functions that are used only once now get inlined. gcc 3.4 has this flag as well, however gcc 3.x have a problem with inlining and stacks and as a result, enabling this flag there would cause excessive and unacceptable stack use. This problem is fixed in the gcc 4.x series. The x86-64 architecture already enables this feature so it's well tested already. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40fc55cb69c0386504ab5184e9bea0a7aecb2bd3 Author: Ingo Molnar Date: Sat Jan 14 13:21:28 2006 -0800 [PATCH] Make __always_inline actually force always inlining This patch is the first in a series that tries to optimize the kernel in terms of size (and thus cache behavior, both cpu and pagecache). This first patch changes __always_inline to be a forced inline instead of the "regular" inline it was on everything except alpha. This forced inline matches the intention of the define better as a matter of documentation. There is no change in behavior by this patch, since "inline" currently is mapped to a forced inline anyway. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9eb8ef7479b6df59645af5d89d293727b521975e Author: Antonino A. Daplas Date: Sat Jan 14 13:21:26 2006 -0800 [PATCH] fbdev: Update maintainers list Update maintainers list. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 216d526c89d144928f095f2800bc6c67e968d628 Author: Christoph Hellwig Date: Sat Jan 14 13:21:25 2006 -0800 [PATCH] fbdev: Sanitize ->fb_mmap prototype No need for a file argument. If we'd really need it it's in vma->vm_file already. gbefb and sgivwfb used to set vma->vm_file to the file argument, but the kernel alrady did that. Signed-off-by: Christoph Hellwig Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67a6680d64e18c7a1901f31ef747ea53b6cd986d Author: Christoph Hellwig Date: Sat Jan 14 13:21:25 2006 -0800 [PATCH] fbdev: Sanitize ->fb_ioctl prototype The ioctl and file arguments to ->fb_mmap are totally unused and there's not reason a driver should need them. Also update the ->fb_compat_ioctl prototype to be the same as ->fb_mmap. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a80da7389891d0eeacbd568a9b54f665fd424d14 Author: David Vrabel Date: Sat Jan 14 13:21:23 2006 -0800 [PATCH] gx1fb: (try to) play nicer with various BIOSes Seems that the CS5530A chip used in Geode GX1 systems has some crazy feature that causes SMI traps when accessing the PCI configuration space of the video device. Various GX1 BIOSes seem to use this 'feature' to hide the real BARs of the device. This patch disables these traps (in an early PCI fixup) so that Linux sees the real, physical BARs and not the virtual ones provided by the BIOS. This should allow the GX1 framebuffer driver to work on more systems that have different BIOSes as the driver no longer guesses at what the virtual BARs mean. I'm not entirely sure it the correct solution as I can neither test regular VGA console nor the X's 'cyrix' video driver so there might be some breakage there -- probably best to get some more testers before applying it. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4836f5749e55663f884ea25920ff88de7822f0a8 Author: Christian Trefzer Date: Sat Jan 14 13:21:21 2006 -0800 [PATCH] neofb: take existing display configuration as default On a Dell Latitude CPi-A I noticed a strangeness wrt. the handling of an external monitor by the neomagic framebuffer driver, namely when the laptop is docked in a C/Dock II with the lid shut. A cold boot would result in the BIOS configuring the video chip to use the "external monitor only" mode, yet neofb would default to "internal LCD only". An attempt for a quick fix by using the Fn-F8 keystroke to toggle the display combination modes resulted in a reproductible hard lock, powering down being the only solution. The attached patch makes neofb probe the register for the current display mode, using that value as a default if nothing was specified as kernel/module parameter. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 16ab3adf562fb723d9085c998637f214b10072c5 Author: Randy Dunlap Date: Sat Jan 14 13:21:20 2006 -0800 [PATCH] Update kernel-parameters.txt IOSCHED to spell out 'anticipatory' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6b25b675db9f9f1af640b928f5476e8454b391c Author: Randy Dunlap Date: Sat Jan 14 13:21:19 2006 -0800 [PATCH] nlm kernel-parameters update Add 2 lockd kernel parameters and spell 2 others correctly. Signed-off-by: Randy Dunlap Cc: Neil Brown Cc: Olaf Kirch Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c878967d32a10cb604718f7608efa0ea3d8b596 Author: Deepak Saxena Date: Sat Jan 14 13:21:18 2006 -0800 [PATCH] cs89x0: add ixdp2351 support This patch adds support for the Intel IXDP2351 to the CS89x0 driver. Signed-off-by: Deepak Saxena Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a07f0dbec01fda6d88f5089e21454b8df53d36fc Author: Lennert Buytenhek Date: Sat Jan 14 13:21:17 2006 -0800 [PATCH] cs89x0: use u16 for device register data cs89x0 inconsistently used 'int' and 'u32' for device register data. As the cs89x0 is a 16-bit chip, change the I/O accessors over to 'u16'. (Spotted by Deepak Saxena.) Signed-off-by: Lennert Buytenhek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 580d7b8cc59d68a3d26bfcc64c2053b464782c9a Author: Lennert Buytenhek Date: Sat Jan 14 13:21:16 2006 -0800 [PATCH] cs89x0: use #elif instead of #else/#if/#endif Signed-off-by: Lennert Buytenhek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 032874e49271f8c9c53c137cb60cf12617a953a0 Author: Lennert Buytenhek Date: Sat Jan 14 13:21:15 2006 -0800 [PATCH] cs89x0: credit Dmitry Pervushin Credit Dmitry Pervushin for the PNX010X platform support. Signed-off-by: Lennert Buytenhek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c5608404e66047bbcd9b7788e7f3ee2555c8639 Author: Abhay Salunke Date: Sat Jan 14 13:21:14 2006 -0800 [PATCH] dell_rbu: fix Bug 5854 This fixes http://bugzilla.kernel.org/show_bug.cgi?id=5854 Root cause: The dell_rbu driver creates entries in /sys/class/firmware/dell_rbu/ by calling request_firmware_nowait (without hotplug ) this function inturn starts a kernel thread which creates the entries in /sys/class/firmware/dell_rbu/loading , data and the thread waits on the user action to return control back to the callback fucntion of dell_rbu. The thread calls wait_on_completion which puts it in a D state until the user action happens. If there is no user action happening the load average goes up as the thread D state is taken in to account. Also after downloading the BIOS image the enrties go away momentarily but they are recreated from the callback function in dell_rbu. This causes the thread to get recreated causing the load average to permenently stay around 1. Fix: The dell_rbu also creates the entry /sys/devices/platform/dell_rbu/image_type at driver load time. The image type by default is mono if required the user can echo packet to image_type to make the BIOS update mechanism using packets. Also by echoing init in to image_type the /sys/class/firmware/dell_rbu entries can be created. The driver code was changed to not create /sys/class/firmware/dell_rbu entries during load time, and also to not create the above entries from the callback function. The entries are only created by echoing init to /sys/devices/platform/dell_rbu/image_type The user now needs to create the entries to download the image monolithic or packet. This fixes the issue since the kernel thread only is created when ever the user is ready to download the BIOS image; this minimizes the life span of the kernel thread and the load average goes back to normal. Signed off by Abhay Salunke Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d063389ecf20e5c20be91a0007656deb9fc38a1c Author: Pekka Enberg Date: Sat Jan 14 13:21:13 2006 -0800 [PATCH] smbfs: remove kmalloc wrapper Remove the remaining kmalloc() wrapper bits from fs/smbfs/. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44db77f33cc42c49f55ddb360f5e9a05581ffdc0 Author: Pekka Enberg Date: Sat Jan 14 13:21:12 2006 -0800 [PATCH] ncpfs: remove kmalloc wrapper Remove remaining kmalloc wrapper bits from fs/ncpfs/. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69c99ac17e2ee0eb45e2c9873e6e12d73260fc6b Author: Coywolf Qi Hunt Date: Sat Jan 14 13:21:11 2006 -0800 [PATCH] abandon gcc 295x main.c tidy After abandon-gcc-295x.patch, this relocates the error-out-early comment. Signed-off-by: Coywolf Qi Hunt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3135806358e8d3d8ac61a13f58f148d0a98a7b9b Author: Valdis.Kletnieks@vt.edu Date: Sat Jan 14 13:21:10 2006 -0800 [PATCH] quota: make useless quota error message informative fs/quota_v2.c can, under some conditions, issue a kernel message that says, in totality, 'failed read'. This patch does the following: 1) Gives a hint who issued the error message, so people reading the logs don't have to go grepping the entire kernel tree (with 11 false positives). 2) Say what amount of data we expected, and actually got. Signed-off-by: Valdis Kletnieks Cc: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9975d6ba0668aa21d9f0c565d7df56c805c8d5c Author: Pekka Enberg Date: Sat Jan 14 13:21:09 2006 -0800 [PATCH] reiserfs: remove d_splice_alias NULL check from reiserfs_lookup Remove redundant NULL check in reiserfs_lookup() as d_splice_alias() can take NULL inode as input. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ff6b1c2575f13885c1d5291e4283682ad9a41cd Author: Pekka Enberg Date: Sat Jan 14 13:21:09 2006 -0800 [PATCH] isofs: remove d_splice_alias NULL check from isofs_lookup Remove redundant NULL check in isofs_lookup() as d_splice_alias() can take NULL inode as input. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba7fe369875075c3b0def9887afb7a44fa88175e Author: Pekka Enberg Date: Sat Jan 14 13:21:08 2006 -0800 [PATCH] ext3: remove d_splice_alias NULL check from ext3_lookup Remove redundant NULL check in ext3_lookup() as d_splice_alias() can take NULL inode as input. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 082a05c6f02e00982dd42ddae434fbc806a822e5 Author: Pekka Enberg Date: Sat Jan 14 13:21:07 2006 -0800 [PATCH] ext2: remove d_splice_alias NULL check from ext2_lookup Remove redundant NULL check in ext2_lookup() as d_splice_alias() can take NULL inode as input. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 505970b96e3b7d22177c38e03435a68376628e7a Author: Paul Jackson Date: Sat Jan 14 13:21:06 2006 -0800 [PATCH] cpuset oom lock fix The problem, reported in: http://bugzilla.kernel.org/show_bug.cgi?id=5859 and by various other email messages and lkml posts is that the cpuset hook in the oom (out of memory) code can try to take a cpuset semaphore while holding the tasklist_lock (a spinlock). One must not sleep while holding a spinlock. The fix seems easy enough - move the cpuset semaphore region outside the tasklist_lock region. This required a few lines of mechanism to implement. The oom code where the locking needs to be changed does not have access to the cpuset locks, which are internal to kernel/cpuset.c only. So I provided a couple more cpuset interface routines, available to the rest of the kernel, which simple take and drop the lock needed here (cpusets callback_sem). Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed68cb3676bb179768529aeb808403d57295af56 Author: Heiko Carstens Date: Sat Jan 14 13:21:05 2006 -0800 [PATCH] s390: fix blk_queue_ordered call in dasd.c fixup The QUEUE_ORDERED_* numbers got renumbered and by accident the dasd driver was changed to use QUEUE_ORDERED_DRAIN instead of QUEUE_ORDERED_TAG. Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ce3b30cf32c5c078518f0f3e6623bcb6eee9872 Author: Cornelia Huck Date: Sat Jan 14 13:21:04 2006 -0800 [PATCH] s390: email-address change Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 871931c1eef1727d42ff3ecf993b1978cf1e209f Author: Cornelia Huck Date: Sat Jan 14 13:21:03 2006 -0800 [PATCH] s390: chps[] array too short The chps[] array in struct channel_subsystem is one too short; therefore the code doesn't realize the chpid ff is already known. When several devices on chpid ff become available, the message "new_channel_path: could not register ff" is displayed for every device but the first one. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f1c12afe5c3e0ef901eec12dee09df4947462ee Author: Martin Schwidefsky Date: Sat Jan 14 13:21:03 2006 -0800 [PATCH] s390: cputime misaccounting finish_arch_switch needs to update the user cpu time as well, not just the system cpu time. Otherwise the partial user cpu time of a process that is stored in the lowcore will be (mis-)accounted to the next process. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bcc132651d384ad115a275868effb49c64b348ce Author: Martin Schwidefsky Date: Sat Jan 14 13:21:02 2006 -0800 [PATCH] s390: fix blk_queue_ordered call in dasdc Add the missing third argument to the blk_queue_ordered call and use the constant QUEUE_ORDERED_DRAIN instead of "1". Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53df751ccd0a404cca169dbd61bae571cc21559a Author: Martin Schwidefsky Date: Sat Jan 14 13:21:01 2006 -0800 [PATCH] s390: add dummy pm_power_off Define a dummy pm_power_off pointer to make sys_reboot happy. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0152fb37603e3a776768794030b809ae77027aa4 Author: Martin Schwidefsky Date: Sat Jan 14 13:21:00 2006 -0800 [PATCH] s390: spinlock fixes Remove useless spin_retry_counter and fix compilation for UP kernels. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68c119177890afff4759abda8da2b4ff5e06efa1 Author: Alexey Dobriyan Date: Sat Jan 14 13:20:58 2006 -0800 [PATCH] s390: fix cpcmd calls on UP Add missing fourth argument to cpcmd calls under !CONFIG_SMP. Signed-off-by: Alexey Dobriyan Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6410dd5e07b63606605794eeb7ec29e61fbda3db Author: Martin Schwidefsky Date: Sat Jan 14 13:20:58 2006 -0800 [PATCH] s390: sigcontext.h vs __user Add an include of linux/compiler.h in sigcontext.h to avoid compiler errors in user space apps because of a missing definition for __user. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb33c190c2b633f0dfc98481ecf12f62a02c705e Author: Heiko Carstens Date: Sat Jan 14 13:20:57 2006 -0800 [PATCH] s390: show_task oops The show_task function walks the kernel stack backchain of processes assuming that the processes are not running. Since this assumption is not correct walking the backchain can lead to an addressing exception and therefore to a kernel hang. So prevent the kernel hang (you still get incorrect results) verity that all read accesses are within the bounds of the kernel stack before performing them. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ffbc9da137ef475afd5e01f72e1ce1ce49668b1 Author: Jan Glauber Date: Sat Jan 14 13:20:56 2006 -0800 [PATCH] s390: sha256 crypto code fix Fix processing of messages larger than 2 * SHA256_BLOCK_SIZE. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fda5e142598341d30006e3715e53b2c983a9fca7 Author: Jan Glauber Date: Sat Jan 14 13:20:55 2006 -0800 [PATCH] s390: aes crypto code fixes Call KM[C] only with a multiple of block size. Check return value of KM[C] instructions and complain about erros Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8dc6038ff894d0eb0b5d61c9fafdf323ec10251 Author: Jan Glauber Date: Sat Jan 14 13:20:53 2006 -0800 [PATCH] s390: des crypto code speedup Provide ECB and CBC encrypt / decrypt functions to crypto API to speed up our hardware accelerated DES implementation. This new functions allow the crypto API to call ECB / CBC directly with large blocks in difference to the old functions that were calles with algorithm block size (8 bytes for DES). This is up to factor 10 faster than our old hardware implementation :) Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1357833bf5d92b1bda41215ae88a6597664251b Author: Jan Glauber Date: Sat Jan 14 13:20:53 2006 -0800 [PATCH] s390: des crypto code cleanup Beautify the s390 in-kernel-crypto des code. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7aa89746e89fca8fc722485aaf4454f2b636cf4d Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Sat Jan 14 13:20:52 2006 -0800 [PATCH] i386: fix stack dump loglevel Recent changes caused part of stack traces from SysRq-T to print at KERN_EMERG loglevel. Also, parts of stack dump during oops were failing to print at that level when they should. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce63ad78b55daf708d5d4ced9b832a4354ad2a4c Author: Randy Dunlap Date: Sat Jan 14 13:20:51 2006 -0800 [PATCH] i386: put HOTPLUG_CPU under Processor type, not Bus options Move the HOTPLUG_CPU option under "Processor type" instead of under "Bus options". This makes it the same for i386 as most other processor types (arm, ia64, parisc, ppc, s390, & x86_64; but not for powerpc). Besides, it takes me too long to find it under Bus options. I can't be the only person who has trouble finding it. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fabbfb9e8c53416eaa4f62b957430211376c9c82 Author: Kumar Gala Date: Sat Jan 14 13:20:50 2006 -0800 [PATCH] powerpc: Add support for the MPC83xx watchdog Add support for the PowerPC MPC83xx watchdog. The MPC83xx has a simple watchdog that once enabled it can not be stopped, has some simple timeout range selection, and the ability to either reset the processor or take a machine check. Signed-off-by: Dave Updegraff Signed-off-by: Kumar Gala Cc: Wim Van Sebroeck Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7339ff8302fd70aabf5f1ae26e0c4905fa74a495 Author: Robin Holt Date: Sat Jan 14 13:20:48 2006 -0800 [PATCH] Add tmpfs options for memory placement policies Anything that writes into a tmpfs filesystem is liable to disproportionately decrease the available memory on a particular node. Since there's no telling what sort of application (e.g. dd/cp/cat) might be dropping large files there, this lets the admin choose the appropriate default behavior for their site's situation. Introduce a tmpfs mount option which allows specifying a memory policy and a second option to specify the nodelist for that policy. With the default policy, tmpfs will behave as it does today. This patch adds support for preferred, bind, and interleave policies. The default policy will cause pages to be added to tmpfs files on the node which is doing the writing. Some jobs expect a single process to create and manage the tmpfs files. This results in a node which has a significantly reduced number of free pages. With this patch, the administrator can specify the policy and nodes for that policy where they would prefer allocations. This patch was originally written by Brent Casavant and Hugh Dickins. I added support for the bind and preferred policies and the mpol_nodelist mount option. Signed-off-by: Brent Casavant Signed-off-by: Hugh Dickins Signed-off-by: Robin Holt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 852cf918dcf2ae46468b425e679fbcbf0ea8fdbb Author: Christoph Lameter Date: Sat Jan 14 13:20:46 2006 -0800 [PATCH] Fix for CONFIG_NUMA without CONFIG_SWAP Some people apparently run CONFIG_NUMA without CONFIG_SWAP. The migration code currently depends on swap. This patch provides a set of inline fallback functions so that the kernel properly compiles. However, calls to migration functions will fail. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eed6565f70ce3fc958e5a3483c48fc4a8e111bdc Author: Calin A. Culianu Date: Sat Jan 14 13:20:46 2006 -0800 [PATCH] Watchdog: Winsystems EPX-C3 SBC This is a 2.6 patch that adds support for the watchdog timer built into the EPX-C3 single board computer manufactured by Winsystems, Inc. Driver details: This is for x86 only. This watchdog is pretty basic and simple. It is only configurable via jumpers on the SBC, and it only has either a 1.5s or 200s interval. The watchdog can either be auto-configured to start as soon as the machine powers up (bad idea for the 1.5s interval!) or it can be enabled and disabled by writing to io port 0x1ee. Petting the watchdog involves writing any value to io port 0x1ef. The only unfortunate thing about this watchdog (and it is not at all uncommmon in watchdogs that linux supports) is that it is not a PCI or ISA-PNP device and as such it isn't at all probeable. Either the watchdog exists as 2 bytes at 0x1ee, or it doesn't. Thus, using this driver on a machine that doesn't have that watchdog can potentially hang/crash the system, etc. So only use this driver if you in fact are on a Winsystems EPX-C3 SBC. Anyway this driver fits into the already-existing watchdog framework quite nicely and I already tested it on my EPX-C3 and it works like a charm. Signed-off-by: Calin A. Culianu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee7be5de357b8ff69afc8c39648b336cd917218a Author: Miklos Szeredi Date: Sat Jan 14 13:20:44 2006 -0800 [PATCH] uml: fix symbol for mktime LD .tmp_vmlinux1 /usr/lib/gcc-lib/i486-linux/3.3.4/../../../libc.a(mktime.o): In function `timelocal': : multiple definition of `mktime' kernel/built-in.o:kernel/time.c:604: first defined here /usr/bin/ld: Warning: size of symbol `mktime' changed from 134 in kernel/built-in.o to 44 in /usr/lib/gcc-lib/i486-linux/3.3.4/../../../libc.a(mktime.o) collect2: ld returned 1 exit status Signed-off-by: Miklos Szeredi Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 858119e159384308a5dde67776691a2ebf70df0f Author: Arjan van de Ven Date: Sat Jan 14 13:20:43 2006 -0800 [PATCH] Unlinline a bunch of other functions Remove the "inline" keyword from a bunch of big functions in the kernel with the goal of shrinking it by 30kb to 40kb Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0a9499c3dd50d333e2aedb7e894873c58da3785 Author: Ingo Molnar Date: Sat Jan 14 13:20:41 2006 -0800 [PATCH] sched: add new SCHED_BATCH policy Add a new SCHED_BATCH (3) scheduling policy: such tasks are presumed CPU-intensive, and will acquire a constant +5 priority level penalty. Such policy is nice for workloads that are non-interactive, but which do not want to give up their nice levels. The policy is also useful for workloads that want a deterministic scheduling policy without interactivity causing extra preemptions (between that workload's tasks). Signed-off-by: Ingo Molnar Cc: Michael Kerrisk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d0cfb527944c2cfee2cffab14f52d483e329fcf Author: Patrick Gefre Date: Sat Jan 14 13:20:40 2006 -0800 [PATCH] Altix: ioc3 serial support Add driver support for a 2 port PCI IOC3-based serial card on Altix boxes: This is a re-submission. On the original submission I was asked to organize the code so that the MIPS ioc3 ethernet and serial parts could be used with this driver. Stanislaw Skowronek was kind enough to provide the shim layer for this - thanks Stanislaw. This patch includes the shim layer and the Altix PCI ioc3 serial driver. The MIPS merged ioc3 ethernet and serial support is forthcoming. Signed-off-by: Patrick Gefre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7170be5f586b59bdcdab082778a5d9203ba7b667 Author: Neil Horman Date: Sat Jan 14 13:20:38 2006 -0800 [PATCH] convert /proc/devices to use seq_file interface A Christoph suggested that the /proc/devices file be converted to use the seq_file interface. This patch does that. I've obxerved one or two installation that had sufficiently large sans that they overran the 4k limit on /proc/devices. Signed-off-by: Neil Horman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit faf3a98918aa5f14a29e0d246e194be58b9357f0 Author: Ian Kent Date: Sat Jan 14 13:20:37 2006 -0800 [PATCH] autofs4 oops fix We forgot to initialise a couple of nameidata fields. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c882b019160ebd7e954ba787f6353ed69281fd7 Author: Benjamin Herrenschmidt Date: Sat Jan 14 16:35:35 2006 +1100 [PATCH] powerpc: Fix Maple build The changes to the device node structure broke Maple build. This fixes it. Unfortunately I coudn't test as my Maple board appears to be dead. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 8385a6a3acfbb4b68150c25cfe9084b6c4f501cf Author: Haren Myneni Date: Fri Jan 13 19:15:36 2006 -0800 [PATCH] powerpc: Fix kdump copy regs and dynamic allocate per-cpu crash notes - This contains the arch specific changes for the following the kdump generic fixes which were already accepted in the upstream. . Capturing CPU registers (for the case of 'panic' and invoking the dump using 'sysrq-trigger') from a function (stack frame) which will be not be available during the kdump boot. Hence, might result in invalid stack trace. . Dynamically allocating per cpu ELF notes section instead of statically for NR_CPUS. - Fix the compiler warning in prom_init.c. Signed-off-by: Haren Myneni Signed-off-by: Paul Mackerras commit 9216ad8cb7849d88b6d8e9f097718de4f25d4121 Author: Paul Mackerras Date: Sun Jan 15 13:00:08 2006 +1100 powerpc/32: Generate miboot images with ARCH=powerpc Miboot images are apparently still used on some old 32-bit powermacs, so build them with ARCH=powerpc if we're 32-bit and powermac support is enabled. Signed-off-by: Paul Mackerras commit fb453d4b0b51ea71c9eb8192c61b768afeb7ee8a Author: Jesper Juhl Date: Sun Jan 15 02:46:48 2006 +0100 MAINTAINERS: CIFS: add linux-cifs-client@lists.samba.org list Add linux-cifs-client@lists.samba.org to CIFS entry in MAINTAINERS Signed-off-by: Jesper Juhl Signed-off-by: Adrian Bunk commit 624dffcbcf87b9c501b13256416a82487be962bc Author: Christian Kujau Date: Sun Jan 15 02:43:54 2006 +0100 correct email address of Manfred Spraul I tried to send the forcedeth maintainer an email, but it came back with: "The mail address manfreds@colorfullife.com is not read anymore. Please resent your mail to manfred@ instead of manfreds@." This patch fixes this. Signed-off-by: Adrian Bunk commit 92c3504e6ee0816d4ea1345a6bd276969224890d Author: Jesper Juhl Date: Sun Jan 15 02:40:08 2006 +0100 Spelling fix in init/Kconfig for the help of CONFIG_SWAP Trivial spelling fix s/socalled/so called/ Signed-off-by: Jesper Juhl Signed-off-by: Adrian Bunk commit 014c2544e6fd09d702c908d95fe32c082376e15c Author: Jesper Juhl Date: Sun Jan 15 02:37:08 2006 +0100 return statement cleanup - kill pointless parentheses This patch removes pointless parentheses from return statements. Signed-off-by: Jesper Juhl Signed-off-by: Adrian Bunk commit 46a9f65f8bb39778646b83220d9619aff1490bcd Author: Domen Puncer Date: Sun Jan 15 02:20:28 2006 +0100 remove unused LOCAL_END_REQUEST Remove the last occurence of LOCAL_END_REQUEST. Signed-off-by: Domen Puncer Signed-off-by: Adrian Bunk commit f1c3ddff84981bbe3bedd60a6330057e8f1f8ef5 Author: Horms Date: Sun Jan 15 02:18:28 2006 +0100 MAINTAINERS: better list for "POSIX CLOCKS and TIMERS" POSIX CLOCKS and TIMERS disscussion is more appropriate on linux-kernel than linux-net. As suggested by the maintainer, George Anzinger. Signed-off-by: Horms Acked-by: George Anzinger Signed-off-by: Adrian Bunk commit 3235798804ee75f09d45aee5003197930de57689 Author: Alexey Dobriyan Date: Sun Jan 15 02:12:54 2006 +0100 Fix "stuct", "strut", "struc" typos Signed-off-by: Alexey Dobriyan Signed-off-by: Adrian Bunk commit fad6a94ee6b33ca5e6184e8b08634a6a2319d0cb Author: Randy Dunlap Date: Sun Jan 15 02:09:54 2006 +0100 Documentation/hpet.txt typo Fix a typo. Requested by Petr Vandrovec. Signed-off-by: Randy Dunlap Signed-off-by: Adrian Bunk commit 750c902ef4a1956cecbc8fb590ce2dad5b02eab9 Author: Adrian Bunk Date: Sun Jan 15 02:01:39 2006 +0100 SOFTWARE_SUSPEND: fix a typo in the dependencies This patch fixes a typo in the dependencies of SOFTWARE_SUSPEND. This patch is based on a report by Jean-Luc Leger . Signed-off-by: Adrian Bunk Acked-by: Pavel Machek commit 575c96871832e91983248aebb02fc072e5fd17c9 Author: Adrian Bunk Date: Sun Jan 15 02:00:17 2006 +0100 spelling: s/appropiate/appropriate/ Signed-off-by: Adrian Bunk commit a8e82ef97a1d1227575698935ec86ae4d02c372c Author: Adrian Bunk Date: Sun Jan 15 01:58:57 2006 +0100 drivers/net/{,wireless/}Kconfig: remove dead URL shadow.cabi.net does no longer exist. Signed-off-by: Adrian Bunk commit b480146fd19b99b16263467216622effcd93fd96 Author: Adrian Bunk Date: Sun Jan 15 01:57:47 2006 +0100 ftape: remove some outdated information from Kconfig files This patch removes some outdated information about the ftape driver like pointers to no longer existing webpages from Kconfig files. Signed-off-by: Adrian Bunk commit 9c782e3b2083c33b5a14c9955cf15f32ea88116b Author: Alex Shepard Date: Sun Jan 15 01:57:00 2006 +0100 Spelling fix in IPW2100 and IPW2200 Kconfig entries s/remvoed/removed/ Signed-off-by: Alex Shepard Signed-off-by: Adrian Bunk commit 7c7dce9209161eb260cdf9e9172f72c3a02379e6 Author: Alexander Viro Date: Sat Jan 14 15:29:55 2006 -0500 [PATCH] Fix double decrement of mqueue_mnt->mnt_count in sys_mq_open Fixed the refcounting on failure exits in sys_mq_open() and cleaned the logics up. Rules are actually pretty simple - dentry_open() expects vfsmount and dentry to be pinned down and it either transfers them into created struct file or drops them. Old code had been very confused in that area - if dentry_open() had failed either in do_open() or do_create(), we ended up dentry and mqueue_mnt dropped twice, once by dentry_open() cleanup and then by sys_mq_open(). Fix consists of making the rules for do_create() and do_open() same as for dentry_open() and updating the sys_mq_open() accordingly; that actually leads to more straightforward code and less work on normal path. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3f471126ee53feb5e9b210ea2f525ed3bb9b7a7f Author: Nicolas Pitre Date: Sat Jan 14 19:30:04 2006 +0000 [ARM] 3262/4: allow ptraced syscalls to be overriden Patch from Nicolas Pitre This is needed by strace to properly handle the tracing of some system calls. It could be useful for other applications as well. Based on an earlier patch from Daniel Jacobowitz. Signed-off-by: Nicolas Pitre Signed-off-by: Daniel Jacobowitz Signed-off-by: Russell King commit 3824ba7df91745da6ebac703c87c3b801c34fdd0 Author: Adrian Bunk Date: Sat Jan 14 03:08:16 2006 +0100 [PATCH] remove unused tmp_buf_sem's tmp_buf_sem sems to be a common name for something completely unused... Signed-off-by: Adrian Bunk Acked-by: Greg Kroah-Hartman ("usb portion") Signed-off-by: Linus Torvalds commit e1b114ee90040af5108973abd1a82babc4905868 Author: Xose Vazquez Perez Date: Sat Jan 14 12:57:41 2006 +0100 [PATCH] docs: update some updated code docs Based on comments from Randy Dunlap on my previous commit 5b0ed2c64d8fdafb5fcfb3baabdd288628b1ff9b Signed-off-by: Linus Torvalds commit 7b4ee73e28052e53aac2fef1c91029666d8b2d70 Author: Evgeniy Date: Sat Jan 14 11:42:06 2006 +0300 [PATCH] ufs cleanup Here is update of ufs cleanup patch, brought on by the recently fixed ubh_get_usb_second() bug that made some ugly code rather painfully obvious. It also includes - fix compilation warnings which appears if debug mode turn on - remove unnecessary duplication of code to support UFS2 I tested it on ufs1 and ufs2 file-systems. Signed-off-by: Evgeniy Dushistov Signed-off-by: Linus Torvalds commit fc091e03820bf67e543362bd40959701a71d0c27 Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:06:04 2006 -0800 [SCSI] qla2xxx: Update version number to 8.01.04-k. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 79f89a4296ff22f09baf538d4ff2a6d0c3097a73 Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:05:58 2006 -0800 [SCSI] qla2xxx: Disable port-type RSCN handling via driver state-machine. Given the semantic changes in both the device-model and fc-transport APIs, the driver's handling of port-type RSCNs via a series of ADISCs and PLOGIs can cause series of badness ranging from unexpectedly device loss to devices not being discovered. In the interim, disable (via a module-parameter) this feature and allow RSCN management to continue to occur within the driver's DPC thread. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit fdd52dfa3c311a2583850a2fbea99f329be861d7 Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:05:53 2006 -0800 [SCSI] qla2xxx: Kconfig update: Add URL to download firmware images. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit c0eb87552654bc3e8da179c501e3e18c92ee4360 Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:05:48 2006 -0800 [SCSI] qla2xxx: Correct setting of FDMI supported/current port speed. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit bc8fb3cb9e208de0d69223f68058714b78f83833 Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:05:42 2006 -0800 [SCSI] qla2xxx: Correct execution-throttle setting for ISP24xx. Similarly to other ISPs, set execution throttle to maximum allowed value since 'throttling' is done on a per-lun basis via queue-depth. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 590f98e5e8d6502cc21fdcddc90a0cc09c1f770e Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:05:37 2006 -0800 [SCSI] qla2xxx: Collapse load RISC RAM implementations. Simplify essentially duplicate load RISC RAM implementation in qla2x00_load_ram_ext() and qla2x00_load_ram(). Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit f94097edf2c3ac9bc48580252c2eee52947b5e60 Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:05:32 2006 -0800 [SCSI] qla2xxx: Correct swing/emphasis settings for ISP24XX. Swing/emphasis settings in NVRAM were not being honoured due to the driver not converting the serial-link options from LE to host-endian format. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit c9d02acf39d9fdde18b63281944003b9ec9a3271 Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:05:26 2006 -0800 [SCSI] qla2xxx: Correct issue where portstate does not transition during loop-resync. If the Get Port Database call fails during local-loop update, then schedule the DPC routine to perform a rescan as the firmware would have updated the Get ID List port-entries of their new state. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 210d53507e961b0f480d1a86d9a26832cc68645e Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:05:21 2006 -0800 [SCSI] qla2xxx: Update firmware-dump procedure for ISP24xx. Small changes to register retrieval and order as per latest firmware specification. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit e978010cebcc0ac1be67caab8dfc7c1fa831406d Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:05:15 2006 -0800 [SCSI] qla2xxx: Re-enable flash-part write protection on ISP24xx boards. Driver would not correctly re-enable the write-protection bits of the flash part after updates. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 5998983113c1c9158c1ce66ff26a212aceaf7e5c Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:05:10 2006 -0800 [SCSI] qla2xxx: Correct excessive delay during LOAD-RISC-RAM mailbox command. Problem report (against 2.4.x driver) from Jeff Layton : An OEM noticed that the U6 qla2200 driver would hang for around 2 minutes at boot time and then proceed normally. I found that the delay was occurring when loading the new firmware into the card, and was due to a schedule_timeout(10) added to the bottom of the polling loop. Some testing showed that the load ram operation on the card was very quick (on the order of a couple of jiffies), but the sleep in the polling loop was making each operation take around 25-30. The attached patch corrects this by making it skip sleeping during the load ram operation, since I believe we only do that when the module is plugged in. It also skips sleeping if the mbox_int flag got set during the current loop. This corrected the hang on my test setup, and OEM also confirmed that it corrected the problem for them. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 03ab2eabed74708c0c74163723007e8e72244219 Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:05:05 2006 -0800 [SCSI] qla2xxx: Use msleep() as delay during ISP polling. Mailbox commands are polled for completion during ISP initialization. During potentially 'long' mailbox commands (i.e. fabric login), we really don't want a busy-wait delay to potentially trigger a (benign) soft-lockup BUG(). Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit e038a1be22bef90795c5239d1563609b89c3aa18 Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:04:59 2006 -0800 [SCSI] qla2xxx: Drop noisy 'UNDERRUN' status message. There's no point in displaying the message during a valid underrun case. Limit the message to potentially problematic cases. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 9403688e9bca54b55bfcea51053c8af537beba0a Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:04:54 2006 -0800 [SCSI] qla2xxx: Correct FC4 feature assignment during RFF_ID. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit dad9c8c15dbe4eac0ab086c74cdb256ec2fb0b70 Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:04:49 2006 -0800 [SCSI] qla2xxx: Reference proper node/port names in fc_host class. The initial-control-block references are not always correct as the use-node-name qualifier during NVRAM configuration will cause the firmware to use the portname as a base for the nodename. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit a1e80c20e1ac751dbdd88dee989e9a19c22c4a84 Author: Mike Christie Date: Fri Jan 13 18:05:56 2006 -0600 [SCSI] iscsi: use pageslab From: FUJITA Tomonori and zhenyu.z.wang@intel.com: We cannot handle filesystems like XFS becuase of the pages they are sending us. We had thought page_count could be used to work around this, but the correct test is for PageSlab. The proper solution is to figure out what type of pages filesystems can use so we do not have to add tests like this or handle it in the block layer for all network block drivers but the issue still has not been resolved on fs-devel so we are sending this patch as a temporary fix. This is last patch just in case it is Nakd with the explanation that we need to push the correct fix through fs-devel, mm or the block layer. The rest of the patchset can live without the patch, but the driver will not work with filesystems like XFS. Signed-off-by: Alex Aizman Signed-off-by: Dmitry Yusupov Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 55e3299d9eca01fb2351c5d37e222872b7c6e0af Author: Mike Christie Date: Fri Jan 13 18:05:53 2006 -0600 [SCSI] iscsi: fix 4k stack iscsi setups When we run the xmit code from queuecomand the stack trace gets too deep. The patch runs the xmit code from the scsi_host work queue. This fixes 4k stack and xfs support and should fix the st and sg stack usage bugs. Signed-off-by: Alex Aizman Signed-off-by: Dmitry Yusupov Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 7b8631b53bea286b68847a939b87135198335b66 Author: Mike Christie Date: Fri Jan 13 18:05:50 2006 -0600 [SCSI] iscsi: seperate iscsi interface from setup functions This is the second version of the patch to address Christoph's comments. Instead of doing the lib, I just kept everything in scsi_trnapsort_iscsi.c like the FC and SPI class. This was becuase the driver model and sysfs class is tied to the session and connection setup so separating did not buy very much at this time. The reason for this patch was becuase HW iscsi LLDs like qla4xxx cannot use the iscsi class becuase the scsi_host was tied to the interface and class code. This patch just seperates the session from scsi host so that LLDs that allocate the host per some resource like pci device can still use the class. This is also fixes a couple refcount bugs that can be triggered when users have a sysfs file open, close the session, then read or write to the file. Signed-off-by: Alex Aizman Signed-off-by: Dmitry Yusupov Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 7cae5159dd2623300cf9820865bfbf6dcdb7c1b9 Author: Mike Christie Date: Fri Jan 13 18:05:47 2006 -0600 [SCSI] iscsi: add high mem support From Mike Christie and FUJITA Tomonori : We cannot use page_address becuase some pages could be highmem. Instead, we can use sock_no_sendpage which does kmap for us. Signed-off-by: Alex Aizman Signed-off-by: Dmitry Yusupov Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 56851698c23430f0f291d6e50da344e6b414f3b9 Author: FUJITA Tomonori Date: Fri Jan 13 18:05:44 2006 -0600 [SCSI] iscsi: data digest page cache usage fix Users can write to a page while we are sending it and making digest calculations. This ends up causing us to retry the command when a digest error is later reported. By using sock_no_sendpage when data digests are calculated we can avoid a lot of (not all but it helps) the retries becuase sock_no_sendpage is not zero copy. Signed-off-by: Alex Aizman Signed-off-by: Dmitry Yusupov Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 3e97c7e6cda933e3a1b518a8100d155c532a3cfc Author: zhenyu.z.wang@intel.com Date: Fri Jan 13 18:05:41 2006 -0600 [SCSI] iscsi: host locking fix We should be taking the host_lock instead of the conn lock when checking host_busy. Signed-off-by: Alex Aizman Signed-off-by: Dmitry Yusupov Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit bf310b8f582bddec20c27e32ffbaf8e2c91e147c Author: zhenyu.z.wang@intel.com Date: Fri Jan 13 18:05:38 2006 -0600 [SCSI] iscsi: data under/over flow fix We need to check the ISCSI_FLAG_DATA_* flags. Signed-off-by: Alex Aizman Signed-off-by: Dmitry Yusupov Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 42f72aa9e5bc969a34e5989fc00e7e2d71e8a95b Author: FUJITA Tomonori Date: Fri Jan 13 18:05:35 2006 -0600 [SCSI] iscsi: whitespace cleanup Remove extra whitespaces. Signed-off-by: Alex Aizman Signed-off-by: Dmitry Yusupov Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit a12e25bd59e36d12dcd026ffa3c65d48b5cf5442 Author: Jes Sorensen Date: Wed Jan 11 08:39:45 2006 -0500 [SCSI] sem2mutex 3w-[x9]xxx Convert a the 3w-9xxx.c and 3w-xxxx.c drivers to use mutexes instead of semaphores. Untested, but compiles and looks obviously correct. Signed-off-by: Jes Sorensen Signed-off-by: James Bottomley commit 3759b788498ffc0b2563181567af4c82d983f921 Author: James Bottomley Date: Sat Jan 14 09:28:07 2006 -0600 [SCSI] mptfc: need to select transport attrs Now that mptfc actually uses the transport class, it can't be built without it. Signed-off-by: James Bottomley commit 569b11dcfa9d764e775f9e964a680c32265ab7f2 Author: Moore, Eric Date: Fri Jan 13 16:25:29 2006 -0700 [SCSI] fusion - fix pci express bug The fix is to write 'MPI_HIM_DIM' to the Host Interrupt Mask register, when enabling interrupts. Instead of the tilde of MPI_HIM_RIM. Apparently writing '1's to some of the reserved bits was causing all the bits to go to `1`, which effectly disabled all interrupts. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit e6bc863cf25f30ed8e2a4d41b76d5688f8efaee9 Author: Moore, Eric Date: Fri Jan 13 16:33:59 2006 -0700 [SCSI] scsi_transport_sas: mapping the rphy channel equal to the port identifier We will be mapping the RAID volumes in mptsas to a reserved channel that is one larger than the anticapated number of ports on the direct attached host adapter. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 4b915a73663fe0951077ebcdaf02337ff2bddcfc Author: Moore, Eric Date: Fri Jan 13 16:25:23 2006 -0700 [SCSI] fusion - mpi header udpate This updates mpi headers in fusion drivers to version 1.5.12. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 816aa907b909177bdf6e6e6b0d00c5e5a6e2be8c Author: Moore, Eric Date: Fri Jan 13 16:25:20 2006 -0700 [SCSI] fusion - adding raid support in mptsas The SAS RAID volumes are reported beyond the expected number of phys. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit e02f3f59225d8c3b2a0ad0dc941a09865e27da61 Author: Christoph Hellwig Date: Fri Jan 13 19:04:00 2006 +0100 [SCSI] remove target parent limitiation When James Smart fixed the issue of the userspace scan atributes crashing the system with the FC transport class he added a patch to let the transport class check if the parent is valid for a given transport class. When adding support for the integrated raid of fusion sas devices we ran into a problem with that, as it didn't allow adding virtual raid volumes without the transport class knowing about it. So this patch adds a user_scan attribute instead, that takes over from scsi_scan_host_selected if the transport class sets it and thus lets the transport class control the user-initiated scanning. As this plugs the hole about user-initiated scanning the target_parent hook goes away and we rely on callers of the scanning routines to do something sensible. For SAS this meant I had to switch from a spinlock to a mutex to synchronize the topology linked lists, in FC they were completely unsynchronized which seems wrong. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 6d5b0c315e0c14f8a0fe274eda7676d62cbd8584 Author: Moore, Eric Date: Fri Jan 13 16:25:26 2006 -0700 [SCSI] fusion - adding support for FC949ES Add software recognition for the new LSI Logic Fibre Channel controller. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 05e8ec17f4d11ba13795e878fc389cb04d1fdadd Author: Michael Reed Date: Fri Jan 13 14:31:54 2006 -0600 [SCSI] mptfusion - fc transport attributes Signed-off-by: Michael Reed Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit d158d26167a3f6a910ec3e0eda23cc0cd437c689 Author: Jes Sorensen Date: Fri Jan 13 16:05:44 2006 -0800 [SCSI] sem2mutex: scsi_transport_spi.c Convert the SCSI transport class code to use a mutex rather than a semaphore. Signed-off-by: Jes Sorensen Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit f20139bee4545b91f30e14e2f528320c7ab36fa6 Author: James Bottomley Date: Fri Jan 13 15:36:25 2006 -0600 [SCSI] fix up message/i2o/pci.c There was a use before initialisation of c->name Signed-off-by: James Bottomley commit 1ca00bb7916cb40b8140173c23481e11d92d6f6a Author: Christoph Hellwig Date: Fri Jan 13 18:27:50 2006 +0100 [SCSI] fusion: kzalloc / kcalloc conversion Convert kmalloc + memset to kzalloc or kcalloc in fusion. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit eeb846cefdd842af479393a7d0fd399a29e42532 Author: Christoph Hellwig Date: Fri Jan 13 18:27:11 2006 +0100 [SCSI] fusion: convert semaphores to mutexes Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 9a28f49adbe4955af8a1306fd36ddae15136dde7 Author: Christoph Hellwig Date: Fri Jan 13 18:04:41 2006 +0100 [SCSI] mptsas: support basic hotplug Adds hotplug support for SAS end devices. Unfortunately the fusion firmware doesn't generate similar events for expanders addition/removal so we can't support them yet. Eric has an idea about a clever scheme to find out about expander changes so that'll be added later on. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 9638d89a75776abc614c29cdeece0cc874ea2a4c Author: Salyzyn, Mark Date: Thu Jan 12 08:31:57 2006 -0500 [SCSI] I2O: move pci_request_regions() just behind pci_enable_device() The problem in dpt_i2o could be the pci config space accesses it triggers as it loads, dangerous to do if there is any I/O activity going on in the other driver (probable if a boot driver I guess). I approve this patch to dpt_i2o.c, and am applying it to the Adaptec branch of the driver. Thanks for the investigation Ryoji. --- In linux 2.6.15, data transfer does hang when both dpt_i2o and i2o_block drivers are loaded. It seems that location of pci_request_regions() are wrong. I moved it just behind pci_enable_device() like other drivers, and it becomes fine. Signed-off-by: Ryoji Kamei Signed-off-by: James Bottomley commit 560c26c8345509619c3575331b99b329b5de1054 Author: Jack Hammer Date: Fri Jan 13 10:06:50 2006 -0500 [SCSI] ips: Mode Sense (Caching Page ) fix To avoid the "sda: got wrong page" message, the ServeRAID driver should be setting flags indicating that the Mode Sense commands are not supported. Signed-off-by: Jack Hammer Signed-off-by: James Bottomley commit ad757cdfd2a40c9d5310d00f24427525788341cd Author: Andreas Herrmann Date: Fri Jan 13 02:26:11 2006 +0100 [SCSI] zfcp: transport class adaptations II Replaced zfcp adapter attributes with fc_host attributes: fc_topology by port_type, physical_wwpn by permanent_port_name. Make use of fc_host attribute supported_speeds. Removed zfcp adapter attribute physical_s_id. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit f6cd94b126aa78ebaa21075df3b9577fbf995968 Author: Andreas Herrmann Date: Thu Jan 5 09:59:34 2006 +0100 [SCSI] zfcp: transport class adaptations Added host stats, removed superfluous get_starget_ functions, removed some attributes from zfcp specific sysfs tree (e.g. scsi_host_no, scsi_lun, wwnn and d_id). Host stats are given for the physical adapter port not for the virtual adapter. Reset stats is implemented in the device driver. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 9eb69aff79264b5f35e41922df20a488c67e9ee2 Author: Maxim Shchetynin Date: Thu Jan 5 09:56:47 2006 +0100 [SCSI] zfcp: handle unsolicited status notification lost Handle unsolicited adapter status that informs about loss of previous unsolicited status notification(s). Signed-off-by: Maxim Shchetynin Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 6b7281d0a0f8f99d39808088a036459f6f7906a6 Author: Andreas Herrmann Date: Fri Jan 13 02:16:54 2006 +0100 [SCSI] fc transport: add permanent_port_name fc_host attribute Add fc_host attribute permanent_port_name which is used to show the port name of the primary port - the port that initially logged into the fabric. For a virtual port (registered via the primary port with FDISC command) it is useful to know not only its (virtual) port name but also the permanent port name. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit a09c6311217e8fb079c967427d009fe23f2e420e Author: Christoph Hellwig Date: Wed Jan 11 14:28:06 2006 +0100 [SCSI] sr: split sr_audio_ioctl into specific helpers split each ioctl handled in sr_audio_ioctl into a function of it's own. This cleans the code up nicely, and allows various places in sr_ioctl to call these helpers directly instead of going through the multiplexer. Signed-off-by: Christoph Hellwig Acked-by: Jens Axboe Signed-off-by: James Bottomley commit 776b23a0363d99ca402edc1aba1db8099b747b33 Author: Christoph Hellwig Date: Fri Jan 6 18:34:07 2006 +0100 [SCSI] always handle REQ_BLOCK_PC requests in common code LLDDs should never see REQ_BLOCK_PC requests, we can handle them just fine in the core code. There is a small behaviour change in that some check in sr's rw_intr are bypassed, but I consider the old behaviour a bug. Mike found this cleanup opportunity and provdided early patches, so all the credit goes to him, even if I redid the patches from scratch beause that was easier than forward-porting the old patches. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit d4054239929479907f20b9d68c905589125ad343 Author: Christoph Hellwig Date: Wed Jan 4 13:45:20 2006 +0100 [SCSI] sas: fix removal of devices behind expanders We need to iterate over all children when removing and expander, else stale objects will be around after host removal. This fixes the oops Eric Moore saw when removing and reloading mptsas. Also don't try the scsi_remove_target call unless operating on an end device. The current unconditional call is harmless but confusing. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 6c90c872017773cde70a51432cb28f253451b967 Author: Nicolas Pitre Date: Sat Jan 14 16:37:15 2006 +0000 [ARM] 3112/1: old ABI compat: config option to turn it on Patch from Nicolas Pitre Enjoy ! Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 8993a44cede418940a4921de5dc24d52a9fe8767 Author: Nicolas Pitre Date: Sat Jan 14 16:36:50 2006 +0000 [ARM] 3111/2: old ABI compat: adjust NWFPE to be operational within an EABI kernel Patch from Nicolas Pitre We need NWFPE if we want to support execution of legacy binaries with an EABI kernel. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit dd35afc22b76766e827c9e67ebc4b7bf6e31ecab Author: Nicolas Pitre Date: Sat Jan 14 16:36:12 2006 +0000 [ARM] 3110/5: old ABI compat: multi-ABI syscall entry support Patch from Nicolas Pitre This patch adds the required code to support both user space ABIs at the same time. A second syscall table is created to include legacy ABI syscalls that need an ABI compat wrapper. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 687ad0191488a067b3b3cc94f670cc21f93811e1 Author: Nicolas Pitre Date: Sat Jan 14 16:35:31 2006 +0000 [ARM] 3109/1: old ABI compat: syscall wrappers for ABI impedance matching Patch from Nicolas Pitre The difference between EABI and the legacy ABI may affect either structure member alignment and/or argument register selection. The patch has the details. Included are wrappers for the following syscalls: sys_stat64 sys_lstat64 sys_fstat64 sys_fcntl64 sys_epoll_ctl sys_epoll_wait sys_ipc sys_semop sys_semtimedop sys_pread64 sys_pwrite64 sys_truncate64 sys_ftruncate64 sys_readahead Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 713c481519f19df9e6d90f257e7da0336b057592 Author: Nicolas Pitre Date: Sat Jan 14 16:35:03 2006 +0000 [ARM] 3108/2: old ABI compat: statfs64 and fstatfs64 Patch from Nicolas Pitre struct statfs64 has extra padding with EABI growing its size from 84 to 88. This struct is now __attribute__((packed,aligned(4))) with a small assembly wrapper to force the sz argument to 84 if it is 88 to avoid copying the extra padding over user space memory unexpecting it. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 704bdda03827db8a551e82b312037d63ba3c22ff Author: Nicolas Pitre Date: Sat Jan 14 16:33:50 2006 +0000 [ARM] 3107/3: ARM EABI: last bits to configure it Patch from Nicolas Pitre This adds the configuration option, and disables any FPA floating point emulators which are not EABI compatible. It also disables Acorn RISC OS/Arthur binary support when CONFIG_EABI=y since it is incompatible with an EABI kernel. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit c155fc95befc95f4a9d6497f5fadec22f4bc3a24 Author: Nicolas Pitre Date: Sat Jan 14 16:32:12 2006 +0000 [ARM] 3106/2: ARM EABI: some syscall adjustments Patch from Nicolas Pitre Fix a few syscalls for EABI requirements. They were sys_pread64 and sys_pwrite64 where the last argument is now entirely pushed on stack, but since commit 567bd98017d9c9f2ac1c148ddc78c062e8abd398 they don't require any fixup. Remains only the stat64 structure. Non EABI kernels are unaffected. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 3f2829a31573e3e502b874c8d69a765f7a778793 Author: Nicolas Pitre Date: Sat Jan 14 16:31:29 2006 +0000 [ARM] 3105/4: ARM EABI: new syscall entry convention Patch from Nicolas Pitre For a while we wanted to change the way syscalls were called on ARM. Instead of encoding the syscall number in the swi instruction which requires reading back the instruction from memory to extract that number and polluting the data cache, it was decided that simply storing the syscall number into r7 would be more efficient. Since this represents an ABI change then making that change at the same time as EABI support is the right thing to do. It is now expected that EABI user space binaries put the syscall number into r7 and use "swi 0" to call the kernel. Syscall register argument are also expected to have "EABI arrangement" i.e. 64-bit arguments should be put in a pair of registers from an even register number. Example with long ftruncate64(unsigned int fd, loff_t length): legacy ABI: - put fd into r0 - put length into r1-r2 - use "swi #(0x900000 + 194)" to call the kernel new ARM EABI: - put fd into r0 - put length into r2-r3 (skipping over r1) - put 194 into r7 - use "swi 0" to call the kernel Note that it is important to use 0 for the swi argument as backward compatibility with legacy ABI user space relies on this. The syscall macros in asm-arm/unistd.h were also updated to support both ABIs and implement the right call method automatically. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit ba95e4e4a0a8a3c6aba363d45f78d5f2e2d111eb Author: Nicolas Pitre Date: Sat Jan 14 16:18:29 2006 +0000 [ARM] 3104/1: ARM EABI: new helper function names Patch from Nicolas Pitre The ARM EABI defines new names for GCC helper functions. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 499b2ea11ff00c624d63af23516404fa2156639a Author: Nicolas Pitre Date: Sat Jan 14 16:18:09 2006 +0000 [ARM] 3103/1: ARM EABI: stack pointer must be 64-bit aligned (part 2) Patch from Nicolas Pitre We must make sure that assembly code that modifies the stack pointer before calling a C function does it so it remains 64-bit aligned. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 2dede2d8e925f4c2cb4e136b14df127685e15dd3 Author: Nicolas Pitre Date: Sat Jan 14 16:18:08 2006 +0000 [ARM] 3102/1: ARM EABI: stack pointer must be 64-bit aligned after a CPU exception Patch from Nicolas Pitre The ARM EABI says that the stack pointer has to be 64-bit aligned for reasons already mentioned in patch #3101 when calling C functions. We therefore must verify and adjust sp accordingly when taking an exception from kernel mode since sp might not necessarily be 64-bit aligned if the exception occurs in the middle of a kernel function. If the exception occurs while in user mode then no sp fixup is needed as long as sizeof(struct pt_regs) as well as any additional syscall data stack space remain multiples of 8. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit da2b1cd61903c8e9796e76be2d606584f26a78e5 Author: Nicolas Pitre Date: Sat Jan 14 16:18:07 2006 +0000 [ARM] 3101/1: ARM EABI: slab memory must be 64-bit aligned Patch from Nicolas Pitre Although ARM is still using 32-bit pointers, version 5 and later versions of the ARM architecture introduced the ldrd and strd instructions to move 64-bit data which must be 64-bit aligned in memory, and the EABI includes new constraints on structure data alignment to allow for the compiler to use those instructions. This means that any slab allocation must start on a 64-bit boundary which is not equivalent to BYTES_PER_WORD, especially on those architecture versions that implements the ldrd/strd instructions. Overriding the default alignment disables some slab debug features. If those debug features are really needed then the kernel will have to be compiled for version 4 of the ARM architecture. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit eab9edd27f7ceaad6b57085817d63287bda15190 Author: Michael Hanselmann Date: Sat Jan 14 10:08:06 2006 -0500 Input: HID - add support for fn key on Apple PowerBooks This patch implements support for the fn key on Apple PowerBooks using USB based keyboards and makes them behave like their ADB counterparts. Signed-off-by: Michael Hanselmann Acked-by: Rene Nussbaumer Acked-by: Johannes Berg Acked-by: Benjamin Herrenschmidt Acked-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 1e27ffd4d7d39783c5196daa2584cca5785d1f95 Author: Dmitry Torokhov Date: Sat Jan 14 00:28:04 2006 -0500 Input: wacom - fix compile on PowerPC Rename G4 (new Graphire4) to WACOM_G4 to avoid clashes on PowerPC Signed-off-by: Dmitry Torokhov commit 5fce9d7bc5f485358263cf3d895e90c974449e1f Author: Dmitry Torokhov Date: Sat Jan 14 00:27:51 2006 -0500 Input: HID - add more simulation usages Signed-off-by: Dmitry Torokhov commit f0d5c6f419d3a10443f66d6835855837eae4ac4b Author: Dmitry Torokhov Date: Sat Jan 14 00:27:37 2006 -0500 Input: psmouse - attempt to re-synchronize mouse every 5 seconds This should help driver to deal vith KVMs that reset mice when switching between boxes. Signed-off-by: Dmitry Torokhov commit b65d0d1bacfdbb4a134a7ebd16f280d5d42241cb Author: Dmitry Torokhov Date: Sat Jan 14 00:26:15 2006 -0500 Input: HID - fix an oops in PID initialization code Signed-off-by: Dmitry Torokhov commit 940824b0ac6661ff4f3b36e7bce17f681d0cbc23 Author: Vojtech Pavlik Date: Sat Jan 14 00:25:39 2006 -0500 Input: HID - add support for Cherry Cymotion keyboard The Cherry Cymotion is a special Linux keyboard made by Cherry, with only one little problem: it doesn't work with Linux. This patch (originally by hexten.net, cleaned up by me) makes it work including all the special keys. Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 3dd01a831133e3260b9c77a09c234b012e9507da Author: Vojtech Pavlik Date: Sat Jan 14 00:24:06 2006 -0500 Input: i8042 - add Sony Vaio FSC-115b to MUX blacklist Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit d5f079000b20887bfbc84d772a27709c5665e652 Author: Paul Mackerras Date: Sat Jan 14 15:08:50 2006 +1100 [PATCH] powerpc: Recognize /chaos bridge on old pmacs as PCI The first generation of PCI powermacs had a host bridge called /chaos which was for all intents and purposes a PCI host bridge, but has a device_type of "vci" in the device tree (presumably it's not really PCI at the hardware level or something). The OF parsing stuff in arch/powerpc/kernel/prom_parse.c currently doesn't recognize it as a PCI bridge, which means that controlfb.c can't get its device addresses. This makes prom_parse.c recognize a device_type of "vci" as indicating a PCI host bridge. With this, controlfb works again. Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit b4e7de0f3575f4862f04921c5bd0cb5680cc8d71 Author: Paul Mackerras Date: Sat Jan 14 15:06:51 2006 +1100 powerpc: Avoid unaligned loads and stores in boot memcpy code The 601 processor will generate an alignment exception for accesses which cross a page boundary. In the boot wrapper code, OF is still handling all exceptions, and it doesn't have an alignment exception handler that emulates the instruction and continues. This changes the memcpy and memmove routines in the boot wrapper to avoid doing unaligned accesses. If the source and destination are misaligned with respect to each other, we just copy one byte at a time. Signed-off-by: Paul Mackerras commit 66a45dd3620ee5f913ba1af3d2dca8b9bdfa2b96 Author: Paul Mackerras Date: Sat Jan 14 15:04:06 2006 +1100 powerpc: Make COFF zImages for old 32-bit powermacs This adds code to build zImage.coff and/or zImage.initrd.coff when CONFIG_PPC32 and CONFIG_PPC_PMAC are defined. It also restructures the OF client code and adds some workarounds for OF quirks on the older machines. Signed-off-by: Paul Mackerras commit 36874579dbf4cafa31486d4207c6807efbbf1378 Author: David Woodhouse Date: Sat Jan 14 00:15:19 2006 +0000 [PATCH] powerpc: macio-adb build fix This makes macio-adb.c build again. Entirely untested. Signed-off-by: David Woodhouse Signed-off-by: Paul Mackerras commit 575e321606c5673efabf28c0fa075e198980c44e Author: David Woodhouse Date: Sat Jan 14 00:13:49 2006 +0000 [PATCH] powerpc: Make CHRP build again This makes CHRP build again, although it's untested because my Pegasos is currently in pieces. Signed-off-by: David Woodhouse Signed-off-by: Paul Mackerras commit 91dc182ca6e25ee8b648ed2fb2a41859ead34903 Author: Dave C Boutcher Date: Fri Jan 13 18:39:24 2006 -0600 [PATCH] powerpc: special-case ibm,suspend-me RTAS call Handle the ibm,suspend-me RTAS call specially. It needs to be wrapped in a set of synchronization hypervisor calls (H_Join). When the H_Join calls are made on all CPUs, the intent is that only one will return with H_Continue, meaning that he is the "last man standing". That CPU then issues the ibm,suspend-me call. What is interesting, of course, is that the CPU running when the rtas syscall is made, may NOT be the CPU that ultimately executes the ibm,suspend-me rtas call. Signed-off-by: Dave Boutcher Signed-off-by: Paul Mackerras commit 91f62a2491f45b5d46ebe5aca1fac3477355c9c1 Author: Paul Mackerras Date: Sat Jan 14 11:17:32 2006 +1100 ppc: Remove duplicate export of get_wchan The arch/powerpc version of process.c exports get_wchan itself. When I moved ARCH=ppc over to using arch/powerpc/kernel/process.c the get_wchan export in arch/ppc/kernel/ppc_ksyms.c became redundant, so remove it. Signed-off-by: Paul Mackerras (cherry picked from 9871166ad692121d6b944159ef3f053570158ea8 commit) commit 2e10c84b9cf0b2d269c5629048d8d6e35eaf6b2b Author: David Brownell Date: Wed Jan 11 11:23:49 2006 -0800 [PATCH] SPI: add spi_butterfly driver This adds a bitbanging parport based adaptor cable for AVR Butterfly, giving SPI links to its DataFlash chip and (eventually) firmware running in the card. Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 5d870c8e216f121307445c71caa72e7e10a20061 Author: Andrew Morton Date: Wed Jan 11 11:23:49 2006 -0800 [PATCH] spi: remove fastcall crap gcc4 generates warnings when a non-FASTCALL function pointer is assigned to a FASTCALL one. Perhaps it has taste. Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 7111763d391b0c5a949a4f2575aa88cd585f0ff6 Author: David Brownell Date: Sun Jan 8 13:34:29 2006 -0800 [PATCH] spi: misc fixes This collects some small SPI patches that seem to be missing from the MM tree: - spi_butterfly kbuild hooks got dropped somehow; this restores them - quick fix for a (theoretical?) m25p80_write() oops noted by Andrew - quick fix for a potential config-specific oops for mtd_dataflash() - minor doc tweaks Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 8275c642ccdce09a2146d0a9eb022e3698ee927e Author: Vitaly Wool Date: Sun Jan 8 13:34:28 2006 -0800 [PATCH] spi: use linked lists rather than an array This makes the SPI core and its users access transfers in the SPI message structure as linked list not as an array, as discussed on LKML. From: David Brownell Updates including doc, bugfixes to the list code, add spi_message_add_tail(). Plus, initialize things _before_ grabbing the locks in some cases (in case it grows more expensive). This also merges some bitbang updates of mine that didn't yet make it into the mm tree. Signed-off-by: Vitaly Wool Signed-off-by: Dmitry Pervushin Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 2f9f762879015d738a5ec2ac8a16be94b3a4a06d Author: Mike Lavender Date: Sun Jan 8 13:34:27 2006 -0800 [PATCH] spi: M25 series SPI flash This was originally a driver for the ST M25P80 SPI flash. It's been updated slightly to handle other M25P series chips. For many of these chips, the specific type could be probed, but for now this just requires static setup with flash_platform_data that lists the chip type (size, format) and any default partitioning to use. Signed-off-by: David Brownell Cc: Mike Lavender Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 9904f22a7202c6b54e96b0cc9870817013c350a1 Author: David Brownell Date: Sun Jan 8 13:34:26 2006 -0800 [PATCH] spi: add spi_bitbang driver This adds a bitbanging spi master, hooking up to board/adapter-specific glue code which knows how to set and read the signals (gpios etc). This code kicks in after the glue code creates a platform_device with the right platform_data. That data includes I/O loops, which will usually come from expanding an inline function (provided in the header). One goal is that the I/O loops should be easily optimized down to a few GPIO register accesses, in common cases, for speed and minimized overhead. This understands all the currently defined protocol tweaking options in the SPI framework, and might eventually serve as as reference implementation. - different word sizes (1..32 bits) - differing clock rates - SPI modes differing by CPOL (affecting chip select and I/O loops) - SPI modes differing by CPHA (affecting I/O loops) - delays (usecs) after transfers - temporarily deselecting chips in mid-transfer A lot of hardware could work with this framework, though common types of controller can't reach peak performance without switching to a driver structure that supports pipelining of transfers (e.g. DMA queues) and maybe controllers (e.g. IRQ driven). Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 2e5a7bd978bf4118a0c8edf2e6ff81d0a72fee47 Author: David Brownell Date: Sun Jan 8 13:34:25 2006 -0800 [PATCH] spi: ads7836 uses spi_driver This updates the ads7864 driver to use the new "spi_driver" struct, and includes some minor unrelated cleanup. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 0c868461fcb8413cb9f691d68e5b99b0fd3c0737 Author: David Brownell Date: Sun Jan 8 13:34:25 2006 -0800 [PATCH] SPI core tweaks, bugfix This includes various updates to the SPI core: - Fixes a driver model refcount bug in spi_unregister_master() paths. - The spi_master structures now have wrappers which help keep drivers from needing class-level get/put for device data or for refcounts. - Check for a few setup errors that would cause oopsing later. - Docs say more about memory management. Highlights the use of DMA-safe i/o buffers, and zero-initializing spi_message and such metadata. - Provide a simple alloc/free for spi_message and its spi_transfer; this is only one of the possible memory management policies. Nothing to break code that already works. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit b885244eb2628e0b8206e7edaaa6a314da78e9a4 Author: David Brownell Date: Sun Jan 8 13:34:23 2006 -0800 [PATCH] spi: add spi_driver to SPI framework This is a refresh of the "Simple SPI Framework" found in 2.6.15-rc3-mm1 which makes the following changes: * There's now a "struct spi_driver". This increase the footprint of the core a bit, since it now includes code to do what the driver core was previously handling directly. Documentation and comments were updated to match. * spi_alloc_master() now does class_device_initialize(), so it can at least be refcounted before spi_register_master(). To match, spi_register_master() switched over to class_device_add(). * States explicitly that after transfer errors, spi_devices will be deselected. We want fault recovery procedures to work the same for all controller drivers. * Minor tweaks: controller_data no longer points to readonly data; prevent some potential cast-from-null bugs with container_of calls; clarifies some existing kerneldoc, And a few small cleanups. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 1d6432fe10c3e724e307dd7137cd293a0edcae80 Author: David Brownell Date: Sun Jan 8 13:34:22 2006 -0800 [PATCH] spi: mtd dataflash driver This is a conversion of the AT91rm9200 DataFlash MTD driver to use the lightweight SPI framework, and no longer be AT91-specific. It compiles down to less than 3KBytes on ARM. The driver allows board-specific init code to provide platform_data with the relevant MTD partitioning information, and hotplugs. This version has been lightly tested. Its parent at91_dataflash driver has been pretty well banged on, although kernel.org JFFS2 dataflash support was acting broken the last time I tried it. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit ffa458c1bd9b6f653008d450f337602f3d52a646 Author: David Brownell Date: Sun Jan 8 13:34:21 2006 -0800 [PATCH] spi: ads7846 driver This is a driver for the ADS7846 touchscreen sensor, derived from the corgi_ts and omap_ts drivers. Key differences from those two: - Uses the new SPI framework (minimalist version) - abstracts board-specific touchscreen info - Sysfs attributes for the temperature and voltage sensors - Uses fewer ARM-specific IRQ primitives The temperature and voltage sensors show up in sysfs like this: $ pwd /sys/devices/platform/omap-uwire/spi2.0 $ ls bus@ input:event0@ power/ temp1 vbatt driver@ modalias temp0 vaux $ cat modalias ads7846 $ cat temp0 991 $ cat temp1 1177 $ So far only basic testing has been done. There's a fair amount of hardware that uses this sensor, and which also runs Linux, which should eventually be able to use this driver. One portability note may be of special interest. It turns out that not all SPI controllers are happy issuing requests that do things like "write 8 bit command, read 12 bit response". Most of them seem happy to handle various word sizes, so the issue isn't "12 bit response" but rather "different rx and tx write sizes", despite that being a common MicroWire convention. So this version of the driver no longer reads 12 bit native-endian words; it reads 16-bit big-endian responses, then byteswaps them and shifts the results to discard the noise. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 8ae12a0d85987dc138f8c944cb78a92bf466cea0 Author: David Brownell Date: Sun Jan 8 13:34:19 2006 -0800 [PATCH] spi: simple SPI framework This is the core of a small SPI framework, implementing the model of a queue of messages which complete asynchronously (with thin synchronous wrappers on top). - It's still less than 2KB of ".text" (ARM). If there's got to be a mid-layer for something so simple, that's the right size budget. :) - The guts use board-specific SPI device tables to build the driver model tree. (Hardware probing is rarely an option.) - This version of Kconfig includes no drivers. At this writing there are two known master controller drivers (PXA/SSP, OMAP MicroWire) and three protocol drivers (CS8415a, ADS7846, DataFlash) with LKML mentions of other drivers in development. - No userspace API. There are several implementations to compare. Implement them like any other driver, and bind them with sysfs. The changes from last version posted to LKML (on 11-Nov-2005) are minor, and include: - One bugfix (removes a FIXME), with the visible effect of making device names be "spiB.C" where B is the bus number and C is the chipselect. - The "caller provides DMA mappings" mechanism now has kerneldoc, for DMA drivers that want to be fancy. - Hey, the framework init can be subsys_init. Even though board init logic fires earlier, at arch_init ... since the framework init is for driver support, and the board init support uses static init. - Various additional spec/doc clarifications based on discussions with other folk. It adds a brief "thank you" at the end, for folk who've helped nudge this framework into existence. As I've said before, I think that "protocol tweaking" is the main support that this driver framework will need to evolve. From: Mark Underwood Update the SPI framework to remove a potential priority inversion case by reverting to kmalloc if the pre-allocated DMA-safe buffer isn't available. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 37d8dc82e0cd93eec77c5bcebd725c4ba661351a Author: David S. Miller Date: Fri Jan 13 16:19:44 2006 -0800 [NETFILTER] x-tables: Missing linux/ipv6.h includes. Signed-off-by: David S. Miller commit 8f069b1a90bd97bf6d59a02ecabf0173d9175609 Author: Marcelo Tosatti Date: Fri Jan 13 14:16:12 2006 -0200 [PATCH] powerpc/8xx: Use 8MB D-TLB's for kernel static mapping faults The following implements support for instantiation of 8MB D-TLB entries for the kernel direct virtual mapping on 8xx, thus reducing TLB space consumed for the kernel. Test used: writing 40MB from /dev/zero to file in ext2fs over RAMDISK. $ time dd if=/dev/zero of=file bs=4k count=10000 VANILLA 8MB kernel data pages real 0m11.485s real 0m11.267s user 0m0.218s user 0m0.250s sys 0m8.939s sys 0m9.108s real 0m11.518s real 0m10.978s user 0m0.203s user 0m0.222s sys 0m9.585s sys 0m9.138s real 0m11.554s real 0m10.967s user 0m0.228s user 0m0.222s sys 0m9.497s sys 0m9.127s real 0m11.633s real 0m11.286s user 0m0.214s user 0m0.196s sys 0m9.529s sys 0m9.134s and averages for both: real 11.54750 real 11.12450 Which is a 3.6% improvement in execution time. More improvement is expected for loads with larger kernel data footprint (real workloads). Signed-off-by: Marcelo Tosatti Signed-off-by: Paul Mackerras commit 7d13d21ae85f64e35dcdae4d6a6286e62a38e0ab Author: Kumar Gala Date: Fri Jan 13 11:19:58 2006 -0600 [PATCH] powerpc: Add MPC834x SYS board to arch/powerpc Add the first MPC83xx board that uses a flat device tree to arch/powerpc. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit eed320010872a11f5255b3d076e5b4f142af553d Author: Kumar Gala Date: Fri Jan 13 11:19:13 2006 -0600 [PATCH] powerpc: Add FSL SOC library and setup code Parse the flat device tree for devices on Freescale SOC's that we know about (gianfar, gianfar_mdio, i2c, mpc83xx_wdt). We need to setup platform devices and platform data for these devices to match arch/ppc usage. Also add a helper function (get_immrbase) that reports the base address of the MMIO registers on the SOC. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit b8e383d592daaa35c944a9083ee92c995dce66ca Author: Kumar Gala Date: Fri Jan 13 10:15:17 2006 -0600 [PATCH] powerpc: Allow for ppc_md restart, power_off, and halt to be NULL On a number of embedded reference boards there isn't always a way to reset, power_off, or halt the board. Rather than having each board implement a spin loop just let the generic code do it. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit 7a45fb19cef93574230827e6e2c97ad5760ddecd Author: Andy Whitcroft Date: Fri Jan 13 12:35:49 2006 +0000 [PATCH] powerpc: oprofile cpu type names clash with other code In 2.6.15-git6 a change was commited in the oprofile support in the powerpc architecture. It introduced the powerpc_oprofile_type which contains the define G4. This causes a name clash with the existing wacom usb tablet driver. CC [M] drivers/usb/input/wacom.o drivers/usb/input/wacom.c:98: error: conflicting types for `G4' include/asm/cputable.h:37: error: previous declaration of `G4' CC [M] drivers/usb/mon/mon_text.o make[3]: *** [drivers/usb/input/wacom.o] Error 1 make[2]: *** [drivers/usb/input] Error 2 The elements of an enum declared in global scope are effectivly global identifiers themselves. As such we need to ensure the names are unique. This patch updates the later oprofile support to use unique names. Signed-off-by: Andy Whitcroft Signed-off-by: Paul Mackerras commit 80f15dc703b3677d0b025bafd215f1f3664c8978 Author: Paul Mackerras Date: Sat Jan 14 10:11:39 2006 +1100 powerpc: Provide a suitable AT_PLATFORM value The glibc folks want to use AT_PLATFORM to select between possible alternative versions of shared libraries. This commit makes the kernel supply an AT_PLATFORM string that indicates what class of processor we are running on. Processors with the same set of user-level instructions and roughly the same instruction scheduling characteristics are given the same AT_PLATFORM value; for example, 821, 823 and 860 are all reported as "ppc823", and 7447, 7447A, 7448, 7450, 7451, 7455 are all called "ppc7450". The intention is that the AT_PLATFORM values match the values that gcc accepts for the -mcpu= option. For values which are numeric (e.g. -mcpu=750), "ppc" has been prepended. This also adds a PPC_FEATURE_BOOKE bit to the AT_HWCAP value and sets it for the 440 family and the Freescale 85xx family. Signed-off-by: Paul Mackerras commit d50f5c5ca0c3426669fbe11ad4d5708d333eb9fb Author: Andreas Schwab Date: Fri Jan 13 23:46:38 2006 +0100 [IA64] build broken for ia64 simserial.c TTY layer buffering revamp broke ia64 in commit 33f0f88f1c51ae5c2d593d26960c760ea154c2e2 CC arch/ia64/hp/sim/simserial.o arch/ia64/hp/sim/simserial.c: In function `receive_chars': arch/ia64/hp/sim/simserial.c:170: error: structure has no member named `flip' ... and so on ... make[1]: *** [arch/ia64/hp/sim/simserial.o] Error 1 Patch from Andreas Schwab. Signed-off-by: Tony Luck commit 95ed644fd12f53c6fc778f3f246974e5fe3a9468 Author: Ingo Molnar Date: Fri Jan 13 14:51:39 2006 -0800 IB: convert from semaphores to mutexes semaphore to mutex conversion by Ingo and Arjan's script. Signed-off-by: Ingo Molnar [ Sanity-checked on real IB hardware ] Signed-off-by: Roland Dreier commit d3ef1f5aafcf7a4129eb2078c70bc9e577bc3af1 Author: Zhang Yanmin Date: Fri Jan 13 14:45:21 2006 -0800 [IA64] prevent accidental modification of args in jprobe handler When jprobe is hit, the function parameters of the original function should be saved before jprobe handler is executed, and restored it after jprobe handler is executed, because jprobe handler might change the register values due to tail call optimization by the gcc. Signed-off-by: Zhang Yanmin Signed-off-by: Anil S Keshavamurthy Signed-off-by: Tony Luck commit dca80b962a811a0454d779ab6250b59446a8c86c Author: Patrick McHardy Date: Fri Jan 13 14:36:55 2006 -0800 [PKT_SCHED]: Change default clock source to gettimeofday The default of using jiffies is very bad and results in underutilization except with very low bandwidth. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ee51b1b6cece4dad408feeb0c3c9adb9cbd9f7d9 Author: Patrick McHardy Date: Fri Jan 13 14:34:36 2006 -0800 [XFRM]: IPsec tunnel wildcard address support When the source address of a tunnel is given as 0.0.0.0 do a routing lookup to get the real source address for the destination and fill that into the acquire message. This allows to specify policies like this: spdadd 172.16.128.13/32 172.16.0.0/20 any -P out ipsec esp/tunnel/0.0.0.0-x.x.x.x/require; spdadd 172.16.0.0/20 172.16.128.13/32 any -P in ipsec esp/tunnel/x.x.x.x-0.0.0.0/require; Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7b11f69fb5c475f521db79f5fa22104e15842671 Author: Kris Katterjohn Date: Fri Jan 13 14:33:06 2006 -0800 [NET]: Clean up comments for sk_chk_filter() This removes redundant comments, and moves one comment to a better location. Signed-off-by: Kris Katterjohn Signed-off-by: David S. Miller commit 46b86a2da0fd14bd49765330df63a62279833acb Author: Joe Perches Date: Fri Jan 13 14:29:07 2006 -0800 [NET]: Use NIP6_FMT in kernel.h There are errors and inconsistency in the display of NIP6 strings. ie: net/ipv6/ip6_flowlabel.c There are errors and inconsistency in the display of NIPQUAD strings too. ie: net/netfilter/nf_conntrack_ftp.c This patch: adds NIP6_FMT to kernel.h changes all code to use NIP6_FMT fixes net/ipv6/ip6_flowlabel.c adds NIPQUAD_FMT to kernel.h fixes net/netfilter/nf_conntrack_ftp.c changes a few uses of "%u.%u.%u.%u" to NIPQUAD_FMT for symmetry to NIP6_FMT Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit e026cca0f2c09c4c28c902db6384fd8a412671d6 Author: Keith Owens Date: Fri Jan 6 10:36:06 2006 +1100 [IA64] Add hotplug cpu to salinfo.c, replace semaphore with mutex Add hotplug cpu support to salinfo.c. The cpu_event field is a cpumask so use the cpu_* macros consistently, replacing the existing mixture of cpu_* and *_bit macros. Instead of counting the number of outstanding events in a semaphore and trying to track that count over user space context, interrupt context, non-maskable interrupt context and cpu hotplug, replace the semaphore with a test for "any bits set" combined with a mutex. Modify the locking to make the test for "work to do" an atomic operation. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 15029285dc977a392e74eacb7625984b71d4f605 Author: Jason Uhlenkott Date: Fri Dec 30 02:27:01 2005 -0800 [IA64] Handle debug traps in fsys mode We need to handle debug traps in fsys mode non-fatally. They can happen now that we have fsyscalls which contain probe instructions. Signed-off-by: Jason Uhlenkott Signed-off-by: Tony Luck commit 6d6e420005f3753392b608a614eee8475bdc16f7 Author: Prarit Bhargava Date: Fri Dec 23 13:33:25 2005 -0500 [IA64-SGI] Fix sn_flush_device_kernel & spinlock initialization This patch separates the sn_flush_device_list struct into kernel and common (both kernel and PROM accessible) structures. As it was, if the size of a spinlock_t changed (due to additional CONFIG options, etc.) the sal call which populated the sn_flush_device_list structs would erroneously write data (and cause memory corruption and/or a panic). This patch does the following: 1. Removes sn_flush_device_list and adds sn_flush_device_common and sn_flush_device_kernel. 2. Adds a new SAL call to populate a sn_flush_device_common struct per device, not per widget as previously done. 3. Correctly initializes each device's sn_flush_device_kernel spinlock_t struct (before it was only doing each widget's first device). Signed-off-by: Prarit Bhargava Signed-off-by: Tony Luck commit cfbb1426bd76c4ba6ec4491c8df2a5dd3d984750 Author: Jack Steiner Date: Thu Dec 22 13:45:41 2005 -0600 [IA64] Hole in IA64 TLB flushing from system threads I originally thought this was an bug only in the SN code, but I think I also see a hole in the generic IA64 tlb code. (Separate patch was sent for the SN problem). It looks like there is a bug in the TLB flushing code. During context switch, kernel threads (kswapd, for example) inherit the mm of the task that was previously running on the cpu. Normally, this is ok because the previous context is still loaded into the RR registers. However, if the owner of the mm migrates to another cpu, changes it's context number, and references a page before kswapd issues a tlb_purge for that same page, the purge will be done with a stale context number (& RR registers). Signed-off-by: Tony Luck commit 17e8ce0e9417eee1f57f9b3d4aad168425e043c3 Author: Russ Anderson Date: Fri Dec 16 17:19:01 2005 -0600 [IA64-SGI] Altix BTE error handling fixes Altix (shub2) pushes the BTE clean-up into SAL. This patch correctly interfaces with the now implemented SAL call. It also fixes a bug when delaying clean-up to allow busy BTEs to complete (or error out). Signed-off-by: Russ Anderson Signed-off-by: Tony Luck commit 7493a314cb83797ce612a577475aacaedc553fed Author: Dmitry Torokhov Date: Fri Jan 13 22:06:43 2006 +0000 [SERIAL] serial8250: convert to the new platform device interface Do not use platform_device_register_simple() as it is going away. Also set up driver's owner to create link driver->module in sysfs. Signed-off-by: Dmitry Torokhov Signed-off-by: Russell King commit 8a4b7b6f187f2967bff222e8c3758ab47efdb14f Author: Francois Wellenrieter Date: Fri Jan 13 14:01:01 2006 -0800 [IA64] Fix conversion of pal_min_state physical address On return from INIT handler we must convert the address of the minstate area from a kernel virtual uncached address (0xC...) to physical uncached (0x8...). A typo (or thinko?) in the code converted to physical cached. Signed-off-by: Tony Luck commit d600b97cf6ef8c24c9b87a4b7ce390c0d13684e8 Author: Adrian Bunk Date: Fri Jan 13 21:57:22 2006 +0000 [SERIAL] fix SERIAL_M32R_PLDSIO dependencies This patch fixes a typo in the dependencies reported by Jean-Luc Leger . Signed-off-by: Adrian Bunk Signed-off-by: Russell King commit 51828abc17a4ae0f7fb3879e00a30da7bdc7ca20 Author: Andrew Morton Date: Fri Jan 13 21:44:18 2006 +0000 [MMC] mmc_blk_probe() warning fix drivers/mmc/mmc_block.c: In function `mmc_blk_probe': drivers/mmc/mmc_block.c:467: warning: long unsigned int format, different type arg (arg 5) We don't know what size sector_t is - cast it. Signed-off-by: Andrew Morton Signed-off-by: Russell King commit e2862f6a833ea26591c7feb755dc2e46909182a6 Author: Ingo Molnar Date: Fri Jan 13 21:37:07 2006 +0000 [SERIAL] convert uart_state.sem to uart_state.mutex semaphore to mutex conversion. the conversion was generated via scripts, and the result was validated automatically via a script as well. build and boot tested. Signed-off-by: Ingo Molnar Signed-off-by: Russell King commit fa0fe48fcca9ea7f8c13e21d2646bbaa1747d183 Author: Russell King Date: Fri Jan 13 21:30:48 2006 +0000 [ARM] Separate VIC (vectored interrupt controller) support from Versatile Other machines may wish to make use of the VIC support code, so move it to arch/arm/common. Signed-off-by: Russell King commit 5ff3fd27161127cc464fc04548d58672a6a8272a Author: Russell King Date: Fri Jan 13 21:09:17 2006 +0000 [ARM] Remove useless 'default n' from Kconfig files The default is already 'n' so there's no need to explicitly state it. Signed-off-by: Russell King commit 23b0ca5bf52cef0ab0f0fe247cb91cbef836e7eb Author: Per Liden Date: Fri Jan 13 13:06:40 2006 -0800 [PATCH] genetlink: don't touch module ref count Increasing the module ref count at registration will block the module from ever being unloaded. In fact, genetlink should not care about the owner at all. This patch removes the owner field from the struct registered with genetlink. Signed-off-by: Per Liden Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit afeb90ca08000cbd75f22836e667f368e25fe3ac Author: Hyok S. Choi Date: Fri Jan 13 21:05:25 2006 +0000 [ARM] Support register switch in nommu mode This patch adds register switch support in nommu mode. Signed-off-by: Hyok S. Choi Signed-off-by: Russell King commit e72b04756f16e40dfd6dab3da81e03fe6dfe16e6 Author: Hyok S. Choi Date: Fri Jan 13 21:04:17 2006 +0000 [ARM] start_thread fixup for nommu mode This patch supports start_thread in nommu mode which requires the base index register. Signed-off-by: Hyok S. Choi Signed-off-by: Russell King commit 946d4935fc61e1479f8c057d58c64110bb43d3b0 Author: Nicolas Pitre Date: Fri Jan 13 20:51:52 2006 +0000 [ARM] 3260/1: remove phys_ram from struct machine_desc (part 2) Patch from Nicolas Pitre This field is redundent since it must be equal to PHYS_OFFSET anyway. Now that no code uses it anymore, mark it deprecated and remove all initializations from the tree. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 2df96b34aae08e0aa688ef7a8444febb8ec44172 Author: Nicolas Pitre Date: Fri Jan 13 20:51:46 2006 +0000 [ARM] 3259/1: remove phys_ram from struct machine_desc (part 1) Patch from Nicolas Pitre This field is redundent since it must be equal to PHYS_OFFSET anyway. First, let's use PHYS_OFFSET directly instead. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 3261e362f603cf2649f90e9ad2d1a1f98f69291a Author: Matt Reimer Date: Fri Jan 13 20:51:44 2006 +0000 [ARM] 3258/1: IMX serial: fix parity Patch from Matt Reimer IMX serial parity generation doesn't work because of a simple logic error. This patch fixes it and now Bluetooth works on R1000. Signed-off-by: Matt Reimer Signed-off-by: Russell King commit dd29c7277126db6884df42d41f2fbe2ebc10041e Author: Lennert Buytenhek Date: Fri Jan 13 20:51:43 2006 +0000 [ARM] 3257/1: ixp2000: map in scratch and sram Patch from Lennert Buytenhek For the ixp2000 netdev driver, we need to map in a chunk of SRAM (to store the transmit and receive descriptors) and the scratch get/put area (so that we can use the scratchpad rings in the cpu for managing the descriptors.) These are the final two mappings needed for the netdev driver and the last missing piece for the driver in mainline to work. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 9c08a938ce5a3e1c9d5f764dc6ae844cb1af76ff Author: Michael Richardson Date: Mon Jan 9 01:04:51 2006 -0800 [PATCH] device_shutdown can loop if the driver frees itself This patch changes device_shutdown() to use the newly introduced safe reverse list traversal. We experienced loops on system reboot if we had removed and re-inserted our device from the device list. We noticed this problem on PPC405. Our PCI IDE device comes and goes a lot. Our hypothesis was that there was a loop caused by the driver->shutdown freeing memory. It is possible that we do something wrong as well, but being unable to reboot is kind of nasty. Signed-off-by: Michael Richardson Cc: Patrick Mochel Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 2d7b5a70e01ff8b1b054d8313362e454e3057c5a Author: Jean Delvare Date: Tue Dec 27 19:45:58 2005 +0100 [PATCH] platform-device-del typo fix Please fold this typo fix into platform-device-del.patch, as was discussed earlier on LKML: http://lkml.org/lkml/2005/12/10/76 Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 8bbace7e686f1536905c703038a7eddfb1520264 Author: Cornelia Huck Date: Wed Jan 11 10:56:22 2006 +0100 [PATCH] Add {css,ccw}_bus_type probe, remove, shutdown methods. The following patch converts css_bus_type and ccw_bus_type to use the new bus_type methods. Signed-off-by: Cornelia Huck CC: Martin Schwidefsky Signed-off-by: Greg Kroah-Hartman commit 348290a4ae143a692124330942b464ccdb0d0365 Author: Russell King Date: Fri Jan 6 11:42:03 2006 +0000 [PATCH] Add bttv sub bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit d78967fb035aeb839a047ae69ce5f1ff39288a8d Author: Russell King Date: Fri Jan 6 11:41:32 2006 +0000 [PATCH] Remove usb gadget generic driver methods USB gadget drivers make no use of these, remove the pointless comments. Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 4031bbe4bbec6c0fe50412ef7fb43a270b0f29f1 Author: Russell King Date: Fri Jan 6 11:41:00 2006 +0000 [PATCH] Add ide_bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit bbbe3a41f7ee529f7f4fdcc1bc1157234bac0766 Author: Russell King Date: Thu Jan 5 14:44:46 2006 +0000 [PATCH] Add Pseudo LLD bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit fc3d3ddd3e628d9f22d4aa56a640d0b31c977a8f Author: Russell King Date: Thu Jan 5 14:44:14 2006 +0000 [PATCH] Add rio_bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit b6a01e9bda69aaf22f3a23bafc91c0fb51420a7a Author: Russell King Date: Thu Jan 5 14:43:43 2006 +0000 [PATCH] Add zorro_bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit ac33bc3d54936d364c1f979e50f43dfa3f9a13c1 Author: Russell King Date: Thu Jan 5 14:43:11 2006 +0000 [PATCH] Add usb_serial_bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit ff2dae79773658eaaab731663ddca9f7975430eb Author: Russell King Date: Thu Jan 5 14:42:40 2006 +0000 [PATCH] Add superhyway_bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit f9ccf4569ac4597e9e09d301ca362d90b4a1046d Author: Russell King Date: Thu Jan 5 14:42:09 2006 +0000 [PATCH] Add ccwgroup_bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 4681fc320889de4591f945c4fdf08546eb9ab266 Author: Russell King Date: Thu Jan 5 14:41:37 2006 +0000 [PATCH] Add pnp_bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 1d0baa3a1c836f0403b318d549fd49ebc73ee631 Author: Russell King Date: Thu Jan 5 14:40:58 2006 +0000 [PATCH] Add pcmcia_bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 4d0b653cdfde193944784c01fa3359b0a444dcf1 Author: Russell King Date: Thu Jan 5 14:40:27 2006 +0000 [PATCH] Add mmc_bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 413b486e18587fd53c9954252e6648f9450c734e Author: Russell King Date: Thu Jan 5 14:39:56 2006 +0000 [PATCH] Add MCP bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 4866b124a1ded3b94b0cea0bd543f46ffa9a3943 Author: Russell King Date: Thu Jan 5 14:39:24 2006 +0000 [PATCH] Add macio_bus_type probe and remove methods Signed-off-by: Russell King Acked-by: Benjamin Herrenschmidt Signed-off-by: Greg Kroah-Hartman commit 30226f8199cb7f5ace767f65bcebb85941612dfc Author: Russell King Date: Thu Jan 5 14:38:53 2006 +0000 [PATCH] Add serio bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 29a4a20e9fe7459f9d464b8be070ce8b7335be7e Author: Russell King Date: Thu Jan 5 14:38:22 2006 +0000 [PATCH] Add gameport bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit b864c7d5d17c171c4ead0791b44ab05d7a21dc0c Author: Russell King Date: Thu Jan 5 14:37:50 2006 +0000 [PATCH] Add i2c_bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 5b34bf88779fa965a134b92ab61688e0d1ddfe1d Author: Russell King Date: Thu Jan 5 14:37:18 2006 +0000 [PATCH] Add dio_bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 2f53a80fc0f6287d4bd6cc2422cd095c90f30410 Author: Russell King Date: Thu Jan 5 14:36:47 2006 +0000 [PATCH] Add vio_bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 79f9fb8886d901fd549793a4ad632ece51c68405 Author: Russell King Date: Thu Jan 5 14:36:16 2006 +0000 [PATCH] Add of_platform_bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit c6a09196bab3bc9e515b713193d61e3e87c720f7 Author: Russell King Date: Thu Jan 5 14:35:42 2006 +0000 [PATCH] Add sh_bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 91fb53866d00b4eaeaf1cbfd2237799cb152f742 Author: Russell King Date: Thu Jan 5 14:35:09 2006 +0000 [PATCH] Add ocp_bus_type probe and remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit ad3ed31c682d956d2187e562635c55c8c74c1021 Author: Russell King Date: Thu Jan 5 14:34:38 2006 +0000 [PATCH] Add parisc_bus_type probe and remove methods Signed-off-by: Russell King Acked-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit 83dfb8b67522f6cf1fc5771a8be0a9095eea65d4 Author: Russell King Date: Thu Jan 5 14:34:06 2006 +0000 [PATCH] Add tiocx bus_type probe/remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 5c0784c350516856ed15deb6adf6b053bf427792 Author: Russell King Date: Thu Jan 5 14:33:35 2006 +0000 [PATCH] Add logic module bus_type probe/remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 306955be37dd1b1f232f19766227ccccb83f7873 Author: Russell King Date: Thu Jan 5 14:33:04 2006 +0000 [PATCH] Add locomo bus_type probe/remove methods Signed-off-by: Russell King Signed-off-by: Richard Purdie Signed-off-by: Greg Kroah-Hartman commit 2876ba4321f0f85c40726b736eeaadf317803f16 Author: Russell King Date: Thu Jan 5 14:32:32 2006 +0000 [PATCH] Add SA1111 bus_type probe/remove methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit e08b754161d6de4f91e2d3c805f350b35a95d8b8 Author: Russell King Date: Thu Jan 5 14:30:57 2006 +0000 [PATCH] Add ecard_bus_type probe/remove/shutdown methods Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit b15d686a2b589c9e4f1ea116553e9c3c3d030dae Author: Russell King Date: Thu Jan 5 14:30:22 2006 +0000 [PATCH] Add pci_bus_type probe and remove methods Move the PCI bus device probe/remove methods to the bus_type structure. We leave the shutdown method alone since there are compatibility issues with that. Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 594c8281f90560faf9632d91bb9d402cbe560e63 Author: Russell King Date: Thu Jan 5 14:29:51 2006 +0000 [PATCH] Add bus_type probe, remove, shutdown methods. Add bus_type probe, remove and shutdown methods to replace the corresponding methods in struct device_driver. This matches the way we handle the suspend/resume methods. Since the bus methods override the device_driver methods, warn if a device driver is registered whose methods will not be called. The long-term idea is to remove the device_driver methods entirely. Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit bd37e5a951ad2123d3f51f59c407b5242946b6ba Author: Kay Sievers Date: Thu Jan 5 13:19:55 2006 +0100 [PATCH] INPUT: add MODALIAS to the event environment input: add MODALIAS to the event environment Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 9335d48e10d2d07eacaddf889ec1efb8a5a5082e Author: Dean Nelson Date: Tue Jan 10 11:12:32 2006 -0600 [IA64-SGI] move xpc.h to include/asm-ia64/sn (cleanup) Cleanup a few items after moving xpc.h from arch/ia64/sn/kernel to include/asm-ia64/sn. Signed-off-by: Dean Nelson Signed-off-by: Tony Luck commit 87a149d6bba5949fbc53b8a21189b54748ac9e2a Author: Dean Nelson Date: Tue Jan 10 11:09:48 2006 -0600 [IA64-SGI] move xpc.h to include/asm-ia64/sn Move xpc.h from arch/ia64/sn/kernel to include/asm-ia64/sn without change. Signed-off-by: Dean Nelson Signed-off-by: Tony Luck commit d6ad033a88b42420ddb6c62c95e42f88d862b246 Author: Dean Nelson Date: Tue Jan 10 11:08:55 2006 -0600 [IA64-SGI] move xpc_system_reboot() Move xpc_system_reboot() to be closer to the file it calls for readability reasons (which are indeed subjective). Signed-off-by: Dean Nelson Signed-off-by: Tony Luck commit 1f4674b2d5f63bac4c393ac4de1d6c1b6b72c09c Author: Dean Nelson Date: Tue Jan 10 11:08:00 2006 -0600 [IA64-SGI] ignoring loss of heartbeat while XPC is in kdebug Allow for the loss of heartbeat while in kdebug to be ignored by remote partitions. Signed-off-by: Dean Nelson Signed-off-by: Tony Luck commit 0752c670d83362609c7f3f59ffa0e180709c60c2 Author: Dean Nelson Date: Tue Jan 10 11:07:19 2006 -0600 [IA64-SGI] XPC and unregistering from notifier lists Only unregister from notifier lists if XPC is unloading. Signed-off-by: Dean Nelson Signed-off-by: Tony Luck commit 1ecaded80f94f2779160529aef7d6f37a22c2f60 Author: Dean Nelson Date: Fri Jan 6 09:48:21 2006 -0600 [IA64-SGI] cleanup XPC disengage related messages Cleanup the XPC disengage related messages that are printed to the log. Signed-off-by: Dean Nelson Signed-off-by: Tony Luck commit 246c7e33d51afe99890b2caab7ad482c0296d5ba Author: Dean Nelson Date: Thu Dec 22 14:32:56 2005 -0600 [IA64-SGI] ensure XPC disengage request is processed This patch fixes a problem in XPC disengage processing whereby it was not seeing the request to disengage from a remote partition, so the disengage wasn't happening. The disengagement is suppose to transpire during the time a XPC channel is disconnecting, and should be completed before the channel is declared to be disconnected. Signed-off-by: Dean Nelson Signed-off-by: Tony Luck commit 7ae69d2aa4ed3ee8cef18a072346366f019d6a4a Author: Tony Luck Date: Fri Jan 13 10:03:58 2006 -0800 [IA64] Add stub entry to fsys.S for sys_migrate_pages When this new syscall was added to ia64 in commit 39743889aaf76725152f16aa90ca3c45f6d52da3 fsys.S was forgotten. Add a ".data8 0" there to keep it in step. [Reported by Stephane Eranian] Signed-off-by: Tony Luck commit 67daf5f11f06b9b15f8320de1d237ccc2e74fe43 Author: Paul Mackerras Date: Fri Jan 13 14:23:25 2006 +1100 [PATCH] Increase AT_VECTOR_SIZE On PowerPC, we want to be able to provide an AT_PLATFORM aux table entry to userspace, so that glibc can choose optimized libraries for the processor we're running on. Unfortunately that would be the 21st aux table entry on powerpc, meaning that the aux table including the terminating null entry would overflow the mm->saved_auxv[] array, leading to userland programs segfaulting. This increases the size of the mm->saved_auxv array to be large enough to accommodate an AT_PLATFORM entry on powerpc. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 8a430d74fea797fc55fef1ad4c21420212b83574 Author: Evgeniy Date: Fri Jan 13 18:12:15 2006 +0300 [PATCH] Fix oops in ufs_fill_super at mount time There's a lack of parenthesis in fs/ufs/utils.h, so instead of the 512th byte of buffer, the usb2 pointer will point to the nth structure of type ufs_super_block_second. This can cause a mount-time oops if you're unlucky (especially with DEBUG_PAGEALLOC, which is how Alexey Dobriyan saw this problem) Signed-off-by: Evgeniy Dushistov Acked-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit c943aa859c392eb4cc76d911daa1f261555075b2 Author: Michael Krufky Date: Fri Jan 13 14:10:26 2006 -0200 V4L/DVB (3364): disable all dvb tuner param_types until we need them - Add param_type dvbs2 - disable all dvb param_types, which will not be needed until we merge dvb-pll. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit b3d37042d7d33baf0247d1df31031e64427f39b3 Author: Hans Verkuil Date: Fri Jan 13 14:10:25 2006 -0200 V4L/DVB (3363): Add support for Samsung tuner TCPN 2121P30A - Add support for Samsung tuner TCPN 2121P30A, used in Hauppauge PVR-500 cards. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 7b0ac9cdd42b254ae2ec0f6c1cc6389655e4ba96 Author: Michael Krufky Date: Fri Jan 13 14:10:25 2006 -0200 V4L/DVB (3359): Redesign tuners struct for maximum flexibility - Tunertype struct redefined to allow one or more tuner_params structs per tuner definition, one for each video standard. - Each tuner_params struct has an element containing an arbitrary amount of tuner_ranges. (this is needed for dvb tuners - to be handled later) - A tuner_range may be referenced by multiple tuner_params structs. There are many duplicates in here. Reusing tuner_range structs, rather than defining new ones for each tuner, will cut down on memory usage, and is preferred when possible. - tunertype struct contains an element, has_tda988x. We must set this for all tunertypes that contain a tda988x chip, and then we can remove this setting from the various card structs. - Improves tuners array memory usage efficiency. - Right now, all tuners are using the first tuner_params[] array element for analog mode. In the future, we will be merging similar tuner definitions together, such that each tuner definition will have a tuner_params struct for each available video standard. At that point, the tuner_params[] array element will be chosen based on the video standard in use. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f4efb4dbf21c78939e32d96cad145421c8b5f106 Author: Michael Krufky Date: Fri Jan 13 14:10:25 2006 -0200 V4L/DVB (3358): Updated MODULE_AUTHOR - Updated MODULE_AUTHOR Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 5486a145a94918707b1d6a53f55e7b9d1b13e237 Author: Michael Krufky Date: Fri Jan 13 14:10:24 2006 -0200 V4L/DVB (3357): Build cx88-alsa when CONFIG_VIDEO_CX88_ALSA is selected. - Build cx88-alsa when CONFIG_VIDEO_CX88_ALSA is selected. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 45bf2daaa32027f44180078bd5c5fb9ac04840f9 Author: Mauro Carvalho Chehab Date: Fri Jan 13 14:10:24 2006 -0200 V4L/DVB (3356): Include missing MODULE_* macros - Include missing MODULE_* macros. - Fixed cx88_vp3054_i2c: module license 'unspecified' taints kernel. Signed-off-by: Mauro Carvalho Chehab commit bd5f0ac930168899003952110c45d110958a5c55 Author: Ingo Molnar Date: Fri Jan 13 14:10:24 2006 -0200 V4L/DVB (3354e): bttv 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. build-tested. Signed-off-by: Ingo Molnar Signed-off-by: Mauro Carvalho Chehab commit 9b565eb794eec1ccd9edcc7263ebe5b3245a1e65 Author: Eric Sesterhenn / snakebyte Date: Fri Jan 13 14:10:23 2006 -0200 V4L/DVB (3354a): Remove old MODULE_PARM in media/video/ Changes MODULE_PARM usage to module_param Signed-off-by: Eric Sesterhenn Signed-off-by: Mauro Carvalho Chehab commit a5ed425cd30c0c2abac4039ae11b38520aa130c2 Author: Mauro Carvalho Chehab Date: Fri Jan 13 14:10:19 2006 -0200 V4L/DVB (3355): removed uneeded init on structs like static int foo=0 - Static vars are equal to zero by default. Removed unnecessary =0 from them, saving some data space Signed-off-by: Mauro Carvalho Chehab commit b11fa580ac06b34944a2b46a44ebce2c284e1a76 Author: Anton Blanchard Date: Fri Jan 13 16:51:52 2006 +1100 [PATCH] powerpc: reformat atomic_add_unless It makes my eyes hurt. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 144b9c135b963bcb7f242c7b83bff930620d3161 Author: Anton Blanchard Date: Fri Jan 13 15:37:17 2006 +1100 [PATCH] powerpc: use lwsync in atomics, bitops, lock functions eieio is only a store - store ordering. When used to order an unlock operation loads may leak out of the critical region. This is potentially buggy, one example is if a user wants to atomically read a couple of values. We can solve this with an lwsync which orders everything except store - load. I removed the (now unused) EIEIO_ON_SMP macros and the c versions isync_on_smp and eieio_on_smp now we dont use them. I also removed some old comments that were used to identify inline spinlocks in assembly, they dont make sense now our locks are out of line. Another interesting thing was that read_unlock was using an eieio even though the rest of the spinlock code had already been converted to use lwsync. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 3356bb9f7ba378a6e2709f9df95f4ea52111f4df Author: David Gibson Date: Fri Jan 13 10:26:42 2006 +1100 [PATCH] powerpc: Remove lppaca structure from the PACA At present the lppaca - the structure shared with the iSeries hypervisor and phyp - is contained within the PACA, our own low-level per-cpu structure. This doesn't have to be so, the patch below removes it, making a separate array of lppaca structures. This saves approximately 500*NR_CPUS bytes of image size and kernel memory, because we don't need aligning gap between the Linux and hypervisor portions of every PACA. On the other hand it means an extra level of dereference in many accesses to the lppaca. The patch also gets rid of several places where we assign the paca address to a local variable for no particular reason. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit e58c3495e6007af59382540bb21ee941e470d88d Author: David Gibson Date: Fri Jan 13 14:56:25 2006 +1100 [PATCH] powerpc: Cleanup LOADADDR etc. asm macros This patch consolidates the variety of macros used for loading 32 or 64-bit constants in assembler (LOADADDR, LOADBASE, SET_REG_TO_*). The idea is to make the set of macros consistent across 32 and 64 bit and to make it more obvious which is the appropriate one to use in a given situation. The new macros and their semantics are described in the comments in ppc_asm.h. In the process, we change several places that were unnecessarily using immediate loads on ppc64 to use the GOT/TOC. Likewise we cleanup a couple of places where we were clumsily subtracting PAGE_OFFSET with asm instructions to use assemble-time arithmetic or the toreal() macro instead. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 7e78e5e502d4f220d24c6f738f2fdb078ad33607 Author: Kumar Gala Date: Thu Jan 12 21:04:23 2006 -0600 [PATCH] powerpc: Updated platforms that use gianfar to match driver The gianfar driver changed how it required MDIO bus and phy id's to be passed to it. Also, it no longer passes the physical address of the MDIO bus. Instead we have a proper platform device. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit 135f0b17a7a146fa65ccd75704eecf77ee19d587 Author: Tom Rini Date: Thu Jan 12 16:55:58 2006 -0700 [PATCH] powerpc/boot: Better use of defaultimage- The following reworks how defaultimage- is used. We default to zImage here and then override it on platforms that need something more (uImage in the future) or less (vmlinux on iSeries). Signed-off-by: Tom Rini Signed-off-by: Paul Mackerras commit 610d91511f99f0a8325ad78fb7259c454b23e65a Author: Dave C Boutcher Date: Thu Jan 12 16:10:22 2006 -0600 [PATCH] powerpc: Add support for changing properties from userspace Add support to reconfigure the device tree through the existing proc filesystem interface. Add "add_property", "remove_property", and "update_property" commands to the existing interface. Signed-off-by: Dave Boutcher Signed-off-by: Paul Mackerras commit ecaa8b0ff326920c8a89d748382e1c1d8812676c Author: Dave C Boutcher Date: Thu Jan 12 16:09:29 2006 -0600 [PATCH] powerpc: Add of_find_property function Add an of_find_property function that returns a struct property given a property name. Then change the get_property function to use that routine internally. Signed-off-by: Dave Boutcher Signed-off-by: Paul Mackerras commit 088186ded490ced80758200cf8f906ed741df306 Author: Dave C Boutcher Date: Thu Jan 12 16:08:27 2006 -0600 [PATCH] powerpc: Add/remove/update properties in firmware device tree Add support for updating and removing device tree properties. Since we hand out pointers to properties with gay abandon, we can't just free the property storage. Instead we move deleted, or the old copy of an updated property, to a "dead properties" list. Also note, its not feasable to kref device tree properties. we call get_property() all over the kernel in a wild variety of contexts. One consequence of this change is that we now take a read_lock(&devtree_lock) when doing get_property(). Signed-off-by: Dave Boutcher Signed-off-by: Paul Mackerras commit 898b5395e915210f41223caa30312994d64cba1d Author: Dave C Boutcher Date: Thu Jan 12 16:07:17 2006 -0600 [PATCH] powerpc: Add/remove/update properties in /proc/device-tree Add support to the proc_device_tree file for removing and updating properties. Remove just removes the proc file, update changes the data pointer within the proc file. The remainder of the device-tree changes occur elsewhere. Signed-off-by: Dave Boutcher Signed-off-by: Paul Mackerras commit 43ccf202214067f12af5d7a6e144e18bb35553a9 Author: Dave C Boutcher Date: Thu Jan 12 16:05:35 2006 -0600 [PATCH] powerpc: Add some more pSeries hypervisor call constants Adds a few more hypervisor call constants. Signed-off-by: Dave Boutcher Signed-off-by: Paul Mackerras commit 9e1c72a4e465ceb2c4c6e2dfc0584a59bec5c2c9 Author: Tom Rini Date: Thu Jan 12 14:25:50 2006 -0700 [PATCH] Remove bzImage target Since the documentation no longer tells people to 'make bzImage', and with the previous patch nothing more than 'make' is required to get the right bootable images (just like on i386 now), this removes the bzImage -> zImage target redirect on ARCH=powerpc Signed-off-by: Tom Rini Signed-off-by: Paul Mackerras commit 9eacee2ac624bfa9740d49355dbe6ee88d0cba0a Author: Michael S. Tsirkin Date: Thu Jan 12 15:55:41 2006 -0800 IB/mthca: Initialize grh_present before using it build_mlx_header() was using sqp->ud_header.grh_present before it was initialized by mthca_read_ah(). Furthermore, header->grh_present is set by ib_ud_header_init, so there's no need to set it again in mthca_read_ah(). Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit c063a06835d3ccfa6c039d3a3869fcf22249c862 Author: Michael S. Tsirkin Date: Thu Jan 12 15:43:58 2006 -0800 IB/mthca: Cosmetic: use the ALIGN macro Use the ALIGN macro to simplify some rounding code. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 17e2e819517d75f2f3407e59c5f7f6f0ef305d14 Author: Jack Morgenstein Date: Thu Jan 12 15:35:15 2006 -0800 IB/mthca: Fix memory leaks in error handling Fix memory leaks in mthca_create_qp() and mthca_create_srq() error handling. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 59f174faffd5dfee709fa0ead320cc6daf827e93 Author: Ishai Rabinovitz Date: Thu Jan 12 15:24:51 2006 -0800 IB/mthca: Fix memory leak of multicast group structures Convert "/ (1 << lg)" to ">> lg" for a slight code size reduction. add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-24 (-24) function old new delta mthca_map_cmd 613 589 -24 Signed-off-by: Ishai Rabinovitz Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 988bd50300ef2e2d5cb8563e2ac99453dd9acd86 Author: Eli Cohen Date: Thu Jan 12 14:32:20 2006 -0800 IPoIB: Fix memory leak of multicast group structures The current handling of multicast groups in IPoIB ends up never freeing send-only multicast groups. It turns out the logic was much more complicated than it needed to be; we can fix this bug and completely kill ipoib_mcast_dev_down() at the same time. Signed-off-by: Eli Cohen Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 2e4e6a17af35be359cc8f1c924f8f198fbd478cc Author: Harald Welte Date: Thu Jan 12 13:30:04 2006 -0800 [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables This monster-patch tries to do the best job for unifying the data structures and backend interfaces for the three evil clones ip_tables, ip6_tables and arp_tables. In an ideal world we would never have allowed this kind of copy+paste programming... but well, our world isn't (yet?) ideal. o introduce a new x_tables module o {ip,arp,ip6}_tables depend on this x_tables module o registration functions for tables, matches and targets are only wrappers around x_tables provided functions o all matches/targets that are used from ip_tables and ip6_tables are now implemented as xt_FOOBAR.c files and provide module aliases to ipt_FOOBAR and ip6t_FOOBAR o header files for xt_matches are in include/linux/netfilter/, include/linux/netfilter_{ipv4,ipv6} contains compatibility wrappers around the xt_FOOBAR.h headers Based on this patchset we're going to further unify the code, gradually getting rid of all the layer 3 specific assumptions. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 880b005f294454d989783d0984dc554dfe3c8214 Author: David S. Miller Date: Thu Jan 12 13:22:32 2006 -0800 [TIPC]: Fix 64-bit build warnings. When storing u32 values in a pointer, need to do some long casts to keep GCC happy. Signed-off-by: David S. Miller commit e86eaa3abc285a988524d95e867285aad5d026a7 Author: Per Liden Date: Thu Jan 12 16:45:18 2006 +0100 [TIPC] Added entry for TIPC in MAINTAINERS Signed-off-by: Per Liden commit 593a5f22d8035b1396a958b6bbde9f13c0f09549 Author: Per Liden Date: Wed Jan 11 19:14:19 2006 +0100 [TIPC] More updates of file headers Updated copyright notice to include the year the file was actually created. Information about file creation dates was extracted from the files in the old CVS repository at tipc.sourceforge.net. Signed-off-by: Per Liden commit 9da1c8b694f8e72a16f259614caaae50cbcdaf10 Author: Per Liden Date: Wed Jan 11 18:40:41 2006 +0100 [TIPC] Update of file headers The copyright statements from different parts of Ericsson have been merged into one. Signed-off-by: Per Liden commit d0a14a9dbdf613d9307c4b748b03a11678fe8d16 Author: Per Liden Date: Wed Jan 11 13:52:51 2006 +0100 [TIPC] Cleaned up info/warn/err macros Signed-off-by: Per Liden commit 9ea1fd3c1a15c620d1e3d0aa269d34b705477003 Author: Per Liden Date: Wed Jan 11 13:30:43 2006 +0100 [TIPC] License header update The license header in each file now more clearly state that this code is licensed under a dual BSD/GPL. Before this was only evident if you looked at the MODULE_LICENSE line in core.c. Signed-off-by: Per Liden commit ea714ccda5d5858ee677a77cf33dbaf34a0060c3 Author: Per Liden Date: Wed Jan 11 12:28:47 2006 +0100 [TIPC] Moved configuration interface into tipc_config.h Restored the old tipc_config.h to get a cleaner division between the interfaces used by normal TIPC users and TIPC administration utilities. Signed-off-by: Per Liden commit b70e4f45a8d8125e4f420c62e71688b8a766689a Author: Jon Maloy Date: Tue Jan 10 18:54:24 2006 +0000 [TIPC} Fixed bug in disc_timeout() Signed-off-by: Jon Maloy commit 1dba9743337cabacea79e47ed6d709e636c5ed47 Author: Per Liden Date: Thu Jan 5 16:34:00 2006 +0100 [TIPC] Use dynamically allocated family id with NETLINK_GENERIC Signed-off-by: Per Liden commit b97bf3fd8f6a16966d4f18983b2c40993ff937d4 Author: Per Liden Date: Mon Jan 2 19:04:38 2006 +0100 [TIPC] Initial merge TIPC (Transparent Inter Process Communication) is a protocol designed for intra cluster communication. For more information see http://tipc.sourceforge.net Signed-off-by: Per Liden commit 9f3f46b5fe83a56d380d4006dd2cd906bc186f91 Author: John W. Linville Date: Fri Dec 9 10:36:09 2005 -0500 [PATCH] via-velocity: use NETIF_F_IP_CSUM (hardware only support IPv4) At least some versions of the via-velocity hardware only support checksumming IPv4 frames in hardware. However, the driver is currently setting the NETIF_F_HW_CSUM flag, which indicates support for more than just IPv4. This results in errors when trying to use IPv6 over via-velocity hardware. Signed-off-by: John W. Linville Signed-off-by: Jeff Garzik commit c9fa7d5d6cec7a45f9dc6c2f23500af50d5617c9 Author: Johannes Berg Date: Tue Dec 27 02:14:13 2005 +0100 [PATCH] fix wrong comments in ieee80211.h The comments in ieee80211.h claim that one doesn't need to set the len parameter of the stats struct. But if one doesn't, the management frames are read far over the memory they actually occupy causing badness. Signed-Off-By: Johannes Berg Signed-off-by: Jeff Garzik commit 5af47b2ff124fdad9ba84baeb9f7eeebeb227b43 Author: Jay Vosburgh Date: Mon Jan 9 12:14:00 2006 -0800 [PATCH] bonding: UPDATED hash-table corruption in bond_alb.c I believe I see the race Michael refers to (tlb_choose_channel may set head, which tlb_init_slave clears), although I was not able to reproduce it. I have updated his patch for the current netdev-2.6.git tree and added a version update. His original comment follows: Our systems have been crashing during testing of PCI HotPlug support in the various networking components. We've faulted in the bonding driver due to a bug in bond_alb.c:tlb_clear_slave() In that routine, the last modification to the TLB hash table is made without protection of the lock, allowing a race that can lead tlb_choose_channel() to select an invalid table element. -J Signed-off-by: Jeff Garzik commit 9a6301c114aaab1df6de6fad9899bb89852a7592 Author: Dan Williams Date: Tue Jan 10 00:56:11 2006 -0500 [PATCH] wireless/atmel: add IWENCODEEXT, IWAUTH, and association event support This patch allows the Atmel driver to work correctly with wpa_supplicant and other programs that require some conformance with WEXT-18. It should not affect current behavior of the driver. The patch does four things: 1) Implements SIOCSIWENCODEEXT, SIOCGIWENCODEEXT, SIOCSIWAUTH, and SIOCGIWAUTH calls for unencrypted and WEP operation 2) Accepts zero-filled addresses for SIOCSIWAP, which are legal and should turn off any previous forced WAP address 3) Sends association and de-association events to userspace at most of the appropriate times 4) Fixes erroneous order of CIPHER_SUITE_WEP_* arguments in one location which are actually unused anyway Signed-off-by: Dan Williams Signed-off-by: Jeff Garzik commit c213460fd4781c04832c81416532d64ae2bfa88b Author: Eric Sesterhenn / snakebyte Date: Tue Jan 10 13:16:03 2006 +0100 [PATCH] replace MODULE_PARM in tulip/uli526x.c Replace the MODULE_PARM usage in uli526x.c with module_param. Signed-off-by: Eric Sesterhenn Signed-off-by: Jeff Garzik commit 4d3248a29cb78b31bb0520eb99b4be620e810a40 Author: Kumar Gala Date: Wed Jan 11 11:27:33 2006 -0800 [PATCH] gianfar: Use new PHY_ID_FMT macro Make the driver produce the string used by phy_connect and have board specific code pass the integer mii bus id and phy device id for the specific controller instance. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit a4d00f179fcec7065fe5742e9cebd6500886070f Author: Kumar Gala Date: Wed Jan 11 11:27:33 2006 -0800 [PATCH] phy: Added a macro to represent the string format used to match a phy device Add the PHY_ID_FMT macro to ensure that the format of the id string used by a driver to match to its specific phy is consistent between the mdio_bus and the driver. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 1d5326774c9245fef77334a9e0f11cd4f8aa7b4e Author: Kumar Gala Date: Wed Jan 11 11:27:32 2006 -0800 [PATCH] gianfar mii: Use proper resource for MII memory region We can now have the gianfar mii platform device have a proper resource for the IO memory region for its registers. Previously we passed this information that the platform_data structure because we couldn't handle overlapping memory regions for platform devices. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 9c07b884b92c80e9d660b7b9282631fb626451e2 Author: Kumar Gala Date: Wed Jan 11 11:26:25 2006 -0800 [PATCH] gfar: fix compile error Missing include of to get definition of IPPROTO_UDP. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 9ad8b9d1520db4d317d791eeb8d6e47c366be82c Author: dann frazier Date: Wed Jan 11 11:26:24 2006 -0800 [PATCH] CONFIG_AIRO needs CONFIG_CRYPTO airo.c currently has MICSUPPORT enabled, which requires CONFIG_CRYPTO. A user reported a build failure which is due to the lack of a Kconfig dependency. See http://bugs.debian.org/344205. This patch makes Kconfig enforce this dependency. Signed-off-by: dann frazier Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit ac7c66698a2c51e4c6a34b84621c79e7cb89e07d Author: ODonnell, Michael Date: Wed Jan 11 11:26:22 2006 -0800 [PATCH] corruption during e100 MDI register access We have identified two related bugs in the e100 driver. Both bugs are related to manipulation of the MDI control register. The first problem is that the Ready bit is being ignored when writing to the Control register; we noticed this because the Linux bonding driver would occasionally come to the spurious conclusion that the link was down when querying Link State. It turned out that by failing to wait for a previous command to complete it was selecting what was essentially a random register in the MDI register set. When we added code that waits for the Ready bit (as shown in the patch file below) all such problems ceased. The second problem is that, although access to the MDI registers involves multiple steps which must not be intermixed, nothing was defending against two or more threads attempting simultaneous access. The most obvious situation where such interference could occur involves the watchdog versus ioctl paths, but there are probably others, so we recommend the locking shown in our patch file. Signed-off-by: Michael O'Donnell Cc: "David S. Miller" Cc: Jeff Garzik Cc: John Ronciak Cc: Ganesh Venkatesan Cc: Jesse Brandeburg Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 745caf71d99c5d4ff4c9e4c0f74e64c429fed531 Author: Petr Vandrovec Date: Wed Jan 11 11:31:07 2006 -0800 [SCSI] Pass proper device from BusLogic to SCSI layer While trying to get SUSE's SLES9 working on system with more than 4GB we've noticed that SCSI layer happilly passes addresses over 4GB to the buslogic driver, which is quite a big problem as buslogic can generate only 32bit busmastering cycles. Fortunately in the current kernels this problem does not exist anymore as SCSI layer now assumes 4GB capable device by default, but it is still good idea to pass correct device structure to the SCSI layer. If nothing else, /sys/block/sda/device now points to /sys/devices/pci0000:00/0000:00:10.0/host0/... instead of /sys/devices/platform/host0/... like it did in the past. Change does nothing for ISA based BusLogic adapters, they'll still end under platform (and they are probably broken for long time as I do not see anything forcing ISA 16MB limit for them). Signed-off-by: Petr Vandrovec Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit ba027def7be0d6494b72603d5758acc0fb1c7514 Author: Jens Axboe Date: Thu Jan 12 20:44:12 2006 +0100 [PATCH] Revert ide softirq handling There's a problem with the REQ_BLOCK_PC handling as well (bad ->data_len handling) where it could actually complete a request ahead of time. I suggest we just back this out for now, I will resubmit it later when I'm fully confident in it. This reverts commit 8672d57138b34447719cd7749f3d21070e1175a1 Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit f392ecfa12de9a2baf72789b00557bac040d6171 Author: Arjan van de Ven Date: Thu Jan 12 18:44:32 2006 +0000 [SERIAL] turn serial semaphores into mutexes Turn several drivers/serial/ semaphores-used-as-mutex into mutexes Signed-off-by: Arjan van de Ven Signed-off-by: Russell King commit a621aaed690b9439141c555941b6af53873f6ff1 Author: Arjan van de Ven Date: Thu Jan 12 18:43:35 2006 +0000 [MMC+MFD] Convert mmc to mutexes convert mfd and mmc to mutexes Signed-off-by: Arjan van de Ven Signed-off-by: Russell King commit 00431707be0cc1236ee08459367872b57da5be29 Author: Arjan van de Ven Date: Thu Jan 12 18:42:23 2006 +0000 [ARM] Convert some arm semaphores to mutexes The arm clock semaphores are strict mutexes, convert them to the new mutex implementation Signed-off-by: Arjan van de Ven Signed-off-by: Russell King commit cd2f1e6980157638f66f427d577a1c368fd4dc12 Author: James Bottomley Date: Thu Jan 12 12:07:13 2006 -0600 [SCSI] aic79xx: bump version to 3.0 This takes us past the old 1.x version of the SCSI driver and the 2.x version of the aic website version to reflect the full incorporation of both branches. Signed-off-by: James Bottomley commit 11668bb673c41ec169a85d0b52c538a1c11d29e1 Author: Hannes Reinecke Date: Thu Jan 12 12:08:06 2006 +0100 [SCSI] aic79xx: Sequencer update Update sequencer code to Adaptec version 2.0.12-6.3.9. Signed-off-by: James Bottomley commit ba62cd2d01e401faa5d5a25fa8e990d0b1a1996a Author: Hannes Reinecke Date: Thu Jan 12 12:07:02 2006 +0100 [SCSI] aic79xx: Sanitize inb/outb handling This patch coalesces inb/outb calls to the approriate word or long form. Signed-off-by: James Bottomley commit 66a0683e4620f087e41e79d4d2be6c5a06bb206b Author: Hannes Reinecke Date: Thu Jan 12 12:05:46 2006 +0100 [SCSI] aic79xx: Use struct map_node Use struct map_node instead of separate variables. Signed-off-by: James Bottomley commit 5e46631b04382ef14255467288052f29cb77daeb Author: Hannes Reinecke Date: Thu Jan 12 12:04:28 2006 +0100 [SCSI] aic7xxx/aic79xx: New device ids Signed-off-by: James Bottomley commit bcc1e382bce8de4f26182c6447916f9c82b0fbe5 Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Wed Jan 11 23:58:40 2006 -0500 [SCSI] Mask capabilities for SCSI-1 CD drive SCSI-1 CD drives can't do MRW or be opened for writing, so mask off those capabilities. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Acked-by: Jens Axboe Signed-off-by: James Bottomley commit 6171b5eff2ef3f84333af652e8c7b0838bf72945 Author: Mark Haverkamp Date: Wed Jan 11 09:28:57 2006 -0800 [SCSI] aacraid: README update Received From Mark Salyzyn. Move the README from the driver directory to the Documentation directory. Updated the documentation, added descriptions for cards that were missing. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit db39363c029cd9e74661ef059a17785d1c62a851 Author: Mark Haverkamp Date: Wed Jan 11 09:28:29 2006 -0800 [SCSI] aacraid: 17 element sg performance update Received From Mark Salyzyn. The Jaguar and Corsair class of adapters (2410, 2810, 2610, 21610, CERC) perform better (about 10% better read performance, write performance neutral) with current Firmware if the OS limits the number of scatter gather elements to 17 per request. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 7686f132653fa3d52d45c3f021215f714094f1ca Author: Mark Haverkamp Date: Wed Jan 11 09:28:16 2006 -0800 [SCSI] aacraid: better sysfs adapter information Received from Mark Salyzyn. Provide more accurate adapter information. Allows the Adapter Firmware to override the Adapter product information. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 6e289a9023d589c24f86b29186d324215cdc9947 Author: Mark Haverkamp Date: Wed Jan 11 09:28:07 2006 -0800 [SCSI] aacraid: Fix default FIB size Received from Mark Salyzyn. If the adapter has not instructed us otherwise that it can handle a 'large' FIB, then it can handle at most a 2KB FIB. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 33b114e935a2202206e224dd2c695cee5a5986bf Author: Christoph Hellwig Date: Wed Jan 11 14:20:43 2006 +0100 [SCSI] sas: clear parent->rphy in sas_rphy_delete We need to clear the backpointer on rphy removal, else we'll run into problems with host removal after a device has been hot unplugged. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 0b9506723826c68b50fa33e345700ddcac1bed36 Author: Arjan van de Ven Date: Wed Jan 11 13:16:10 2006 +0100 [SCSI] turn most scsi semaphores into mutexes the scsi layer is using semaphores in a mutex way, this patch converts these into using mutexes instead Signed-off-by: Arjan van de Ven Signed-off-by: James Bottomley commit dacee84b070c4e705a5b6446f1f0a6a6e2f8d7a4 Author: James Bottomley Date: Tue Jan 10 12:11:42 2006 -0600 [SCSI] aic7xxx: fix timer handling bug The driver is doing a rather stupid mod_timer allegedly to "give request sense more time to complete". This is illegal and pointless, so just eliminate it. Also eliminate all the other uses of struct timer_list in the driver, which are mostly bogus. Signed-off-by: James Bottomley commit db1019ca0548b263989bc98900eaf15107e533ad Author: Dominik Brodowski Date: Tue Jan 10 19:19:37 2006 +0100 [PATCH] pcmcia: runtime powermanagement interface With the "power/state" sysfs interface being deprecated, make another one available which is compatible to what was discussed on the linux PM mailinglist. Signed-off-by: Dominik Brodowski commit f542ff6dd1a444c85cc245ac40aef5f703e48674 Author: Dominik Brodowski Date: Tue Jan 10 19:06:33 2006 +0100 [PATCH] pcmcia: add new IDs for serial_cs.c Add IDs for Sierra Aircard 55 CDMA 1xrtt Modem -- a CIS update is required for this card. Signed-off-by: Dominik Brodowski commit 8e0df4a757db82a571f3a179108b62d09258eaf2 Author: Andrew Vasquez Date: Mon Jan 9 10:17:40 2006 -0800 [SCSI] qla2xxx: Kconfig: two fixes Original From: Adrian Bunk Here's a composite patch with Adrian's original additions and help-text with the new Kconfig variable SCSI_QLA_FC. Signed-off-by: James Bottomley commit 455c53ec61a6c96d7b21b72ad1fa26ac89824e8e Author: Adrian Bunk Date: Fri Jan 6 20:21:28 2006 +0100 [SCSI] lpfc_scsi.c: make lpfc_get_scsi_buf() static Signed-off-by: Adrian Bunk Acked-by: James Smart Signed-off-by: James Bottomley commit bdd70f2cebce0f5172350aab37c057c3b66494ac Author: Adrian Bunk Date: Thu Jan 5 23:39:18 2006 +0100 [SCSI] scsi_transport_spi.c: make print_nego() static Signed-off-by: Adrian Bunk Signed-off-by: James Bottomley commit 8e32ca49ef2eb5bfec1444b5e731cc2d35111519 Author: Moore, Eric Date: Wed Jan 4 14:58:43 2006 -0700 [SCSI] raid_class.c - adding RAID10 and RAID10 defines Adding defines for RAID10 and RAID50 levels, in preparation of adding RAID Transport support in the mpt fusion drivers. (BTW: IME is RAID10, and IM is RAID1). Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit f4619025a51747a3788fd1bb6bdc46e368a889a7 Author: Russell King Date: Thu Jan 12 17:17:57 2006 +0000 [ARM] Allow r2 to be passed through the decompressor to the kernel This is part of a patch from Marc Singer to allow r2 to be passed to the kernel. Marc's original comments follow: This revised R2 (atags pointer) patch incorporates comments from Nico Pitre and Ben Dooks. It modifies the head.S files such that the R2 value set by the bootloader is conveyed to the kernel startup code. The kernel head.S heuristically validates the pointer. It will set R2 to zero if it believes the pointer is invalid. Presently, it requires that the ATAGS list reside in the first 16KiB of physical RAM. Relaxing this contraint may be both desirable as well as tricky. Signed-off-by: Marc Singer Signed-off-by: Russell King commit a2d823bf13efea4c859376f6e85c49cfbad7ab60 Author: Al Viro Date: Thu Jan 12 01:06:40 2006 -0800 [PATCH] m68k: console code in head.S needs framebuffer support built in Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c9757b7c28161e073e7f408978b7ed01925924c Author: Al Viro Date: Thu Jan 12 01:06:40 2006 -0800 [PATCH] m68k: fix PIO case in esp we always set ->SCp.ptr to physical address of buffer; for DMA that's just what we need, but we end up using it as virtual address in PIO case of esp_do_data(), with obvious breakage as soon as memory mapping becomes non-trivial. The fix is obvious. Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed1705afb93409a3e345d653be9d263984aa5c1b Author: Al Viro Date: Thu Jan 12 01:06:39 2006 -0800 [PATCH] m68k: fix macfb init To be used by module_init() function should return int; same for functions that have "return -ENODEV;" in them, actually ;-) Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54a5a6eb5842d68fe0aaa60d50fdea532c19770b Author: Al Viro Date: Thu Jan 12 01:06:38 2006 -0800 [PATCH] m68k: fix reference to init_task in vmlinux-sun3.lds it's *(.data.init_task), not init_task... Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a763be5c1aace94cf4adfc5ea164f5b0d2d255cd Author: Al Viro Date: Thu Jan 12 01:06:37 2006 -0800 [PATCH] m68k: fix use of void foo(void) asm("bar") in traps.c with gcc4 these have file scope, so having them different in different blocks doesn't work anymore Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 639074354bb371feb2dde409b2ce05d56afef02b Author: Al Viro Date: Thu Jan 12 01:06:36 2006 -0800 [PATCH] m68k: kill mach_floppy_setup, convert to proper __setup() in drivers Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c79358b874af31430cf8d26540ae7b8713505f6 Author: Al Viro Date: Thu Jan 12 01:06:35 2006 -0800 [PATCH] m68k: Moved initialisation of conswitchp from subarches to global arch setup Signed-off-by: Kars de Jong Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35efbcabdc217f2b3a73bf3b895559e8f269e258 Author: Al Viro Date: Thu Jan 12 01:06:34 2006 -0800 [PATCH] m68k: cast in strnlen switched to unsigned long Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5d361fc24b75ea51e219367ee32c64422a2134f Author: Al Viro Date: Thu Jan 12 01:06:34 2006 -0800 [PATCH] m68k: NULL noise removal Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 031eb4cddec7a4825212ece47de4bd64cd8e0bee Author: Al Viro Date: Thu Jan 12 01:06:33 2006 -0800 [PATCH] m68k: dmasound __user annotations Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d998265feb7cbcf74e27e3057dac309dcad47bf7 Author: Al Viro Date: Thu Jan 12 01:06:32 2006 -0800 [PATCH] m68k: zorro __user annotations Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3728d254def75837bf57aa4f897ba4f3a3e82d0b Author: Al Viro Date: Thu Jan 12 01:06:31 2006 -0800 [PATCH] m68k: amifb __user annotations Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d85f6891aa143bed92590e10e210e7e102bbb2a1 Author: Al Viro Date: Thu Jan 12 01:06:31 2006 -0800 [PATCH] m68k: dsp56k __user annotations Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab14caec7a5f0d9569c8a9dd2ad62e89b220c968 Author: Al Viro Date: Thu Jan 12 01:06:30 2006 -0800 [PATCH] m68k: amiserial __user annotations Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c7af51129161a7a3dc4169c984964912f1f4822 Author: Al Viro Date: Thu Jan 12 01:06:29 2006 -0800 [PATCH] m68k: ataflop __user annotations, NULL noise removal Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a423e542b4a9af45ac0106ab8275760af770793 Author: Al Viro Date: Thu Jan 12 01:06:28 2006 -0800 [PATCH] m68k: amiflop __user annotations Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6225d85f171f8b7a776850d30352bd196f9bd0d6 Author: Al Viro Date: Thu Jan 12 01:06:28 2006 -0800 [PATCH] m68k: checksum __user annotations Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 350c20a6fd24b2a3265f7ca440aa17570e89e2cd Author: Al Viro Date: Thu Jan 12 01:06:27 2006 -0800 [PATCH] m68k: syscalls __user annotation Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b7bb54a417ca73eefc52df3702ff5167b46dc89 Author: Al Viro Date: Thu Jan 12 01:06:26 2006 -0800 [PATCH] m68k: rtc __user annotations Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2382f77ffcde32e5195d5c82fee91171bb764c1a Author: Al Viro Date: Thu Jan 12 01:06:25 2006 -0800 [PATCH] m68k: signal __user annotations Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11c40f8a6ac8bd057043b1f9e7c9490c0e6149f3 Author: Al Viro Date: Thu Jan 12 01:06:24 2006 -0800 [PATCH] m68k: basic __user annotations Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad9ec4f8de264903c6b5ba7ae8d8e96432188858 Author: Al Viro Date: Thu Jan 12 01:06:24 2006 -0800 [PATCH] m68k: basic iomem annotations Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a4729118c8851bce709a00eba1b3a8f1fd9ed58 Author: Al Viro Date: Thu Jan 12 01:06:23 2006 -0800 [PATCH] m68k: compile fixes for dmasound (static vs. extern) sound/oss/dmasound/dmasound_atari.c has static expand_bal sound/oss/dmasound/dmasound_q40.c has static expand_bal sound/oss/dmasound/dmasound_awacs.c has non-static expand_bal sound/oss/dmasound/trans_16.c uses expand_bal from dmasound_awacs.c all 4 include dmasound.h; extern for expand_bal used to be there, which is a bloody bad idea, considering _atari and _q40. Moved the extern to trans_16.c. Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3756513d5fdc7b4ba814419165afcd10c6b1618d Author: Al Viro Date: Thu Jan 12 01:06:22 2006 -0800 [PATCH] m68k: lvalues abuse in dmasound Cast is not an lvalue Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 815f597be444e5f9f5b4dbd65b862208d5253598 Author: Al Viro Date: Thu Jan 12 01:06:21 2006 -0800 [PATCH] m68k: dmasound_paula.c lvalues abuse (from m68k CVS) Avoid warnings about use of cast expressions as lvalues Signed-off-by: Roman Zippel Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09cc07a5c7996192cc19c79c8aac5a4a22528059 Author: Al Viro Date: Thu Jan 12 01:06:21 2006 -0800 [PATCH] m68k: lvalues abuse in mac8390 Cast is not an lvalue Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0efb71348249903c54e71f26927cfc94ba186dfb Author: Al Viro Date: Thu Jan 12 01:06:20 2006 -0800 [PATCH] m68k: bogus function argument types (sun3_pgtable.h) function arguments can't be inline, TYVM... Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f2633388d64c0489516af04e0d4cd9f01397a94 Author: Al Viro Date: Thu Jan 12 01:06:19 2006 -0800 [PATCH] m68k: broken constraints on mulu.l Too permissive constraint on mulu.l - the first argument should not be an a-register. Fixed by replacing "g" with "dm"; with older gcc we got lucky and it had never attempted mulu.l %a0, %d1:%d0. These days it does, with predictable objections from as(1). Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77add9f3e6a486e5623f3e693ded216f155bd2a5 Author: Al Viro Date: Thu Jan 12 01:06:18 2006 -0800 [PATCH] m68k: memory input should be an lvalue (mac/misc.c) gcc4 is less forgiving and wants memory inputs to be real lvalues; variable added and value stored in it explicitly before doing __asm__. Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84a65cc6c18848fcee9c9ae8766bb5c60787d21b Author: Al Viro Date: Thu Jan 12 01:06:17 2006 -0800 [PATCH] m68k: static vs. extern in amigaints.h extern declaration of static object removed from header Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ebf21ac7cefce035452f34971f6825641791015 Author: Al Viro Date: Thu Jan 12 01:06:17 2006 -0800 [PATCH] m68k: static vs. extern in sun3ints.h extern declaration of static object removed from header Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df87ac96140ef216e31b859868743d43732686de Author: Al Viro Date: Thu Jan 12 01:06:16 2006 -0800 [PATCH] m68k: static vs. extern in scc.h extern declaration before the static one Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa7e02fe3786b524dde18d24f0c5a718182c72a2 Author: Al Viro Date: Thu Jan 12 01:06:15 2006 -0800 [PATCH] m68k: isa_{type,sex} should be exported Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 641940611478df8b63f581310b9d51806dda3212 Author: Al Viro Date: Thu Jan 12 01:06:14 2006 -0800 [PATCH] m68k: oktagon makefile fix oktagon_esp is described as modular. However, drivers/scsi/Makefile doesn't handle it right - it's multi-object module, with one of the parts being built from .S. Current makefile tries to declare each part a module of its own; that not only wouldn't work (oktagon_io.o doesn't have the right parts for that), it actually doesn't even build since kbuild doesn't believe in single-object modules built from .S. Turned into proper multi-object module... Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cef46b1f10ab67c2a00d866413b9e7e26aae9eed Author: Al Viro Date: Thu Jan 12 01:06:13 2006 -0800 [PATCH] m68k: dumb typo in atyfb Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3272244c2b1a8f13cec83c04b8245fa7fcb47a27 Author: Al Viro Date: Thu Jan 12 01:06:13 2006 -0800 [PATCH] m68k: switch mac/misc.c to direct use of appropriate cuda/pmu/maciisi requests kill ADBREQ_RAW use, replace adb_read_time(), etc. with per-type variants, eliminated remapping from pmu ones, fix the ifdefs (PMU->PMU68K) Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4290a23cfa9040e2f0de5ab57d6ea65abaf053b Author: Al Viro Date: Thu Jan 12 01:06:12 2006 -0800 [PATCH] m68k: namespace pollution fix (custom->amiga_custom) in amigahw.h custom renamed to amiga_custom, in drivers with few instances the same replacement, in the rest - #define custom amiga_custom in driver itself Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 198a4101197797fd9cee40c17dc285dc84c5d745 Author: Al Viro Date: Thu Jan 12 01:06:11 2006 -0800 [PATCH] m68k: compile fix - updated vmlinux.lds to include LOCK_TEXT Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85b07cd1aa50aca8331e5dfe3b2ccb2eb391b183 Author: Al Viro Date: Thu Jan 12 01:06:10 2006 -0800 [PATCH] m68k: compile fix - hardirq checks were in wrong place move the sanity check for NR_IRQS being no more than 1< Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5a61d0c13db3522a996075bc1b1884a8af2ed37 Author: Al Viro Date: Thu Jan 12 01:06:09 2006 -0800 [PATCH] death of get_thread_info/put_thread_info {get,put}_thread_info() were introduced in 2.5.4 and never had been called by anything in the tree. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75bb07e788abb060cc93b6f4dc48a70a53c1406b Author: Al Viro Date: Thu Jan 12 01:06:08 2006 -0800 [PATCH] mips: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc8f6029cd51af1b148846a32e68d69013a5cc0f Author: Al Viro Date: Thu Jan 12 01:06:07 2006 -0800 [PATCH] mips: task_thread_info() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40bc9c671a9f0a5189c07a2b4280aec9b40e30cd Author: Al Viro Date: Thu Jan 12 01:06:07 2006 -0800 [PATCH] mips: task_pt_regs() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6450578f32cdca587ae5f148e2118b2fcc36bb11 Author: Al Viro Date: Thu Jan 12 01:06:06 2006 -0800 [PATCH] ia64: task_pt_regs() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab03591db110e8d195d381a68692eb37da981cdf Author: Al Viro Date: Thu Jan 12 01:06:05 2006 -0800 [PATCH] ia64: task_thread_info() on ia64 thread_info is at the constant offset from task_struct and stack is embedded into the same beast. Set __HAVE_THREAD_FUNCTIONS, made task_thread_info() just add a constant. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 718d6114fcd894bf4d3527b9e206a1cbcaaae35d Author: Al Viro Date: Thu Jan 12 01:06:04 2006 -0800 [PATCH] cris: task_thread_info() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfa0f29b6da2c4d45ecdeaabe17af4c4adc47c05 Author: Al Viro Date: Thu Jan 12 01:06:04 2006 -0800 [PATCH] cris: fix KSTK_EIP cris KSTK_EIP looked for pt_regs at the right offset but from the wrong place - forgotten ->thread_info Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 95ca0dc603ab58f3e4c5a1c23f675bd1f5b5fef3 Author: Al Viro Date: Thu Jan 12 01:06:03 2006 -0800 [PATCH] cris: task_pt_regs() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0cec6fd1370807f98934e84c9e6147335b81d8a5 Author: Al Viro Date: Thu Jan 12 01:06:02 2006 -0800 [PATCH] powerpc: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5e2fc1c6259e6f26bc4ae4de697da1f8da0edec Author: Al Viro Date: Thu Jan 12 01:06:01 2006 -0800 [PATCH] powerpc: task_thread_info() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee8c1dd44305cca9d0ded248de991f67b55ec622 Author: Al Viro Date: Thu Jan 12 01:06:01 2006 -0800 [PATCH] sh64: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fdf0d7a2012e560fee738bfd7f2af26faeb3a39 Author: Al Viro Date: Thu Jan 12 01:06:00 2006 -0800 [PATCH] arm26: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02ef691f6ce4097da5617ebf59493487cb2b4f82 Author: Al Viro Date: Thu Jan 12 01:05:59 2006 -0800 [PATCH] arm26: task_pt_regs() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 697102cda5c5e778d0bc3b4b9f8d935f4fe64125 Author: Al Viro Date: Thu Jan 12 01:05:59 2006 -0800 [PATCH] arm26: task_thread_info() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32d39a9355780bc9aadcf76a2d2004bdbe0f4665 Author: Al Viro Date: Thu Jan 12 01:05:58 2006 -0800 [PATCH] arm: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 552058239238342dfd2fa8d33a299a162b1a4f05 Author: Al Viro Date: Thu Jan 12 01:05:57 2006 -0800 [PATCH] arm: end_of_stack() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 815d5ec86eb8d5f57e5e4aa147bd1fb6338c58ac Author: Al Viro Date: Thu Jan 12 01:05:57 2006 -0800 [PATCH] arm: task_pt_regs() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7c1b32fd354c34c4dceb1736a485bc5d91f7c43 Author: Al Viro Date: Thu Jan 12 01:05:56 2006 -0800 [PATCH] arm: task_thread_info() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68f8b1f8f113fcbc8d8e835f174b97cdaf96af20 Author: Al Viro Date: Thu Jan 12 01:05:55 2006 -0800 [PATCH] h8300: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40f1f0deaff90b78b81dbba109bfa1cef241ec16 Author: Al Viro Date: Thu Jan 12 01:05:55 2006 -0800 [PATCH] parisc: task_stack_page(), task_thread_info() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 513091ba7e4a8b498632d7913ff9408ebbca6235 Author: Al Viro Date: Thu Jan 12 01:05:54 2006 -0800 [PATCH] m68knommu: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 768595ffba46b101ad54d8775e640fecbe470d9a Author: Al Viro Date: Thu Jan 12 01:05:53 2006 -0800 [PATCH] m68k: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 097cb338c72b4916d8221278caba63d74d9f19d6 Author: Al Viro Date: Thu Jan 12 01:05:53 2006 -0800 [PATCH] frv: task_thread_info(), task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c3559fc458e3ed171d7a8bf6a6d7eaea1e7b2e5 Author: Al Viro Date: Thu Jan 12 01:05:52 2006 -0800 [PATCH] m32r: task_pt_regs(), task_stack_page(), task_thread_info() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7f6961d83d480c8636543d1d0dbb9584b878a68 Author: Al Viro Date: Thu Jan 12 01:05:51 2006 -0800 [PATCH] v850: task_stack_page(), task_pt_regs() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04fe6faf10c310480151667e7fe3e06df4208a8e Author: Al Viro Date: Thu Jan 12 01:05:50 2006 -0800 [PATCH] xtensa: task_pt_regs(), task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30af7120fe6cfa8cf9ccd0626474fa1cd6d2bd59 Author: Al Viro Date: Thu Jan 12 01:05:50 2006 -0800 [PATCH] s390: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7584fb6b46a71a1aba5e06dc3cc54ce10f0129e Author: Al Viro Date: Thu Jan 12 01:05:49 2006 -0800 [PATCH] s390: task_pt_regs() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 579b3ea5916d60ade1e04d2a49637e5cbba67eac Author: Al Viro Date: Thu Jan 12 01:05:48 2006 -0800 [PATCH] uml: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca9bc0bb2d1c7afdd34ec79b3de4d16a8e0225e8 Author: Al Viro Date: Thu Jan 12 01:05:48 2006 -0800 [PATCH] uml: task_thread_info() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36483c6b5e6cc8f29fbe5203caa7e0b836802747 Author: Al Viro Date: Thu Jan 12 01:05:47 2006 -0800 [PATCH] sparc: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d562ef6a23feb72f32ebd23fb32fe7d2c35a85cd Author: Al Viro Date: Thu Jan 12 01:05:46 2006 -0800 [PATCH] sparc: task_thread_info() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 308a792f7c563a7af6e325274c63812f98988d6f Author: Al Viro Date: Thu Jan 12 01:05:45 2006 -0800 [PATCH] sh: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cafcfcaa60dbb5bcccbbc1d0ad7d4bdeeb4d0cc8 Author: Al Viro Date: Thu Jan 12 01:05:45 2006 -0800 [PATCH] sh: task_thread_info() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3cf0f4ece9f1680e54b154b1e38baaf6ace20a62 Author: Al Viro Date: Thu Jan 12 01:05:44 2006 -0800 [PATCH] sh: task_pt_regs() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 26ecbdea4bf46b0165db4aafd8e4981b4db53936 Author: Al Viro Date: Thu Jan 12 01:05:43 2006 -0800 [PATCH] sparc64: task_pt_regs() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee3eea165e706a3ce8a53693e810403f65239ebb Author: Al Viro Date: Thu Jan 12 01:05:43 2006 -0800 [PATCH] sparc64: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3169641c12d2c5abdab863f5393a3f3534788dd Author: Al Viro Date: Thu Jan 12 01:05:42 2006 -0800 [PATCH] sparc64: task_thread_info() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 65e0fdffc977e69a8f1f26d4bf8ba30984db7e44 Author: Al Viro Date: Thu Jan 12 01:05:41 2006 -0800 [PATCH] i386: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07b047fc2466249aff7cdb23fa0b0955a7a00d48 Author: akpm@osdl.org Date: Thu Jan 12 01:05:41 2006 -0800 [PATCH] i386: fix task_pt_regs() ) From: Al Viro task_pt_regs() needs the same offset-by-8 to match copy_thread() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06b425d80f56280e698b3e8487c372e0d39d9ba1 Author: Al Viro Date: Thu Jan 12 01:05:40 2006 -0800 [PATCH] i386: task_thread_info() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57eafdc22c8e788859b67c2c7ac4d636716603a5 Author: Al Viro Date: Thu Jan 12 01:05:39 2006 -0800 [PATCH] amd64: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb049232fa8fe08c90b182f378eed5017da5235c Author: Al Viro Date: Thu Jan 12 01:05:38 2006 -0800 [PATCH] amd64: task_pt_regs() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4f17c436f8e4241995c2531372be8dd7ea6ff75 Author: Al Viro Date: Thu Jan 12 01:05:38 2006 -0800 [PATCH] amd64: task_thread_info() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e52f4ca2a7cfea3495cabae23d48f1538f09ccf2 Author: akpm@osdl.org Date: Thu Jan 12 01:05:37 2006 -0800 [PATCH] alpha: task_pt_regs() ) From: Al Viro rename alpha_task_regs() to task_pt_regs(), switch open-coded instances to use of the helper. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27f451304aa6f2bccf34ef3c2b049c01d05d6fff Author: Al Viro Date: Thu Jan 12 01:05:36 2006 -0800 [PATCH] alpha: task_stack_page() use task_stack_page() for accesses to stack page of task in alpha-specific parts of tree Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37bfbaf995d2c1f8196ee04c9d6f68258d5ec3e8 Author: Al Viro Date: Thu Jan 12 01:05:36 2006 -0800 [PATCH] alpha: task_thread_info() use task_thread_info() for accesses to thread_info of task in arch/alpha and include/asm-alpha Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9fc658763bf992e778243ebe898b03746151ab88 Author: Al Viro Date: Thu Jan 12 01:05:34 2006 -0800 [PATCH] missing helper - task_stack_page() Patchset annotates arch/* uses of ->thread_info. Ones that really are about access of thread_info of given process are simply switched to task_thread_info(task); ones that deal with access to objects on stack are switched to new helper - task_stack_page(). A _lot_ of the latter are actually open-coded instances of "find where pt_regs are"; those are consolidated into task_pt_regs(task) (many architectures actually have such helper already). Note that these annotations are not mandatory - any code not converted to these helpers still works. However, they clean up a lot of places and have actually caught a number of bugs, so converting out of tree ports would be a good idea... As an example of breakage caught by that stuff, see i386 pt_regs mess - we used to have it open-coded in a bunch of places and when back in April Stas had fixed a bug in copy_thread(), the rest had been left out of sync. That required two followup patches (the latest - just before 2.6.15) _and_ still had left /proc/*/stat eip field broken. Try ps -eo eip on i386 and watch the junk... This patch: new helper - task_stack_page(task). Returns pointer to the memory object containing task stack; usually thread_info of task sits in the beginning of that object. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7102e95b7b9c00277562c29aad421d2d521c5f6 Author: akpm@osdl.org Date: Thu Jan 12 01:05:32 2006 -0800 [PATCH] sched: filter affine wakeups ) From: Nick Piggin Track the last waker CPU, and only consider wakeup-balancing if there's a match between current waker CPU and the previous waker CPU. This ensures that there is some correlation between two subsequent wakeup events before we move the task. Should help random-wakeup workloads on large SMP systems, by reducing the migration attempts by a factor of nr_cpus. Signed-off-by: Ingo Molnar Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 198e2f181163233b379dc7ce8a6d7516b84042e7 Author: akpm@osdl.org Date: Thu Jan 12 01:05:30 2006 -0800 [PATCH] scheduler cache-hot-autodetect ) From: Ingo Molnar This is the latest version of the scheduler cache-hot-auto-tune patch. The first problem was that detection time scaled with O(N^2), which is unacceptable on larger SMP and NUMA systems. To solve this: - I've added a 'domain distance' function, which is used to cache measurement results. Each distance is only measured once. This means that e.g. on NUMA distances of 0, 1 and 2 might be measured, on HT distances 0 and 1, and on SMP distance 0 is measured. The code walks the domain tree to determine the distance, so it automatically follows whatever hierarchy an architecture sets up. This cuts down on the boot time significantly and removes the O(N^2) limit. The only assumption is that migration costs can be expressed as a function of domain distance - this covers the overwhelming majority of existing systems, and is a good guess even for more assymetric systems. [ People hacking systems that have assymetries that break this assumption (e.g. different CPU speeds) should experiment a bit with the cpu_distance() function. Adding a ->migration_distance factor to the domain structure would be one possible solution - but lets first see the problem systems, if they exist at all. Lets not overdesign. ] Another problem was that only a single cache-size was used for measuring the cost of migration, and most architectures didnt set that variable up. Furthermore, a single cache-size does not fit NUMA hierarchies with L3 caches and does not fit HT setups, where different CPUs will often have different 'effective cache sizes'. To solve this problem: - Instead of relying on a single cache-size provided by the platform and sticking to it, the code now auto-detects the 'effective migration cost' between two measured CPUs, via iterating through a wide range of cachesizes. The code searches for the maximum migration cost, which occurs when the working set of the test-workload falls just below the 'effective cache size'. I.e. real-life optimized search is done for the maximum migration cost, between two real CPUs. This, amongst other things, has the positive effect hat if e.g. two CPUs share a L2/L3 cache, a different (and accurate) migration cost will be found than between two CPUs on the same system that dont share any caches. (The reliable measurement of migration costs is tricky - see the source for details.) Furthermore i've added various boot-time options to override/tune migration behavior. Firstly, there's a blanket override for autodetection: migration_cost=1000,2000,3000 will override the depth 0/1/2 values with 1msec/2msec/3msec values. Secondly, there's a global factor that can be used to increase (or decrease) the autodetected values: migration_factor=120 will increase the autodetected values by 20%. This option is useful to tune things in a workload-dependent way - e.g. if a workload is cache-insensitive then CPU utilization can be maximized by specifying migration_factor=0. I've tested the autodetection code quite extensively on x86, on 3 P3/Xeon/2MB, and the autodetected values look pretty good: Dual Celeron (128K L2 cache): --------------------- migration cost matrix (max_cache_size: 131072, cpu: 467 MHz): --------------------- [00] [01] [00]: - 1.7(1) [01]: 1.7(1) - --------------------- cacheflush times [2]: 0.0 (0) 1.7 (1784008) --------------------- Here the slow memory subsystem dominates system performance, and even though caches are small, the migration cost is 1.7 msecs. Dual HT P4 (512K L2 cache): --------------------- migration cost matrix (max_cache_size: 524288, cpu: 2379 MHz): --------------------- [00] [01] [02] [03] [00]: - 0.4(1) 0.0(0) 0.4(1) [01]: 0.4(1) - 0.4(1) 0.0(0) [02]: 0.0(0) 0.4(1) - 0.4(1) [03]: 0.4(1) 0.0(0) 0.4(1) - --------------------- cacheflush times [2]: 0.0 (33900) 0.4 (448514) --------------------- Here it can be seen that there is no migration cost between two HT siblings (CPU#0/2 and CPU#1/3 are separate physical CPUs). A fast memory system makes inter-physical-CPU migration pretty cheap: 0.4 msecs. 8-way P3/Xeon [2MB L2 cache]: --------------------- migration cost matrix (max_cache_size: 2097152, cpu: 700 MHz): --------------------- [00] [01] [02] [03] [04] [05] [06] [07] [00]: - 19.2(1) 19.2(1) 19.2(1) 19.2(1) 19.2(1) 19.2(1) 19.2(1) [01]: 19.2(1) - 19.2(1) 19.2(1) 19.2(1) 19.2(1) 19.2(1) 19.2(1) [02]: 19.2(1) 19.2(1) - 19.2(1) 19.2(1) 19.2(1) 19.2(1) 19.2(1) [03]: 19.2(1) 19.2(1) 19.2(1) - 19.2(1) 19.2(1) 19.2(1) 19.2(1) [04]: 19.2(1) 19.2(1) 19.2(1) 19.2(1) - 19.2(1) 19.2(1) 19.2(1) [05]: 19.2(1) 19.2(1) 19.2(1) 19.2(1) 19.2(1) - 19.2(1) 19.2(1) [06]: 19.2(1) 19.2(1) 19.2(1) 19.2(1) 19.2(1) 19.2(1) - 19.2(1) [07]: 19.2(1) 19.2(1) 19.2(1) 19.2(1) 19.2(1) 19.2(1) 19.2(1) - --------------------- cacheflush times [2]: 0.0 (0) 19.2 (19281756) --------------------- This one has huge caches and a relatively slow memory subsystem - so the migration cost is 19 msecs. Signed-off-by: Ingo Molnar Signed-off-by: Ashok Raj Signed-off-by: Ken Chen Cc: Signed-off-by: John Hawkes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4dc7a0bbeb6882ad665e588e82fabe5bb4645f2f Author: Ingo Molnar Date: Thu Jan 12 01:05:27 2006 -0800 [PATCH] sched: add cacheflush() asm Add per-arch sched_cacheflush() which is a write-back cacheflush used by the migration-cost calibration code at bootup time. Signed-off-by: Ingo Molnar Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6b44d10f25e5a93eca5135b686a35775c63546e Author: Andi Kleen Date: Thu Jan 12 01:05:26 2006 -0800 [PATCH] Implement ioctl emulation for the parport character device Fixes bugzilla.kernel.org bug 2903. Cc: Cc: Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cbe8dd4af2967ee1c2d54ec9d4db35cf3ecc98d3 Author: Greg Ungerer Date: Thu Jan 12 01:05:24 2006 -0800 [PATCH] memmap_init_zone(): remove uneccesary page++ Remove unecessary page++ from memmap_init_zone loop. Signed-off-by: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1edf80d347387405ff4e8934d194d75f57a3caef Author: Neil Brown Date: Thu Jan 12 01:05:23 2006 -0800 [PATCH] md: remove slashes from disk names when creation dev names in sysfs e.g. The sx8 driver uses names like sx8/0. This would make a md component dev name like /sys/block/md0/md/dev-sx8/0 which is not allowed. So we change the '/' to '!' just like fs/partitions/check.c(register_disk) does. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a7e2f7dcb81279e73aefb691ea55ab3540e408a Author: Catalin Marinas Date: Thu Jan 12 01:05:21 2006 -0800 [PATCH] do_truncate() call fix in tiny-shmem.c Adapt tiny-shmem.c to the new do_truncate() prototype. Signed-off-by: Catalin Marinas Acked-by: Matt Mackall Acked-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4598c8b3678abd65be3be00ed3d046375a4777e Author: Christoph Lameter Date: Thu Jan 12 01:05:20 2006 -0800 [PATCH] migration: make sure there is no attempt to migrate reserved pages. This ensures that reserved pages are not migrated. Reserved pages currently cause the WARN_ON to trigger in migrate_page_add() Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1bc691d357c646700b9523d2aeca02847d3fb3f4 Author: Tejun Heo Date: Thu Jan 12 15:39:26 2006 +0100 [PATCH] fix queue stalling while barrier sequencing If ordered tag isn't supported, request ordering for barrier sequencing is performed by queue draining, which basically hangs the request queue until elv_completed_request() reports completion of all previous fs requests. The condition check in elv_completed_request() was only performed for fs requests. If a special request is queued between the last to-be-drained request and the barrier sequence, draining is never completed and the queue is stalled forever. This patch moves the end-of-draining condition check such that it's performed for all requests. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 90303b102353302e84758f245906368907e6a23b Author: Catalin Marinas Date: Thu Jan 12 16:53:51 2006 +0000 [ARM] 3256/1: Make the function-returning ldm's use sp as the base register Patch from Catalin Marinas If the low interrupt latency mode is enabled for the CPU (from ARMv6 onwards), the ldm/stm instructions are no longer atomic. An ldm instruction restoring the sp and pc registers can be interrupted immediately after sp was updated but before the pc. If this happens, the CPU restores the base register to the value before the ldm instruction but if the base register is not sp, the interrupt routine will corrupt the stack and the restarted ldm instruction will load garbage. Note that future ARM cores might always run in the low interrupt latency mode. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit ece5f7b3c4fde70a1ae4add7372ebca5c90bc34d Author: Richard Purdie Date: Thu Jan 12 16:30:23 2006 +0000 [ARM] 3237/1: PXA I2C driver updates Patch from Richard Purdie This patch adds a check to see if the pxa i2c interface is enabled before allowing it to be used and resets it if found to be disabled. This automatically restores the interface if the device has been suspended and resumed without causing any suspend/resume call ordering issues. The patch also fixes a build warning and adds an appropriate module licence (the module is gpl according to the header). Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 6b090a25fe58067e4bf4515d5056df1f07b64849 Author: Catalin Marinas Date: Thu Jan 12 16:28:16 2006 +0000 [ARM] 3234/1: Update cpu_architecture() to deal with the new ID format Patch from Catalin Marinas Since ARM1176, the CPU ID format has changed and it will also be used for future ARM architectures. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 37134cd55d57e95d3f606c6f2a57fa496bdad333 Author: Kevin Hilman Date: Thu Jan 12 16:12:21 2006 +0000 [ARM] 3209/1: Configurable DMA-consistent memory region Patch from Kevin Hilman This patch increase available DMA-consistent memory allocated by dma_coherent_alloc(). The default remains at 2M (defined in asm/memory.h) and each platform has the ability to override in asm/arch-foo/memory.h. Signed-off-by: Kevin Hilman Signed-off-by: Russell King commit c9db4fa11526affde83603fe52595bd1260c1354 Author: Thomas Gleixner Date: Thu Jan 12 11:47:34 2006 +0100 [hrtimer] Enforce resolution as lower limit of intervals Roman Zippel pointed out that the missing lower limit of intervals leads to an accounting error in the overrun count. Enforce the lower limit of intervals to resolution in the timer forwarding code. Signed-off-by: Thomas Gleixner commit e2787630c1abb075c935cf47e91beb7c656f48c4 Author: Thomas Gleixner Date: Thu Jan 12 11:36:14 2006 +0100 [hrtimer] Change resolution storage to ktime_t format Change the storage format of the per base resolution to ktime_t to make it easier accessible in the hrtimers code. Change the resolution from (NSEC_PER_SEC/HZ) to TICK_NSEC as Roman pointed out. TICK_NSEC is closer to the real resolution. Signed-off-by: Thomas Gleixner commit 288867ec5c377db82933b64460ce050e5c998ee9 Author: Thomas Gleixner Date: Thu Jan 12 11:25:54 2006 +0100 [hrtimer] Remove listhead from hrtimer struct The list_head in the hrtimer structure was introduced for easy access to the first timer with the further extensions of real high resolution timers in mind, but it turned out in the course of development that it is not necessary for the standard use case. Remove the list head and access the first expiry timer by a datafield in the timer base. Signed-off-by: Thomas Gleixner commit 624cee31bcb14bfd85559fbec5dd7bb833542965 Author: Paul Mackerras Date: Thu Jan 12 21:22:34 2006 +1100 powerpc: make ARCH=ppc use arch/powerpc/kernel/process.c Commit 5388fb1025443ec223ba556b10efc4c5f83f8682 made signal_32.c use discard_lazy_cpu_state, which broke ARCH=ppc because that uses the common signal_32.c but has its own process.c. Make ARCH=ppc use the common process.c to fix this and to reduce the amount of duplicated code. Signed-off-by: Paul Mackerras commit 9c7d462eda13ca211b7b4a62f191f4cfda135e2d Author: Dave Airlie Date: Thu Jan 12 20:44:30 2006 +1100 drm: fix issues with systems with no MTRR On systems with no MTRR we should still define the interface. Original bug from apkm. Signed-off-by: Dave Airlie commit 8fce10a3c9ee7f9c74d83502fd5156a8ec82c21a Author: Arnd Bergmann Date: Wed Jan 11 23:07:11 2006 +0000 [PATCH] powerpc: cell namespace cleanup These symbols are only used in the file that they are defined in, so they should not be in the global namespace. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit b0da985644faa45def84ce5d8e18af6f1680f490 Author: Arnd Bergmann Date: Wed Jan 11 00:00:05 2006 +0000 [PATCH] powerpc: xmon namespace cleanups These symbols are only used in the file that they are defined in, so they should not be in the global namespace. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit ff38e7c80a92de91b34e483478d81eb3d1cf1b37 Author: Arnd Bergmann Date: Wed Jan 11 00:00:03 2006 +0000 [PATCH] powerpc: pmac namespace cleanup pmac_setup_arch is only used in the file that it is defined in, so it should not be in the global namespace. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 8446196ade39befe68f60cfae49c43b94a1144fc Author: Arnd Bergmann Date: Wed Jan 11 00:00:02 2006 +0000 [PATCH] powerpc: pseries namespace cleanup These symbols are only used in the file that they are defined in, so they should not be in the global namespace. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit b07dfab3e329955c218cd1d06efdb133c5c18ecd Author: Olof Johansson Date: Thu Jan 12 00:20:50 2006 -0600 [PATCH] powerpc: minor dart driver cleanup Rpn is assigned every time in the loop, no need to increase it too. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 9623b5d3d3d85bac47a83e0e2cf2a9998ade9bd3 Author: Stephen Rothwell Date: Thu Jan 12 14:18:28 2006 +1100 [PATCH] powerpc: small pci cleanups pcibios_claim_one_bus is not needed on iSeries and phbs_remap_io can be mode static. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 9bd7ea60b1a0cf9fc745fd2eadb261e4c7719acd Author: Stephen Rothwell Date: Thu Jan 12 13:58:19 2006 +1100 [PATCH] powerpc: clean up iommu.h a bit There was a function declared for CONFIG_PSERIES which no longer exists and the two function declarations for CONFIG_ISERIES have been moved into an include file in platforms/iseries since they are defined and used only there. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit ee2cdecec4dce8f7eb0d37a1bbf820cb32b2b75b Author: Stephen Rothwell Date: Thu Jan 12 13:54:20 2006 +1100 [PATCH] powerpc: iSeries fixes for build with no PCI This reverts part of "ppc64 iSeries: allow build with no PCI" (145d01e4287b8cbf50f87c3283e33bf5c84e8468) which affected generic code and applies a fix in the arch specific code. Commit "partly merge iseries do_IRQ" (5fee9b3b39eb55c7e3619a3b36ceeabffeb8f144) introduced iSeries_get_irq which was only available if CONFIG_PCI is set. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 511061049b2fab5ea684dfddcb8d2a38591391f3 Author: Stephen Rothwell Date: Thu Jan 12 13:51:42 2006 +1100 [PATCH] powercp: iSeries include file comment cleanups Mainly just removing file names from the comments. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit f9cb83ac1f6c3b794c2706e06546d8fecae60ba5 Author: Stephen Rothwell Date: Thu Jan 12 13:50:18 2006 +1100 [PATCH] powerpc: eliminate bitfields from ItLpNaca Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 677f8c0d0455a35aaff08a0292ba9c6232ef4eb1 Author: Stephen Rothwell Date: Thu Jan 12 13:47:43 2006 +1100 [PATCH] powerpc: remove bitfields from HvLpEvent Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 6814350b80e0e7dfb87d2faebbcbef876573897c Author: Stephen Rothwell Date: Thu Jan 12 13:48:52 2006 +1100 [PATCH] powerpc: remove bitfields from hv_call_event.h Also does some comment cleanups and removal of unnecessary variables. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit cbbcf3401173f11f7e4c03c7ec8955ea29cd83b5 Author: Kumar Gala Date: Wed Jan 11 17:57:13 2006 -0600 [PATCH] powerpc: Fixed memory reserve map layout powerpc: Fixed memory reserve map layout The memory reserve map is suppose to be a pair of 64-bit integers to represent each region. On ppc32 the code was treating the pair as two 32-bit integers. Additional the prom_init code was producing the wrong layout on ppc32. Added a simple check to try to provide backwards compatibility. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit ea183a957abea8e05530a4536a9c2db16e9fdd85 Author: Olof Johansson Date: Wed Jan 11 14:02:58 2006 -0600 [PATCH] powerpc: remove warning in EEH code Remove warning in eeh code about mixed variables and code. Signed-off-by: Olof Johansson Acked-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 5388fb1025443ec223ba556b10efc4c5f83f8682 Author: Paul Mackerras Date: Wed Jan 11 22:11:39 2006 +1100 [PATCH] powerpc: Avoid potential FP corruption with preempt and UP Heikki Lindholm pointed out that there was a potential race with the lazy CPU state (FP, VR, EVR) stuff if preempt is enabled. The race is that in the process of restoring FP state on sigreturn, the task gets preempted by a user task that wants to use the FPU. It will take an FP unavailable exception, which will write the current FPU state to the thread_struct, overwriting the values which sigreturn has stored. Note that this can only happen on UP since we don't implement lazy CPU state on SMP. The fix is to flush the lazy CPU state before updating the thread_struct. To do this we re-use the flush_lazy_cpu_state() function from process.c. Signed-off-by: Paul Mackerras commit 983d5dbdb2b38d024935f560a91cddcf704875f3 Author: Vivek Goyal Date: Thu Jan 12 03:35:20 2006 +0100 [PATCH] x86_64: Fix SMP bootup with CONFIG_KDUMP enabled o This fix was posted for i386 long back. Posting it for x86_64. http://marc.theaimsgroup.com/?l=linux-kernel&m=110380103229830&w=2 o This patch fixes the problem of secondary cpus boot up. This situation is faced when kernel is built for default locations like 16MB and onwards. In this configuration, only primary cpu (BP) comes and secondary cpus don't boot. o Problem occurs because in trampoline code, lgdt is not able to load the GDT as it happens to be situated beyond 16MB. This is due to the fact that cpu is still in real mode and default operand size is 16bit. o This patch uses lgdtl instead of lgdt to force operand size to 32 instead of 16. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0d9cb75f2f41788a59bcd3dac30b264a4bebaf2e Author: Andi Kleen Date: Wed Jan 11 22:47:10 2006 +0100 [PATCH] x86_64: Don't confuse noapic with noapictimer Handling common prefixes is tricky. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 256ddb01ebdcb065f81487fff00be833192d8764 Author: Jan Beulich Date: Wed Jan 11 22:47:07 2006 +0100 [PATCH] x86_64: don't copy command line twice ... reducing the amount of changes Xen has to do. Signed-Off-By: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2a2d5924c249e0f73aa00d617f8d5e242ea1430d Author: Jan Beulich Date: Wed Jan 11 22:47:03 2006 +0100 [PATCH] i386/x86-64: make setup_early_printk() usage consistent The explicit and implicit calls to setup_early_printk() were passing inconsistent arguments. Signed-Off-By: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4092bdebab46235d69fcd68afc710cddad550892 Author: Andi Kleen Date: Wed Jan 11 22:47:00 2006 +0100 [PATCH] i386: Move DOUBLEFAULT config to arch/i386/Kconfig It has no business being elsewhere and x86-64 doesn't need/want it. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6c5acd160a10c76e8debf4f8fa8256d7c914f290 Author: Andi Kleen Date: Wed Jan 11 22:46:57 2006 +0100 [PATCH] x86_64: Allow kernel page tables upto the end of memory Previously they would be only allocated before the kernel text at 1MB. This limited the maximum supported memory to 128GB. Now allow the e820 allocator to put them everywhere. Try to put them beyond any DMA zones to avoid filling them up. This should free some GFP_DMA memory compared to earlier kernels. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0a9c3ee7692fa20670986bcf550950e88ab9b4cc Author: Andi Kleen Date: Wed Jan 11 22:46:54 2006 +0100 [PATCH] x86_64: Use safe_smp_processor_id in MCE handler hard_smp_processor_id would return the local APIC id instead of the Linux processor id. On big systems they are often not identical. safe_smp_processor_id is just a wrapper around it that does the necessary conversions. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 11a8e778c46ee76fc46b0a7fa9d455b5a8e3e19f Author: Andi Kleen Date: Wed Jan 11 22:46:51 2006 +0100 [PATCH] x86_64: Some housekeeping in local APIC code Remove support for obsolete hardware and cleanup. - Remove checks for non integrated APICs - Replace apic_write_around with apic_write. - Remove apic_read_around - Remove APIC version reads used by old workarounds - Remove old workaround for Simics - Fix indentation Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5f1d189f8a87930d62c507800a8ac20b9a185e41 Author: Jan Beulich Date: Wed Jan 11 22:46:48 2006 +0100 [PATCH] x86_64: Display meaningful part of filename during BUG() When building in a separate objtree, file names produced by BUG() & Co. can get fairly long; printing only the first 50 characters may thus result in (almost) no useful information. The following change makes it so that rather the last 50 characters of the filename get printed. Signed-Off-By: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1b2f6304500930ab534a6aa3198bce0c51586206 Author: Jan Beulich Date: Wed Jan 11 22:46:45 2006 +0100 [PATCH] x86_64: Reduce screen space needed by stack trace Especially under Xen, where the console cannot be adjusted to more than 25 lines, it is fairly important that the information displayed during a panic is as compact as possible. Below adjustments work towards that. Signed-Off-By: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5329e13d0bd82e13814050eb9facb25eedde4bbc Author: Jan Beulich Date: Wed Jan 11 22:46:42 2006 +0100 [PATCH] x86_64: Fix get_cmos_time() Due to a broken condition, the body of the loop that is intended to wait for the Update-In-Progress bit to get set and then cleared again was never entered; in fact, the entire loop was optimized out by the compiler. Here is a change to fix the condition (and to also move the initialization of locals out of the spin lock protected region). Signed-Off-By: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bdf2b1c9fedf76a1797216559f221e5eaa7a1eab Author: Andi Kleen Date: Wed Jan 11 22:46:39 2006 +0100 [PATCH] x86_64: No need to export get_cmos_time anymore It was only needed for APM Pointed out by Jan Beulich Cc: jbeulich@novell.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit dd52d642db8ca05267456a07a592922e8b093e1c Author: Andi Kleen Date: Wed Jan 11 22:46:36 2006 +0100 [PATCH] x86_64: Remove unused AMD K8 C stepping flag X86_FEATURE_K8_C was a synthetic Linux CPUID flag that was used for some code optimizations in Opteron C stepping or later. But support for pre C stepping optimizations has been removed, so this isn't needed anymore. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2e664aa2bad56b0bb52cf9cb9d14c9b575b437bb Author: Andi Kleen Date: Wed Jan 11 22:46:33 2006 +0100 [PATCH] i386: Move phys_proc_id/early intel workaround to correct function. early_cpu_detect only runs on the BP, but this code needs to run on all CPUs. Looks like a mismerge somewhere. Also add a warning comment. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 77a75333a3d16b830ccf47cf51d944655b015363 Author: Stephen Hemminger Date: Wed Jan 11 22:46:30 2006 +0100 [PATCH] x86_64: sparse warning cleanups Fix some trivial sparse warnings in x86_64 code. Signed-off-by: Stephen Hemminger Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit cf0501328674849f8becf6de16620067a0c2f1b5 Author: Andi Kleen Date: Wed Jan 11 22:46:27 2006 +0100 [PATCH] x86_64: Move NUMA page_to_pfn/pfn_to_page functions out of line Saves about ~18K .text in defconfig There would be more optimization potential, but that's for later. Suggestion originally from Bill Irwin. Fix from Andy Whitcroft. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit cdc4b9c01909d606afbc1e4a4b6c21fa1687a016 Author: Andi Kleen Date: Wed Jan 11 22:46:24 2006 +0100 [PATCH] x86_64: Remove unused segments They used to be used by the reboot code, but not anymore. Noticed by Jan Beulich Cc: JBeulich@novell.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit af5b98042452cc6f50de8afa9d079bda8556d74d Author: Vivek Goyal Date: Wed Jan 11 22:46:21 2006 +0100 [PATCH] x86_64: ioapic virtual wire mode fix o Currently, during kexec reboot, IOAPIC is re-programmed back to virtual wire mode if there was an i8259 connected to it. This enables getting timer interrupts in second kernel in legacy mode. o After putting into virtual wire mode, IOAPIC delivers the i8259 interrupts to CPU0. This works well for kexec but not for kdump as we might crash on a different CPU and second kernel will not see timer interrupts. o This patch modifies the redirection table entry to deliver the timer interrupts to the cpu we are rebooting (instead of hardcoding to zero). This ensures that second kernel receives timer interrupts even on a non-boot cpu. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 79f12614a6537cc3ac9ca4d1ea26f6e4f4a34aee Author: Ravikiran G Thirumalai Date: Wed Jan 11 22:46:18 2006 +0100 [PATCH] x86_64: Inclusion of ScaleMP vSMP architecture patches - vsmp_arch Introduce vSMP arch to the kernel. This patch: 1. Adds CONFIG_X86_VSMP 2. Adds machine specific macros for local_irq_disabled, local_irq_enabled and irqs_disabled 3. Writes to the vSMP CTL device to indicate kernel compiled with CONFIG_VSMP Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5fd63b308569060ffa40af52ed122d9734111bff Author: Ravikiran G Thirumalai Date: Wed Jan 11 22:46:15 2006 +0100 [PATCH] x86_64: Inclusion of ScaleMP vSMP architecture patches - vsmp_align vSMP specific alignment patch to 1. Define INTERNODE_CACHE_SHIFT for vSMP 2. Use this for alignment of critical structures 3. Use INTERNODE_CACHE_SHIFT for ARCH_MIN_TASKALIGN, and let the slab align task_struct allocations to the internode cacheline size 4. Introduce and use ARCH_MIN_MMSTRUCT_ALIGN for mm_struct slab allocations. Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 99f7b77d3c62045bb47dfc4228a2341ba71bff1d Author: Andi Kleen Date: Wed Jan 11 22:46:12 2006 +0100 [PATCH] x86_64: Make sure BITS_PER_ATOMIC is defined in asm-generic/atomic.h Fixes CC fs/nfsctl.o In file included from include2/asm/atomic.h:427, from /home/lsrc/quilt/linux/include/linux/file.h:8, from /home/lsrc/quilt/linux/fs/nfsctl.c:8: /home/lsrc/quilt/linux/include/asm-generic/atomic.h:20:5: warning: "BITS_PER_LONG" is not defined Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e4b5939a7eec7726d410517e433040db4ede5102 Author: Brian Gerst Date: Wed Jan 11 22:46:09 2006 +0100 [PATCH] x86_64: cleanup enter_lazy_tlb() Move the #ifdef into the function body. Signed-off-by: Brian Gerst Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1008fddcaed7ad3e69f72939c87b24d0d3387ca2 Author: Eric W. Biederman Date: Wed Jan 11 22:46:06 2006 +0100 [PATCH] x86_64: Memorize location of i8259 for reboots. Currently we attempt to restore virtual wire mode on reboot, which only works if we can figure out where the i8259 is connected. This is very useful when we are kexec another kernel and likely helpful to an peculiar BIOS that make assumptions about how the system is setup. Since the acpi MADT table does not provide the location where the i8259 is connected we have to look at the hardware to figure it out. Most systems have the i8259 connected the local apic of the cpu so won't be affected but people running Opteron and some serverworks chipsets should be able to use kexec now. In addition this patch removes the hard coded assumption that the io_apic that delivers isa interrups is always known to the kernel as io_apic 0. There does not appear to be anything to guarantee that assumption is true. And From: Vivek Goyal A minor fix to the patch which remembers the location of where i8259 is connected. Now counter i has been replaced by apic. counter i is having some junk value which was leading to non-detection of i8259 connected to IOAPIC. Signed-off-by: Eric W. Biederman Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 60923df35edab273d0bd8e829cdfdc5cfbb4fd2c Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Wed Jan 11 22:46:03 2006 +0100 [PATCH] x86_64: allow setting RF in EFLAGS Setting RF (resume flag) allows a debugger to resume execution after a code breakpoint without tripping the breakpoint again. It is reset by the CPU after executing one instruction. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 100c0e36852a771864c56c31b260b7810b554170 Author: Chuck Ebbert <76306.1226@compuserve.com> Date: Wed Jan 11 22:46:00 2006 +0100 [PATCH] x86_64: "invalid operand" -> "invalid opcode" The manual says Int 6 is "invalid opcode", not "invalid operand". Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 68209407856507cda9d085470e8d28542ed1a941 Author: Luiz Fernando Capitulino Date: Wed Jan 11 22:45:57 2006 +0100 [PATCH] x86_64: Sparse warnings fix. Fixes the following sparse warnings: arch/x86_64/kernel/mce_amd.c:321:29: warning: Using plain integer as NULL pointer arch/x86_64/kernel/mce_amd.c:410:41: warning: Using plain integer as NULL pointer Signed-off-by: Luiz Capitulino Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 915f34e20c20ee383832bce0a4bc962d0c86be8d Author: Andi Kleen Date: Wed Jan 11 22:45:54 2006 +0100 [PATCH] x86_64: Remove useless KDB vector It was set as an NMI, but the NMI bit always forces an interrupt to end up at vector 2. So it was never used. Remove. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e080e9d66fd276ed34bc2834eedc134189b87fc9 Author: Jason Uhlenkott Date: Wed Jan 11 22:45:51 2006 +0100 [PATCH] x86_64: Don't claim too many vectors for TLB flushing It looks like the new scalable TLB flush code for x86_64 is claiming one more IRQ vector than it actually uses. Signed-off-by: Jason Uhlenkott Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5b22a3855127bb8221bc96e8e41064b3c5b2bf08 Author: Andi Kleen Date: Wed Jan 11 22:45:48 2006 +0100 [PATCH] x86_64: Tell user to enable GART_IOMMU when needed Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7554c3f0e378161fb6315160d6c3e23bf2de5869 Author: Andi Kleen Date: Wed Jan 11 22:45:45 2006 +0100 [PATCH] x86_64: Fix warning in nmi.c on uniprocessor kernels Fix CC arch/x86_64/kernel/nmi.o linux/arch/x86_64/kernel/nmi.c: In function ???check_nmi_watchdog???: linux/arch/x86_64/kernel/nmi.c:155: warning: statement with no effect on Uniprocessor builds. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 365ba9179f84244d2ffa98e46ae3cddfeb2ef6ff Author: Ravikiran G Thirumalai Date: Wed Jan 11 22:45:42 2006 +0100 [PATCH] x86_64: Allocate PDAs in the local node Patch uses a static PDA array early at boot and reallocates processor PDA with node local memory when kmalloc is ready, just before pda_init. The boot_cpu_pda is needed since the cpu_pda is used even before pda_init for that cpu is called (to set the static per-cpu areas offset table etc) Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit df79efde82952edc653fa6eb1338a82b87aa0585 Author: Ravikiran G Thirumalai Date: Wed Jan 11 22:45:39 2006 +0100 [PATCH] x86_64: Node local pda take 2 -- cpu_pda preparation Helper patch to change cpu_pda users to use macros to access cpu_pda instead of the cpu_pda[] array. Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 05b3cbd8bb98736387df8a2e1efe311b1fb4d2ad Author: Ravikiran Thirumalai Date: Wed Jan 11 22:45:36 2006 +0100 [PATCH] x86_64: Early initialization of cpu_to_node Patch enables early intialization of cpu_to_node. apicid_to_node is built by reading the SRAT table, from acpi_numa_init with ACPI_NUMA and k8_scan_nodes with K8_NUMA. x86_cpu_to_apicid is built by parsing the ACPI MADT table, from acpi_boot_init. We combine these two tables and setup cpu_to_node. Early intialization helps the static per_cpu_areas in getting pages from correct node. Change since last release: Do not initialize early init_cpu_to_node for faking node cases. Patch tested on TYAN dual core 4P board with K8 only, ACPI_NUMA. Tested on EM64T NUMA. Also tested with numa=off, numa=fake, and running a kernel compiled with NUMA on a regular EM64 2 way SMP. 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 0b91317e338f42367de6d53f5e14f273aae7d034 Author: Andi Kleen Date: Wed Jan 11 22:45:33 2006 +0100 [PATCH] x86_64: Fix up white space in time.c No functional changes. And remove one redundant prototype. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2c8bc9446a853f4f36475ce314808dd92201f74e Author: Andi Kleen Date: Wed Jan 11 22:45:30 2006 +0100 [PATCH] x86_64: Use standard __always_inline in vsyscall.c Replacing the old home brewn __force_inline. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 487472bc01fab0625996aad37836aad931e4eda9 Author: Andi Kleen Date: Wed Jan 11 22:45:27 2006 +0100 [PATCH] i386: Replace broken serialize_cpu in microcode driver with correct sync_core Passing random input values in eax to cpuid is not a good idea because the CPU will GPF for unknown ones. Use the correct x86-64 version that exists for a longer time too. This also adds a memory barrier to prevent the optimizer from reordering. Cc: tigran@veritas.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit c818a18146997d1356a4840b0c01f1168c16c8a4 Author: Andi Kleen Date: Wed Jan 11 22:45:24 2006 +0100 [PATCH] x86_64: On Intel CPUs don't do an additional CPU sync before RDTSC RDTSC serialization using cpuid is not needed for Intel platforms. This increases gettimeofday performance. Cc: vojtech@suse.cz Cc: rohit.seth@intel.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7f6c5b046978d68e69bdc73433ead41612a2a1c9 Author: Andi Kleen Date: Wed Jan 11 22:45:21 2006 +0100 [PATCH] x86_64: Support alternative() in vsyscalls The real vsyscall .text addresses are not mapped when the alternative() replacement runs early, so use some black magic to access them using the direct mapping. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6e54d95f73bbc79171802a1983e0c3835676db88 Author: Andi Kleen Date: Wed Jan 11 22:45:18 2006 +0100 [PATCH] x86_64: Support alternative() with a output argument. Needed for follow on patches Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 737c5c3bde5641af9c24e3a60366674af72a43ef Author: Andi Kleen Date: Wed Jan 11 22:45:15 2006 +0100 [PATCH] x86_64: Don't try to synchronize the TSC over CPUs on Intel CPUs at boot. They already do this in hardware and the Linux algorithm actually adds errors. Cc: mingo@elte.hu Cc: rohit.seth@intel.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3c0217511313a46039137d2dab30fdb1c5a65e64 Author: Andi Kleen Date: Wed Jan 11 22:45:12 2006 +0100 [PATCH] x86_64: Fix compile error with !CONFIG_COMPAT cpumask.h wasn't included implicitely into proto.h in this case. Just move it over to smp.h Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b9d1e4bd6e44f2a75340226eb5f762e16bb4652f Author: Vivek Goyal Date: Wed Jan 11 22:45:09 2006 +0100 [PATCH] x86_64: x86_64 write apic id fix o Apic id is in most significant 8 bits of APIC_ID register. Current code is trying to write apic id to least significant 8 bits. This patch fixes it. o This fix enables booting uni kdump capture kernel on a cpu with non-zero apic id. Signed-off-by: Vivek Goyal Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit aea9fca1dc8a1f9ac5d3b76ef04516a010cbf2e4 Author: Brian Gerst Date: Wed Jan 11 22:45:06 2006 +0100 [PATCH] x86_64: Remove duplicate exports Remove exports that are already exported from the object's source file. Signed-off-by: Brian Gerst Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e3602824cb1172deeb0f2b286025753882b90b28 Author: Brian Gerst Date: Wed Jan 11 22:45:03 2006 +0100 [PATCH] x86_64: unexport pci_*_consistent These functions are inlines and shouldn't be exported. Signed-off-by: Brian Gerst Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2d0db401ee4ee08857b79f1d3be40e8a819f8992 Author: Andi Kleen Date: Wed Jan 11 22:45:00 2006 +0100 [PATCH] x86_64: Remove unused apic_write_atomic This function is never used for x86_64. Signed-off-by: Brian Gerst Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4cef0c61380888af99b054937ed391fb28757836 Author: Andi Kleen Date: Wed Jan 11 22:44:57 2006 +0100 [PATCH] x86_64: Make the cpu_*_maps in kernel/sched.c read mostly They are referred to often so avoid potential false sharing for them. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit fd78f11790c37e2165733699f50450500e63a7b3 Author: Andi Kleen Date: Wed Jan 11 22:44:54 2006 +0100 [PATCH] i386: make pci_map_single/pci_map_sg warn for zero length. As suggested by Linus. This catches driver bugs that could cause corruption on IOMMU architectures. Also I converted the BUGs to out_of_line_bug()s to save a bit of text space. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3d831d925c6d66569a0c7f6f5f17c0927f7d3d25 Author: Andi Kleen Date: Wed Jan 11 22:44:51 2006 +0100 [PATCH] x86_64: Enable sound in old style OSS driver for NForce4 CK804 Just add the missing PCI ID. Cc: perex@suse.cz Cc: tiwai@suse.de Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4855170f9876c8b4a16f115f32cf6851bac1ffcc Author: Andi Kleen Date: Wed Jan 11 22:44:48 2006 +0100 [PATCH] x86_64: Make it clear in machine checks that it's an hardware problem Hopefully the users will take the hint. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2cbc9ee35c992f88fb2558a4f13920e3df4ef3bb Author: Andi Kleen Date: Wed Jan 11 22:44:45 2006 +0100 [PATCH] x86_64: Clean up copy_*_user - Remove optimization for old B stepping Opteron - Make the fast path for copies with a multiple of eight length faster. - Minor instruction rearrangement to hopefully avoid a pipeline stall or two. - Add comment about errata to consider. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 17a941d854a3f7b0bb916fdeee4c9ffdcc19d8d3 Author: Muli Ben-Yehuda Date: Wed Jan 11 22:44:42 2006 +0100 [PATCH] x86_64: Use function pointers to call DMA mapping functions AK: I hacked Muli's original patch a lot and there were a lot of changes - all bugs are probably to blame on me now. There were also some changes in the fall back behaviour for swiotlb - in particular it doesn't try to use GFP_DMA now anymore. Also all DMA mapping operations use the same core dma_alloc_coherent code with proper fallbacks now. And various other changes and cleanups. Known problems: iommu=force swiotlb=force together breaks needs more testing. This patch cleans up x86_64's DMA mapping dispatching code. Right now we have three possible IOMMU types: AGP GART, swiotlb and nommu, and in the future we will also have Xen's x86_64 swiotlb and other HW IOMMUs for x86_64. In order to support all of them cleanly, this patch: - introduces a struct dma_mapping_ops with function pointers for each of the DMA mapping operations of gart (AMD HW IOMMU), swiotlb (software IOMMU) and nommu (no IOMMU). - gets rid of: if (swiotlb) return swiotlb_xxx(); - PCI_DMA_BUS_IS_PHYS is now checked against the dma_ops being set This makes swiotlb faster by avoiding double copying in some cases. Signed-Off-By: Muli Ben-Yehuda Signed-Off-By: Jon D. Mason Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8a6fdd3e912e0ce6f723431d66baf704bf8a1d26 Author: Andi Kleen Date: Wed Jan 11 22:44:39 2006 +0100 [PATCH] x86_64: Reject SRAT tables that don't cover all memory Broken BIOS on Iwill 8way systems reports these and it causes the bootmem allocator to crash. Add a sanity check if all the PXMs in the SRAT table cover all memory as reported by e820. If the sanity check fails the SRAT is rejected and the code will fall back to discover the NUMA topology using the K8 northbridge registers when applicable. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 95833c83f3b812c78e48db4eaa19f6c74958470b Author: Andi Kleen Date: Wed Jan 11 22:44:36 2006 +0100 [PATCH] x86_64: Add idle notifiers This adds a new notifier chain that is called with IDLE_START when a CPU goes idle and IDLE_END when it goes out of idle. The context can be idle thread or interrupt context. Since we cannot rely on MONITOR/MWAIT existing the idle end check currently has to be done in all interrupt handlers. They were originally inspired by the similar s390 implementation. They have a variety of applications: - They will be needed for CONFIG_NO_IDLE_HZ - They can be used for oprofile to fix up the missing time in idle when performance counters don't tick. - They can be used for better C state management in ACPI - They could be used for microstate accounting. This is just infrastructure so far, no users. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6b050f8075823b0d9ec4fad38f4f552b74e5c5af Author: Andi Kleen Date: Wed Jan 11 22:44:33 2006 +0100 [PATCH] x86_64: Clean up some printks in NUMA code Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d18ff47068154de8b4c1506be60a30a961846d18 Author: Andi Kleen Date: Wed Jan 11 22:44:30 2006 +0100 [PATCH] x86_64: Fix up coding style in numa.c No functional changes Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ca8642f606ce22de23bae08a5044067f98de855b Author: Andi Kleen Date: Wed Jan 11 22:44:27 2006 +0100 [PATCH] x86_64: Fix off by one in IOMMU check Fix off by one when checking if the machine has enougn memory to need IOMMU This caused the IOMMUs to be needlessly enabled for mem=4G Based on a patch from Jon Mason Signed-off-by: jdmason@us.ibm.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d25bf7e5fe73b5b6d2246ab0be08ae35d718456b Author: Venkatesh Pallipadi Date: Wed Jan 11 22:44:24 2006 +0100 [PATCH] x86_64: Handle missing local APIC timer interrupts on C3 state Whenever we see that a CPU is capable of C3 (during ACPI cstate init), we disable local APIC timer and switch to using a broadcast from external timer interrupt (IRQ 0). Patch below adds the code for x86_64. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6eb0a0fd059598ee0d49c6283ce25cccd743e9fc Author: Venkatesh Pallipadi Date: Wed Jan 11 22:44:21 2006 +0100 [PATCH] i386: Handle missing local APIC timer interrupts on C3 state Whenever we see that a CPU is capable of C3 (during ACPI cstate init), we disable local APIC timer and switch to using a broadcast from external timer interrupt (IRQ 0). This is needed because Intel CPUs stop the local APIC timer in C3. This is currently only enabled for Intel CPUs. Patch below adds the code for i386 and also the ACPI hunk. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5a07a30c3cc4dc438494d6416ffa74008a2194b3 Author: Venkatesh Pallipadi Date: Wed Jan 11 22:44:18 2006 +0100 [PATCH] i386/x86-64: Remove sub jiffy profile timer support Remove the finer control of local APIC timer. We cannot provide a sub-jiffy control like this when we use broadcast from external timer in place of local APIC. Instead of removing this only on systems that may end up using broadcast from external timer (due to C3), I am going the "I'm feeling lucky" way to remove this fully. Basically, I am not sure about usefulness of this code today. Few other architectures also don't seem to support this today. If you are using profiling and fine grained control and don't like this going away in normal case, yell at me right now. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 01b8faaef5d239aeabb1e712c5d9619f29e808dd Author: John Blackwood Date: Wed Jan 11 22:44:15 2006 +0100 [PATCH] x86_64: Report hardware breakpoints in user space when triggered by the kernel I would like to throw out a suggestion for a possible change in the way that the debug register traps are handled in do_debug() when the trap occurs in kernel-mode. In the x86_64 version of do_debug(), the code will skip around sending a SIGTRAP to the current task if the trap occurred while in kernel mode. On the i386-side of things, if the access happens to occur in kernel mode (say during a read(2) of user's buffer that matches the address of a debug register trap), then the do_debug() routine for i386 will go ahead and call send_sigtrap() and send the SIGTRAP signal. The send_sigtrap() code will also set the info.si_addr to NULL in this case (even though I don't understand why, since the SIGTRAP siginfo processing doesn't use the si_addr field...). So I would like to suggest that the x86_64 do_debug() routine also follow this type of behavior and have it go ahead and send the SIGTRAP signal to the current task, even if the debug register trap happens to have occurred in kernel mode. I have taken a stab at a patch for this change below. (It includes the i386-ish change for setting si_addr to NULL when the trap occurred in kernel mode.) It seems like a useful feature to be able to 'watch' a user location that might also be modified in the kernel via a system service call, and have the debugger report that information back to the user, rather than to just silently ignore the trap. Additionally, I realize that users that pull in a kernel debugger such as KGDB into their kernel might want to remove this change below when they add in KGDB support. However, they could alternatively look at the current task's thread.debugreg[] values to see if the trap occurred due to KGDB or instead because of a user-space debugger trap, and still honor the user SIGTRAP processing (instead of the KGDB breakpoint processing) if the trap matches up with the thread.debugreg[] registers. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4839057cafc9a508ad5906857e9c1d8707c875e3 Author: Adrian Bunk Date: Wed Jan 11 22:44:12 2006 +0100 [PATCH] x86_64: "extern inline" -> "static inline" in pgtable.h Signed-off-by: Adrian Bunk Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 66c581569e2cb41231b3fcd91a6c9f853d4d4e25 Author: Andi Kleen Date: Wed Jan 11 22:44:09 2006 +0100 [PATCH] x86_64: Convert page fault error codes to symbolic constants. Much better to deal with these than with the magic numbers. And remove the comment describing the bits - kernel source is no replacement for an architecture manual. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bf2fcc6fdfe4f4e92bb74f062c0a1be189f3a561 Author: Andi Kleen Date: Wed Jan 11 22:44:06 2006 +0100 [PATCH] x86_64: Implement is_compat_task the right way By setting a flag during a 32bit system call only Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2966387b481a11a90a7bed6600fc17b4253f6980 Author: Andi Kleen Date: Wed Jan 11 22:44:03 2006 +0100 [PATCH] x86_64: Implement compat code for sg driver SG_GET_REQUEST_TABLE ioctl Apparently helps with some non SANE scanner drivers. Cc: axboe@suse.de Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f95190b28daa1bebf78ab5ec4129d01a223982c5 Author: Andi Kleen Date: Wed Jan 11 22:44:00 2006 +0100 [PATCH] x86_64: Remove unnecessary case from the page fault handler Don't need to do the vmalloc check for the module range because its PML4 is shared with the kernel text. Also removed an unnecessary TLB flush. Pointed out by Jan Beulich Cc: jbeulich@novell.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit c11efdf94d3152443c11334720824bb6c7f6c655 Author: Ravikiran G Thirumalai Date: Wed Jan 11 22:43:57 2006 +0100 [PATCH] x86_64: Align and pad x86_64 GDT on page boundary This patch is on the same lines as Zachary Amsden's i386 GDT page alignemnt patch in -mm, but for x86_64. Patch to align and pad x86_64 GDT on page boundries. [AK: some minor cleanups and fixed incorrect TLS initialization in CPU init.] Signed-off-by: Nippun Goel Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bb33421dde79f9a36d5485c56335ff178ac7d268 Author: Andi Kleen Date: Wed Jan 11 22:43:54 2006 +0100 [PATCH] x86_64: Allow compilation on a 32bit biarch toolchain This might help on distributions that use a 32bit biarch compiler. First pass -m64 by default. Secondly add some more .code32s because at least the Ubuntu biarch 32bit as called by gcc doesn't seem to handle -m64 -m32 as generated by the Makefile without such assistance. And finally make sure the linker script can be preprocessed with a 32bit cpp. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 79c62cf1789f935280138b412bb750be84aec747 Author: Ross Biro Date: Wed Jan 11 22:43:51 2006 +0100 [PATCH] x86_64: Make udelay more accurate The attempt to avoid overflow in __delay caused varying precision on different CPUs depending on differences in the CPU speed. We should be able to do this multiplication with out overflowing provided the cpu is running at less than about 128 GHz. xloops < 20000 * 0x10c6. loops_per_jiffy * HZ <= cpu_clock_speed. So if the cpu clock speed < 2^64/(20000 * 0x10c6) = 2^64/ 51E6CC0 < 2^64/2^27 = 2^37 = 128G we will not overflow the calculation. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e4e94072d9c3b19662537cbd5e2d37bcaeed3d9b Author: Andi Kleen Date: Wed Jan 11 22:43:48 2006 +0100 [PATCH] x86_64: Return -1 for unknown PCI bus affinity When we don't know the node a PCI bus is connected to return -1. This matches the generic code. Noticed by Ravikiran G Thirumalai Cc: Ravikiran G Thirumalai Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 819a692804a8d2d42b7bb033d2650dba47622149 Author: Andi Kleen Date: Wed Jan 11 22:43:45 2006 +0100 [PATCH] x86_64: Handle unknown node (-1) in alloc_pages_node Following kmalloc_node. Needed for another patch to return -1 for unknown nodes in x86-64. Cc: Christoph Lameter Cc: kiran@scalex86.org Signed-off-by: Andi Kleen [ Changed 0 to numa_node_id() on suggestion by Christoph Lameter ] Signed-off-by: Linus Torvalds commit 1584b89c921acefe88881f08d836d80f00600a84 Author: Andi Kleen Date: Wed Jan 11 22:43:42 2006 +0100 [PATCH] x86_64: Validate SLIT table A lot of Opteron BIOS just pass 10 in all SLIT entries (10 is the normalized unit). This is actually worse than the default heuristic because it leads to pci_distance not knowing the difference between local and remote nodes anymore. This messes up some NUMA heuristics in generic code. In this case it's better to fall back to the default heuristic which just does nodea == nodeb ? 10 : 20. This patch does some basic sanity checking on the SLIT and only accepts the SLIT when it passes. Invariants enforced are: - Node to itself shall be 10 - Any other distance shouldn't be 10 - Distances smaller than 10 are illegal Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7a4a76cc1057de0dc96ee481590347aa8c5b9ffb Author: Andi Kleen Date: Wed Jan 11 22:43:39 2006 +0100 [PATCH] x86_64: Fix off by one in acpi table mapping And fix the test to include the size Noticed by Vivek Goyal Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7180d4fb83085fef9d24b353f5bd79cf6fd98447 Author: Jan Beulich Date: Wed Jan 11 22:43:36 2006 +0100 [PATCH] x86_64: Fix 64bit FXSAVE encoding The separation of the rex64 prefix (on fxsave/fxrstor) by way of using a semicolon resulted in the prefix not always taking effect (because when extended registers are needed for addressing, another rex prefix would have been generated by the compiler), thus (depending on the build) resulting in eventually getting 32-bit saves and/or restores. Signed-Off-By: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e99286744599a66195de4cd975d7ef4d643c2789 Author: Andi Kleen Date: Wed Jan 11 22:43:33 2006 +0100 [PATCH] x86_64: Generalize DMI and enable for x86-64 Some people need it now on 64bit so reuse the i386 code for x86-64. This will be also useful for future bug workarounds. It is a bit simplified there because there is no need to do it very early on x86-64. This means it doesn't need early ioremap et.al. We run it as a core initcall right now. I hope it's not needed for early setup. I added a general CONFIG_DMI symbol in case IA64 or someone else wants to reuse the code later too. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b347d25fbc4616f4f37895e9afbe25b2bbc7e11f Author: Andi Kleen Date: Wed Jan 11 22:43:30 2006 +0100 [PATCH] x86_64: Remove bogus file in arch/x86_64/pci This was a backup file that somehow made it into the official tree. Never used for anything. Remove. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f46ace69282e9791757ec7d7b130285124ec10d0 Author: Andi Kleen Date: Wed Jan 11 22:43:27 2006 +0100 [PATCH] x86_64: Add missing newline in IOMMU error message Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 636dd2b7def5c9c72551b51d4d516a65c269de08 Author: Stephen Hemminger Date: Wed Jan 11 22:43:24 2006 +0100 [PATCH] x86_64: fls in asm for x86_64 Use single instruction for find largest set bit on x86_64. [Updated by Jan Beulich to fix wrong asm constraints in original patch -AK] Cc: jbeulich@novell.com Signed-off-by: Stephen Hemminger Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bd9cb64df1d99c07ea9672661ede6ca3ba5c6579 Author: Jan Beulich Date: Wed Jan 11 22:43:21 2006 +0100 [PATCH] x86_64: fix page fault from show_trace() The introduction of call_softirq switching to the interrupt stack several releases earlier resulted in a problem with the code in show_trace, which assumes that it can pick the previous stack pointer from the end of the interrupt stack. Cc: Andi Kleen Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4724e3e86d806860c90917f9b73d4354e388b39b Author: Peter Beutner Date: Wed Jan 11 22:43:18 2006 +0100 [PATCH] x86_64: fix single step handling for 32bit processes Be more careful with TF handling to fix some copy protection codes in wine patch originally for i386 by Linus, then ported to x86_64 by Andi Kleen see: [PATCH] x86_64: Some fixes for single step handling commit: be61bff789fe44bfb6d9282d8f7eccc860bdcfb6 But it was never applied to the ia32 emulation code which breaks some copy-protection schemes under wine when running on x86_64. Signed-off-by: Peter Beutner Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 60917a3832547886549962ab9ee753253cf5e44c Author: Benjamin LaHaise Date: Wed Jan 11 22:43:15 2006 +0100 [PATCH] x86_64: don't save eflags in x86-64 switch_to() As discussed, the flags register on x86-64 is saved and restored by the assembly code which sets up struct pt_regs, so we do not need to save and restore it in the inline assembler which already informs gcc that we're clobbering the flags. This patch has been sanity booted and works okay here. Signed-off-by: Benjamin LaHaise Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6e3fbee5f11a8135109b08bfcbc05a29eb4eabe8 Author: Eric W. Biederman Date: Wed Jan 11 22:43:12 2006 +0100 [PATCH] i386/x86-64: Don't IPI to offline cpus on shutdown So why are we calling smp_send_stop from machine_halt? We don't. Looking more closely at the bug report the problem here is that halt -p is called which triggers not a halt but an attempt to power off. machine_power_off calls machine_shutdown which calls smp_send_stop. If pm_power_off is set we should never make it out machine_power_off to the call of do_exit. So pm_power_off must not be set in this case. When pm_power_off is not set we expect machine_power_off to devolve into machine_halt. So how do we fix this? Playing too much with smp_send_stop is dangerous because it must also be safe to be called from panic. It looks like the obviously correct fix is to only call machine_shutdown when pm_power_off is defined. Doing that will make Andi's assumption about not scheduling true and generally simplify what must be supported. This turns machine_power_off into a noop like machine_halt when pm_power_off is not defined. If the expected behavior is that sys_reboot(LINUX_REBOOT_CMD_POWER_OFF) becomes sys_reboot(LINUX_REBOOT_CMD_HALT) if pm_power_off is NULL this is not quite a comprehensive fix as we pass a different parameter to the reboot notifier and we set system_state to a different value before calling device_shutdown(). Unfortunately any fix more comprehensive I can think of is not obviously correct. The core problem is that there is no architecture independent way to detect if machine_power will become a noop, without calling it. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 329d400f47ddfe8ff599823d739c5c5565da3207 Author: Zwane Mwaikambo Date: Wed Jan 11 22:43:09 2006 +0100 [PATCH] x86_64/i386: Remove preempt disable calls in lowlevel IPI I noticed that some lowlevel send_IPI_mask helpers had a hotplug/preempt race whereupon the cpu_online_map was read before disabling preemption; ... cpumask_t mask = cpu_online_map; int cpu = get_cpu(); cpu_clear(cpu, mask); ... But then i realised that there is no need for these lowlevel functions to be going through all this trouble when all the callers are already made hotplug/preempt safe. Signed-off-by: Zwane Mwaikambo Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 73ca5358aab55e2e29993a31f3776c54c05ae729 Author: Shaohua Li Date: Wed Jan 11 22:43:06 2006 +0100 [PATCH] x86_64: increase MCE bank counts There is one CPU here whose MCE bank count is 6. This patch increases x86_64's MCE bank count. Signed-off-by: Shaohua Li Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f2ecfab91c6f248cf71dff66c2111d31c8cc1747 Author: Benjamin LaHaise Date: Wed Jan 11 22:43:03 2006 +0100 [PATCH] x86_64: another mb() for smpboot.c The following is probably a good idea given that the atomic_set() isn't a barrier here either. Signed-off-by: Benjamin LaHaise Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b556b35e98ad2b9174a7a623d152cdf412d1a999 Author: Jan Beulich Date: Wed Jan 11 22:43:00 2006 +0100 [PATCH] x86_64: Move int 3 handler to debug stack and allow to increase it. This - switches the INT3 handler to run on an IST stack (to cope with breakpoints set by a kernel debugger on places where the kernel's %gs base hasn't been set up, yet); the IST stack used is shared with the INT1 handler's [AK: this also allows setting a kprobe on the interrupt/exception entry points] - allows nesting of INT1/INT3 handlers so that one can, with a kernel debugger, debug (at least) the user-mode portions of the INT1/INT3 handling; the nesting isn't actively enabled here since a kernel- debugger-free kernel doesn't need it Signed-Off-By: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ed8388a5d9db0445322f86ee8381b0f04a2057ee Author: Andi Kleen Date: Wed Jan 11 22:42:57 2006 +0100 [PATCH] x86_64: Don't confuse apic=... command line option with apic Previously apic was foced with apic=logopt was specified. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7c0ac555b0b927ee0b3ca6200617f43dbdbaffb8 Author: Andi Kleen Date: Wed Jan 11 22:42:54 2006 +0100 [PATCH] x86_64: Dont't disable early PCI scan with apic It might be still needed for non APIC related issues. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3f98bc4991df8e7b5972489b4632e1e5c03cd1ee Author: Andi Kleen Date: Wed Jan 11 22:42:51 2006 +0100 [PATCH] i386/x86-64: Update AMD CPUID flags Print bits for RDTSCP, SVM, CR8-LEGACY. Also now print power flags on i386 like x86-64 always did. This will add a new line in the 386 cpuinfo, but that shouldn't be an issue - did that in the past too and I haven't heard of any breakage. I shrunk some of the fields in the i386 cpuinfo_x86 to chars to make up for the new int "x86_power" field. Overall it's smaller than before. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 152bf8c55d657898c40c8ed270630c0cf9d51f7d Author: Andi Kleen Date: Wed Jan 11 22:42:48 2006 +0100 [PATCH] x86_64: Use X86_FEATURE_CONSTANT_TSC now to clean up Intel speedstep drivers They previously tried to figure this out on their own. Suggested by Venkatesh. Cc: venkatesh.pallipadi@intel.com Cc: davej@redhat.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 39b3a7910556005a7a0d042ecb7ff98bfa84ea57 Author: Andi Kleen Date: Wed Jan 11 22:42:45 2006 +0100 [PATCH] i386/x86-64: Generalize X86_FEATURE_CONSTANT_TSC flag Define it for i386 too. This is a synthetic flag that signifies that the CPU's TSC runs at a constant P state invariant frequency. Fix up the logic on x86-64/i386 to set it on all known CPUs. Use the AMD defined bit to set it on future AMD CPUs. Cc: venkatesh.pallipadi@intel.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2d52ede9876ba566b583f255fdc43800eea81baa Author: Andi Kleen Date: Wed Jan 11 22:42:42 2006 +0100 [PATCH] x86_64: Remove enable/disable_hlt Was only used by the floppy driver to work around some ancient hardware bug that should never occur on any 64bit system. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 7eb903f4a5c35c8310f0aa7b0e94aae0b826d837 Author: Andi Kleen Date: Wed Jan 11 22:42:39 2006 +0100 [PATCH] x86_64: Add documentation for CPU hotplug ACPI extension Cc: len.brown@intel.com, ashok.ray@intel.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f62a91f6911479642c0018290d4248ace4287648 Author: Andi Kleen Date: Wed Jan 11 22:42:35 2006 +0100 [PATCH] x86_64: Don't reserve hotplug CPUs by default Most users don't need it so no need to waste memory. This means an user has to specify the appropiate number of hotplug CPUs on the command line with additional_cpus=... or fix their BIOS to follow the convention in Documentation/x86-64/cpu-hotplug-spec Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 92934bcbf96bc9dc931c40ca5f1a57685b7b813b Author: Andi Kleen Date: Wed Jan 11 22:42:32 2006 +0100 [PATCH] i386/x86-64: Use input/output dependencies for bitops Noticed by Andreas Schwab Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 636aab5ce332d88a76362797a55804c7da643467 Author: Andi Kleen Date: Wed Jan 11 22:42:29 2006 +0100 [PATCH] x86_64: No need to remove NT during CPU setup head.S already clears EFLAGS completely. Following an i386 patch from Zachary Amsden. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1f6818b90dbb887261c616a318733703ed526f0a Author: Andi Kleen Date: Wed Jan 11 22:42:26 2006 +0100 [PATCH] x86_64: Minor GFP_DMA32 comment fix Pretty obvious Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8b1bde93175182d7c11d9a1230b2210a5815e747 Author: Jan Beulich Date: Wed Jan 11 22:42:23 2006 +0100 [PATCH] x86_64: Adjust page fault handling Adjust page fault protection error check before considering it to be a vmalloc synchronization candidate. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 505cc4e1d6885acaee008950ac9c6e838f2209f8 Author: Jan Beulich Date: Wed Jan 11 22:42:20 2006 +0100 [PATCH] x86_64: Remove unprotected iret Make sure no iret can fault without attached recovery code. Cannot happen in the normal case, but might be useful with kernel debuggers Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit eca37c18beb306dd9dea4579d7214e1b4414b3fb Author: Jan Beulich Date: Wed Jan 11 22:42:17 2006 +0100 [PATCH] x86_64: Clean up double fault handling Since a double fault always implies that kernel data structures are corrupt, this fault should neither be handed to user mode handling, nor should the handler allow resuming the faulting code stream (since architecturally this isn't a fault, but an abort). Note that this slightly depends on the previously submitted patch adjusting the prototype of notify_die() (a compiler warning will result without that other patch). AK: Removed obsolete CONFIG_CHECKING code, added comments Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6e3f361781573a27296c77a79c9892dec8f2e36c Author: Jan Beulich Date: Wed Jan 11 22:42:14 2006 +0100 [PATCH] x86_64: make trap information available to die notification handlers This adjusts things so that handlers of the die() notifier will have sufficient information about the trap currently being handled. It also adjusts the notify_die() prototype to (again) match that of i386. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5c617cfa6422bfba9e79d8d004303a6cc3d2e7d7 Author: Jan Beulich Date: Wed Jan 11 22:42:11 2006 +0100 [PATCH] x86_64: Removing unused function die_if_kernel(). Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0a5215882166dd33a95b313637dd318e4c143113 Author: Jan Beulich Date: Wed Jan 11 22:42:08 2006 +0100 [PATCH] x86_64: fix bound check IDT gate Other than apparently commonly assumed, the bound instruction does not require the corresponding IDT entry to have DPL 3. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6e0c47ede7b1473a4e2ab65a0fecf0385ab23c03 Author: Jan Beulich Date: Wed Jan 11 22:42:05 2006 +0100 [PATCH] x86_64: Separate CONFIG_UNWIND_INFO from CONFIG_DEBUG_INFO As a follow-up to the introduction of CONFIG_UNWIND_INFO, this separates the generation of frame unwind information for x86-64 from that of full debug information. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 130951ccb14167c20b87e8bed52b60864ed53c2b Author: Andi Kleen Date: Wed Jan 11 22:42:02 2006 +0100 [PATCH] x86_64: Support constant TSC feature in future AMD CPUs. Based on the documentation recently posted by Richard Brunner. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2765130b020c22f803afba74772f33f2ad13bf28 Author: Jan Beulich Date: Wed Jan 11 22:41:59 2006 +0100 [PATCH] x86_64: More CFI fixes for 32bit entry code Frame unwind information was still incorrect for ia32_ptregs_common (sorry, my fault), and could be improved for some of the other entry points. Signed-Off-By: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6076399e9561a92388ed320dc7105595f8db1ba9 Author: Andi Kleen Date: Wed Jan 11 22:41:56 2006 +0100 [PATCH] x86_64: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8d8706e2f86d28814c1b40a116ffdeca35e4c949 Author: Andrew Morton Date: Wed Jan 11 12:17:49 2006 -0800 [PATCH] lindent rio drivers Run all rio files through indent -kr -i8 -bri0 -l255, as requested by Alan. rioboot.c and rioinit.c were skipped due to worrisome lindent warnings. Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9415644583ef344e02f84faf5fe24bfadb2af8e Author: Randy Dunlap Date: Wed Jan 11 12:17:48 2006 -0800 [PATCH] capable/capability.h (arch/) arch: Use where capable() is used. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4fc268d24ceb9f4150777c1b5b2b8e6214e56b2b Author: Randy Dunlap Date: Wed Jan 11 12:17:47 2006 -0800 [PATCH] capable/capability.h (net/) net: Use where capable() is used. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 16f7e0fe2ecc30f30652e8185e1772cdebe39109 Author: Randy Dunlap Date: Wed Jan 11 12:17:46 2006 -0800 [PATCH] capable/capability.h (fs/) fs: Use where capable() is used. Signed-off-by: Randy Dunlap Acked-by: Tim Schmielau Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c59ede7b78db329949d9cdcd7064e22d357560ef Author: Randy.Dunlap Date: Wed Jan 11 12:17:46 2006 -0800 [PATCH] move capable() to capability.h - Move capable() from sched.h to capability.h; - Use where capable() is used (in include/, block/, ipc/, kernel/, a few drivers/, mm/, security/, & sound/; many more drivers/ to go) Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e16885c5ad624a6efe1b1bf764e075d75f65a788 Author: Ingo Molnar Date: Wed Jan 11 12:17:45 2006 -0800 [PATCH] uninline capable() Uninline capable(). Saves 2K of kernel text on a generic .config, and 1K on a tiny config. In addition it makes the use of capable more consistent between CONFIG_SECURITY and !CONFIG_SECURITY Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9fad4cc3975573a359a92ad047f5995d8391631 Author: Matt Domsch Date: Wed Jan 11 12:17:44 2006 -0800 [PATCH] ipmi: use CONFIG_DMI instead of CONFIG_X86 With Andi Kleen's x86_64 patch to use DMI, and my ia64 to use DMI, there is now a new CONFIG_DMI option which takes the place of CONFIG_X86 to denote the availability of the DMI functions. Make the IPMI driver use CONFIG_DMI instead. Tested on ia64 2.6.15 kernel plus the previous patch, on a Dell PowerEdge 7250 Itanium2 server, and it now autodetects the IPMI KCS driver as expected. Signed-off-by: Matt Domsch Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c908a74d90e693d9079f4238012d43b06231a70 Author: Jesper Juhl Date: Wed Jan 11 12:17:43 2006 -0800 [PATCH] remove unused out_pio label in i810_audio sound/oss/i810_audio.c:3431: warning: label `out_pio' defined but not used Signed-off-by: Jesper Juhl Signed-off-by: Linus Torvalds commit eb3a72921c8276bf2cd028a458bb83435f16c91c Author: Keshavamurthy Anil S Date: Wed Jan 11 12:17:42 2006 -0800 [PATCH] kprobes: fix race in recovery of reentrant probe There is a window where a probe gets removed right after the probe is hit on some different cpu. In this case probe handlers can't find a matching probe instance related to break address. In this case we need to read the original instruction at break address to see if that is not a break/int3 instruction and recover safely. Previous code had a bug where we were not checking for the above race in case of reentrant probes and the below patch fixes this race. Tested on IA64, Powerpc, x86_64. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df019b1d8b893d0f0ee5a9b0f71486f0892561ae Author: Keshavamurthy Anil S Date: Wed Jan 11 12:17:41 2006 -0800 [PATCH] kprobes: fix unloading of self probed module When a kprobes modules is written in such a way that probes are inserted on itself, then unload of that moudle was not possible due to reference couning on the same module. The below patch makes a check and incrementes the module refcount only if it is not a self probed module. We need to allow modules to probe themself for kprobes performance measurements This patch has been tested on several x86_64, ppc64 and IA64 architectures. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef43bc4fc32bec8fda7bae8948b774616dc9e496 Author: Jan Kara Date: Wed Jan 11 12:17:40 2006 -0800 [PATCH] reiserfs: fix assertion failure in reiserfs+journaled quotas Sometimes we call do_journal_end() with t_refcount == 0. If quota is turned on and we happen to have some inode with preallocation bad things happen as we try to use the current handle for quota operations. Checks for t_refcount in journal_begin() fail and we Oops. We raise t_refcount to make those checks happy. We should not cause any bad as all the needed quota blocks should be already attached to the transaction (they were attached to the transaction when we allocated those preallocation blocks). Signed-off-by: Jan Kara Cc: Jeff Mahoney Cc: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c8365ecc57f87e4d982c3fe59a4c1b985484e7f Author: Paul Fulghum Date: Wed Jan 11 12:17:39 2006 -0800 [PATCH] synclink_gt remove unnecessary page alignment Remove unnecessary and incorrectly implemented page alignment of register base address before calling ioremap() Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d251575ab60ca2b5337574bfaf8f8b583f18059e Author: Stephen Hemminger Date: Wed Jan 11 12:17:38 2006 -0800 [PATCH] random: get rid of sparse warning Get rid of bogus extern attribute that causes sparse warning. Signed-off-by: Stephen Hemminger Acked-by: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c174af880d02f29599178284bb43f8d4f0fdcd8 Author: Alan Cox Date: Wed Jan 11 12:17:37 2006 -0800 [PATCH] MAINTAINERS: remove dead project Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e9e3941d0a3497c1e7fb9ce62059705825bb775 Author: Vivek Goyal Date: Wed Jan 11 12:17:37 2006 -0800 [PATCH] kdump: vmcore compilation warning fix o fs/proc/vmcore.c compilation gives warnings on ppc64. The reason being that u64 is defined as unsigned long hence u64* is not same as loff_t* and compiler cribs. o Changed the parameter type to u64* instead of loff_t* to resolve the conflict. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd85d765b75db608500c783e5bc41b63627957c8 Author: Jean Delvare Date: Wed Jan 11 12:17:36 2006 -0800 [PATCH] cs89x0: Fix the Kconfig help text Fix the help text of the cs89x0 network driver Kconfig entry. Signed-off-by: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91e1c46356beddf984ce0ce5ec4fbaea43a07ec8 Author: Lennert Buytenhek Date: Wed Jan 11 12:17:34 2006 -0800 [PATCH] cs89x0: fix setting of ALLOW_DMA There's an ifdef in cs89x0.c that seems to have been the wrong way round since it was merged (and noone seems to have noticed) -- the IXDP2x01 doesn't support ISA-style DMA, but when building for IXDP2x01, cs89x0's ALLOW_DMA is set to 1, and when building for another platform, ALLOW_DMA is set to 0. Signed-off-by: Lennert Buytenhek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ab2495a30bb3de1cfe41a886f83afb68616ab7d Author: Alan Cox Date: Wed Jan 11 12:17:33 2006 -0800 [PATCH] tclk: fix typos, exclamation mark frenzy and missing device id on messages I sent this out a couple of months ago and the driver author said it he'd merge it. Nothing has happened since so I'm submitting it directly. No functionality changes just texts. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7599587faea9403edf4d7f74e80b3c9ea217930 Author: Alan Cox Date: Wed Jan 11 12:17:32 2006 -0800 [PATCH] Allow reading CMOS day of week register Someone wanted access to this usually unused (and unused by Linux) value for the day of week. Existing kernels have the field in the struct but return 0 always. This updates the kernel to fill in the field. The usual case of 'not set' conveniently is 0. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e56d5ae305b9be17edfee20740ec84257e518747 Author: Tore Anderson Date: Wed Jan 11 12:17:31 2006 -0800 [PATCH] ext3: fix documentation of online resizing Undocument the non-working resize= mount option in ext3, and add some references to the ext2resize package instead, which appears to be the only proper way of doing online resizing of ext3 filesystems. Signed-off-by: Tore Anderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75ba0861bcc64634166124f164dcc05b6393c0ee Author: Akinobu Mita Date: Wed Jan 11 12:17:31 2006 -0800 [PATCH] doc: refer to kdump in oops-tracing.txt Kdump has been merged and supported on several architectures. It is better to encourage to use kdump rather than non standard kernel crash dump patches. Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8428cfe893c1f13eb22cd879669f12b65900738f Author: Akinobu Mita Date: Wed Jan 11 12:17:30 2006 -0800 [PATCH] kdump: add dmesg gdbmacro into document Add gdb macro which print the kernel ring buffer into kdump docs Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit beb25c6e27b21d0c0f7b9c2769fa334f1f9a8c2c Author: Jeff Dike Date: Wed Jan 11 12:17:29 2006 -0800 [PATCH] uml: kill an unused variable The HDIO_GETGEO patch left an unused variable in the UML block driver. This gets rid of it. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 621009f4baf24581211dbb7b0816e01ed9fa8496 Author: Jeff Dike Date: Wed Jan 11 12:17:28 2006 -0800 [PATCH] uml: fix debug output on x86_64 The debug-stub patch was broken on x86_64 because it thinks the frame size there is 168 words. In reality, it is 168 bytes, and using HOST_FRAME_SIZE, which is expressed in consistent units across architectures, fixes this. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a174b30e2963a02e9657f4ac69b2b500993bf0d4 Author: Jeff Dike Date: Wed Jan 11 12:17:28 2006 -0800 [PATCH] uml: eliminate doubled boot output CON_PRINTBUFFER was a bad idea for the mconsole console. It causes the boot output to be printed twice. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit edc0e6595616db3f34229077f30eb0616d1e0b84 Author: Jeff Dike Date: Wed Jan 11 12:17:27 2006 -0800 [PATCH] uml: revert compile-time option checking Undo the previous no-modes patch since Adrian Bunk sent in a kbuild way of doing the same thing. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 114d1ff4f551c8cc940de71b03c5b7365b4124f5 Author: Jeff Dike Date: Wed Jan 11 12:17:26 2006 -0800 [PATCH] uml: update Kconfig help The MODE_TT help was a little outdated. This updates it in light of the existence of skas0 mode. It's also turned off by default since it is mostly obsoleted by skas0 mode. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ee189a9260849ebacbdd3caf1fd5eb077fcf6a9 Author: Jeff Dike Date: Wed Jan 11 12:17:23 2006 -0800 [PATCH] uml: fix missing KBUILD_BASENAME 2.6.15-mm1 caused kernel-offsets.c to stop compiling with a syntax error in a header. The problem was with KBUILD_BASENAME, which didn't get a definition with the by-hand compilation in the main UML Makefile. This was OK before since the expansion was syntactically the same as the KBUILD_BASENAME token. With -mm1, the expansion is now a quote-delimited string, so there needs to be a definition of it. Since kernel-offsets.c is basically the same as other arches' asm-offsets.c, and those seem to build OK, this patch turns kernel-offsets.c into asm-offsets.c. kernel-offsets.c is in arch/um/sys-$(SUBARCH), i.e. sys-i386 and sys-x86_64, while kbuild expects it to be in arch/um/kernel. kernel-offsets.c is moved to arch/um/include/sysdep-$(SUBARCH)/kernel-offsets.h, which is included by arch/um/kernel/asm-offsets.c. With that, include/asm-um/asm-offsets.h is generated automatically. kernel-offsets.h continues to exist because it needs to be accessible to userspace UML code, and include/asm-um isn't. So, a symlink is made from arch/um/include/kernel-offsets.h to include/asm-um/asm-offsets.h. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10b5aabddd1e8f26fdccc56666ddcad653e02fd6 Author: Adrian Bunk Date: Wed Jan 11 12:17:20 2006 -0800 [PATCH] include/asm-h8300/page.h: remove unused KTHREAD_SIZE #define Signed-off-by: Adrian Bunk Cc: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4eac915d02453e81a32595cd7423492c81337a26 Author: Paul Jackson Date: Wed Jan 11 12:17:19 2006 -0800 [PATCH] mm: gfp_atomic comments Clarify in comments that GFP_ATOMIC means both "don't sleep" and "use emergency pools", hence both ALLOC_HARDER and ALLOC_HIGH. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7365f3d169a1eae00e713c1a4eea90e86415dcc5 Author: Hugh Dickins Date: Wed Jan 11 12:17:18 2006 -0800 [PATCH] Restore KERN_EMERG to each line printed by bad_page Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9cfc08d640e1586e76eee63cc2b0a9360bc7c7e Author: Adrian Bunk Date: Wed Jan 11 23:57:55 2006 -0200 V4L/DVB (3354): VIDEO_SAA7134_ALSA shouldn't select SND_PCM_OSS - There's no reason for an ALSA driver to select an OSS legacy userspace interface. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit a113bc787e9b0e792f316e803b619d31af1397ad Author: Guy Martin Date: Wed Jan 11 23:40:51 2006 -0200 V4L/DVB (3352): Some fixes to compat_ioctl32 - Adds suppport or fix support for VIDIOC_ENUMSTD, VIDIOC_ENUMINPUT, VIDIOC_G_TUNER and VIDIOC_S_TUNER. - Fix the warnings at compile time and add checks for the pointer validity using access_ok(). - v4l_print_ioctl() has also be added to identify possible missing ioctls. - Has been tested on sparc64 and amd64. Other arches such as mips and hppa are expected to work as sparc, but not tested yet. Signed-off-by: Guy Martin Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab commit f8bf134d5f697311c04e867b6733d047a4b55a12 Author: Regis Prevot Date: Wed Jan 11 23:31:53 2006 -0200 V4L/DVB (3351): adding support for knc1 Tv Star dvb-s - Added knc1 tv star dvb-s support with philips tuner sd1878. Signed-off-by: Regis Prevot Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit ac9ffb90b8d0d28e3d9e5b5a045ee870a6269b5f Author: Michael Krufky Date: Wed Jan 11 23:21:00 2006 -0200 V4L/DVB (3350): Added USB ID for DigitalNow DVB-T Dual USB, DViCO clone - Added USB ID for DigitalNow DVB-T Dual USB, DViCO FusionHDTV DVB-T Dual USB clone Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 6bfb2e1f19a3fb68cf82f6ad44c34f4bcf9d4e9f Author: Michael Krufky Date: Wed Jan 11 22:52:28 2006 -0200 V4L/DVB (3349): Add PCI ID for UltraView DVB-T Plus, rebranded DViCO FusionHDTV DVB-T Plus - Add PCI ID for UltraView DVB-T Plus,rebranded DViCO FusionHDTV DVB-T Plus Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit b5fc71440f63f653d86c75c2930fe22ad84c909d Author: Hans Verkuil Date: Wed Jan 11 22:41:36 2006 -0200 V4L/DVB (3348): debug renamed to cx25840_debug - Debug var renamed to cx25840 to avoid conflicts with other var with the same name at kernel Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit bb7e8c5a55c1f5d4192f4b61a84a791796ebf0c3 Author: Adrian Bunk Date: Wed Jan 11 16:40:30 2006 -0800 [PKT_SCHED] net/sched/Kconfig: fix typo in NET_EMATCH_META description Noted by Matt LaPlante . Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 54608b709963b4f474ea26c1a087409eb0d9bebf Author: Evgeniy Polyakov Date: Wed Jan 11 16:13:46 2006 -0800 [PKT_SCHED] ematch: Remove bogus include. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c3f343e4d7b99638b8a4f05c12b542d32405cfc4 Author: Evgeniy Polyakov Date: Wed Jan 11 16:12:41 2006 -0800 [NET]: Fix diverter build. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 8b3a70058bfe711b2d05ba2134178bae623183ce Author: Kris Katterjohn Date: Wed Jan 11 15:56:43 2006 -0800 [NET]: Remove more unneeded typecasts on *malloc() This removes more unneeded casts on the return value for kmalloc(), sock_kmalloc(), and vmalloc(). Signed-off-by: Kris Katterjohn Acked-by: James Morris Signed-off-by: David S. Miller commit ae0f7d5f83236a43c572a744e4bbb30e8702d821 Author: David Woodhouse Date: Wed Jan 11 15:53:04 2006 -0800 [IPV6]: Avoid calling ip6_xmit() with NULL sk The ip6_xmit() function now assumes that its sk argument is non-NULL, which isn't currently true when TCPv6 code is sending RST or ACK packets. This fixes that code to use a socket of its own for sending such packets, as TCPv4 does. (Thanks Andi for the pointer). Signed-off-by: David Woodhouse Signed-off-by: David S. Miller commit a7768097557be91d0d4c37e8f2e38cd126c4cdf9 Author: David S. Miller Date: Wed Jan 11 15:39:14 2006 -0800 [NETFILTER]: ip_ct_proto_gre_fini() cannot be __exit It is invoked from failures paths of __init code. Signed-off-by: David S. Miller commit 82bf7e97ac5b9fd03aea10df6910cad50d6c032d Author: David S. Miller Date: Wed Jan 11 15:38:28 2006 -0800 [NET]: Some more missing include/etherdevice.h includes For compare_ether_addr() Signed-off-by: David S. Miller commit 607f4e3864a4306be0d0ad11ff34284c239aad1b Author: Paul Fulghum Date: Wed Jan 11 17:51:48 2006 -0600 [PATCH] new tty buffering access fix Fix typos in new tty buffering that incorrectly access and update buffers in pending queue. Signed-off-by: Paul Fulghum Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 61943c5015acae42fe355bf033bbee8d63691fe3 Author: Adrian Bunk Date: Wed Jan 11 15:55:23 2006 -0800 [SPARC64] arch/sparc64/Kconfig: fix HUGETLB_PAGE_SIZE_64K dependencies This patch fixes a typo in the dependencies of HUGETLB_PAGE_SIZE_64K. It might be more logical to rename the HUGETLB_PAGE_SIZE_*K dependencies to HUGETLB_PAGE_SIZE_*KB, but let's fix this bug first. This bug was reported by Jean-Luc Leger . Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 4cec87361462d570d6a67888feda41e77e0a9562 Author: Linus Torvalds Date: Wed Jan 11 15:50:47 2006 -0800 Fix mutex_trylock() copy-and-paste bug (x86, x86-64, generic mutex-dec.h) Noticed by Arjan originally on x86-64, then Ingo on x86, and finally me grepping for it in the generic version. Bad parenthesis nesting. Signed-off-by: Linus Torvalds commit 0d1335b3106687d87fcfa0e4d90f2a961bd7e1db Author: Nathan Scott Date: Thu Jan 12 10:32:51 2006 +1100 [XFS] Fix follow_link when dealing with symlinks larger than 256 bytes. Thanks to Yamamoto Takashi. SGI-PV: 947953 SGI-Modid: xfs-linux-melb:xfs-kern:24962a Signed-off-by: Nathan Scott commit 3762ec6bf76cdd32653c409dbad09f7b85807c68 Author: Nathan Scott Date: Thu Jan 12 10:29:53 2006 +1100 [XFS] Merge in trivial changes, sync up headers with userspace equivalents. SGI-PV: 907752 SGI-Modid: xfs-linux-melb:xfs-kern:24961a Signed-off-by: Nathan Scott commit f9195ded25a4e8fba09c67aa24b42cd98a242d7d Author: Hans Verkuil Date: Wed Jan 11 19:01:01 2006 -0200 V4L/DVB (3347): Fixes some bad global variables - Debug global var is already used inside kernel, so renamed debug to tuner_debug for the tuner module Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f167cb4e6ee07914b66eb85fc0bf006a409b6838 Author: Mauro Carvalho Chehab Date: Wed Jan 11 19:41:49 2006 -0200 V4L/DVB (3345): Fixes some bad global variables - Debug global var is already used inside kernel. - v4l_dbg now expects the debug var - global vars inside msp34xx renamed to msp_* Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab commit b2a17e47ceb82d23dbf5c5fb24b5377e21486dce Author: Jiri Slaby Date: Wed Jan 11 19:41:40 2006 -0200 V4L/DVB (3344f): Stradis Kconfig url changed http://www.stradis.com/decoder.html returns `No input file specified.' Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit f823f6793659e63f9f22d3d7617a457806d6d69a Author: Jiri Slaby Date: Wed Jan 11 19:41:32 2006 -0200 V4L/DVB (3344e): Stradis Lindent Stradis Lindent + some handwork Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 91fb8357c3e097a46eb6e92d03b284182172ce80 Author: Jiri Slaby Date: Wed Jan 11 19:41:21 2006 -0200 V4L/DVB (3344d): Stradis video little cleanup Unused function removed. Used container_of instead of for loop. Some small changes Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 9ae82293ff3a3057d939b4f56d57eeea2f91bbec Author: Jiri Slaby Date: Wed Jan 11 19:41:13 2006 -0200 V4L/DVB (3344c): Pci probing for stradis driver - Pci probing functions added, some functions were rewritten. - Use PCI_DEVICE macro. - dev_ used for printing when pci_dev available. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit d4437d3fada351d7f40bcc48a62c12b92e2ad9d8 Author: Arthur Othieno Date: Wed Jan 11 19:41:04 2006 -0200 V4L/DVB (3344b): don't ignore return from i2c_add_driver() for tuner-3036 The call to i2c_add_driver() may actually fail, but tuner-3036 ignores this and always returns 0, regardless. Fix it up so it returns what i2c_add_driver() does, instead. Signed-off-by: Arthur Othieno Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 7408187d223f63d46a13b6a35b8f96b032c2f623 Author: Panagiotis Issaris Date: Wed Jan 11 19:40:56 2006 -0200 V4L/DVB (3344a): Conversions from kmalloc+memset to k(z|c)alloc Conversions from kmalloc+memset to k(z|c)alloc. Signed-off-by: Panagiotis Issaris Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 0b3af1b6df82cfdb54ae294ed860263011fa0408 Author: Ricardo Cerqueira Date: Wed Jan 11 19:40:45 2006 -0200 V4L/DVB (3344): Enable microtune for Pinnacle 300i boards - The Pinnacle 300i (like the PCTV Stereo) needs tda9887 port2 set to 1 for the tuner to work Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab commit 6f44725986df6959058b4a0fc35dd215ef16f24a Author: Michael Krufky Date: Wed Jan 11 19:40:33 2006 -0200 V4L/DVB (3343): Add support for DViCO FusionHDTV DVB-T USB devices - Add support for DViCO FusionHDTV DVB-T USB devices (Thomson dtt7579 and LG z201 based) Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit ca08ca01fdf0c944a04d35c2dc05dd3498f6c80e Author: Michael Krufky Date: Wed Jan 11 19:40:25 2006 -0200 V4L/DVB (3342): More whitespace cleanup in bttv-cards.c - More whitespace cleanup in bttv-cards.c Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit bc28636ad37717c53d3247964164cf7ca1aff9d7 Author: Michael Krufky Date: Wed Jan 11 19:40:17 2006 -0200 V4L/DVB (3341): whitespace cleanup: insert missing space before curly brackets - whitespace cleanup: insert missing space before curly brackets Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2d05ae6b5b77f063aa0f82cf0570f3e4b80b367c Author: Julian Calaby Date: Wed Jan 11 19:40:09 2006 -0200 V4L/DVB (3340): Add bttv card MagicTV (rebranded MachTV) - Add bttv card MagicTV (rebranded MachTV) Signed-off-by: Julian Calaby Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 30367bfda384ccb96c0fe35aaa001c7624e9fd01 Author: Chris Pascoe Date: Wed Jan 11 19:40:01 2006 -0200 V4L/DVB (3339): Activate remote control on HVR1100 - Add a missing case which was preventing the operation of the HVR1100 remote. Signed-off-by: Chris Pascoe Signed-off-by: Mauro Carvalho Chehab commit 78bfe0b5b67fe126ed98608e42e42fb6ed9aabd4 Author: Michael S. Tsirkin Date: Wed Jan 11 11:47:34 2006 -0800 IPoIB: Take dev->xmit_lock around mc_list accesses dev->mc_list accesses must be protected by dev->xmit_lock. Found by Eli Cohen . Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit a4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 Author: David Woodhouse Date: Wed Jan 11 14:41:26 2006 +0000 [PATCH] fix/simplify mutex debugging code Let's switch mutex_debug_check_no_locks_freed() to take (addr, len) as arguments instead, since all its callers were just calculating the 'to' address for themselves anyway... (and sometimes doing so badly). Signed-off-by: David Woodhouse Acked-by: Ingo Molnar Signed-off-by: Linus Torvalds commit aab8df141fdc4c4c9587521a24b6865390eaeb79 Author: Dave Airlie Date: Wed Jan 11 22:32:51 2006 +1100 drm: cleanup properly on drm module unload Cleanup multiple cards properly Signed-off-by: Dave Airlie commit 6ab65429b4871c42bfd0013f7f5e49d40c0642cd Author: Nathan Scott Date: Wed Jan 11 21:03:28 2006 +1100 [XFS] Fix compiler warnings from older gcc versions wrt printfalike arguments. SGI-PV: 907752 SGI-Modid: xfs-linux-melb:xfs-kern:24901a Signed-off-by: Nathan Scott commit ca5ccbf98d792d8727e893765cc2df479ba399f2 Author: Nathan Scott Date: Wed Jan 11 21:03:04 2006 +1100 [XFS] Fix some build fallout from atime changes. SGI-PV: 946679 SGI-Modid: xfs-linux-melb:xfs-kern:24899a Signed-off-by: Nathan Scott commit 1259845d3f3e1d1cf96b2a78f3aec824b9d1e109 Author: Tim Shimmin Date: Wed Jan 11 21:02:47 2006 +1100 [XFS] remove XFS_LOG_RES_DEBUG and turn on the res history all the time to get more useful error info on space for trans items SGI-PV: 947110 SGI-Modid: xfs-linux-melb:xfs-kern:24886a Signed-off-by: Tim Shimmin Signed-off-by: Nathan Scott commit 71df099dc3f9cd17e8564eb647d7c1fb2ee83e2d Author: Yingping Lu Date: Wed Jan 11 21:02:29 2006 +1100 [XFS] xfssyncd is responsible for flushing inode or device's data by extracting the work from its queue. In addition, this processing also decrement the inode's i_count. If there are any remaining works in queue before this process terminates, we have unbalanced increment and decrement of i_count. Thus it can cause assertion failure of vn_count. The fix allows xyssyncd to process any remaining work before it is shutdown. SGI-PV: 945935 SGI-Modid: xfs-linux-melb:xfs-kern:203970a Signed-off-by: Yingping Lu Signed-off-by: Nathan Scott commit 75e17b3caf29b262000dc7348f1be9a7d5403463 Author: Christoph Hellwig Date: Wed Jan 11 20:58:44 2006 +1100 [XFS] add helper to get xfs_inode from vnode SGI-PV: 947206 SGI-Modid: xfs-linux-melb:xfs-kern:203960a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 204ab25f36fbd44a24458c0227cf2629c8caf00d Author: Nathan Scott Date: Wed Jan 11 20:50:22 2006 +1100 [XFS] Fix up offset type inconsistencies and gcc warnings from earlier changes. SGI-PV: 947038 SGI-Modid: xfs-linux-melb:xfs-kern:24875a Signed-off-by: Nathan Scott commit da7f93e9eec0885317351eb8a20cc550ed48f470 Author: Christoph Hellwig Date: Wed Jan 11 20:49:57 2006 +1100 [XFS] fix up per-device xfsbufd SGI-PV: 947098 SGI-Modid: xfs-linux-melb:xfs-kern:203831a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit f5e596bbef3b0fa583c66c5a83dc9737c0fe2610 Author: Christoph Hellwig Date: Wed Jan 11 20:49:42 2006 +1100 [XFS] fix writeback control handling fix a reversed condition on where to trylock and deal with block layer congestion properly. Patch from David Chinner and Christoph Hellwig. SGI-PV: 947118 SGI-Modid: xfs-linux-melb:xfs-kern:203830a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 6c4fe19f66a839bce68fcb7b99cdcb0f31c7a59e Author: Christoph Hellwig Date: Wed Jan 11 20:49:28 2006 +1100 [XFS] cluster rewrites We can cluster mapped pages aswell, this improves performances on rewrites since we can reduce the number of allocator calls. SGI-PV: 947118 SGI-Modid: xfs-linux-melb:xfs-kern:203829a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 7336cea8c2737bbaf0296d67782f760828301d56 Author: Christoph Hellwig Date: Wed Jan 11 20:49:16 2006 +1100 [XFS] pass full 64bit offsets to xfs_add_to_ioend SGI-PV: 947118 SGI-Modid: xfs-linux-melb:xfs-kern:203828a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit d5cb48aaac5bba1721bce3232e6fb022ade2c0b7 Author: Christoph Hellwig Date: Wed Jan 11 20:49:02 2006 +1100 [XFS] consolidate some code in xfs_page_state_convert The unmapped buffer case is very similar to delayed and unwritten extends. Reorganize the code to share some code for these cases. SGI-PV: 947118 SGI-Modid: xfs-linux-melb:xfs-kern:203827a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 9260dc6b2ee011f728bae50edce11022567be096 Author: Christoph Hellwig Date: Wed Jan 11 20:48:47 2006 +1100 [XFS] various fixes for xfs_convert_page fix various bogusities in handling offets From David Chinner and Christoph Hellwig SGI-PV: 947118 SGI-Modid: xfs-linux-melb:xfs-kern:203826a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 1defeac9d4fffa3eabc4fba887e8ff5b1da7f361 Author: Christoph Hellwig Date: Wed Jan 11 20:48:33 2006 +1100 [XFS] clean up the xfs_offset_to_map interface Currently we pass a struct page and a relative offset into that page around, and returns the current xfs_iomap_t if the block at the specified offset fits into it, or a NULL pointer otherwise. This patch passed the full 64bit offset into the inode that all callers have anyway, and changes the return value to a simple boolean. Also the function gets a more descriptive name: xfs_iomap_valid. SGI-PV: 947118 SGI-Modid: xfs-linux-melb:xfs-kern:203825a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 10ce444428c2329eb2aaf84850b5c7c09cecc58c Author: Christoph Hellwig Date: Wed Jan 11 20:48:14 2006 +1100 [XFS] use pagevec lookups This reduces the time spend in the radix tree lookups and avoids unessecary look roundtrips. SGI-PV: 947118 SGI-Modid: xfs-linux-melb:xfs-kern:203823a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 8d2ea6258123d7a92a1f6ec638a8cad4a0604c43 Author: Dave Airlie Date: Wed Jan 11 20:48:09 2006 +1100 drm: fixup drm bufs being just under the EOM If the mapping was just under the end of memory it would fail. Lets DRM start on my PCI card. Signed-off-by: Dave Airlie commit 78539fdfa4c21308e90c596f060df8114483862a Author: Christoph Hellwig Date: Wed Jan 11 20:47:41 2006 +1100 [XFS] Export pagevec_lookup for use on the XFS page writeout path, for dealing with delayed allocate and unwritten extents (as well). Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 97b1b999748d3cde6a3f381e0839e0f1082323e6 Author: Michael Ellerman Date: Wed Jan 11 16:41:29 2006 +1100 [PATCH] powerpc: Don't build crash.c for PPC32 arch/powerpc/kernel/crash.c isn't safe for PPC32 (yet?), so don't build it. Built with CONFIG_KEXEC=y for pmac32_defconfig, pseries_defconfig, and g5_defconfig. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit a8b9ee7396ccc8db3bdb4108993556acbe2d3527 Author: David S. Miller Date: Wed Jan 11 00:15:16 2006 -0800 [MUTEX]: linux/mutex.h needs linux/linkage.h too Signed-off-by: David S. Miller commit 886c98d78652f78a64cb21516d3b25ffd5c05e94 Author: Kumar Gala Date: Tue Jan 10 22:36:37 2006 -0600 [PATCH] powerpc: Fix clean_files in arch/powerpc/boot Makefile clean-files was being set twice rather than being appended to. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit c38a04b1ba67e488d94ec680a7dddd4e32d6ddfb Author: Paul Mackerras Date: Wed Jan 11 16:27:21 2006 +1100 powerpc/32: Fix compile error caused by pud_t/pgt_t confusion PPC32 is still using asm-generic/4level-fixup.h, but asm-powerpc/page.h was defining pud_t and pgd_t. Depending on the order in which files got included, this could result in a compilation error. Tweak the ifdef so that page.h doesn't try to define pud_t on ppc32 (which uses 2-level page tables). Signed-off-by: Paul Mackerras commit d274ba2081cce6ff59f94e608a348f20ba1fe775 Author: Linus Torvalds Date: Tue Jan 10 21:09:19 2006 -0800 x86: fix "make install" target Removing the dependency on the boot image build was good, but it also meant that the $< expansion by make needed to be done explicitly. Noted by Stephen Hemminger. Signed-off-by: Linus Torvalds commit 5bf887f2ff874e2cd881c34bbed974bee2c90808 Author: David S. Miller Date: Tue Jan 10 21:02:21 2006 -0800 [IPV6]: Fix modular build with netfilter enabled. Also, drop __exit marker from ipv6_netfilter_fini() as this can be invoked from inet6_init() error handling paths. Based upon a report from Stephen Hemminger. Signed-off-by: David S. Miller commit f6d6d4fcd180f8e47bf6b13fc6cce1e6c156d0ea Author: Christoph Hellwig Date: Wed Jan 11 15:40:13 2006 +1100 [XFS] Initial pass at going directly-to-bio on the buffered IO path. This allows us to submit much larger I/Os instead of sending down lots of small buffer_heads. To do this we need to have a rather complicated I/O submission and completion tracking infrastructure. Part of the latter has been merged already a long time ago for direct I/O support. Part of the problem is that we need to track sub-pagesize regions and for that we still need buffer_heads for the time beeing. Long-term I hope we can move to better data strucutures and/or maybe move this to fs/mpage.c instead of having it in XFS. Original patch from Nathan Scott with various updates from David Chinner and Christoph Hellwig. SGI-PV: 947118 SGI-Modid: xfs-linux-melb:xfs-kern:203822a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit ce8e922c0e79c8093452ba9a124981332b75706b Author: Nathan Scott Date: Wed Jan 11 15:39:08 2006 +1100 [XFS] Complete the pagebuf -> xfs_buf naming convention transition, finally. SGI-PV: 947038 SGI-Modid: xfs-linux-melb:xfs-kern:24866a Signed-off-by: Nathan Scott commit 68bdb6eabcd2869caa795019961a5445a11b5bc1 Author: Yingping Lu Date: Wed Jan 11 15:38:31 2006 +1100 [XFS] Fixed delayed_blks assert failure during umount. The delayed_blks was caused by ENOSPC but not Rreclaimed by xfs_release or xfs_inactive. The fix changed the condition in xfs_release and xfs_inactive to invoke xfs_inactive_free_eofblocks for this special case, changed xfs_inactive_free_eofblocks to clean the delayed blks after eof. It also changed xfs_write to set correct eof when ENOSPC occurs. SGI-PV: 946267 SGI-Modid: xfs-linux-melb:xfs-kern:203788a Signed-off-by: Yingping Lu Signed-off-by: Nathan Scott commit a6867a6815fa0241848d4620f2dbd2954f4405d7 Author: David Chinner Date: Wed Jan 11 15:37:58 2006 +1100 [XFS] Introduce per-filesystem delwri pagebuf flushing to reduce contention between filesystems and prevent deadlocks between filesystems when a flush dependency exists between them. SGI-PV: 947098 SGI-Modid: xfs-linux-melb:xfs-kern:24844a Signed-off-by: David Chinner Signed-off-by: Nathan Scott commit 216d3b2acba469a9bee98a09bb957e012ba7bc25 Author: Tim Shimmin Date: Wed Jan 11 15:37:38 2006 +1100 [XFS] take out the call to vn_mark_bad() used when acl inherit fails and it needs to back out the inode creation. Tested by xfs_tests/077. SGI-PV: 930841 SGI-Modid: xfs-linux-melb:xfs-kern:24842a Signed-off-by: Tim Shimmin Signed-off-by: Nathan Scott commit 794fe2dc65f1ec4acacc388053bb52d32d3a932e Author: Christoph Hellwig Date: Wed Jan 11 15:37:17 2006 +1100 [XFS] endianess annotations and tidying for the uuid code SGI-PV: 943272 SGI-Modid: xfs-linux-melb:xfs-kern:203709a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 60a204f096dd67683f3993798e14905ee9828ba5 Author: Nathan Scott Date: Wed Jan 11 15:37:00 2006 +1100 [XFS] Fix a thinko when generating a forced shutdown stack trace. SGI-PV: 929558 SGI-Modid: xfs-linux-melb:xfs-kern:203817a Signed-off-by: Nathan Scott commit 0733af213f2859f7228229f3ac053c025f57d0d5 Author: Ryan Hankins Date: Wed Jan 11 15:36:44 2006 +1100 [XFS] Add a stack trace in the case of xfs_forced_shutdown. SGI-PV: 929558 SGI-Modid: xfs-linux-melb:xfs-kern:203701a Signed-off-by: Ryan Hankins Signed-off-by: Nathan Scott commit 77a7cce42509461067f49c484aee626f62162fbc Author: Nathan Scott Date: Wed Jan 11 15:35:57 2006 +1100 [XFS] Fix quotaoff logitem for project quota, affects log recovery only. SGI-PV: 946444 SGI-Modid: xfs-linux-melb:xfs-kern:24768a Signed-off-by: Nathan Scott commit c9c47b6e27ca49fb0eea6b021b4919cb2467c8e1 Author: Michael Ellerman Date: Wed Jan 11 15:27:25 2006 +1100 [PATCH] powerpc: Remove redundant setting of htab_address iSeries doesn't need to set the htab_address explicitly, htab_initialize() will do it for us later. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 446ada4a03808f128e8f28daa0f103dc69d22d5b Author: Nathan Scott Date: Wed Jan 11 15:35:44 2006 +1100 [XFS] Add an XFS callout to security_inode_init_security; SE Linux is not functional with XFS without this change. SGI-PV: 946762 SGI-Modid: xfs-linux-melb:xfs-kern:24766a Signed-off-by: Nathan Scott commit 7eb5476f68cd6c6e7a065083e1741a72a666ac6d Author: Michael Ellerman Date: Wed Jan 11 15:27:24 2006 +1100 [PATCH] powerpc: Add ibm,pft-size to iSeries device tree To make iSeries just a teensy bit less special, create ibm,pft-size properties in the iSeries device tree. We can then rely on htab_dt_scan_pftsize() to set ppc64_pft_size for us. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 0e5e39bfd811be4612a23242353b426ac6438e03 Author: Kumar Gala Date: Tue Jan 10 22:12:23 2006 -0600 [PATCH] powerpc: Add some missing .gitignore's ignore generated files under arch/powerpc Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit c2cd2550603d847b709035c4c6b666adf560d7b8 Author: Nathan Scott Date: Wed Jan 11 15:35:32 2006 +1100 [XFS] Fix v2 log bufsize reporting in /proc/mounts. SGI-PV: 946760 SGI-Modid: xfs-linux-melb:xfs-kern:24765a Signed-off-by: Nathan Scott commit 08264cbc9f4ded253e063ed4a804226b195e067c Author: Kumar Gala Date: Tue Jan 10 21:43:56 2006 -0600 [PATCH] powerpc: Updated Kconfig and Makefiles for 83xx support Updated Kconfig & Makefiles in prep for adding support for the Freescale MPC83xx family of processors to arch/powerpc. Moved around some config options that are more globally applicable to other PowerPC processors. Added a temporary config option (83xx) to match existing arch/ppc support for the MPC83xx line. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit 42fe2b1f7fe788ed5304a7bfa0a0b0db81bc03a8 Author: Christoph Hellwig Date: Wed Jan 11 15:35:17 2006 +1100 [XFS] fix, speedup and simplify atime handling let the VFS handle atime updates and only sync back to the xfs inode when nessecary SGI-PV: 946679 SGI-Modid: xfs-linux-melb:xfs-kern:203362a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 7f52eb009306b8047031eaf64169a7ce437a26e7 Author: Geoff Levand Date: Tue Jan 10 19:47:37 2006 -0800 [PATCH] spufs: Suspend/restore MFC DMA operations at SPU context switch. The SPE Book IV indicates that MFC DMA operations must be suspended and restored on SPU context switch (in Step 8). This patch adds that operation, which is missing from the current spufs implementation. Signed-off-by: Masato Noguchi Signed-off-by: Geoff Levand Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit dd954c69d189cd91571b42d3f926e70351395dc3 Author: Christoph Hellwig Date: Wed Jan 11 15:34:50 2006 +1100 [XFS] turn xlog helper macros into real functions SGI-PV: 946205 SGI-Modid: xfs-linux-melb:xfs-kern:203360a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 24ee80882deb5777aeee6f75a05f178ab8fbfa69 Author: Eric Sandeen Date: Wed Jan 11 15:34:32 2006 +1100 [XFS] remove unused vars, args, & unneeded intermediate vars from zeroing code SGI-PV: 946641 SGI-Modid: xfs-linux-melb:xfs-kern:203328a Signed-off-by: Eric Sandeen Signed-off-by: Nathan Scott commit 65be60541909c7bf8c384cde3502c18cc362939e Author: Eric Sandeen Date: Wed Jan 11 15:34:19 2006 +1100 [XFS] remove unused "readonly" arg from xlog_find_tail and xlog_recover SGI-PV: 946611 SGI-Modid: xfs-linux-melb:xfs-kern:203307a Signed-off-by: Eric Sandeen Signed-off-by: Nathan Scott commit f6cc82fc0b2b6be9ab25f0bfc285e6358db3597a Author: Haren Myneni Date: Tue Jan 10 19:25:25 2006 -0800 [PATCH] powerpc: fix for compile problem in kdump code when SMP disabled This patch fixes the compilation error (shown below) when CONFIG_SMP=n. arch/powerpc/kernel/crash.c: In function `crash_kexec_prepare_cpus': arch/powerpc/kernel/crash.c:236: error: implicit declaration of function `smp_release_cpus' Signed-off-by: Haren Myneni Signed-off-by: Paul Mackerras commit 0d14824c0774d050cb4232e1e470e5fc9e32e587 Author: Nathan Scott Date: Wed Jan 11 15:33:51 2006 +1100 [XFS] Ensure max diosize reported is aligned with minimum diosize. SGI-PV: 910890 SGI-Modid: xfs-linux-melb:xfs-kern:24689a Signed-off-by: Nathan Scott commit ee2a4f7caa4a72cdf2329081a1f7eb9939df3aab Author: Nathan Scott Date: Wed Jan 11 15:33:36 2006 +1100 [XFS] Fix an intermittent pquota panic caused by dodgey quota flags to an umount dquot flush call. SGI-PV: 946444 SGI-Modid: xfs-linux-melb:xfs-kern:24680a Signed-off-by: Nathan Scott commit 3ddb8fa98ccce6c3b2afd2f4b95a10b3bb60d1f0 Author: Nathan Scott Date: Wed Jan 11 15:33:02 2006 +1100 [XFS] Sort out cosmetic differences between user and kernel copies of some sources. SGI-PV: 907752 SGI-Modid: xfs-linux-melb:xfs-kern:24659a Signed-off-by: Nathan Scott commit a255a7456d4051e804fd6efff9a7c0f43483a7fc Author: Nathan Scott Date: Wed Jan 11 15:32:30 2006 +1100 [XFS] Make d_maxiosz report the real maximum (INT_MAX) so we dont incorrectly limit people using this interface to size IO buffers. SGI-PV: 910890 SGI-Modid: xfs-linux-melb:xfs-kern:24657a Signed-off-by: Nathan Scott commit b04ed21a1fdbfe48ee0738519a4d1af09589dfea Author: Nathan Scott Date: Wed Jan 11 15:32:17 2006 +1100 [XFS] Disable write barriers for now till intermittent IO errors are understood. SGI-PV: 912426 SGI-Modid: xfs-linux-melb:xfs-kern:202962a Signed-off-by: Nathan Scott commit 13059ff04c5071c3f6f8a4bd9e51631849f63fa4 Author: Nathan Scott Date: Wed Jan 11 15:32:01 2006 +1100 [XFS] Reverse the sense of COMPAT_ATTR and ATTR2, keeps it simple and consistent. SGI-PV: 941645 SGI-Modid: xfs-linux-melb:xfs-kern:202961a Signed-off-by: Nathan Scott commit e13a73f02595c564e423bda5742fb8df4ebca455 Author: Christoph Hellwig Date: Wed Jan 11 15:30:08 2006 +1100 [XFS] Write log dummy record when freezing filesystem SGI-PV: 945483 SGI-Modid: xfs-linux-melb:xfs-kern:202638a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 6bac953fa424519f784ba2589fefd8f040ce54f0 Author: Paul Mackerras Date: Wed Jan 11 15:30:07 2006 +1100 powerpc: Fix compile error when CONFIG_PROC_VMCORE is not defined We were getting elfcorehdr_addr undefined in this case. Signed-off-by: Paul Mackerras commit 1df84c930a5101223da016f256b46b192dbf2b30 Author: Christoph Hellwig Date: Wed Jan 11 15:29:52 2006 +1100 [XFS] Mark some lookup tables const. Thanks to Arjan van de Ven for spotting these. SGI-PV: 946028 SGI-Modid: xfs-linux-melb:xfs-kern:202617a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 1661dc8e7a2c6aeb8f2fb6a8197909c95c220a71 Author: Yingping Lu Date: Wed Jan 11 15:29:39 2006 +1100 [XFS] Fixed an assertion failure in xfs_reclaim caused by delayed block. The assertion failure came from XFS QA41. The fix is done by enabling truncate for delayed block in xfs_inactive. SGI-PV: 945412 SGI-Modid: xfs-linux-melb:xfs-kern:202521a Signed-off-by: Yingping Lu Signed-off-by: Nathan Scott commit c7d437da3dda0ac7199c320b6a48c04ec37a614d Author: Christoph Hellwig Date: Wed Jan 11 15:28:56 2006 +1100 [XFS] do barrier checks earlier. quota initialization may write to the filesystem SGI-PV: 912426 SGI-Modid: xfs-linux-melb:xfs-kern:202355a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 70a061f1fdbfa4805233a113868d059e9614731a Author: Nathan Scott Date: Wed Jan 11 15:28:45 2006 +1100 [XFS] Fix typo from when enabling write barriers by default, flags botch in showargs. SGI-PV: 912426 SGI-Modid: xfs-linux-melb:xfs-kern:24383a Signed-off-by: Nathan Scott commit dd9f438e32900d67def49fa1b8961b3e19b6fefc Author: Nathan Scott Date: Wed Jan 11 15:28:28 2006 +1100 [XFS] Implement the di_extsize allocator hint for non-realtime files as well. Also provides a mechanism for inheriting this property from the parent directory for new files. SGI-PV: 945264 SGI-Modid: xfs-linux-melb:xfs-kern:24367a Signed-off-by: Nathan Scott commit 061f7209bdfb0193b306f88b4ff36b2574b001d3 Author: Nathan Scott Date: Wed Jan 11 15:27:50 2006 +1100 [XFS] Do not inherit properties for the quota inodes from the root inode. SGI-PV: 945264 SGI-Modid: xfs-linux-melb:xfs-kern:24366a Signed-off-by: Nathan Scott commit 4ef19dddbaf2f24e492c18112fd8a04ce116daca Author: Christoph Hellwig Date: Wed Jan 11 15:27:18 2006 +1100 [XFS] enable write barriers by default SGI-PV: 912426 SGI-Modid: xfs-linux-melb:xfs-kern:201981a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit d3a9b1f9da4ee3e6d284148412097621b1c9e575 Author: Christoph Hellwig Date: Wed Jan 11 15:23:43 2006 +1100 [XFS] merge xfs_arch.h userspace changes back SGI-PV: 907752 SGI-Modid: xfs-linux-melb:xfs-kern:201882a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit f60d36690ce11a6a41b89e63b4201fbba3aa0bfb Author: Christoph Hellwig Date: Wed Jan 11 15:22:04 2006 +1100 [XFS] remove over-eager assert SGI-PV: 941804 SGI-Modid: xfs-linux-melb:xfs-kern:201702a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 415c2e083a85f0daf6cbb4988691ac3ea9279509 Author: Stephen Rothwell Date: Wed Jan 11 13:51:22 2006 +1100 [PATCH] powerpc: fix up iSeries console after TTY layer buffering revamp Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 7a0268fa1a3613f2c526a9b3058701b277f6abe1 Author: Anton Blanchard Date: Wed Jan 11 13:16:44 2006 +1100 [PATCH] powerpc/64: per cpu data optimisations The current ppc64 per cpu data implementation is quite slow. eg: lhz 11,18(13) /* smp_processor_id() */ ld 9,.LC63-.LCTOC1(30) /* per_cpu__variable_name */ ld 8,.LC61-.LCTOC1(30) /* __per_cpu_offset */ sldi 11,11,3 /* form index into __per_cpu_offset */ mr 10,9 ldx 9,11,8 /* __per_cpu_offset[smp_processor_id()] */ ldx 0,10,9 /* load per cpu data */ 5 loads for something that is supposed to be fast, pretty awful. One reason for the large number of loads is that we have to synthesize 2 64bit constants (per_cpu__variable_name and __per_cpu_offset). By putting __per_cpu_offset into the paca we can avoid the 2 loads associated with it: ld 11,56(13) /* paca->data_offset */ ld 9,.LC59-.LCTOC1(30) /* per_cpu__variable_name */ ldx 0,9,11 /* load per cpu data Longer term we can should be able to do even better than 3 loads. If per_cpu__variable_name wasnt a 64bit constant and paca->data_offset was in a register we could cut it down to one load. A suggestion from Rusty is to use gcc's __thread extension here. In order to do this we would need to free up r13 (the __thread register and where the paca currently is). So far Ive had a few unsuccessful attempts at doing that :) The patch also allocates per cpu memory node local on NUMA machines. This patch from Rusty has been sitting in my queue _forever_ but stalled when I hit the compiler bug. Sorry about that. Finally I also only allocate per cpu data for possible cpus, which comes straight out of the x86-64 port. On a pseries kernel (with NR_CPUS == 128) and 4 possible cpus we see some nice gains: total used free shared buffers cached Mem: 4012228 212860 3799368 0 0 162424 total used free shared buffers cached Mem: 4016200 212984 3803216 0 0 162424 A saving of 3.75MB. Quite nice for smaller machines. Note: we now have to be careful of per cpu users that touch data for !possible cpus. At this stage it might be worth making the NUMA and possible cpu optimisations generic, but per cpu init is done so early we have to be careful that all architectures have their possible map setup correctly. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 193cac99f6d8604aca71e5a966a8cd1dfb84819d Author: Michael Neuling Date: Wed Jan 11 12:08:56 2006 +1100 [PATCH] powerpc: parallel port init fix This stops parport from accessing nonexistent parallel ports. Signed-off-by: Michael Neuling Signed-off-by: Paul Mackerras commit 296167ae1799815b9ed2d135a847436502f2ee91 Author: Michael Ellerman Date: Wed Jan 11 11:54:09 2006 +1100 [PATCH] powerpc: Make early debugging configurable via Kconfig This patch adds Kconfig entries to control the early debugging options, currently in setup_64.c. Doing this via Kconfig rather than #defines means you can have one source tree, which is buildable for multiple platforms - and you can enable the correct early debug option for each platform via .config. I made udbg_early_init() a static inline because otherwise GCC is to daft to optimise it away when debugging is off. Now that we have udbg_init_rtas() we can make call_rtas_display_status* static. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit bf6a7112bda99aadd6675526423a96be6b356a3d Author: Michael Ellerman Date: Wed Jan 11 11:54:08 2006 +1100 [PATCH] powerpc: Early debugging support for iSeries Connect iSeries up to the standard early debugging infrastructure. To actually use this you need to enable the iSeries early debugging in setup_64.c. Then after the messages are logged hit Ctrl-x Ctrl-x on your console to dump the Hypervisor console buffer. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit f481f1edee77b3d623457685add1c6b507c25d6f Author: Olaf Hering Date: Tue Jan 10 22:31:53 2006 +0100 [PATCH] powerpc: remove remaining crash_notes variable from machine_kexec.c remove remaining crash_notes definition to fix compile error /dev/shm/linux-2.6/arch/powerpc/kernel/machine_kexec.c:21: error: conflicting types for `crash_notes' /dev/shm/linux-2.6/include/linux/kexec.h:129: error: previous declaration of `crash_notes' Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit af9deabeb0298559227fd9b481d33aefcb15ca54 Author: linas Date: Tue Jan 10 15:18:16 2006 -0600 [PATCH] PCI Hotplug/powerpc: module build break The RPAPHP hoplug driver will not build as a module, because it calls on a pcibios routine which is not exported. This exports the symbol. Problem reported by Olaf Hering Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit ad2b2426bb8dce97827182946e33e7f7ff0afbce Author: Olaf Hering Date: Tue Jan 10 21:57:40 2006 +0100 [PATCH] enable the RTC driver in ppc64_defconfig Enable the RTC driver. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 9819d85c210f5953fffc1052060e589d633f20ed Author: Linus Torvalds Date: Tue Jan 10 19:35:19 2006 -0800 Fix net/core/wireless.c link failure It needs for compare_ether_addr() commit 58b6c58caef7a34eab7ec887288fa495696653e7 Author: Matthew Wilcox Date: Tue Jan 10 20:48:07 2006 -0500 [PARISC] Use STABS_DEBUG macro from vmlinux.lds.h Cleanup vmlinux.lds.S by using STABS_DEBUG macro from vmlinux.lds.h instead of repeating the sections. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit f45adcf977ac3c5512c17fd97b073bda99c81232 Author: Matthew Wilcox Date: Tue Jan 10 20:48:06 2006 -0500 [PARISC] Fix Dino reporting on J2240 Fix Dino reporting on J2240. This particular machine thought it had a Cujo. Also add J2240 Dino chip to the hp_hardware_list. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 4d62ce5d2a85976a2e6f2732980e59b21b2aa8d2 Author: Helge Deller Date: Tue Jan 10 20:48:05 2006 -0500 [PARISC] stifb: Remove obsolete MODULE_PARM() The bpp module parameter has been obsoleted in favour of a setup string, so remove the MODULE_PARM. Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit daaeb6f8d3afdfa58ffeffb7ba168ccbd5969858 Author: Helge Deller Date: Tue Jan 10 20:48:04 2006 -0500 [PARISC] stifb: Fix framebuffer console at 32bpp Fix stifb framebuffer console at 32bpp on a HCRX-24 card by properly setting DIRECTCOLOR. Also a few nice cleanups to the code. Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 5d6d1640a254b27d0f598007313065713c1e3a04 Author: Helge Deller Date: Tue Jan 10 20:48:03 2006 -0500 [PARISC] stifb: use F_EXTEND macro Use the F_EXTEND() macro instead of open coding it with an #ifdef. Provides a nice cleanup. Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 02d79800a221eb4e54d80cbf2026af9edc1f437d Author: Alexey Dobriyan Date: Tue Jan 10 20:48:02 2006 -0500 [PARISC] Use C99 initializers in asm-parisc/processor.h Cleanup asm-parisc/processor.h to use C99 initializers in INIT_THREAD(). Signed-off-by: Alexey Dobriyan Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 4b991da7fec9b87acf86c250332ce15c2811255b Author: Thibaut VARENE Date: Tue Jan 10 20:48:01 2006 -0500 [PARISC] pdc_stable: More robust sysfs error checking pdc_stable 0.10: As mentioned on LKML, pdc_stable wasn't checky enough on the return values of some calls. This patch makes it more robust to errors when registering objects in sysfs. Signed-off-by: Thibaut VARENE Signed-off-by: Kyle McMartin commit 9b9ff2e16a4609a7ab39b12e67fc56b51c8cd1f4 Author: Grant Grundler Date: Tue Jan 10 20:48:00 2006 -0500 [PARISC] Make PCI_HOST_ADDR and PCI_BUS_ADDR symmetrical Change to asm-parisc/pci.h makes the define of PCI_HOST_ADDR symmetrical with PCI_BUS_ADDR. Also add a comment about PA_VIEW and LMMIO/ELMMIO/GMMIO. Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin commit 7c0b67efe9e15fa81cfa332a9a6f6cd5f7941bbc Author: Guy Martin Date: Tue Jan 10 20:47:59 2006 -0500 [PARISC] Fix parport_gsc by selecting PARPORT_NOT_PC PARPORT_GSC requires selecting PARPORT_NOT_PC in order to work properly. Signed-off-by: Guy Martin Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 49efdd46eed353027096a765f40dd8af52ece5ae Author: Stuart Brady Date: Tue Jan 10 20:47:58 2006 -0500 [PARISC] OSS: Fix build of parisc harmony driver OSS Harmony got missed on the conversion of parisc_device.hpa to a struct resource... fix its build. Signed-off-by: Stuart Brady Signed-off-by: Kyle McMartin commit 5cdb8205e917c09fd1348e4b22e26492e8c45b36 Author: Grant Grundler Date: Tue Jan 10 20:47:57 2006 -0500 [PARISC] Fix BLK_BOUNCE_HIGH on parisc by initializing max_low_pfn max_low_pfn was not being set in arch/parisc/mm/init.c, causing severe problems whenever anything tried to use BLK_BOUNCE_HIGH. Set it to max_pfn like other similar architectures do. Signed-off-by: Grant Grundler Signed-off-by: Kyle McMartin commit 6ca45a24ccb847251f71aec8906746d33e99f33e Author: Grant Grundler Date: Tue Jan 10 20:47:56 2006 -0500 [PARISC] Truncate overlapping PAT PDC reported ranges Deal with overlapping LBA MMIO resources, rp3440 PDC BUG: PDC reports lmmio range for the last rope that overlaps with the CPU HPA. Console output was: ... Found devices: 1. Storm Peak Fast at 0xfffffffffe798000 [152] { 0, 0x0, 0x889, 0x00004 } 2. Storm Peak Fast at 0xfffffffffe799000 [153] { 0, 0x0, 0x889, 0x00004 } ... FAILED: lba_fixup_bus() request for lmmio_space [fffffffff0000000/fffffffffecffffe] Output is now: LBA: Truncating lmmio_space [fffffffff0000000/fffffffffecffffe] to [fffffffff0000000,fffffffffe797fff] My only concern with this patch is how C8000 (PAT PDC) will report elmmio ranges when a gfx card is installed. I'll have to test this another day. Signed-off-by: Grant Grundler Signed-off-by: James Bottomley Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 110957f0e521c8d14f97bbe955af2fa17bb720bf Author: Alexey Dobriyan Date: Tue Jan 10 20:47:56 2006 -0500 [PARISC] Add __iomem to __raw_check_addr() Add __iomem to __raw_check_addr(), which nukes ~13809 sparse warnings on allmodconfig. Signed-off-by: Alexey Dobriyan Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit e8b736c860dd93ba26b391abc91891e03ca99858 Author: Helge Deller Date: Tue Jan 10 20:47:55 2006 -0500 [PARISC] Add some defines for HugeTLB pages Define some constants for HugeTLB pages, not that parisc-linux supports it yet. Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 4d64c9f58e618b1bdbc91cb071e6c8d90f43d620 Author: Helge Deller Date: Tue Jan 10 20:47:54 2006 -0500 [PARISC] Introduce DINO_LOCAL_IRQS and use it for gsc_find_local_irq Fix dino by using DINO_LOCAL_IRQS as the limit for gsc_find_local_irq() instead of the irq itself. Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit a01c8cb126cb5f5a592f01b08ff8859508c75ba1 Author: Matthew Wilcox Date: Tue Jan 10 20:47:53 2006 -0500 [PARISC] Fix GSC graphics cards with 64MB regions Make knapps work with its 64MB gfx card. I probably just broke another machine in the process, but assuming 64MB when 64MB aligned is probably safer than assuming 32MB all the time. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit e0565a1c83a1045d8fae728056082262e712b201 Author: Kyle McMartin Date: Tue Jan 10 20:47:52 2006 -0500 [PARISC] Fix and cleanup ioremap.c to work with 4level-fixup.h Fixup ioremap a bit. It seems to work on 32-bit kernels, but fails miserably on the first ioremapped access on 64-bit kernels. Also, having STI enabled causes it to fail. Probably because we're passing an ioremapped region to a real-mode STI call... Signed-off-by: Kyle McMartin commit 45dbe9147dcad2b03f9d1397353d6eed9204da02 Author: Alexey Dobriyan Date: Tue Jan 10 20:47:51 2006 -0500 [PARISC] Add __user annotation to eisa_eeprom.c Annotate eisa_eeprom_read() with __user. Signed-off-by: Alexey Dobriyan Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 04d35d7324ed35983189bd396db7874a50bbea43 Author: Helge Deller Date: Tue Jan 10 20:47:50 2006 -0500 [PARISC] Fix Cirrus 6832 Cardbus on RDI Tadpole PARISC Laptop Fix irq-off-by-one for Cirrus 6832 Cardbus on RDI Tadpole PARISC Laptop. We just DECLARE_PCI_FIXUP_ENABLE as it is unlikely that this will be found in any other parisc system. Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 1b2425e3c79984975a1a3e6fa84512f23d96da9f Author: Matthew Wilcox Date: Tue Jan 10 20:47:49 2006 -0500 [PARISC] Make local cache flushes take a void * Make flush_data_cache_local, flush_instruction_cache_local and flush_tlb_all_local take a void * so they don't have to be cast when using on_each_cpu(). This becomes a problem when on_each_cpu is a macro (as it is in current -mm). Also move the prototype of flush_tlb_all_local into tlbflush.h and remove its declaration from .c files. Signed-off-by: Matthew Wilcox Signed-off-by: Kyle McMartin commit 8039de10aae3cd4cf0ef0ccebd58aff0e8810df2 Author: Helge Deller Date: Tue Jan 10 20:35:03 2006 -0500 [PARISC] Add __read_mostly section for parisc Flag a whole bunch of things as __read_mostly on parisc. Also flag a few branches as unlikely() and cleanup a bit of code. Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 7da942e5bc889bc970554876a8c03d7e2af9923d Author: Nicolas Kaiser Date: Wed Jan 11 02:10:28 2006 +0100 fs/proc/vmcore.c: header included twice Header included twice. Signed-off-by: Nicolas Kaiser Signed-off-by: Adrian Bunk commit c566c6dbf9cb0eed6e11ec7a4141e7af68ec2316 Author: Nicolas Kaiser Date: Wed Jan 11 02:08:57 2006 +0100 fs/attr.c: header included twice Header included twice. Signed-off-by: Nicolas Kaiser Signed-off-by: Adrian Bunk commit 0563572bf47efdc02a059b923d3c1e589783c019 Author: Nicolas Kaiser Date: Wed Jan 11 02:07:34 2006 +0100 asm-powerpc: header included twice Header included twice. Signed-off-by: Nicolas Kaiser Signed-off-by: Adrian Bunk commit 099f7f0a828bfef7b7047101cf52dc44a4b1d76f Author: Nicolas Kaiser Date: Wed Jan 11 02:06:20 2006 +0100 xfs: header included twice Header included twice. Signed-off-by: Nicolas Kaiser Signed-off-by: Adrian Bunk commit b8ab50bc554c2f9149e6d0ae741e05810e581ea5 Author: Nicolas Kaiser Date: Wed Jan 11 02:04:35 2006 +0100 netfilter: headers included twice Headers included twice. Signed-off-by: Nicolas Kaiser Signed-off-by: Adrian Bunk commit 864913f30dbd6f75b94045cd20ea0b082996287e Author: Paul Jackson Date: Wed Jan 11 02:01:38 2006 +0100 cpuset two little doc fixes Two little cpuset documentation fixes. Signed-off-by: Paul Jackson Signed-off-by: Adrian Bunk commit b56d55b69c5c787b279819f5c0c2d5f5864d0fc2 Author: Adrian Bunk Date: Wed Jan 11 02:00:10 2006 +0100 drivers/net/gianfar_sysfs.c: update email address of Kumar Gala drivers/net/gianfar_sysfs.c still contained the old email address of Kumar Gala. Signed-off-by: Adrian Bunk commit e8d2a424675d9878356397e2ecfc632bbf09aa2c Author: Jesper Juhl Date: Wed Jan 11 01:52:40 2006 +0100 add loglevel to printk in fs/afs/cmservice.c This is a small patch that adds loglevel to a printk in fs/afs/cmservice.c Signed-off-by: Jesper Juhl Signed-off-by: Adrian Bunk commit 74da6cd06225da6971943bea6a33f4cb7f6b76a3 Author: Jesper Juhl Date: Wed Jan 11 01:51:26 2006 +0100 missing printk loglevel and tiny tiny whitespace change in binfmt_elf() Patch adds a mising printk loglevel (I think KERN_WARNING is appropriate here) in fs/binfmt_elf.c, and while I was there I made some tiny tiny tiny adjustments to whitespacing in the neighborhood. Signed-off-by: Jesper Juhl Signed-off-by: Adrian Bunk commit e97a31117c0f96be6637f68b4029609bb1f2cc7c Author: Jesper Juhl Date: Wed Jan 11 01:50:28 2006 +0100 add missing printk loglevel in mm/swapfile.c in mm/swapfile.c a printk() is missing a loglevel. I believe the proper loglevel for this situation is KERN_ERR, so that's what the patch below sets -if you agree, please apply. Signed-off-by: Jesper Juhl Signed-off-by: Adrian Bunk commit ffd59daceb7db5f7c54f095c5529cec45222c1f1 Author: Jesper Juhl Date: Wed Jan 11 01:48:08 2006 +0100 Tiny esthetic changes to Documentation/laptop-mode.txt Here's a tiny patch making a few esthetic changes to Documentation/laptop-mode.txt To me this patch makes sense, but feel free to disagree, I don't feel strongly about it at all. It changes a single URL to its strictly correct form (directories should end in /), and it makes the arguments to main in an included example program follow convention and be named argc and argv. Signed-off-by: Jesper Juhl Signed-off-by: Adrian Bunk commit 210bb9560cb697c950e803d0fdaf9869efefed54 Author: Adrian Bunk Date: Wed Jan 11 01:43:01 2006 +0100 MAINTAINERS: sh: update the mailing list Signed-off-by: Adrian Bunk commit 7823c7c121839f5a003acdf9c2f1839bfa2f6c43 Author: Luiz Fernando Capitulino Date: Wed Jan 11 01:38:27 2006 +0100 ext2: trivial indentation fix. This memset() line was indented with seven spaces, this patch fixes it to use a tab instead. Yes, very trivial but it's the third time I have to look at this line.. Signed-off-by: Luiz Capitulino Signed-off-by: Adrian Bunk commit 02706647a49011ae1e7b4eca33e835d1681b094e Author: Ingo Molnar Date: Tue Jan 10 23:15:02 2006 +0100 [PATCH] mutex: trivial whitespace cleanups Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit c544bdb1999e04eb10035f1c3262a103859d94b2 Author: Ingo Molnar Date: Tue Jan 10 22:10:36 2006 +0100 [PATCH] mark mutex_lock*() as might_sleep() Mark mutex_lock() and mutex_lock_interruptible() as might_sleep() functions. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 73165b88ffd29813bf73b331eaf90d3521443236 Author: Ingo Molnar Date: Tue Jan 10 22:07:44 2006 +0100 [PATCH] fix i386 mutex fastpath on FRAME_POINTER && !DEBUG_MUTEXES Call the mutex slowpath more conservatively - e.g. FRAME_POINTERS can change the calling convention, in which case a direct branch to the slowpath becomes illegal. Bug found by Hugh Dickins. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 042c904c3e35e95ac911e8a2bf4097099b059e1a Author: Ingo Molnar Date: Tue Jan 10 15:48:59 2006 -0500 [PATCH] remove unnecessary asm/mutex.h from kernel/mutex-debug.c Remove unnecessary (and incorrect) inclusion of asm/mutex.h, pointed out by David Howells. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 8a4c8a96a47c9e2f08156fd9664974df086eed50 Author: Bart De Schuymer Date: Tue Jan 10 13:12:22 2006 -0800 [EBTABLES] Don't match tcp/udp source/destination port for IP fragments Signed-off-by: Bart De Schuymer Signed-off-by: David S. Miller commit 65e480ac551a7d95969aa824f77d7160a74cf08d Author: Adrian Bunk Date: Tue Jan 10 13:11:44 2006 -0800 [IRDA] DONGLE_OLD: remove dependency on non-existing symbol Jean-Luc Leger reported this alternative dependency on a non-existing symbol. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 214ad78437544b20c3c0d5c2acb24650ce6e4db8 Author: Adrian Bunk Date: Tue Jan 10 13:10:02 2006 -0800 [IRDA]: kill drivers/net/irda/sir_core.c EXPORT_SYMBOL's do nowadays belong to the files where the actual functions are. Moving the module_init/module_exit to the file with the actual functions has the advantage of saving a few bytes due to the removal of two functions. Signed-off-by: Adrian Bunk Acked-by: Jean Tourrilhes Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 79a34648e488a41be92369c72aa9784bd4d741f9 Author: Jesper Juhl Date: Tue Jan 10 13:09:01 2006 -0800 [ATM]: Remove unneeded kmalloc() return value casts + tiny whitespace cleanup Small cleanups for drivers/atm/zatm.c Get rid of unneeded cast of kmalloc() return value. Small whitespace/CodingStyle/formatting cleanup (since I was in there anyway). Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 12fe2c588df77d60dfe13b432f95d00f76b8c969 Author: Jesper Juhl Date: Tue Jan 10 13:08:21 2006 -0800 [NET]: Remove unneeded kmalloc() return value casts Get rid of needless casting of kmalloc() return value in net/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit ea2e90dfcee2c09eff8a180976ace071922663a5 Author: Jesper Juhl Date: Tue Jan 10 13:07:44 2006 -0800 [RXRPC]: Decrease number of pointer derefs in connection.c Decrease the number of pointer derefs in net/rxrpc/connection.c Benefits of the patch: - Fewer pointer dereferences should make the code slightly faster. - Size of generated code is smaller - improved readability Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit ad8e4b75c8a7bed475d72ce09bf5267188621961 Author: Martin Murray Date: Tue Jan 10 13:02:29 2006 -0800 [AF_NETLINK]: Fix DoS in netlink_rcv_skb() From: Martin Murray Sanity check nlmsg_len during netlink_rcv_skb. An nlmsg_len == 0 can cause infinite loop in kernel, effectively DoSing machine. Noted by Matin Murray. Signed-off-by: Chris Wright Signed-off-by: David S. Miller commit babbdb1a18d37e57acae7e348ef122f2b905df0a Author: Patrick McHardy Date: Mon Jan 9 17:48:09 2006 -0800 [NETFILTER]: Fix timeout sysctls on big-endian 64bit architectures The connection tracking timeout variables are unsigned long, but proc_dointvec_jiffies is used with sizeof(unsigned int) in the sysctl tables. Since there is no proc_doulongvec_jiffies function, change the timeout variables to unsigned int. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9d28026b7ec0f3e2a407d5c03fcb37d0b59d1add Author: Patrick McHardy Date: Mon Jan 9 16:44:36 2006 -0800 [NETFILTER]: Remove unused function from NAT protocol helpers ->print and ->print_range are not used (and apparently never were). Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c07bc1ffbdc14312b214b56fa39f4a4ab1406b8e Author: Patrick McHardy Date: Mon Jan 9 16:44:18 2006 -0800 [NETFILTER]: Fix return value confusion in PPTP NAT helper ip_nat_mangle_tcp_packet doesn't return NF_* values but 0/1 for failure/success. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 03b9feca89366952ae5dfe4ad8107b1ece50b710 Author: Patrick McHardy Date: Mon Jan 9 16:44:00 2006 -0800 [NETFILTER]: Fix another crash in ip_nat_pptp The PPTP NAT helper calculates the offset at which the packet needs to be mangled as difference between two pointers to the header. With non-linear skbs however the pointers may point to two seperate buffers on the stack and the calculation results in a wrong offset beeing used. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 15db34702cfafd24acc60295cf14861e497502ab Author: Patrick McHardy Date: Mon Jan 9 16:43:43 2006 -0800 [NETFILTER]: Fix crash in ip_nat_pptp When an inbound PPTP_IN_CALL_REQUEST packet is received the PPTP NAT helper uses a NULL pointer in pointer arithmentic to calculate the offset in the packet which needs to be mangled and corrupts random memory or crashes. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit bb94aa169eaa6e713a429370d37388722f08666f Author: Patrick McHardy Date: Mon Jan 9 16:43:13 2006 -0800 [NETFILTER]: net/ipv[46]/netfilter.c cleanups Don't wrap entire file in #ifdef CONFIG_NETFILTER, remove a few unneccessary includes. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d3f4a687f683f536506d0aa6b22e6cb3e79639ce Author: Kris Katterjohn Date: Mon Jan 9 16:01:43 2006 -0800 [NET]: Change memcmp(,,ETH_ALEN) to compare_ether_addr() This changes some memcmp(one,two,ETH_ALEN) to compare_ether_addr(one,two). Signed-off-by: Kris Katterjohn Signed-off-by: David S. Miller commit 770cfbcffdf0011ecf3a12435ecb5604c4c97a19 Author: Stephen Hemminger Date: Mon Jan 9 15:56:09 2006 -0800 [INET]: congestion and af_ops can be const The congestion ops and af_ops in the inet_connection_sock can be const. Signed-off-by: Stephen Hemminger Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit a3e49436867e6c7acc1b5eed21d30c88d156825b Author: Nicolas Pitre Date: Tue Jan 10 19:48:02 2006 +0000 [ARM] 3252/1: help gcc do the best with ___arch__swab32 Patch from Nicolas Pitre Depending on your gcc version, the current C-only implementation would produce suboptimal code, ranging from a bad register selection forcing an additional mov instruction to a failure to merge the eor and the ror in a single instruction. With a little help gcc always produces the best code. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 49cd619c69d643b30a24029e40eb5364c7a26b2e Author: Alan Cox Date: Mon Jan 9 09:35:28 2006 -0500 [PATCH] moxa serial: add proper capability check This requires the proper capabilities for the moxa bios update ioctl's. Signed-off-by: Linus Torvalds commit 19dbaf6f6f0f3b766df08594446d64747a5cced3 Author: Greg Ungerer Date: Tue Jan 10 17:02:57 2006 +1000 [PATCH] m68knommu: save reg a5 on context change Fix a5 register corruption when processing user space signals handlers. We need to save a5 through each contenxt change. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 3960f2faaf0a67ad352bd5d4085e43f19f33ab91 Author: Greg Ungerer Date: Tue Jan 10 17:00:39 2006 +1000 [PATCH] m68knommu: fix find_next_zero_bit in bitops.h We're starting a number of big applications (memory footprint app. 1MByte) on our Arcturus uC5272. Therefore memory fragmentation is a real pain for us. We've switched to uClinux-2.4.27-uc1 and found that page_alloc2 fragments the memory heavily. Digging into it we found a bug in the find_next_zero_bit function in the m68knommu/bitops.h file. if the size isn't a multiple of 32 than the upper bits of the last word to be searched should be masked. But the functions masks the lower bits of the last word because it uses a right shift instead of a left shift operator. Patch submitted by Sascha Smejkal Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 845884d332c060b0dfc54ba5a580d0f1a99c58a2 Author: Greg Ungerer Date: Tue Jan 10 16:59:37 2006 +1000 [PATCH] uclinux: delay binfmt_flat trace Modify the initial trace output (which is based on flags in the binary header) so that it is not done until after the magic number check. This may well not be a flat format binary, so the flags could be invalid. (Prime example, running a script). Changes prompted by patches from Stuart Hughs. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 082f2c1cc7aa7aabdbf5235b788ff42e10abb399 Author: Greg Ungerer Date: Tue Jan 10 16:59:04 2006 +1000 [PATCH] m68knommu: set irq priority/level different for each ColdFire serial port Set the hardware interrupt priority to a different value for each attached ColdFire serial port. According to the CPU documentation you should not use the same combination of level/priority on more than one device. People have reported odd serial port behavior with them set the same. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 892b62527fb3cd6753d6d2b79b5f21259f344cf5 Author: Greg Ungerer Date: Tue Jan 10 16:58:16 2006 +1000 [PATCH] m68knommu: allow configure of FEC for M520x CPU family Allow the ColdFire FEC ethernet driver to be enabled on the M520x CPU family. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 694d855fbc797141960a3907019c442240ed8a0f Author: Greg Ungerer Date: Tue Jan 10 16:43:39 2006 +1000 [PATCH] m68knommu: fix ram length of m5208evb board Adjust length of M5208EVB ram define. It should size up to 32MB after adding in the dBUG reserved 128k. Problem pointed out be Milton Miller . Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 01829e7212dd9ba3fa68bf8afffc9a175c44cb04 Author: Greg Ungerer Date: Tue Jan 10 16:42:59 2006 +1000 [PATCH] m68knommu: fix a5 reg corruption in signal handlers This is a patch adapted from a posting by Andrea Tarani which was pointed out to me by Bernardo Innocenti. Thanks to both of them for their help and patience. The original posting is here: http://mailman.uclinux.org/pipermail/uclinux-dev/2005-July/033543.html The problem first manifest itself as busybox ping terminating with an "Illegal instruction". I reduced this to a test case and found that variable size arrays allocated on the stack could lead to stacks not aligned on 32 bit boundaries. For the Coldfire this proved fatal. Having been pointed out this patch by Bernardo, I applied it and it fixed the first test case. I then went back to busybox's ping. This still failed with "Illegal instruction", but in a different way. Before it depended on the size allocated for the ping buffer, now it happened every time. I also found it depended on optimisation level (gcc-3.4.0) -Os was okay but not -O2. After a lot of looking, it turned out that register a5 was being corrupted by the signal handler (after applying the patch). I re-worked the patch a bit to save/restore a5 and now all seems well. Patch submitted by Stuart Hughs Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit afc7cd8950572786c87ad081d8e65e5ea58b563c Author: Greg Ungerer Date: Tue Jan 10 16:42:18 2006 +1000 [PATCH] m68knommu: fix mangled 'truct' in ptrace.c Fix broken "truct" -> "struct" in arch_ptrace() parameter list. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit db10cb8e9906a43c8fa49b3fab547b365bc2c666 Author: Greg Ungerer Date: Tue Jan 10 16:40:21 2006 +1000 [PATCH] m68knommu: don't set gcc optimizer flags Don't specify compiler optimization flags in the m68knommu Makefile. Let the top level Makefile/config set it. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 82409799853c3cabc4b17533ff640a95bef01358 Author: Greg Ungerer Date: Tue Jan 10 16:39:35 2006 +1000 [PATCH] h8300: remove MAGIC_ROM_PTR from memory.c Remove obsolete MAGIC_ROM_PTR code from h8300 architecture. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 7ba6b5ece34fb799f63c72c35a30dac8aca735eb Author: Greg Ungerer Date: Tue Jan 10 16:39:30 2006 +1000 [PATCH] h8300: remove MAGIC_ROM_PTR from k8300_ksyms.c Remove obsolete MAGIC_ROM_PTR code from h8300 architecture. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit b016450f9f603210239e1a91e3c28f17c310dcc7 Author: Richard Purdie Date: Tue Jan 10 17:16:12 2006 +0000 [ARM] 3250/1: Change pxa2xx PCMCIA drivers to use platform_device_alloc Patch from Richard Purdie Change mainstone and sharpsl pxa2xx pcmcia drivers to use platform_device_alloc which fixes a memory leak. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 49978db4f39950cdaaf967e1aad4a324bdc2e180 Author: Andrew Victor Date: Tue Jan 10 16:59:29 2006 +0000 [ARM] 3247/1: AT91RM9200 support for 2.6 (Cogent CSB337 & CSB637 boards) (Patch #3244) Patch from Andrew Victor This patch adds support to the 2.6 kernel series for the Atmel AT91RM9200 processor. This patch is the support for the Cogent CSB337 and CSB637 boards. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit f0a13854be269357ff70022524ec503d3cba6a32 Author: Andrew Victor Date: Tue Jan 10 16:59:28 2006 +0000 [ARM] 3243/2: AT91RM9200 support for 2.6 (Atmel DK & EK boards) Patch from Andrew Victor This patch adds support to the 2.6 kernel series for the Atmel AT91RM9200 processor. This patch is the support for Atmel's DK and EK boards. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 1e6c9c2878c9c1f301449c78551e0b7c5f3e3ae5 Author: Andrew Victor Date: Tue Jan 10 16:59:27 2006 +0000 [ARM] 3242/2: AT91RM9200 support for 2.6 (Serial) Patch from Andrew Victor This patch adds support to the 2.6 kernel series for the Atmel AT91RM9200 processor. This patch is the Serial driver. This version uses the newly re-written GPL'ed hardware headers. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 4f47707b056bd2e3627ef390557ee93d312daba5 Author: Linus Torvalds Date: Tue Jan 10 08:56:39 2006 -0800 Fix rpc shutdown event condition bug We want to wait for the cl_users to go down to zero, not for it to stay positive. Quoth Trond (who wasn't even the author, but acked the wrong version): "Argh! I need to increase my daily caffeine dosages." Signed-off-by: Linus Torvalds commit a9c828155ae8d1a1576f9648cc4d9677aea53f89 Author: Oleg Nesterov Date: Tue Jan 10 17:24:53 2006 +0300 [PATCH] rcu: fix hotplug-cpu ->donelist leak Pointed out by Srivatsa Vaddagiri . rcu_do_batch() stops after processing maxbatch callbacks on ->donelist leaving rcu_tasklet in TASKLET_STATE_SCHED state. If CPU_DEAD event happens remaining ->donelist entries are lost, rcu_offline_cpu() kills this tasklet. With this patch ->donelist migrates along with ->curlist and ->nxtlist to the current cpu. Compile tested. Signed-off-by: Oleg Nesterov Acked-by: Paul E. McKenney Cc: Srivatsa Vaddagiri Cc: Dipankar Sarma Signed-off-by: Linus Torvalds commit 69a0b3157983925f14fe0bdc49622d5389538d8d Author: Oleg Nesterov Date: Tue Jan 10 16:48:02 2006 +0300 [PATCH] rcu: join rcu_ctrlblk and rcu_state This patch moves rcu_state into the rcu_ctrlblk. I think there are no reasons why we should have 2 different variables to control rcu state. Every user of rcu_state has also "rcu_ctrlblk *rcp" in the parameter list. Signed-off-by: Oleg Nesterov Acked-by: Paul E. McKenney Signed-off-by: Linus Torvalds commit c0400dc507a4345357fc25f13e8ac929287688a8 Author: Andrey Borzenkov Date: Tue Jan 10 11:27:00 2006 +0100 [PATCH] ide-cd: clear random-write capability it not supported Add CDC-RAM to capability mask. This prevents udev incorrectly reporting RAM capabilities for device. Signed-off-by: Andrey Borzenkov Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit daef265f1590cf3e6de989d074041a280c82d58b Author: Jens Axboe Date: Tue Jan 10 10:48:02 2006 +0100 [PATCH] dm: don't enable bouncing by default DM doesn't need to bounce bio's on its own, but the block layer defaults to that in blk_queue_make_request(). The lower level drivers should bounce ios themselves, that is what they need to do if not layered below dm anyways. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 00d6da9b4d6707b808481372537adb0fb38f99b3 Author: Jens Axboe Date: Tue Jan 10 10:43:54 2006 +0100 [PATCH] cdrom: kill "open failed" error message This triggers all the time with the various polled event programs, change it to CD_OPEN so it's supressed by default. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 4ff57935ad0f1620269f4b08e8acfda619cc5e4b Author: Jens Axboe Date: Tue Jan 10 09:44:39 2006 +0100 [PATCH] ide: preserve errors for failed requests To preserve the ->errors values for requests that failed, use the normal completion path for that. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit c8d52465f95c4187871f8e65666c07806ca06d41 Author: Anton Blanchard Date: Tue Jan 10 18:21:20 2006 +1100 [PATCH] Work around ppc64 compiler bug In the process of optimising our per cpu data code, I found a ppc64 compiler bug that has been around forever. Basically the current RELOC_HIDE can end up trashing r30. Details of the bug can be found at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25572 This bug is present in all compilers before 4.1. It is masked by the fact that our current per cpu data code is inefficient and causes other loads that end up marking r30 as used. A workaround identified by Alan Modra is to use the =r asm constraint instead of =g. Signed-off-by: Anton Blanchard [ Verified that this makes no real difference on x86[-64] */ Signed-off-by: Linus Torvalds commit 9979ead5d1eb23191a00453559927c5abf9087e2 Author: Adrian Bunk Date: Mon Jan 9 20:54:52 2006 -0800 [PATCH] fs/hfsplus/: remove the hfsplus_inode_check() debug function This patch removes the hfsplus_inode_check() debug function. It also removes the now obsolete last_inode_cnt and inode_cnt from struct hfsplus_sb_info. Signed-off-by: Adrian Bunk Acked-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f346f4b373aa320fb0337a3b504e3fb5344abc0b Author: Adrian Bunk Date: Mon Jan 9 20:54:51 2006 -0800 [PATCH] let MAGIC_SYSRQ no longer depend on DEBUG_KERNEL I know several people using MAGIC_SYSRQ not for kernel debugging but for trying to do a halfway normal shutdown in case of problems. Since there's no technical reason why MAGIC_SYSRQ would have to depend on DEBUG_KERNEL, I'm therefore suggesting to drop this dependency. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c29c4c5f28616f2a87f0e6499aa9776d9be58ad Author: Adrian Bunk Date: Mon Jan 9 20:54:50 2006 -0800 [PATCH] include/linux/sched.h: no need to guard the normalize_rt_tasks() prototype There's no need to guard the normalize_rt_tasks() prototype with an #ifdef CONFIG_MAGIC_SYSRQ. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d974837ae076101d33a59eefc6bfef923eaa0e32 Author: Adrian Bunk Date: Mon Jan 9 20:54:49 2006 -0800 [PATCH] kernel/resource.c: __check_region(): remove pointless __deprecated If a __deprecated is desired it should go to the prototype in the header (where it currently isn't). But at this place it's pointless. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51d53bd3eb82b953bfd58d0e9c935c34dfb34808 Author: Adrian Bunk Date: Mon Jan 9 20:54:48 2006 -0800 [PATCH] video/matrox/matroxfb_misc.c: remove dead code The Coverity checker spotted this dead code. Signed-off-by: Adrian Bunk Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca5ed2f5c7bf3ca51598336fcc1436b5da129f34 Author: Adrian Bunk Date: Mon Jan 9 20:54:47 2006 -0800 [PATCH] include/asm-sh64/: "extern inline" -> "static inline" "extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk Cc: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0795cf46d174d4faab35d13d0a088b5bcb2752a Author: Jesper Juhl Date: Mon Jan 9 20:54:46 2006 -0800 [PATCH] selinux: Remove unneeded k[cm]alloc() return value casts Remove redundant casts of k*alloc() return values in security/selinux/ss/services.c Signed-off-by: Jesper Juhl Acked-by: Stephen Smalley Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 792db3af38a55b2079df504b9f5aa57b2dbee48d Author: Jesper Juhl Date: Mon Jan 9 20:54:45 2006 -0800 [PATCH] fs/binfmt_elf: Remove unneeded kmalloc() return value casts Remove unneeded casts of kmalloc() return value in binfmt_elf. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 352d768b19408d3c019a3fa09fd5bfed99a55bc6 Author: Jesper Juhl Date: Mon Jan 9 20:54:44 2006 -0800 [PATCH] Decrease number of pointer derefs in multipath.c Decrease the number of pointer derefs in drivers/md/multipath.c Benefits of the patch: - Fewer pointer dereferences should make the code slightly faster. - Size of generated code is smaller - improved readability Signed-off-by: Jesper Juhl Acked-by: Ingo Molnar Cc: Alasdair G Kergon Acked-by: NeilBrown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3795e1616f16905889761536cdc266ebc51855e5 Author: Jesper Juhl Date: Mon Jan 9 20:54:39 2006 -0800 [PATCH] Decrease number of pointer derefs in exit.c Decrease the number of pointer derefs in kernel/exit.c Benefits of the patch: - Fewer pointer dereferences should make the code slightly faster. - Size of generated code is smaller - improved readability Signed-off-by: Jesper Juhl Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a547dfe9563c49fd0f9743640e01d1d652119ec7 Author: Jiri Slaby Date: Mon Jan 9 20:54:26 2006 -0800 [PATCH] char/isicom: More whitespaces and coding style Wrap all the code to 80 chars on a line. `}\nelse' changed to `} else'. Clean whitespaces in header file. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e65c1db19fe8177fa2da53e3e0bddffe585b2d47 Author: Jiri Slaby Date: Mon Jan 9 20:54:25 2006 -0800 [PATCH] char/isicom: Firmware loading Firmware loading via hotplug added. Cleanup firmware old-way fields in header file. Signed-off-by: Jiri Slaby Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ac0948b20f76d9659add91f868c57383ea1e4e5 Author: Jiri Slaby Date: Mon Jan 9 20:54:24 2006 -0800 [PATCH] char/isicom: Pci probing added Pci probing functions added, most of functions rewrited because of it (some for loops were redundant). Used PCI_DEVICE macro. dev_* used for printing wherever possible. Renamed some functions to have isicom_ in the name. Signed-off-by: Jiri Slaby Signed-off-by: Laurent Riffard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aaa246ea78c68cd205f505070650cda7c5a95d34 Author: Jiri Slaby Date: Mon Jan 9 20:54:23 2006 -0800 [PATCH] char/isicom: Other little changes Move some code from one place to another. Get rid of ugly ifdefs in code in next p[patches, so here create functions and macros to enable it. Rename some functions and align some code to 80 chars. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8070e35c6524e0f254cd69f493c50811e8e5b856 Author: Jiri Slaby Date: Mon Jan 9 20:54:22 2006 -0800 [PATCH] char/isicom: Type conversion and variables deletion Type which is needed to have accurate size was converted to [us]{8,16}. Removed void * cast. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8d16e47442a84d7fefc7ff839952ddfc919e495 Author: Jiri Slaby Date: Mon Jan 9 20:54:21 2006 -0800 [PATCH] char/isicom: Whitespace cleanup Trailing spaces and tabs and space used for indentation deleted. Indented content of structures. Switch/case indent. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9e39538ce7c52e45e653e777d73ed373189c20d Author: Alan Cox Date: Mon Jan 9 20:54:20 2006 -0800 [PATCH] clean up computone remaining cli use Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c58cbb6cbb635f53c8b340ae8da9e84b263cc41a Author: Grant Coady Date: Mon Jan 9 20:54:18 2006 -0800 [PATCH] n_hdlc.c: remove unused declaration drivers/char/n_hdlc.c:194: warning: `n_hdlc_tty_room' declared `static' but never defined Signed-off-by: Grant Coady Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33f0f88f1c51ae5c2d593d26960c760ea154c2e2 Author: Alan Cox Date: Mon Jan 9 20:54:13 2006 -0800 [PATCH] TTY layer buffering revamp The API and code have been through various bits of initial review by serial driver people but they definitely need to live somewhere for a while so the unconverted drivers can get knocked into shape, existing drivers that have been updated can be better tuned and bugs whacked out. This replaces the tty flip buffers with kmalloc objects in rings. In the normal situation for an IRQ driven serial port at typical speeds the behaviour is pretty much the same, two buffers end up allocated and the kernel cycles between them as before. When there are delays or at high speed we now behave far better as the buffer pool can grow a bit rather than lose characters. This also means that we can operate at higher speeds reliably. For drivers that receive characters in blocks (DMA based, USB and especially virtualisation) the layer allows a lot of driver specific code that works around the tty layer with private secondary queues to be removed. The IBM folks need this sort of layer, the smart serial port people do, the virtualisers do (because a virtualised tty typically operates at infinite speed rather than emulating 9600 baud). Finally many drivers had invalid and unsafe attempts to avoid buffer overflows by directly invoking tty methods extracted out of the innards of work queue structs. These are no longer needed and all go away. That fixes various random hangs with serial ports on overflow. The other change in here is to optimise the receive_room path that is used by some callers. It turns out that only one ldisc uses receive room except asa constant and it updates it far far less than the value is read. We thus make it a variable not a function call. I expect the code to contain bugs due to the size alone but I'll be watching and squashing them and feeding out new patches as it goes. Because the buffers now dynamically expand you should only run out of buffering when the kernel runs out of memory for real. That means a lot of the horrible hacks high performance drivers used to do just aren't needed any more. Description: tty_insert_flip_char is an old API and continues to work as before, as does tty_flip_buffer_push() [this is why many drivers dont need modification]. It does now also return the number of chars inserted There are also tty_buffer_request_room(tty, len) which asks for a buffer block of the length requested and returns the space found. This improves efficiency with hardware that knows how much to transfer. and tty_insert_flip_string_flags(tty, str, flags, len) to insert a string of characters and flags For a smart interface the usual code is len = tty_request_buffer_room(tty, amount_hardware_says); tty_insert_flip_string(tty, buffer_from_card, len); More description! At the moment tty buffers are attached directly to the tty. This is causing a lot of the problems related to tty layer locking, also problems at high speed and also with bursty data (such as occurs in virtualised environments) I'm working on ripping out the flip buffers and replacing them with a pool of dynamically allocated buffers. This allows both for old style "byte I/O" devices and also helps virtualisation and smart devices where large blocks of data suddenely materialise and need storing. So far so good. Lots of drivers reference tty->flip.*. Several of them also call directly and unsafely into function pointers it provides. This will all break. Most drivers can use tty_insert_flip_char which can be kept as an API but others need more. At the moment I've added the following interfaces, if people think more will be needed now is a good time to say int tty_buffer_request_room(tty, size) Try and ensure at least size bytes are available, returns actual room (may be zero). At the moment it just uses the flipbuf space but that will change. Repeated calls without characters being added are not cumulative. (ie if you call it with 1, 1, 1, and then 4 you'll have four characters of space. The other functions will also try and grow buffers in future but this will be a more efficient way when you know block sizes. int tty_insert_flip_char(tty, ch, flag) As before insert a character if there is room. Now returns 1 for success, 0 for failure. int tty_insert_flip_string(tty, str, len) Insert a block of non error characters. Returns the number inserted. int tty_prepare_flip_string(tty, strptr, len) Adjust the buffer to allow len characters to be added. Returns a buffer pointer in strptr and the length available. This allows for hardware that needs to use functions like insl or mencpy_fromio. Signed-off-by: Alan Cox Cc: Paul Fulghum Signed-off-by: Hirokazu Takata Signed-off-by: Serge Hallyn Signed-off-by: Jeff Dike Signed-off-by: John Hawkes Signed-off-by: Martin Schwidefsky Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ed80991a2dce4afc113be35089c564d62fa1f11 Author: Andrew Morton Date: Mon Jan 9 20:54:09 2006 -0800 [PATCH] tty-layer-buffering-revamp: jsm is broken Looks like JSM will be uncompilable after the TTY layer rework is merged into Linus's post-2.6.15 tree. It was complex to fix - the maintainers were notified in September. Cc: Wendy Xiong Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e91c55b32a469d9dda845a90038c015a70838e3 Author: Paul Jackson Date: Mon Jan 9 20:54:08 2006 -0800 [PATCH] Serial: disable jsm in ppc64 defconfig Changes to the serial driver to remove flip buffers have broken the serial jsm driver. It doesn't even compile anymore. The jsm driver was enabled in only one defconfig - ppc64. In order to keep defconfigs building, disable CONFIG_SERIAL_JSM for the time being. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87c2ce3b9305b9b723faeedf6e32ef703ec9b33a Author: Adrian Bunk Date: Mon Jan 9 20:54:07 2006 -0800 [PATCH] lib/zlib*: cleanups This patch contains the following possible cleanups: - #if 0 the following unused functions: - zlib_deflate/deflate.c: zlib_deflateSetDictionary - zlib_deflate/deflate.c: zlib_deflateParams - zlib_deflate/deflate.c: zlib_deflateCopy - zlib_inflate/infblock.c: zlib_inflate_set_dictionary - zlib_inflate/infblock.c: zlib_inflate_blocks_sync_point - zlib_inflate/inflate_sync.c: zlib_inflateSync - zlib_inflate/inflate_sync.c: zlib_inflateSyncPoint - remove the following unneeded EXPORT_SYMBOL's: - zlib_deflate/deflate_syms.c: zlib_deflateCopy - zlib_deflate/deflate_syms.c: zlib_deflateParams - zlib_inflate/inflate_syms.c: zlib_inflateSync - zlib_inflate/inflate_syms.c: zlib_inflateSyncPoint Signed-off-by: Adrian Bunk Cc: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3af13763d696468d31f71a798155b33f681f221f Author: Adrian Bunk Date: Mon Jan 9 20:54:06 2006 -0800 [PATCH] fs/ext3/: small cleanups This patch contains the following cleanups: - there's no need for ext3_count_free() #ifndef EXT3FS_DEBUG - having prototypes for ext3_count_free() in two different headers is nonsense Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4610a6bea7742ab34e40dcb776bd3feb52da10d6 Author: Adrian Bunk Date: Mon Jan 9 20:54:05 2006 -0800 [PATCH] fs/ext2/bitmap.c: ext2_count_free() is only required #ifdef EXT2FS_DEBUG There's no need for ext2_count_free() #ifndef EXT2FS_DEBUG. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0aa7d0639277f375989071fb52a7ce78beeef97 Author: Adrian Bunk Date: Mon Jan 9 20:54:04 2006 -0800 [PATCH] drivers/video/: possible cleanups This patch contains the possible cleanups including the following: - every file should #include the headers containing the prototypes for it's global functions - make needlessly global functions static - kyro/STG4000Interface.h: #include video/kyro.h and linux/pci.h instead of a manual "struct pci_dev" - i810_main.{c,h}: prototypes for static functions belong to the C file Signed-off-by: Adrian Bunk Acked-by: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d64ec153e914cbd60cfaaa47ececed55a9d14d7 Author: Jean Delvare Date: Mon Jan 9 20:54:03 2006 -0800 [PATCH] vr41xx: ARRAY_SIZE cleanup No need to define RTC_NUM_RESOURCES, it doesn't add any value to the code. Signed-off-by: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe971071a89c5c5184fc9f3482c7a8e997cf0520 Author: Tobias Klauser Date: Mon Jan 9 20:54:02 2006 -0800 [PATCH] drivers/char: Use ARRAY_SIZE macro Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]) and remove duplicates of ARRAY_SIZE. Signed-off-by: Tobias Klauser Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c6bee1d4037a5c569f30d40bd852a57ba250912 Author: Jesper Juhl Date: Mon Jan 9 20:54:01 2006 -0800 [PATCH] turn "const static" into "static const" ICC likes to complain about storage class not being first, GCC doesn't care much (except for cases like "inline static"). have a hard time seeing how it could break anything. Thanks to Gabriel A. Devenyi for pointing out http://linuxicc.sourceforge.net/ which is what made me create this patch. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7c368b7676bbe6145f14fbc87913596c9b93c11 Author: Adrian Bunk Date: Mon Jan 9 20:54:00 2006 -0800 [PATCH] drivers/net/irda/irport.c: cleanups This patch contains the following cleanups: - make a needlessly global function static - remove the unneeded global function irport_probe Signed-off-by: Adrian Bunk Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e48e99093c9bbb67f95e903d37aef30a969a0153 Author: Jesper Juhl Date: Mon Jan 9 20:53:59 2006 -0800 [PATCH] Docs update: small fixes to stable_kernel_rules.txt Small spelling, formating & similar fixes to stable_kernel_rules.txt Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5dd94ed249c7d19934e8738bf60f9554d07e888f Author: Jesper Juhl Date: Mon Jan 9 20:53:58 2006 -0800 [PATCH] Docs update: remove obsolete patch from locks.txt Remove obsolete patch from Documentation/locks.txt Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c63ca3c8b01e8cad4fe8874366e598bcbbdd048e Author: Jesper Juhl Date: Mon Jan 9 20:53:57 2006 -0800 [PATCH] Docs update: small spelling, formating etc fixes for filesystems/ext3.txt Spelling fixes, formating changes and corrections for Documentation/filesystems/ext3.txt Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c594a50db4cbe8b839a70fca0cff524d392531ca Author: Randy Dunlap Date: Mon Jan 9 20:53:56 2006 -0800 [PATCH] Docs update: typos, corrections and additions to applying-patches.txt Typos/corrections. A few extra additions on top of Randy's fixes. Signed-off-by: Randy Dunlap Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6d3fe77dace2c41a32b9699fe78960ab0908a97 Author: Martin Waitz Date: Mon Jan 9 20:53:55 2006 -0800 [PATCH] DocBook: warn for missing macro parameters Previously kernel-doc silently ignored missing parameter descriptions for preprocessor macros. Now that all such omissions are fixed up we can warn about them in kernel-doc to be able to keep it that way. Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0863afb32b77fc89c7110b3d10fb048cb56bb1b5 Author: Martin Waitz Date: Mon Jan 9 20:53:55 2006 -0800 [PATCH] DocBook: fix kernel-doc comments Fix typos in comments to remove kernel-doc warnings. Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 061350e7ecf869ed3c98d962b16a772e9674e283 Author: Martin Waitz Date: Mon Jan 9 20:53:53 2006 -0800 [PATCH] Add git tree for DocBook Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be217ff21c875ee1b8073a4fd07353a7a24a4cfd Author: Martin Waitz Date: Mon Jan 9 20:53:52 2006 -0800 [PATCH] DocBook: add .gitignore file when ignoring all DocBook output files git-status output becomes meaningful again. Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc3d28d02e3e83c3147b2afc5e19e3b58d23f31b Author: Jesper Juhl Date: Mon Jan 9 20:53:51 2006 -0800 [PATCH] CodingStyle correction Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d060a3218f6a046509fa31939ce1a671b0359086 Author: Ville Syrjala Date: Mon Jan 9 20:53:49 2006 -0800 [PATCH] Fix console blanking Current console blanking code is broken. It will first do a normal blank, then start the VESA blank timer if vesa_off_interval != 0, and then proceed to do the VESA blanking directly. After the timer expires it will do the VESA blanking a second time. Also the vesa_powerdown() function doesn't allow all VESA modes to be used. With this patch the behaviour is: 1. Blank: vesa_off_interval != 0 -> Do normal blank vesa_off_interval == 0 -> Do VESA blank 2. Start the VESA blank timer if vesa_off_interval != 0 and vesa_power_mode != 0. It also gets rid of the limiting vesa_powerdown() function. Signed-off-by: Ville Syrjala Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cae8a12f49972f040bae6707b7707cd93fe9c9ab Author: Thomas Koeller Date: Mon Jan 9 20:53:48 2006 -0800 [PATCH] non-linear frame buffer read/write access While the code in fbmem.c allows for hooking read/write access to non-linear frame buffers by means of fb_read and fb_write in struct fb_ops, I could not find a way tho access the actual frame buffer memory from within these routines. I therefore had to patch fbmem.c, to be able to retrieve a pointer to struct fb_info from the 'file' argument to these functions. The second hunk of the patch is not strictly required, I only did that for symmetry reasons (and the code is somewhat shorter). Signed-off-by: Thomas Koeller Acked-by: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74b4f04231b9755106d803ef73b11c3cf6978bcd Author: YOSHIFUJI Hideaki Date: Mon Jan 9 20:53:46 2006 -0800 [PATCH] fbdev: Typos in Kconfig Signed-off-by: YOSHIFUJI Hideaki Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit def1ededb7bfefc8678b4c7251622f7cbe65af94 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:45 2006 -0800 [PATCH] fbdev: Replace kmalloc with kzalloc Replace kmalloc with kzalloc Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a39bc34ea8f042e090ade124726ae5a3fd1a51f8 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:44 2006 -0800 [PATCH] fbcon: Code cleanups - replace kmalloc with kzalloc - remove repeated define (FONTCHHCNT) - remove unneeded local variable (redraw) in ypan_{up|down}_redraw - add and delete cursor timer in fbcon_switch() if old_info != info Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5eec03f314e1406829d9683284673203b91b9b8 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:43 2006 -0800 [PATCH] i810fb: Fix suspend and resume hooks The i810fb suspend and resume hooks have suffered bitrot over time. Update to current framework, but functionality still not guaranteed to work. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 740f14ba5335d1e25b9f3e80643be801f653cd32 Author: Arnaud Patard Date: Mon Jan 9 20:53:41 2006 -0800 [PATCH] s3c2410fb: cleanup and fix Here are some cleanups for the s3c2410fb drivers. It : * Removes a buggy call to s3c2410fb_init_registers. There was two calls to this function but the first was done without all initialisations done. No oops but it may confuse some LCDs. * Makes two functions static. Signed-Off-By: Arnaud Patard Signed-Off-By: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 918799ab6f278805d4811770e9b18ae36408c17f Author: Antonino A. Daplas Date: Mon Jan 9 20:53:40 2006 -0800 [PATCH] nvidiafb: Reduce stack usage Reduce stack usage of NVCommonSetup() Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ade9185a39aa2bc51f95b4899836e59df671d844 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:39 2006 -0800 [PATCH] nvidiafb: Add boot option 'bpp' Add boot/module option 'bpp' so user can specify at what color depth to boot into. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af5d0f7e2b5e9ef369de2aefe51e14ca1e6928f5 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:38 2006 -0800 [PATCH] fbdev: Reduce stack usage calc_mode_timings() and fb_get_mode() are using more than 500 bytes off the stack. Fix. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a484a3af905a256cbdd7079defceac62b39e8fa Author: Antonino A. Daplas Date: Mon Jan 9 20:53:37 2006 -0800 [PATCH] fbdev: Fix return code of fb_read and fb_write Make fb_read() and fb_write() return 0 (EOF) instead of -ENOSPC if reading at or past the end of the framebuffer. This fixes user space apps hanging if info->fix.smem_len == 0. Whitespace changes. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 244ab72d84a04d40bd270da604161e02af73fb11 Author: Knut Petersen Date: Mon Jan 9 20:53:36 2006 -0800 [PATCH] fbcon: disable ywrap if not supported by fbcon scrolling code updatescrollmode() must not select ywrap scrolling if divides(vc->vc_font.height, yres) is not true as this is not supported by the actual ywrap scrolling code. The bug is triggered with e.g. mode 800x600, vxres 1024, vyres 8192, bpp 8, font dimensions 8x16, 8Mb video ram and FBINFO_HWACCEL_YWRAP set. If those conditions are met, scrolling is broken and garbage is permanently displayed at the bottom of the screen. No regression, no possible side effects. Definitely needed by cyblafb and probably needed by amifb. Signed-off-by: Knut Petersen Acked-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f08ff4a4dab1ebef06d154050fb80ce2c13fc9c Author: Adrian Bunk Date: Mon Jan 9 20:53:35 2006 -0800 [PATCH] include/video/newport.h: "extern inline" -> "static inline" "extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d911233fe6632981086942a6b66e7ae5dabaaadc Author: Antonino A. Daplas Date: Mon Jan 9 20:53:34 2006 -0800 [PATCH] skeletonfb: Documentation update Update skeletonfb so it reflects recent (and somewhat old) changes of the framebuffer layer. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c549dc6422e4b720fed6702d70fddd8cee0f5c9a Author: Antonino A. Daplas Date: Mon Jan 9 20:53:33 2006 -0800 [PATCH] nvidiafb: Add support for some pci-e chipsets Chipsets with PCI device ids & 0xf0 == 0x00f0 has their actual chipset type in offset 0x1800 of the mmio space. Add support for this. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a14b2283c5fb8504d15768cbd20fbe337ffdb3d6 Author: Ville Syrjälä Date: Mon Jan 9 20:53:32 2006 -0800 [PATCH] atyfb: LT/LG cleanup Clean up LT and LG chip descriptions. "Mach64 LG" is called 3D Rage LT in the specs and ATI press releases. "Mach64 LT" is unclear. XFree86 driver doesn't know this chip at all. Windows display.inf calls it just "mach64 LT" and it uses the same driver as VT-A/GT-A and older chips. VT-B/GT-B and better use another driver and all of those chips have a more descriptive name in the display.inf file. That makes me think this chip is not a 3D Rage chip. Signed-off-by: Ville Syrjälä Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c23b67c49e239e40fad3947483815637e5f1790 Author: Ville Syrjälä Date: Mon Jan 9 20:53:31 2006 -0800 [PATCH] atyfb: VT/GT cleanup Clean up VT and GT chip descriptions. All B revision VT chips are called 264VT3. Verified from pictures of the chips as the specs are a bit unlear in this. GT revision B1 is Rage II, B2 is Rage II+. Specs and chip pictures seem to agree. VT revision A4 is 264VT2. Revision A3 is probably a plain 264VT. Signed-off-by: Ville Syrjälä Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69b569f5c0b47c33fec4e35921368e43cbe089a5 Author: Ville Syrjälä Date: Mon Jan 9 20:53:30 2006 -0800 [PATCH] atyfb: Rage XL/XC cleanup Clean up Rage XL/XC chip descriptions. Signed-off-by: Ville Syrjälä Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 480913fe42ae2ff2c821a9e12e6e3eac28d7d730 Author: Ville Syrjälä Date: Mon Jan 9 20:53:28 2006 -0800 [PATCH] atyfb: Improve blanking Force blanking signal and disable display requests when blanked. Don't disable LCD backlight with FB_BLANK_NORMAL. Signed-off-by: Ville Syrjälä Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 25163c56ed88a3009e7c1d808d3a052357301d63 Author: Ville Syrjälä Date: Mon Jan 9 20:53:27 2006 -0800 [PATCH] atyfb: Set ECP divider Set ECP (scaler/overlay clock) divider. The limits were taken from the XFree86 ati driver. Signed-off-by: Ville Syrjälä Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e98cef1e9e0ef0c5c02f6f3daa4da7956ad1c9ea Author: Ville Syrjälä Date: Mon Jan 9 20:53:26 2006 -0800 [PATCH] atyfb: Don't stretch with CRT The overlay on 3D Rage LT Pro doesn't work correctly if stretching is enabled when using only a CRT. Signed-off-by: Ville Syrjälä Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a87d7fddbd7f46475842431d153d35bd03cf4f63 Author: Ville Syrjälä Date: Mon Jan 9 20:53:25 2006 -0800 [PATCH] atyfb: Fix interlaced modes Fix interlaced display modes. Signed-off-by: Ville Syrjälä Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50c839c7b5e7d7cc3443176f5d5458e134b0b189 Author: Ville Syrjälä Date: Mon Jan 9 20:53:23 2006 -0800 [PATCH] atyfb: Fix CRTC_FIFO_LWM mask CRTC_FIFO_LWM was incorrectly masked. Signed-off-by: Ville Syrjälä Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 866d84cec0d37bd6a54428b66fed01e7b7aceeb3 Author: Ville Syrjälä Date: Mon Jan 9 20:53:22 2006 -0800 [PATCH] atyfb: Reduce verbosity Don't complain about invalid modes when FB_ACTIVATE_TEST is used. Signed-off-by: Ville Syrjälä Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd4617bef436a3342a959fe7ca870bb10d59d509 Author: Ville Syrjälä Date: Mon Jan 9 20:53:21 2006 -0800 [PATCH] atyfb: Fix spelling Fix some spelling mistakes. Signed-off-by: Ville Syrjälä Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c49a2bf7993c38b452017e729646e86815b7a51d Author: Antonino A. Daplas Date: Mon Jan 9 20:53:19 2006 -0800 [PATCH] vga16fb: Trim vga16fb_pan_display Remove error checking and updating from vga16fb_pan_display. This is guaranteed to be done by the core layer. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e53f87a02a0d77c519fb93c7aa0912956294050c Author: Antonino A. Daplas Date: Mon Jan 9 20:53:18 2006 -0800 [PATCH] Fix vesafb display panning regression Fix vesafb hang when scroll mode is REDRAW. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f845fbac4e68573351965d9aaf626a63cc4151c7 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:17 2006 -0800 [PATCH] vesafb: Trim vesafb_pan_display Remove error checking from vesafb_pan_display. This is guaranteed to be done by the core layer. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32cf8c1e50ac9d49f348e886c6e664cdc37aaead Author: Antonino A. Daplas Date: Mon Jan 9 20:53:16 2006 -0800 [PATCH] savagefb: Trim savagefb_pan_display Remove error checking and updating from savagefb_pan_display. This is guaranteed to be done by the core layer. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 198a52a1c490be89a8d5d130eda972630919e0af Author: Antonino A. Daplas Date: Mon Jan 9 20:53:15 2006 -0800 [PATCH] rivafb: Trim rivafb_pan_display Remove error checking and updating from rivafb_pan_display. This is guaranteed to be done by the core layer. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7227576f4b9dcffe32f8e6b228361b38814bbe7f Author: Antonino A. Daplas Date: Mon Jan 9 20:53:14 2006 -0800 [PATCH] fbdev: sstfb: Driver cleanups - remove unneeded casts - make setcolreg return success if regno > 15, but don't do anything - use framebuffer_alloc/framebuffer_release to allocate/free memory Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb639258f92b2407c50f79a95364f42932481389 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:13 2006 -0800 [PATCH] fbdev: atyfb: Remove BIOS-less booting CONFIG_ATYFB_XL_INIT option is broken for a long time. It will always cause a kernel hang. Since no one has fixed this problem for some time now, remove it from atyfb. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 313e58ab362473fb471f32b7bf86587f7c627a11 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:12 2006 -0800 [PATCH] fbdev: fbdev: Cleanup - remove unneeded casts Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a807f618b62594467a52b488912bd77606af0572 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:11 2006 -0800 [PATCH] fbdev: tdfxfb: Driver cleanups - remove unneeded casts - move memory for pseudo_palette inside struct tdfxfb_par - whitespace changes Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6772a2ee9d5992a712b46990f39249c500e0221f Author: Antonino A. Daplas Date: Mon Jan 9 20:53:10 2006 -0800 [PATCH] fbdev: pm2fb: Driver cleanups - remove unneeded casts - move memory for pseudo_palette inside struct pm2fb_par Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f19bc56c3ce7d9a1c7159c2456d9b50883930e6 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:09 2006 -0800 [PATCH] fbdev: neofb: Driver cleanups - remove unneeded casts - move memory for pseudo_palette inside struct neofb_par Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a26968df0110bc2117e5572a07e285b183e68736 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:08 2006 -0800 [PATCH] fbdev: kyrofb: Driver cleanups - remove unneeded casts - use framebuffer_alloc/framebuffer_release to allocate/free memory - the pseudo_palette is always u32 regardless of bpp if using generic drawing functions Signed-off-by: Antonino Daplas Acked-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94f9e09ce531d48b2e46208f9b1c8733a74c22de Author: Antonino A. Daplas Date: Mon Jan 9 20:53:07 2006 -0800 [PATCH] fbdev: imsttfb: Driver cleanups - remove unneeded casts - the pseudo_palette, if using the generic drawing functions, must always be u32 regardless of the bpp - use framebuffer_alloc/framebuffer_release to allocate memory Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d204ef3e4ea61058e49453af393ca754b529b85 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:06 2006 -0800 [PATCH] fbdev: hgafb: Convert to platform device - convert to platform device Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a9f61702608b6ae7905063278b832439e608938 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:05 2006 -0800 [PATCH] fbdev: asiliantfb: Driver cleanups - allocate just enough space for the pseudo_palette Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4a41836f1215ae1835c3f00316b20bb32cbfe99 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:04 2006 -0800 [PATCH] fbdev: rivafb: Driver cleanups - remove redundant casts Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c019c0ec97548d545c42961e960cbe2e8a6aabe9 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:03 2006 -0800 [PATCH] fbdev: i810fb: Driver cleanups - remove redundant casts Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8901b091db260b0f0101d6395ce5c6016835a47 Author: Antonino A. Daplas Date: Mon Jan 9 20:53:02 2006 -0800 [PATCH] fbdev: savagefb: Driver cleanup - remove redundant casts - remove symbol_get/symbol_put Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c439e345425434f07df333083794fc8864cee9ca Author: Antonino A. Daplas Date: Mon Jan 9 20:53:02 2006 -0800 [PATCH] fbdev: nvidiafb: Driver cleanup - remove redundant casts - add mode_option to module parameter Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30420f8f464975f7f26e8195f60569dfed6ac060 Author: Matthew Garrett Date: Mon Jan 9 20:53:01 2006 -0800 [PATCH] Add sysfs entry to disable framebuffer access What commit c35dba601728412f67801792107d3dddd1f3ada1 Author: Jean Delvare Date: Mon Jan 9 20:52:59 2006 -0800 [PATCH] savagefb: One more I2C-enabled device in savagefb The I2C bus of the S3 Savage2000 is supposed to work the same way the Savage4 does. At least, the legacy i2c-savage4 driver handled both devices the same way. I do not have the hardware to test this, so testers are welcome. Signed-off-by: Jean Delvare Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3e21169b84a80b35d81a2b9fd97eb0b7d73d3f9 Author: Antonino A. Daplas Date: Mon Jan 9 20:52:58 2006 -0800 [PATCH] matroxfb: Remove fbcon.h from the main header file matroxfb has no need for struct display and fbcon.h. Remove. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04a2fe574ad10156266fcdb50adf30ebedad76fb Author: Antonino A. Daplas Date: Mon Jan 9 20:52:58 2006 -0800 [PATCH] fbcon: Store struct display when setting all vcs Store struct display when setting all vc's. Otherwise, fbcon's behavior becomes undefined, such as malpositioning of the cursor. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2610acc7ab36d7657d9a0c97a0e83cd1d6ee2b33 Author: Alessandro Zummo Date: Mon Jan 9 20:52:57 2006 -0800 [PATCH] nvidiafb: i2c bus name beautification Assign nvidiafb's i2c busses a better name. Signed-off-by: Alessandro Zummo Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b73deed32d08740bdbf5f4aab43d988e4d135d95 Author: Antonino A. Daplas Date: Mon Jan 9 20:52:56 2006 -0800 [PATCH] fbcon: Sanitize fbcon Do not pass the structure display since fbcon is already keeping the pointer to the current display. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8416131ded5e491ecc2947d1ffaedf64725bb7a3 Author: Richard Knutsson Date: Mon Jan 9 20:52:55 2006 -0800 [PATCH] aty: remove unnecessary CONFIG_PCI Signed-off-by: Richard Knutsson Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b4f2f4b0132afa9f441171285cca354377bf5d0 Author: Antonino A. Daplas Date: Mon Jan 9 20:52:54 2006 -0800 [PATCH] vesafb: Drop blank hook From: Bugzilla Bug 5351 "After resuming from S3 (suspended while in X), the LCD panel stays black . However, the laptop is up again, and I can SSH into it from another machine. I can get the panel working again, when I first direct video output to the CRT output of the laptop, and then back to LCD (done by repeatedly hitting Fn+F5 buttons on the Toshiba, which directs output to either LCD, CRT or TV) None of this ever happened with older kernels." This bug is due to the recently added vesafb_blank() method in vesafb. It works with CRT displays, but has a high incidence of problems in laptop users. Since CRT users don't really get that much benefit from hardware blanking, drop support for this. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 532347e2bbae9e849816dc7b12a3d0f2c42d4944 Author: Ingo Molnar Date: Mon Jan 9 20:52:53 2006 -0800 [PATCH] nfs: sleep_on() removal Convert sleep_on() to wait_event_timeout(). Probably safe with the BKL but could be racy once BKL use in NFS-client is gone. Acked-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e866cfa939de7f52c154a9495eb5767f89abf453 Author: Oleg Drokin Date: Mon Jan 9 20:52:51 2006 -0800 [PATCH] d_instantiate_unique / NFS inode leakage If we have found aliased dentry that we return, inode reference is not dropped and inode is not attached anywhere, so it seems the reference to inode is leaked in that case. Cc: Trond Myklebust , Cc: Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 632d6407afb58ef125bf7e82a2e8af27d0704b56 Author: Jiri Slaby Date: Mon Jan 9 20:52:51 2006 -0800 [PATCH] media-radio: Maestro radio delete owner line from video device fops is used for module handling with ownership. Signed-off-by: Jiri Slaby Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f86e7767990c0d63f0630cbf6018b6996f9ecde5 Author: Jiri Slaby Date: Mon Jan 9 20:52:50 2006 -0800 [PATCH] media-radio: Maestro avoid accessing private structures directly video_device.priv is not allowed to touch and it will be actually removed in near future. Use video_get_drvdata() instead. Signed-off-by: Jiri Slaby Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0eaa21fdfe2c50ba27456730cd8da8782cddaf6f Author: Jiri Slaby Date: Mon Jan 9 20:52:49 2006 -0800 [PATCH] media-radio: Maestro types change __u16 --> u16 and so on Signed-off-by: Jiri Slaby Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a2cf8eed7f9c8dcc08785259cd179fcb317b120 Author: Jiri Slaby Date: Mon Jan 9 20:52:48 2006 -0800 [PATCH] media-radio: Maestro radio Lindent Maestro radio Lindent + some handwork Signed-off-by: Jiri Slaby Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89dad8f07fa244d64459ecd9499bc314dc617598 Author: Jiri Slaby Date: Mon Jan 9 20:52:47 2006 -0800 [PATCH] media-radio: Pci probing for maestro radio - Pci probing functions added, some functions were rewrited. - Use PCI_DEVICE macro. - dev_* used for printing when pci_dev available. - some static variables changed to dynamicto allow operation with multiple cards. - Deleted macros for DEVICE_IDS, they are in pci_ids.h yet. Signed-off-by: Jiri Slaby Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0d50069ed3620e9a4d8939bbc3e0d5a692ab58a Author: Keshavamurthy Anil S Date: Mon Jan 9 20:52:46 2006 -0800 [PATCH] Kprobes: conversion from kcalloc to kzalloc Signed-of-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0498b63504f818e5ab39c818cd6f7b41319a1187 Author: Ananth N Mavinakayanahalli Date: Mon Jan 9 20:52:46 2006 -0800 [PATCH] kprobes: fix build breakage The following patch (against 2.6.15-rc5-mm3) fixes a kprobes build break due to changes introduced in the kprobe locking in 2.6.15-rc5-mm3. In addition, the patch reverts back the open-coding of kprobe_mutex. Signed-off-by: Ananth N Mavinakayanahalli Acked-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e597c2984c64609c6e1e1ac803f00f7550705860 Author: Anil S Keshavamurthy Date: Mon Jan 9 20:52:45 2006 -0800 [PATCH] kprobes: arch_remove_kprobe Currently arch_remove_kprobes() is only implemented/required for x86_64 and powerpc. All other architecture like IA64, i386 and sparc64 implementes a dummy function which is being called from arch independent kprobes.c file. This patch removes the dummy functions and replaces it with #define arch_remove_kprobe(p, s) do { } while(0) Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f709b122343fb9a010b6cf2d5559641f1820f7c9 Author: Keshavamurthy Anil S Date: Mon Jan 9 20:52:44 2006 -0800 [PATCH] kprobes-changed-fro