commit 826eeb53a6f264842200d3311d69107d2eb25f5e Author: Linus Torvalds Date: Thu Feb 2 22:03:08 2006 -0800 Linux v2.6.16-rc2 commit 1113a7e92e483074c6235da59460759e33b9b144 Author: Stefan Bader Date: Thu Feb 2 14:28:07 2006 -0800 [PATCH] device-mapper log bitset: fix big endian find_next_zero_bit This is a fix to the device-mapper-log-bitset-fix-endian patch that switched to ext2_* versions of the set and clear bit functions. The find_next_zero_bit function also has to be the ext2 one. Otherwise the mirror target tries to recover non-existent regions beyond the end of device. Signed-off-by: Stefan Bader Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35849c75d7750a254119c1a4b88c90156919df2a Author: NeilBrown Date: Thu Feb 2 14:28:06 2006 -0800 [PATCH] md: Add sysfs access to raid6 stripe cache size .. just as we already have for raid5. Signed-off-by: Neil Brown Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 978f946bb628ef228e13aadf4d4255b8727c4fc3 Author: NeilBrown Date: Thu Feb 2 14:28:05 2006 -0800 [PATCH] md: Don't remove bitmap from md array when switching to read-only While a read-only array doesn't not really need a bitmap, we should not remove the bitmap when switching an array to read-only because a/ There is no code to re-add the bitmap which switching to read-write, b/ There is insufficient locking - the bitmap could be accessed while it is being removed. Cc: Reuben Farrelly Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0ca340cd20b350eab8288974e9a6077900846e8 Author: NeilBrown Date: Thu Feb 2 14:28:04 2006 -0800 [PATCH] md: Make sure array geometry changes persist with version-1 superblocks super_1_sync only updates fields in the superblock that might have changed. 'raid_disks' and 'size' could have changed, but this information doesn't get updated.... until this patch. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d89332b776fc11bac0073209e44ec8f39831e4e Author: NeilBrown Date: Thu Feb 2 14:28:03 2006 -0800 [PATCH] md: Fix device-size updates in md As 'array_size' is a 'sector_t', it may overflow inappropriately when shifted 10 bits. So We should cast it to a loff_t first. There are two places with this problem, but the second (in update_raid_disks) isn't needed so just remove it: The only personality that handles ->reshape currently is raid1, and it doesn't change the size of the array. When added for raid5/6, reshape again won't change the size of the array, at least not straight away. This code might be need for reshaping 'linear' but linear->shape, if implemented, should probably do the i_size_write itself. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0271fc2db6260dd46f196191e24281af2fddb879 Author: Jeremy Higdon Date: Thu Feb 2 00:00:46 2006 -0800 [PATCH] Fix sgiioc4 DMA timeout problem with 64KiB s/g elements. Problem caused by the fact that the code used to only pick the low 16 bits of the bytecount. That may be how some controllers act on it (byte count of 0 means 0x10000), but not for this particular hardware. Signed-off-by: Jeremy Higdon Acked-by: Jes Sorensen Signed-off-by: Linus Torvalds commit 30e2fb188194908e48d3f27a53ccea6740eb1e98 Author: Dave Airlie Date: Thu Feb 2 19:37:46 2006 +1100 sem2mutex: drivers/char/drm/ From: Arjan van de Ven Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit ce60fe02fbe737cbce09e2ba5a2ef1efd20eff73 Author: Dave Airlie Date: Thu Feb 2 19:21:38 2006 +1100 drm: drivers/char/drm/: make some functions static From: Adrian Bunk This patch makes some needlessly global functions static. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 9ad11ab48b1ad618bf47076e9e579f267f5306c2 Author: Stephen Rothwell Date: Thu Feb 2 16:11:51 2006 +1100 [PATCH] compat: fix compat_sys_openat and friends Most of the 64 bit architectures will zero extend the first argument to compat_sys_{openat,newfstatat,futimesat} which will fail if the 32 bit syscall was passed AT_FDCWD (which is a small negative number). Declare the first argument to be an unsigned int which will force the correct sign extension when the internal functions are called in each case. Also, do some small white space cleanups in fs/compat.c. Signed-off-by: Stephen Rothwell Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 61ee9cd5f2e76859222c1d64394ae633f9080163 Author: Linas Vepstas Date: Wed Feb 1 18:21:09 2006 -0600 [PATCH] PowerPC/PCI Hotplug build break Build break: Building PCI hotplug on PowerPC results in a build break, due to failure to export symbols. Reported today by Dave Jones : drivers/pci/hotplug/rpaphp.ko needs unknown symbol pcibios_add_pci_devices This patch fixes same problem in drivers/pci tree Previous patch fixes the break in the arch/powerpc tree. Signed-off-by: Linas Vepstas Signed-off-by: Linus Torvalds commit f9bdfa0ecb3304e8b7e74862b1f4b03b6feaaeef Author: Linas Vepstas Date: Wed Feb 1 18:19:06 2006 -0600 [PATCH] PowerPC/PCI Hotplug build break Build break: Building PCI hotplug on PowerPC results in a build break, due to failure to export symbols. Reported today by Dave Jones : drivers/pci/hotplug/rpaphp.ko needs unknown symbol pcibios_add_pci_devices This patch fixes the break in the arch/powerpc tree. Next patch fixes same problem in drivers/pci tree Signed-off-by: Linas Vepstas Signed-off-by: Linus Torvalds commit 00b464debf0038b1628996065f0be564ccfbfd86 Author: Trond Myklebust Date: Wed Feb 1 12:49:28 2006 -0500 SUNRPC: Remove obsolete rpcauth #defines RPCAUTH_CRED_LOCKED, and RPC_AUTH_PROC_CREDS are unused. Kill them. Signed-off-by: Trond Myklebust commit 1935245655996ca4d14e687c3a100d2e2bbdc78d Author: Dirk Mueller Date: Wed Feb 1 12:19:47 2006 -0500 NFSv3: fix sync_retry in direct i/o NFS Only do a sync_retry if the memcmp failed. Signed-off-by: Dirk Mueller Signed-off-by: Trond Myklebust commit fba3bad488a2eec2d76c067edb7a5ff92ef42431 Author: Trond Myklebust Date: Wed Feb 1 12:19:27 2006 -0500 SUNRPC: Move upcall out of auth->au_ops->crcreate() This fixes a bug whereby if two processes try to look up the same auth_gss credential, they may end up creating two creds, and triggering two upcalls because the upcall is performed before the credential is added to the credcache. Signed-off-by: Trond Myklebust commit adb12f63e0f837078c6832fa2c90649ddeaab54f Author: Trond Myklebust Date: Wed Feb 1 12:19:13 2006 -0500 SUNRPC: Remove the deprecated function lookup_hash() from rpc_pipefs code Signed-off-by: Trond Myklebust commit 9842ef3557abf5ec2fd92bfa6e29ce0e271b3f6e Author: Trond Myklebust Date: Wed Feb 1 12:18:44 2006 -0500 SUNRPC: rpc_timeout_upcall_queue should not sleep The function rpc_timeout_upcall_queue runs from a workqueue, and hence sleeping is not recommended. Convert the protection of the upcall queue from being mutex-based to being spinlock-based. Signed-off-by: Trond Myklebust commit 8a3177604b729ec3b80e43790ee978863ac7551b Author: Trond Myklebust Date: Wed Feb 1 12:18:36 2006 -0500 SUNRPC: Fix a lock recursion in the auth_gss downcall When we look up a new cred in the auth_gss downcall so that we can stuff the credcache, we do not want that lookup to queue up an upcall in order to initialise it. To do an upcall here not only redundant, but since we are already holding the inode->i_mutex, it will trigger a lock recursion. This patch allows rpcauth cache searches to indicate that they can cope with uninitialised credentials. Signed-off-by: Trond Myklebust commit aaaa99423b4b1f9cfd33ea5643d9274c25f62491 Author: Trond Myklebust Date: Wed Feb 1 12:18:25 2006 -0500 NLM: Ensure that nlmclnt_cancel_callback() doesn't loop forever If the server returns NLM_LCK_DENIED_NOLOCKS, we currently retry the entire NLM_CANCEL request. This may end up looping forever unless the server changes its mind (why would it do that, though?). Ensure that we limit the number of retries (to 3). See bug# 5957 in bugzilla.kernel.org. Signed-off-by: Trond Myklebust commit 16fb24252a8170799e7adf14d8fc31b817fcaf53 Author: Trond Myklebust Date: Wed Feb 1 12:18:22 2006 -0500 NLM: Fix arguments to NLM_CANCEL call The OpenGroup docs state that the arguments "block", "exclusive" and "alock" must exactly match the arguments for the lock call that we are trying to cancel. Currently, "block" is always set to false, which is wrong. See bug# 5956 on bugzilla.kernel.org. Signed-off-by: Trond Myklebust commit 3c3b809e256c417847f1a96b2f9d9f66c7fcb02c Author: Randy Dunlap Date: Wed Feb 1 03:06:58 2006 -0800 [PATCH] kernel-doc: clean up the script (whitespace) Remove lots of trailing whitespace. Nothing else. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d28bee0c0a9c6abddf1d14c69f188400e994eb5a Author: Randy Dunlap Date: Wed Feb 1 03:06:57 2006 -0800 [PATCH] Doc/kernel-doc: add more usage info - Add info that structs, unions, enums, and typedefs are supported. - Add doc about "private:" and "public:" tags for struct fields. - Fix some typos. - Remove some trailing whitespace. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7045f37b17ffa6e85435ca980122b46a74caa7e4 Author: Martin Waitz Date: Wed Feb 1 03:06:57 2006 -0800 [PATCH] DocBook: fix some kernel-doc comments in fs and block Update some parameter descriptions to actually match the code. Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 99acf0442111cc452ac1b93868dde8f6ff37a989 Author: Martin Waitz Date: Wed Feb 1 03:06:56 2006 -0800 [PATCH] DocBook: fix some kernel-doc comments in net/sunrpc Fix the syntax of some kernel-doc comments Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9598f91f2216ba51fef472a7fc3074a0c8429a96 Author: Martin Waitz Date: Wed Feb 1 03:06:55 2006 -0800 [PATCH] DocBook: allow even longer return types kernel-doc errored out because it could not understand the new __copy_to_user definition. Now we allow return types with four words. Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00d340b94f6df17d5dc478521e4ee1cfb30c53ac Author: Manuel Lauss Date: Wed Feb 1 03:06:54 2006 -0800 [PATCH] i810fb: Do not probe the third i2c bus by default Some time before 2.6.15, a third DDC channel was added to i810fb. On systems where these ddc pins are not connected, the probe takes about 10 seconds. Add a boot/module option for i810fb to explicitly probe for the 3rd ddc bus if needed. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06c6f90032e39d33d02ab20f32e3f3cd87f58d28 Author: Andriy Skulysh Date: Wed Feb 1 03:06:53 2006 -0800 [PATCH] video: hp680 backlight driver This adds support for the hp680 backlight, as found in the hp6xx series of sh devices. Signed-off-by: Andriy Skulysh Signed-off-by: Paul Mundt Acked-by: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9477e260b7ca3b6076b91eae15739383c508f3e2 Author: Antonino A. Daplas Date: Wed Feb 1 03:06:52 2006 -0800 [PATCH] fbcon: Fix screen artifacts when moving cursor When moving the cursor by writing to /dev/vcs*, the old cursor image is not erased. Fix by hiding the cursor first before moving the cursor to the new position. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa385bef256077f3b820b241e8f3755ef3905b74 Author: Jeff Mahoney Date: Wed Feb 1 03:06:51 2006 -0800 [PATCH] reiserfs: reiserfs: check for files > 2GB on 3.5.x disks When a filesystem has been converted from 3.5.x to 3.6.x, we need an extra check during file write to make sure we are not trying to make a 3.5.x file > 2GB. Signed-off-by: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ae1ea447d21c4fecf5df8d0e1022461274fb4e8 Author: Chris Mason Date: Wed Feb 1 03:06:50 2006 -0800 [PATCH] reiserfs: reiserfs fix journal accounting in journal_transaction_should_end reiserfs: journal_transaction_should_end should increase the count of blocks allocated so the transaction subsystem can keep new writers from creating a transaction that is too large. Signed-off-by: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d4492f81dd7b486f1be0616a1ce7f73760f406e Author: Chris Mason Date: Wed Feb 1 03:06:49 2006 -0800 [PATCH] reiserfs: reiserfs write_ordered_buffers should not oops on dirty non-uptodate bh write_ordered_buffers should handle dirty non-uptodate buffers without a BUG() Signed-off-by: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0e851cf30f1a9bd2e2a7624e9810378d6a2b072 Author: Chris Mason Date: Wed Feb 1 03:06:49 2006 -0800 [PATCH] reiserfs: reiserfs hang and performance fix for data=journal mode In data=journal mode, reiserfs writepage needs to make sure not to trigger transactions while being run under PF_MEMALLOC. This patch makes sure to redirty the page instead of forcing a transaction start in this case. Also, calling filemap_fdata* in order to trigger io on the block device can cause lock inversions on the page lock. Instead, do simple batching from flush_commit_list. Signed-off-by: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc5cd582e9c934ddaf6f310179488932cd154794 Author: Chris Mason Date: Wed Feb 1 03:06:48 2006 -0800 [PATCH] reiserfs: zero b_private when allocating buffer heads The b_private field in buffer heads needs to be zero filled when the buffers are allocated. Thanks to Nathan Scott for finding this. It was causing problems on systems with both XFS and reiserfs. Signed-off-by: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d62b1b87a7d1c3a21dddabed4251763090be3182 Author: Chris Mason Date: Wed Feb 1 03:06:47 2006 -0800 [PATCH] resierfs: fix reiserfs_invalidatepage race against data=ordered After a transaction has closed but before it has finished commit, there is a window where data=ordered mode requires invalidatepage to pin pages instead of freeing them. This patch fixes a race between the invalidatepage checks and data=ordered writeback, and it also adds a check to the reiserfs write_ordered_buffers routines to write any anonymous buffers that were dirtied after its first writeback loop. That bug works like this: proc1: transaction closes and a new one starts proc1: write_ordered_buffers starts processing data=ordered list proc1: buffer A is cleaned and written proc2: buffer A is dirtied by another process proc2: File is truncated to zero, page A goes through invalidatepage proc2: reiserfs_invalidatepage sees dirty buffer A with reiserfs journal head, pins it proc1: write_ordered_buffers frees the journal head on buffer A At this point, buffer A stays dirty forever Signed-off-by: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec191574b9c3cb7bfb95e4f803b63f7c8dc52690 Author: Christoph Hellwig Date: Wed Feb 1 03:06:46 2006 -0800 [PATCH] reiserfs: use generic_permission Use the generic_permission code with a proper wrapper and callback instead of having a local copy. Signed-off-by: Christoph Hellwig Cc: Jeff Mahoney Cc: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c87d0c07ea198db1ce451421904edd60b7d385ee Author: Christoph Hellwig Date: Wed Feb 1 03:06:45 2006 -0800 [PATCH] reiserfs: remove reiserfs_permission_locked This function is completely unused since the xattr permission checking changes. Remove it and fold __reiserfs_permission into reiserfs_permission. Signed-off-by: Christoph Hellwig Cc: Jeff Mahoney Cc: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5dd259f78ba0fd0c7bfc5c52179dbbff3eb48aa Author: Diego Calleja Date: Wed Feb 1 03:06:44 2006 -0800 [PATCH] reiserfs: missing kmalloc failure check According to http://bugzilla.kernel.org/show_bug.cgi?id=5778 fs/reiserfs/file.c is missing this check. Signed-off-by: Diego Calleja Cc: Jeff Mahoney Cc: Chris Mason Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c777cc4be1390862d053cbc002246e87572147b Author: Pekka Enberg Date: Wed Feb 1 03:06:43 2006 -0800 [PATCH] reiserfs: use __GFP_NOFAIL instead of yield and retry loop for allocation This patch replaces yield and retry loop with __GFP_NOFAIL in alloc_journal_list(). Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d739b42b82773206297db1fc0d96ef895a5d9688 Author: Pekka Enberg Date: Wed Feb 1 03:06:43 2006 -0800 [PATCH] reiserfs: remove kmalloc wrapper Remove kmalloc() wrapper from fs/reiserfs/. Please note that a reiserfs /proc entry format is changed because kmalloc statistics is removed. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d19720a909b4443f78cbb03f4f090180e143ad9d Author: Paul E. McKenney Date: Wed Feb 1 03:06:42 2006 -0800 [PATCH] RCU documentation fixes (January 2006 update) Updates to in-tree RCU documentation based on comments over the past few months. Signed-off-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53d8be5c144ece5d48745810b14248968e73eaf2 Author: Pat Gefre Date: Wed Feb 1 03:06:41 2006 -0800 [PATCH] Altix ioc3: correct export call Use EXPORT_SYMBOL_GPL in ioc3 shim layer. Signed-off-by: Patrick Gefre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 172411f10c25bbd81b19f67566af6a7f549f46a9 Author: Davi Arnaut Date: Wed Feb 1 03:06:40 2006 -0800 [PATCH] ebcdic do_kdsk_ioctl off-by-one Add a missing return check from strnlen_user and fixes a off-by-one when terminating the string with zero. Signed-off-by: Davi Arnaut Cc: Heiko Carstens Cc: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46d0d2c811c8e9dd5cffdc3a5c03d988eb5a2996 Author: Peter Oberparleiter Date: Wed Feb 1 03:06:40 2006 -0800 [PATCH] s390: Add missing memory constraint to stcrw() Add missing memory constraint to stcrw() inline assembly. Signed-off-by: Peter Oberparleiter Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1969fa46d95efcdb0b84c540eca10db99665148 Author: Cornelia Huck Date: Wed Feb 1 03:06:39 2006 -0800 [PATCH] s390: Fix modalias for ccw devices Fix modalias for ccw devices: cu_type should be in capitals as well. Signed-off-by: Cornelia Huck Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54dfe5dd9abc547f63060d132dad2c024a47de1e Author: Heiko Carstens Date: Wed Feb 1 03:06:38 2006 -0800 [PATCH] s390: Add support for new syscalls/TIF_RESTORE_SIGMASK Add support for the new *at, pselect6 and ppoll system calls. This includes adding required support for TIF_RESTORE_SIGMASK. Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ab865c146ef5151828f0693f1b983891cf40ff1 Author: Heiko Carstens Date: Wed Feb 1 03:06:37 2006 -0800 [PATCH] s390: New default configuration New default configuration. Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c2ba444d1d871d3f6cd3bc5e7d8e19c48c8c02a4 Author: Horst Hummel Date: Wed Feb 1 03:06:37 2006 -0800 [PATCH] s390: dasd wait for clear i/o interrupt The sleep_on function clears a running cqr without waiting for the related interrupt. This can lead to a panic at the time the interrupt is processed because the related memory might already be freed. Wait for clear-interrupt and de-queue cqr prior to return. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57467195d1581e354998d5cc35dfd7a12d6e0a24 Author: Horst Hummel Date: Wed Feb 1 03:06:36 2006 -0800 [PATCH] s390: dasd open counter The open_count is increased for every opener, that includes the blkdev_get in dasd_scan_partitions. This tampers the open_count in BIODASDINFO. Hide the internal open from user-space. Signed-off-by: Horst Hummel Signed-off-by: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 600b5d163d7434332539cac7be00f649cbbfedcc Author: Peter Oberparleiter Date: Wed Feb 1 03:06:35 2006 -0800 [PATCH] s390: ccw_device_probe_console return value The return code of ccw_device_probe_console() is not properly handled. It should only return a valid ccw device pointer or a error value converted by ERR_PTR. Fix the console driver code to check with IS_ERR instead against NULL. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3633b0475eb269dcb85923b23b321505f06b9488 Author: Jan Glauber Date: Wed Feb 1 03:06:34 2006 -0800 [PATCH] s390: hangcheck timer support Remove useless s390 define from hangcheck-timer, remove wrong definition of a TOD second and other s390 ifdefs. Use monotonic_clock instead. Add hangcheck-timer option, copied from drivers/char/Kconfig. This is ugly but unless we have a big Kconfig cleanup we cannot include drivers/char/Kconfig... Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32f65f274602b43e8f48314e9769f254da1d8323 Author: Jan Glauber Date: Wed Feb 1 03:06:33 2006 -0800 [PATCH] s390: monotonic_clock interface Add monotonic_clock interface, used by the hangcheck-timer. On s390 this is the same as sched_clock(). Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9dbafa5368c2b7467bd2ce034b56c54908ceb39e Author: Jan Glauber Date: Wed Feb 1 03:06:32 2006 -0800 [PATCH] s390: overflow in sched_clock The least significant bit of the TOD clock value returned by get_clock is the 4096th part of a microsecond. To get to nanoseconds the value needs to be divided by 4096 and multiplied with 1000. The current method multiplies first and then shifts the value to make the result as precise as possible. The disadvantage is that the multiplication with 1000 will overflow shortly after 52 days. sched_clock is used by the scheduler for time stamp deltas, if an overflow occurs between two time stamps the scheduler will get confused. With the patch the problem occurs only after approx. one year, so the chance to run into this overflow is extremly low. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e018ba1fceee5bd306e31f6e3a60934d5f143ac5 Author: Heiko Carstens Date: Wed Feb 1 03:06:31 2006 -0800 [PATCH] s390: Remove CVS generated information - Remove all CVS generated information like e.g. revision IDs from drivers/s390 and include/asm-s390 (none present in arch/s390). - Add newline at end of arch/s390/lib/Makefile to avoid diff message. Acked-by: Andreas Herrmann Acked-by: Frank Pavlic Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ceba75f121004335616befd2045c8a6b75b2bc4 Author: Alexey Dobriyan Date: Wed Feb 1 03:06:30 2006 -0800 [PATCH] xtensa: add asm/futex.h Signed-off-by: Alexey Dobriyan Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72e5525765ee01d72a9b92fab78ecea883ae7fdd Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Feb 1 03:06:29 2006 -0800 [PATCH] uml: avoid "CONFIG_NR_CPUS undeclared" bogus error messages Olaf Hering Olaf reported UML doesn't build for him with a clear analisys of what happened - we're using NR_CPUS in files linked against glibc headers. Seems like it defines CONFIG_SMP but not CONFIG_NR_CPUS, so we get CONFIG_NR_CPUS undeclared. The fix is to move the declaration away from that header file and move it in asm-um headers, and to add that header where needed. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42947cb98fd16bff21e0000a974ff6bd1e620cd4 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Feb 1 03:06:29 2006 -0800 [PATCH] uml: some harmless sparse warning fixes Fix some simple sparse warnings - a lot more staticness and a misplaced __user. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4cd7ed94428babb0cdbf08cc14c257e223186079 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Feb 1 03:06:28 2006 -0800 [PATCH] uml: skas0-hold-own-ldt fixups for x86-64 In a recent fixup i386 code was copied raw to x86_64 subarch to make it compile again. Here there are some little fixups and resyncs needed for it (mainly for cleanliness sake) - I did an audit and found the rest of the code to be safe. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5cf888631af95c8022d659d77fb595e0c3ac778 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Feb 1 03:06:27 2006 -0800 [PATCH] uml: TT - SYSCALL_DEBUG - fix buglet introduced in cleanup Fixes a bug introduced in commit e32dacb9f481fd6decb41adb28e720c923d34f54 - index is initialized based on syscall before syscall is calculated. I'm bothering with this mainly because it gives a correct warning when the config option is enabled, even if the code is for a almost unused debugging option. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dfd95b378953f6cf0bd58fc990c05ef5a0ea1a6 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Feb 1 03:06:26 2006 -0800 [PATCH] uml: fix "apples/bananas" typo Fix stupid typo. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 854e981cc69bb93b49bdd052c8bc1dc744509f04 Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Feb 1 03:06:25 2006 -0800 [PATCH] uml: fix hugest stack users The C99 initialization, with GCC's bad handling, for 6K wide structs (which _aren't_ on the stack), is causing GCC to use 12K for these silly procs with 3 vars. Workaround this. Note that .name = { '\0' } translates to memset(->name, 0, '->name' size) - I verified this with GCC's docs and a testprogram. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98105d47d3d62eb68d06d85dd448699678d725fc Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Feb 1 03:06:25 2006 -0800 [PATCH] uml: comments about libc-conflict guards While fixing myself the mktime conflict (which someone already merged), I also improved a few comments. Merge them up. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c19585b0d2f6817dd9af607650d3f6cae2fd8bc Author: Paolo 'Blaisorblade' Giarrusso Date: Wed Feb 1 03:06:24 2006 -0800 [PATCH] uml: typo fixup Trivial innocent cosmetical fixup. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db805812084ab03fbf6aac95c5f7ef2f50e3bd9a Author: Jeff Dike Date: Wed Feb 1 03:06:23 2006 -0800 [PATCH] uml: fix some typos Fix a couple of typos. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6b7a1edcb31306f904b5b11354bf0d198136e15 Author: Jeff Dike Date: Wed Feb 1 03:06:22 2006 -0800 [PATCH] uml: add a build dependency kern_constants.h now depends on arch/um/include to make sure it exists before we try to create symlinks in it. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8c206b2eeb244d6ab57d5a339e707fef2305aa7 Author: Alexey Dobriyan Date: Wed Feb 1 03:06:22 2006 -0800 [PATCH] arm26: select BLK_DEV_FD only on A5K Signed-off-by: Alexey Dobriyan Acked-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2fa63c4d0d89a3add74bf37f7768a79c1d39cb7a Author: Alexey Dobriyan Date: Wed Feb 1 03:06:21 2006 -0800 [PATCH] arm26: add __kernel_old_dev_t for nfsd Signed-off-by: Alexey Dobriyan Acked-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 407c57b86237fc2512654fa2f2ceedda92684472 Author: Alexey Dobriyan Date: Wed Feb 1 03:06:20 2006 -0800 [PATCH] arm26: drop first arg of prepare_arch_switch, finish_arch_switch Signed-off-by: Alexey Dobriyan Acked-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae7a49666af427da745e69a39fcfdd3a8b4ab3e8 Author: Alexey Dobriyan Date: Wed Feb 1 03:06:20 2006 -0800 [PATCH] arm26: drop local task_running copy Signed-off-by: Alexey Dobriyan Acked-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 896f361bd291f34e0ef439c249b79d7c51ed3f9a Author: Alexey Dobriyan Date: Wed Feb 1 03:06:19 2006 -0800 [PATCH] arm26: fixup asm statement in kernel/fiq.c Signed-off-by: Alexey Dobriyan Acked-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a16ef86c87f4b029f55fa41979134d73d1375398 Author: Alexey Dobriyan Date: Wed Feb 1 03:06:18 2006 -0800 [PATCH] arm26: fixup get_signal_to_deliver call Signed-off-by: Alexey Dobriyan Acked-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41a60ef0698394ee320813816baf221bcb533797 Author: Alexey Dobriyan Date: Wed Feb 1 03:06:17 2006 -0800 [PATCH] arm26: select system type via "choice" Choosing ARCH_ARC and ARCH_A5K together causes redefining and errors here and there. Signed-off-by: Alexey Dobriyan Acked-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0679b75e5fb653fbf6691293e7fc45520abae1d7 Author: Alexey Dobriyan Date: Wed Feb 1 03:06:17 2006 -0800 [PATCH] arm26: remove irq_exit() from hardirq.h Signed-off-by: Alexey Dobriyan Acked-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19f03f75873aebb2fb7fb592b6223b9a38bb7ad3 Author: Alexey Dobriyan Date: Wed Feb 1 03:06:16 2006 -0800 [PATCH] arm26: fix warnings about NR_IRQS being not defined Signed-off-by: Alexey Dobriyan Acked-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1320ae31b40df06fd7deec94b5369a11b0ec25c Author: Alexey Dobriyan Date: Wed Feb 1 03:06:14 2006 -0800 [PATCH] arm26: fix find_first_zero_bit related warnings include/linux/nodemask.h: In function `__first_unset_node': include/linux/nodemask.h:254: warning: passing arg 1 of `_find_first_zero_bit_le' discards qualifiers from pointer target type fs/minix/bitmap.c: In function `minix_new_block': fs/minix/bitmap.c:89: warning: passing arg 1 of `_find_first_zero_bit_le' from incompatible pointer type Signed-off-by: Alexey Dobriyan Acked-by: Ian Molton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5e3d98c5666c2533e67fb35dc5ad5de47db8aae Author: Eric Sesterhenn Date: Wed Feb 1 03:06:13 2006 -0800 [PATCH] alpha show_interrups() trashes argument This is a bug found by cpminer. The show_interrupts function reuses i as a for loop counter, and therefore trashes its contents, which are needed later. (akpm: rename local `i' to `irq', use for_each_inline_cpu()) Signed-off-by: Eric Sesterhenn Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a5e7339908d7d718ebc4149b77eee06291bdb95 Author: Eric W. Biederman Date: Wed Feb 1 03:06:12 2006 -0800 [PATCH] alpha: Fix getxpid on alpha so it works for threads While looking in the code I discovered that alpha has fallen behind because it doesn't use sys_getppid. The problem is that it doesn't follow the task struct to the task_group_leader. Acked-by: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 975b3d3d5b983eb60706d35f0d24cd19f6badabf Author: Mark Lord Date: Wed Feb 1 03:06:11 2006 -0800 [PATCH] VMSPLIT config options Enable selection of different user/kernel VM splits for i386, including an optimized mode for 1GB physical RAM, which gives the kernel a direct (non HIGHMEM) mapping to the entire 1GB rather than just the first 896MB. There is a similarly a similarly optimized mode for machines with exactly 2GB of physical RAM. This can speed up the kernel by avoiding having to create/destroy temporary HIGHMEM mappings, and by not having to include HIGHMEM support at all on such machines. The flip side is that there's less virtual addressing left for userspace in these alternatives, and some binary-only kernel modules may misbehave unless rebuilt with the same VMSPLIT option as the main kernel image. Original idea/patch from Jens Axboe, modified based on suggestions from Linus et al. Signed-off-by: Mark Lord Signed-off-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4940fb441275d654cff7d0f7708f91bd8435a85a Author: Alexey Dobriyan Date: Wed Feb 1 03:06:09 2006 -0800 [PATCH] arch/sh64/kernel/time.c: add module.h It uses EXPORT_SYMBOL. arch/sh64/kernel/time.c:254: warning: type defaults to `int' in declaration of `EXPORT_SYMBOL' arch/sh64/kernel/time.c:254: warning: parameter names (without types) in function declaration arch/sh64/kernel/time.c:254: warning: data definition has no type or storage class Signed-off-by: Alexey Dobriyan Cc: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87f55e67dc1be000fa76009532906b168a80b3dd Author: Paul Mundt Date: Wed Feb 1 03:06:09 2006 -0800 [PATCH] sh/sh64: Fix bogus TIOCGICOUNT definitions As reported by Russell King, sh and sh64 currently have bogus definitions for TIOCGICOUNT, particularly referencing a kernel only structure. Switch to using a sensible ioctl value. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3310bbd3add738c2b40bb4e4dc966cdea9d6a04 Author: Paul Mundt Date: Wed Feb 1 03:06:08 2006 -0800 [PATCH] sh: machine_halt()/machine_power_off() cleanups machine_halt() managed to trigger the soft lockup detection due to not disabling interrupts before going to sleep, so correct that. machine_power_off() should be using pm_power_off, which lets us drop the board-specific hacks from here. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c80a1f888f548c090feaac3ad63b2d1f607a2c5 Author: Paul Mundt Date: Wed Feb 1 03:06:07 2006 -0800 [PATCH] sh: Add missing timers directory rule to build This should have been part of the timer framework support that was merged earlier, but looks to have been accidentally omitted. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7a76e4b4e212ec0829f3a7243064511d62cb6da Author: Paul Mundt Date: Wed Feb 1 03:06:06 2006 -0800 [PATCH] sh: sh-sci clock framework updates A couple of updates for the sh-sci serial driver: - Update for clock framework on sh. - Fix a compile error introduced by some h8300 changes. - Add SH7770/SH7780 subtype support. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37cc7943788c841b03a48c00751dfac0ad9f5b12 Author: Paul Mundt Date: Wed Feb 1 03:06:05 2006 -0800 [PATCH] sh: convert voyagergx to platform device, drop sh-bus Trivial patch updating the voyagergx cchip code to reference a platform device instead, now that the dma mask is taken care of. Given this, there's no longer any reason to drag around the SH-bus code, so kill that off entirely. Signed-off-by: Manuel Lauss Signed-off-by: Paul Mundt Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d27e08191379b7a3302a33a6efdb8bdfd319c95 Author: Paul Mundt Date: Wed Feb 1 03:06:04 2006 -0800 [PATCH] sh: drop maskpos from make_ipr_irq(), remove duplicate irq definitions Clean up some of the subtype IRQ definitions for IPR IRQ, and consolidate the make_ipr_irq() definitions by dropping maskpos. SH-4A was the only thing interested in the maskpos, and this should be handled through INTC2 rather than IPR. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50373c1b7ee9cdd9b8ccaa1b58d13ad43f879908 Author: Paul Mundt Date: Wed Feb 1 03:06:03 2006 -0800 [PATCH] sh: unknown mach-type updates Trivial cleanup of the unknown machine type for some of the recent machvec changes. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de02797aa744c96a90f47be7bc081ce2f74b17fd Author: Paul Mundt Date: Wed Feb 1 03:06:02 2006 -0800 [PATCH] sh: Cleanup struct sh_cpuinfo for clock framework changes Now that the clock framework changes have been integrated, the manual clock accounting that was done in sh_cpuinfo can be dropped. Also correct a bug with running past the end of the CPU flags when there's a mismatch between the added flags and printed ones. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 091904ae5fc6f018680f83d71301ceac4f39d77f Author: Paul Mundt Date: Wed Feb 1 03:06:01 2006 -0800 [PATCH] sh: Move TRA/EXPEVT/INTEVT definitions for reuse Currently entry.S is home to these definitions, so we move them somewhere more sensible. IPR IRQ handling depends on being to read from INTEVT. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 134ed1420eb5a3dd9827aa185dd37fe2dd0ab4d5 Author: Paul Mundt Date: Wed Feb 1 03:06:01 2006 -0800 [PATCH] sh: Make peripheral clock frequency setting mandatory Pretty much every subtype does this now anyways, and as we depend on it in a few places being set to something sensible quite early on, it's better for a new subtype to simply set a sensible default. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 740172947b315fa97f8d29b0b9809b1ea1201642 Author: Paul Mundt Date: Wed Feb 1 03:05:59 2006 -0800 [PATCH] sh: SH4-202 microdev updates A few trivial updates for the microdev board support code: - Update for __IO_PREFIX changes. - Consolidate headers into a single microdev.h. - Update the microdev_defconfig. - Add init values for the S1D13806 used by s1d13xxxfb. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a41cdf9788f14bb120ad06d9ce17ca05fd72f03 Author: Heiko Carstens Date: Wed Feb 1 03:05:58 2006 -0800 [PATCH] powerpc: Fix sigmask handling in sys_sigsuspend. Better save the sigmask instead of throwing it away so it can be restored. Signed-off-by: Heiko Carstens Acked-by: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e61997881e0402aedbfad8696e369568a0583f14 Author: Olaf Hering Date: Wed Feb 1 03:05:58 2006 -0800 [PATCH] MODALIAS= for macio Prodive a MODALIAS= enviroment variable for devices on the mac-io bus. Change the buffer length counter to not waste memory by advancing the pointer for the next string too far. Tested on an ibook1 with modular pmac_zilog. Signed-off-by: Olaf Hering Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39931e41becd6abeb2014747369d8b6392f5dbac Author: Albert Herranz Date: Wed Feb 1 03:05:57 2006 -0800 [PATCH] powerpc: fix for kexec ppc32 - kexec.h is included from assembly code, thus C code must be properly protected. - (embedded) ppc32 systems use machine_kexec_simple whose declaration vanished during a recent powerpc merge change. Signed-off-by: Albert Herranz Cc: Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ac49d22138348198f729f07371ffb11991368e6 Author: Stephen Smalley Date: Wed Feb 1 03:05:56 2006 -0800 [PATCH] selinux: remove security struct magic number fields and tests Remove the SELinux security structure magic number fields and tests, along with some unnecessary tests for NULL security pointers. These fields and tests are leftovers from the early attempts to support SELinux as a loadable module during LSM development. Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 26d2a4be6a56eec575dac651f6606756a971f0fb Author: Stephen Smalley Date: Wed Feb 1 03:05:55 2006 -0800 [PATCH] selinux: change file_alloc_security to use GFP_KERNEL This patch changes the SELinux file_alloc_security function to use GFP_KERNEL rather than GFP_ATOMIC; the use of GFP_ATOMIC appears to be a remnant of when this function was being called with the files_lock spinlock held, and is no longer necessary. Please apply. Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db4c9641def55d36a6f9df79deb8a949292313ca Author: Stephen Smalley Date: Wed Feb 1 03:05:54 2006 -0800 [PATCH] selinux: fix and cleanup mprotect checks Fix the SELinux mprotect checks on executable mappings so that they are not re-applied when the mapping is already executable as well as cleaning up the code. This avoids a situation where e.g. an application is prevented from removing PROT_WRITE on an already executable mapping previously authorized via execmem permission due to an execmod denial. Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee13d785eac1fbe7e79ecca77bf7e902734a0b30 Author: Randy Dunlap Date: Wed Feb 1 03:05:53 2006 -0800 [PATCH] slab: fix sparse warning mm/slab.c:1522:13: error: incompatible types for operation (&) Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a70773ddb96b74c7afe5a5bc859ba45e3d02899e Author: Randy.Dunlap Date: Wed Feb 1 03:05:52 2006 -0800 [PATCH] mm/slab: add kernel-doc for one function Fix kernel-doc for calculate_slab_order(). Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fd6b1413082c303613fc137aca9a004740cacf0 Author: Pekka Enberg Date: Wed Feb 1 03:05:52 2006 -0800 [PATCH] slab: fix kzalloc and kstrdup caller report for CONFIG_DEBUG_SLAB Fix kzalloc() and kstrdup() caller report for CONFIG_DEBUG_SLAB. We must pass the caller to __cache_alloc() instead of directly doing __builtin_return_address(0) there; otherwise kzalloc() and kstrdup() are reported as the allocation site instead of the real one. Thanks to Valdis Kletnieks for reporting the problem and Steven Rostedt for the original idea. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b958f7d9f35bfb61625f201cd92a3fc39504af7a Author: Andrew Morton Date: Wed Feb 1 03:05:51 2006 -0800 [PATCH] dump_stack() in oom handler Sometimes it's nice to know who's calling. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 343e0d7a93951e35065fdb5e3dd61aece0ec6b3c Author: Pekka Enberg Date: Wed Feb 1 03:05:50 2006 -0800 [PATCH] slab: replace kmem_cache_t with struct kmem_cache Replace uses of kmem_cache_t with proper struct kmem_cache in mm/slab.c. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a2dba4b4912b493070cbc170629fdbf440b01d7 Author: Pekka Enberg Date: Wed Feb 1 03:05:49 2006 -0800 [PATCH] slab: rename ac_data to cpu_cache_get Rename the ac_data() function to more descriptive cpu_cache_get(). Acked-by: Manfred Spraul Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ed5eb2211204224799b2821656bbbfde26ef200 Author: Pekka Enberg Date: Wed Feb 1 03:05:49 2006 -0800 [PATCH] slab: extract virt_to_{cache|slab} Introduce virt_to_cache() and virt_to_slab() functions to reduce duplicate code and introduce a proper abstraction should we want to support other kind of mapping for address to slab and cache (eg. for vmalloc() or I/O memory). Acked-by: Manfred Spraul Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5295a74cc0bcf1291686eb734ccb06baa3d55c1a Author: Pekka Enberg Date: Wed Feb 1 03:05:48 2006 -0800 [PATCH] slab: reduce inlining From: Manfred Spraul Reduce the amount of inline functions in slab to the functions that are used in the hot path: - no inline for debug functions - no __always_inline, inline is already __always_inline - remove inline from a few numa support functions. Before: text data bss dec hex filename 13588 752 48 14388 3834 mm/slab.o (defconfig) 16671 2492 48 19211 4b0b mm/slab.o (numa) After: text data bss dec hex filename 13366 752 48 14166 3756 mm/slab.o (defconfig) 16230 2492 48 18770 4952 mm/slab.o (numa) Signed-off-by: Manfred Spraul Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78d382d77c84229d031431931bf6490d5da6ab86 Author: Matthew Dobson Date: Wed Feb 1 03:05:47 2006 -0800 [PATCH] slab: extract slab_{put|get}_obj Create two helper functions slab_get_obj() and slab_put_obj() to replace duplicated code in mm/slab.c Signed-off-by: Matthew Dobson Acked-by: Manfred Spraul Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12dd36faec5d3bd96da84fa8f76efecc632930ab Author: Matthew Dobson Date: Wed Feb 1 03:05:46 2006 -0800 [PATCH] slab: extract slab_destroy_objs() Create a helper function, slab_destroy_objs() which called from slab_destroy(). This makes slab_destroy() smaller and more readable, and moves ifdefs outside the function body. Signed-off-by: Matthew Dobson Acked-by: Manfred Spraul Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fbaccacff1f17c65ae0972085368a7ec75be6062 Author: Steven Rostedt Date: Wed Feb 1 03:05:45 2006 -0800 [PATCH] slab: cache_estimate cleanup Clean up cache_estimate() in mm/slab.c and improves the algorithm from O(n) to O(1). We first calculate the maximum number of objects a slab can hold after struct slab and kmem_bufctl_t for each object has been given enough space. After that, to respect alignment rules, we decrease the number of objects if necessary. As required padding is at most align-1 and memory of obj_size is at least align, it is always enough to decrease number of objects by one. The optimization was originally made by Balbir Singh with more improvements from Steven Rostedt. Manfred Spraul provider further modifications: no loop at all for the off-slab case and added comments to explain the background. Acked-by: Balbir Singh Signed-off-by: Manfred Spraul Signed-off-by: Steven Rostedt Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ec8a847bb8ae2ba6395cfb7cb4bfdc78ada82ed Author: Steven Rostedt Date: Wed Feb 1 03:05:44 2006 -0800 [PATCH] slab: have index_of bug at compile time I noticed the code for index_of is a creative way of finding the cache index using the compiler to optimize to a single hard coded number. But I couldn't help noticing that it uses two methods to let you know that someone used it wrong. One is at compile time (the correct way), and the other is at run time (not good). Signed-off-by: Steven Rostedt Acked-by: Manfred Spraul Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18f820f655ce93b1e4d9b48fc6fcafc64157c6bc Author: Christoph Lameter Date: Wed Feb 1 03:05:43 2006 -0800 [PATCH] slab: minor cleanup to kmem_cache_alloc_node Clean up kmem_cache_alloc_node a bit. Signed-off-by: Christoph Lameter Acked-by: Manfred Spraul Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dafccf22751429e69b6266636cf3acf45b48075 Author: Manfred Spraul Date: Wed Feb 1 03:05:42 2006 -0800 [PATCH] slab: distinguish between object and buffer size An object cache has two different object lengths: - the amount of memory available for the user (object size) - the amount of memory allocated internally (buffer size) This patch does some renames to make the code reflect that better. Signed-off-by: Manfred Spraul Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e965f9630c651fa4249039fd4b80c9392d07a856 Author: Christoph Lameter Date: Wed Feb 1 03:05:41 2006 -0800 [PATCH] Direct Migration V9: Avoid writeback / page_migrate() method Migrate a page with buffers without requiring writeback This introduces a new address space operation migratepage() that may be used by a filesystem to implement its own version of page migration. A version is provided that migrates buffers attached to pages. Some filesystems (ext2, ext3, xfs) are modified to utilize this feature. The swapper address space operation are modified so that a regular migrate_page() will occur for anonymous pages without writeback (migrate_pages forces every anonymous page to have a swap entry). Signed-off-by: Mike Kravetz Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e2ab150d1b3b286a4c864c60a549b2601777b63 Author: Christoph Lameter Date: Wed Feb 1 03:05:40 2006 -0800 [PATCH] Direct Migration V9: upgrade MPOL_MF_MOVE and sys_migrate_pages() Modify policy layer to support direct page migration - Add migrate_pages_to() allowing the migration of a list of pages to a a specified node or to vma with a specific allocation policy in sets of MIGRATE_CHUNK_SIZE pages - Modify do_migrate_pages() to do a staged move of pages from the source nodes to the target nodes. Signed-off-by: Paul Jackson Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3351e525e4768c29aa5d22ef59b5b38e0361e53 Author: Christoph Lameter Date: Wed Feb 1 03:05:39 2006 -0800 [PATCH] Direct Migration V9: remove_from_swap() to remove swap ptes Add remove_from_swap remove_from_swap() allows the restoration of the pte entries that existed before page migration occurred for anonymous pages by walking the reverse maps. This reduces swap use and establishes regular pte's without the need for page faults. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a48d07afdf18212de22b959715b16793c5a6e57a Author: Christoph Lameter Date: Wed Feb 1 03:05:38 2006 -0800 [PATCH] Direct Migration V9: migrate_pages() extension Add direct migration support with fall back to swap. Direct migration support on top of the swap based page migration facility. This allows the direct migration of anonymous pages and the migration of file backed pages by dropping the associated buffers (requires writeout). Fall back to swap out if necessary. The patch is based on lots of patches from the hotplug project but the code was restructured, documented and simplified as much as possible. Note that an additional patch that defines the migrate_page() method for filesystems is necessary in order to avoid writeback for anonymous and file backed pages. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Mike Kravetz Signed-off-by: Christoph Lameter Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b16664e44c54525be89dc07ad15a13b4eeec5634 Author: Christoph Lameter Date: Wed Feb 1 03:05:36 2006 -0800 [PATCH] Direct Migration V9: PageSwapCache checks Check for PageSwapCache after looking up and locking a swap page. The page migration code may change a swap pte to point to a different page under lock_page(). If that happens then the vm must retry the lookup operation in the swap space to find the correct page number. There are a couple of locations in the VM where a lock_page() is done on a swap page. In these locations we need to check afterwards if the page was migrated. If the page was migrated then the old page that was looked up before was freed and no longer has the PageSwapCache bit set. Signed-off-by: Hirokazu Takahashi Signed-off-by: Dave Hansen Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a16e3f4b0c408b9e50297d2ec27e295d490267a Author: Christoph Lameter Date: Wed Feb 1 03:05:35 2006 -0800 [PATCH] Reclaim slab during zone reclaim If large amounts of zone memory are used by empty slabs then zone_reclaim becomes uneffective. This patch shakes the slab a bit. The problem with this patch is that the slab reclaim is not containable to a zone. Thus slab reclaim may affect the whole system and be extremely slow. This also means that we cannot determine how many pages were freed in this zone. Thus we need to go off node for at least one allocation. The functionality is disabled by default. We could modify the shrinkers to take a zone parameter but that would be quite invasive. Better ideas are welcome. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b2ffb7896ad46067f5b9ebf7de1891d74a4cdef Author: Christoph Lameter Date: Wed Feb 1 03:05:34 2006 -0800 [PATCH] Zone reclaim: Allow modification of zone reclaim behavior In some situations one may want zone_reclaim to behave differently. For example a process writing large amounts of memory will spew unto other nodes to cache the writes if many pages in a zone become dirty. This may impact the performance of processes running on other nodes. Allowing writes during reclaim puts a stop to that behavior and throttles the process by restricting the pages to the local zone. Similarly one may want to contain processes to local memory by enabling regular swap behavior during zone_reclaim. Off node memory allocation can then be controlled through memory policies and cpusets. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a11ff06d7d12be5d1bbcf592fff649b45ac2388 Author: Christoph Lameter Date: Wed Feb 1 03:05:33 2006 -0800 [PATCH] zone_reclaim: configurable off node allocation period. Currently the zone_reclaim code has a fixed window of 30 seconds of off node allocations should a local zone have no unused pagecache pages left. Reclaim will be attempted again after this timeout period to avoid repeated useless scans for memory. This is also useful to established sufficiently large off node allocation chunks to relieve the local node. It may be beneficial to adjust that time period for some special situations. For example if memory use was exceeding node capacity one may want to give up for longer periods of time. If memory spikes intermittendly then one may want to shorten the time period to reduce the number of off node allocations. This patch allows just that.... Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a92f71263af9d0ab77c260f709c0c079656221aa Author: Christoph Lameter Date: Wed Feb 1 03:05:32 2006 -0800 [PATCH] zone_reclaim: partial scans instead of full scan Instead of scanning all the pages in a zone, imitate real swap and scan only a portion of the pages and gradually scan more if we do not free up enough pages. This avoids a zone suddenly loosing all unused pagecache pages (we may after all access some of these again so they deserve another chance) but it still frees up large chunks of memory if a zone only contains unused pagecache pages. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa3f18b3391ac305baa01faead3fdf9147daf54b Author: Christoph Lameter Date: Wed Feb 1 03:05:32 2006 -0800 [PATCH] zone_reclaim: do not unmap file backed pages zone_reclaim should leave that to the real swapper. We are only interested in evicting unmapped pages. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e6a510a74145585f4111d60d1b5fd450d795dd8 Author: Hugh Dickins Date: Wed Feb 1 03:05:31 2006 -0800 [PATCH] mm: hugepage accounting fix 2.6.15's hugepage faulting introduced huge_pages_needed accounting into hugetlbfs: to count how many pages are already in cache, for spot check on how far a new mapping may be allowed to extend the file. But it's muddled: each hugepage found covers HPAGE_SIZE, not PAGE_SIZE. Once pages were already in cache, it would overshoot, wrap its hugepages count backwards, and so fail a harmless repeat mapping with -ENOMEM. Fixes the problem found by Don Dupuis. Signed-off-by: Hugh Dickins Acked-By: Adam Litke Acked-by: William Irwin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9884fd8df195fe48d4e1be2279b419be96127cae Author: Benjamin LaHaise Date: Wed Feb 1 03:05:30 2006 -0800 [PATCH] Use 32 bit division in slab_put_obj() Improve the performance of slab_put_obj(). Without the cast, gcc considers ptrdiff_t a 64 bit signed integer and ends up emitting code to use a full signed 128 bit divide on EM64T, which is substantially slower than a 32 bit unsigned divide. I noticed this when looking at the profile of a case where the slab balance is just on edge and thrashes back and forth freeing a block. Signed-off-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c84db23c6e587d3ab00a41c51fedf758e1f6ecd4 Author: Christoph Lameter Date: Wed Feb 1 03:05:29 2006 -0800 [PATCH] zone_reclaim: minor fixes - If we only reclaim nr_pages then its okay to stay on node. Switch from > to >= for the comparison. - vm_table[] entry for zone_reclaim_mode is a bit screwed up. - Add empty lines around shrink_zone to show that this is the central function to be called. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52a8363eae3872af15880292ff4e06d0fab36986 Author: Christoph Lameter Date: Wed Feb 1 03:05:28 2006 -0800 [PATCH] mm: improve function of sc->may_writepage Make sc->may_writepage control the writeout behavior of shrink_list. Remove the laptop_mode trick from shrink_list and instead set may_writepage in try_to_free_pages properly. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce2ea89ba101d976907128441ba3aca72a8804b9 Author: Andy Whitcroft Date: Wed Feb 1 03:05:27 2006 -0800 [PATCH] GFP_ZONETYPES: calculate from GFP_ZONEMASK GFP_ZONETYPES calculate from GFP_ZONEMASK GFP_ZONETYPES's value is directly related to the value of GFP_ZONEMASK. It takes one of two forms depending whether the top bit of GFP_ZONEMASK is a 'loner'. Supply both forms, enabling the loner. Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79046ae07ae21245520ca0aab985ee6678a879f8 Author: Andy Whitcroft Date: Wed Feb 1 03:05:26 2006 -0800 [PATCH] GFP_ZONETYPES: add commentry on how to calculate GFP_ZONETYPES define using GFP_ZONEMASK and add commentry Add commentry explaining the optimisation that we can apply to GFP_ZONETYPES when the leftmost bit is a 'loaner', it can only be set in isolation. Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42c722d4cb4022e56ff200f3f5a58c0dfd7edac6 Author: Christoph Lameter Date: Wed Feb 1 03:05:26 2006 -0800 [PATCH] zone_reclaim: reclaim on memory only node support Zone reclaim is usually only run on the local node. Headless nodes do not have any local processors. This patch checks for headless nodes and performs zone reclaim on them. Signed-off-by: Christoph Lameter Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8928862398fef04a137e5673ac5fa9e797960c87 Author: Christoph Lameter Date: Wed Feb 1 03:05:25 2006 -0800 [PATCH] Optimize off-node performance of zone reclaim Ensure that the performance of off node pages stays the same as before. Off node pagefault tests showed an 18% drop in performance without this patch. - Increase the timeout to 30 seconds to reduce the overhead. - Move all code possible out of the off node hot path for zone reclaim (Sorry Andrew, the struct initialization had to be sacrificed). The read_page_state() bit us there. - Check first for the timeout before any other checks. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 537421be79b94bcf620467f50dd9e38b739c2a00 Author: Alexey Dobriyan Date: Wed Feb 1 03:05:24 2006 -0800 [PATCH] Mark CONFIG_UFS_FS_WRITE as BROKEN OpenBSD doesn't see "." correctly in directories created by Linux. Copying files over several KB will buy you infinite loop in __getblk_slow(). Copying files smaller than 1 KB seems to be OK. Sometimes files will be filled with zeros. Sometimes incorrectly copied file will reappear after next file with truncated size. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c125a1838a95604eb35b60259a8d678dc193f7e4 Author: David Gibson Date: Wed Feb 1 03:05:22 2006 -0800 [PATCH] powerpc: Add flattened device tree documentation The flattened device tree is the only supported way of booting ARCH=powerpc kernels on non Open Firmware machines. The documentation for the flattened tree format and contents has been discussed on mailing lists and lately has been living in the dtc git tree. Really, it ought to go in the kernel's Documentation directory for maximum visibility. Signed-off-by: David Gibson Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7b8988ff50d99c99746f65f420364e91362c065 Author: Rafael J. Wysocki Date: Wed Feb 1 03:05:21 2006 -0800 [PATCH] swsusp: do not change log level during suspend/resume Prevent the kernel from setting the log level to 10 unconditionally during suspend/resume which was needed in the past for debugging, but generally is undesirable. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8183ebb45324ef99f98a175623d67cdcec4466f Author: Dave Jones Date: Wed Feb 1 03:05:21 2006 -0800 [PATCH] fix saa7146 kobject register failure Whoops. kobject_register failed for hexium HV-PCI6/Orion (-13) [] kobject_register+0x31/0x47 [] bus_add_driver+0x4a/0xfd [] __pci_register_driver+0x82/0xa4 [] hexium_init_module+0xa/0x47 [hexium_orion] [] sys_init_module+0x167b/0x1822 [] do_sync_read+0xb8/0xf3 [] autoremove_wake_function+0x0/0x2d [] audit_syscall_entry+0x118/0x13f [] do_syscall_trace+0x104/0x14a [] syscall_call+0x7/0xb slashes in kobject names aren't allowed. Signed-off-by: Dave Jones Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb3c190e8d43fcbf1210effb05dc660cb3ccf817 Author: V. Ananda Krishnan Date: Wed Feb 1 03:05:20 2006 -0800 [PATCH] jsm: fix for high baud rates problem Scott Kilau Digi serial port console doesn't work when baud rates are set higher than 38400. So the lookup table and code in jsm_neo.c has been modified and tested. Please let me have the feed-back. Signed-off-by: V.Ananda Krishnan Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bfaa1deeb982c985d8e0435e835baeaae63b57fd Author: john stultz Date: Wed Feb 1 03:05:19 2006 -0800 [PATCH] disable lost tick compensation before TSCs are synced Avoid lost tick compensation early in boot before the TSCs are synchronized. Currently timekeeping is enabled before the TSCs are synchronized, thus when the TSCs are synched (reset to zero), it appears that a number of lost ticks have occurred. This can cause premature expiry of timers and in extreme cases can cause the soft lockup detection to fire. This resolves issues reported by Andy Whitcroft as well as bug #5366 reported by Tim Mann. Signed-off-by: John Stultz Acked-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f7016d917faef8f1e016b4a7bd7f594694480b6 Author: Jack Steiner Date: Wed Feb 1 03:05:18 2006 -0800 [PATCH] sys_sched_getaffinity() & hotplug Change sched_getaffinity() so that it returns a bitmap that indicates the legally schedulable cpus that a task is allowed to run on. Without this patch, if CONFIG_HOTPLUG_CPU is enabled, sched_getaffinity() unconditionally returns (at least on IA64) a mask with NR_CPUS bits set. This conveys no useful infornmation except for a kernel compile option. This fixes a breakage we obseved running recent kernels. We have MPI jobs that use sched_getaffinity() to determine where to place their threads. Placing them on non-existant cpus is problematic :-) Signed-off-by: Jack Steiner Acked-by: Ingo Molnar Cc: Nathan Lynch Cc: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f07496144c270f10d0ad06b70b9c9387d5527fd Author: Bryan O'Sullivan Date: Wed Feb 1 03:05:17 2006 -0800 [PATCH] Add faster __iowrite32_copy routine for x86_64 This assembly version is measurably faster than the generic version in lib/iomap_copy.c. Signed-off-by: Bryan O'Sullivan Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c27a0d75b33c030965cc97d3d7f571107a673fb4 Author: Bryan O'Sullivan Date: Wed Feb 1 03:05:16 2006 -0800 [PATCH] Introduce __iowrite32_copy This arch-independent routine copies data to a memory-mapped I/O region, using 32-bit accesses. The naming is double-underscored to make it clear that it does not guarantee write ordering, nor does it perform a memory barrier afterwards; the kernel doc also explicitly states this. This style of access is required by some devices. This change also introduces include/linux/io.h, at Andrew's suggestion. It only has one occupant at the moment, but is a logical destination for oft-replicated contents of include/asm-*/{io,iomap}.h to migrate to. Signed-off-by: Bryan O'Sullivan Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7589f28d7dd4586b4e90ac3b2a180409669053a Author: Bryan O'Sullivan Date: Wed Feb 1 03:05:15 2006 -0800 [PATCH] Define BITS_PER_BYTE This can make the intent behind some arithmetic expressions clearer. Signed-off-by: Bryan O'Sullivan Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 493f01d1d0699ddafc30067d33fcc18d0b95b624 Author: Adrian Bunk Date: Wed Feb 1 03:05:14 2006 -0800 [PATCH] kernel/posix-timers.c: remove do_posix_clock_notimer_create() This function is neither used nor has any real contents. Signed-off-by: Adrian Bunk Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 952bbc87f01f552ef091a62ea2a721b5b2670e74 Author: Thomas Gleixner Date: Wed Feb 1 03:05:13 2006 -0800 [PATCH] hrtimers: set correct initial expiry time for relative SIGEV_NONE timers The expiry time for relative timers with SIGEV_NONE set was never updated to the correct value. Pointed out by George Anzinger. Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66188fae3bf7f8dd951e2291d2a81888ed1b65de Author: Thomas Gleixner Date: Wed Feb 1 03:05:13 2006 -0800 [PATCH] hrtimers: add back lost credit lines At some point we added credits to people who actively helped to bring k/hr-timers along. This was lost in the big code revamp. Add it back. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7978672c4d9a1e6a6081de3a9d9ba5e5b24904a0 Author: George Anzinger Date: Wed Feb 1 03:05:11 2006 -0800 [PATCH] hrtimers: cleanups and simplifications Clean up the interface to hrtimers by changing the init code to pass the mode as well as the clock. This allow the init code to select the correct base and eliminates extra timer re-init code in posix-timers. We also simplify the restart interface nanosleep use. Signed-off-by: George Anzinger Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff60a5dc4fa584d47022d2533bc5c53b80096fb5 Author: akpm@osdl.org Date: Wed Feb 1 03:05:10 2006 -0800 [PATCH] hrtimers: fix posix-timer requeue race From: Steven Rostedtrostedt@goodmis.org CPU0 expires a posix-timer and runs the callback function. The signal is queued. After releasing the posix-timer lock and before returning to hrtimer_run_queue CPU0 gets interrupted. CPU1 delivers the queued signal and rearms the timer. CPU0 comes back to hrtimer_run_queue and sets the timer state to expired. The next modification of the timer can result in an oops, because the state information is wrong. Keep track of state = RUNNING and check if the state has been in the return path of hrtimer_run_queue. In case the state has been changed, ignore a restart request and do not touch the state variable. Signed-off-by: Steven Rostedt Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a16a1c095a2392d49fafea22f3a508e268ef7167 Author: Thomas Gleixner Date: Wed Feb 1 03:05:09 2006 -0800 [PATCH] hrtimers: fix oldvalue return in setitimer This resolves bugzilla bug#5617. The oldvalue of the timer was read after the timer was cancelled, so the remaining time was always zero. Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6557fbca805217588a412f391a65ceafcf1a1af Author: Thomas Gleixner Date: Wed Feb 1 03:05:09 2006 -0800 [PATCH] hrtimers: fix possible use of NULL pointer in posix-timers Fixup the conversion of posix-timers to hrtimers. Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc1978d404befacd272d0321ef749cc3192e488b Author: Thomas Gleixner Date: Wed Feb 1 03:05:08 2006 -0800 [PATCH] hrtimers: fixup itimer conversion The itimer conversion removed the locking which protects the timer and variables in the shared signal structure. Steven Rostedt found the problem in the latest -rt patches. Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 853609b61ef88b414ffd1613741aa59894334320 Author: Rafael J. Wysocki Date: Wed Feb 1 03:05:07 2006 -0800 [PATCH] swsusp: use bytes as image size units Make swsusp use bytes as the image size units, which is needed for future compatibility. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8730eabd45e47e392f230ab8720c4b8537901fc Author: Pekka Enberg Date: Wed Feb 1 03:05:06 2006 -0800 [PATCH] uml: compilation fix when MODE_SKAS disabled CC arch/um/sys-i386/ldt.o arch/um/sys-i386/ldt.c:19:21: proc_mm.h: No such file or directory make[1]: *** [arch/um/sys-i386/ldt.o] Error 1 Signed-off-by: Pekka Enberg Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d0098b6e2055e4afb2ceadf11c4b9f43b671ccc Author: Alexey Dobriyan Date: Wed Feb 1 03:05:05 2006 -0800 [PATCH] mips: gdb-stub.c: fix parse error before ; token Signed-off-by: Alexey Dobriyan Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 295b117ef334bcc3c9596117cb0aa640054e35fc Author: Kylene Jo Hall Date: Wed Feb 1 03:05:04 2006 -0800 [PATCH] tpm: tpm_bios remove unused variable Remove event_data_size since it was pointed out in tpm_bios-indexing- fix.patch that is was ugly and it wasn't actually being used. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10296cb0b2b0b0eb312f81032216504a64ee675a Author: Kylene Jo Hall Date: Wed Feb 1 03:05:04 2006 -0800 [PATCH] tpm: tpm_bios fix sparse warnings Fixing the sparse warnings on the acpi_os_map_memory calls pointed out by Randy. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bcee5b86a8d9f8a0f2c1848fd9abd675e09e969 Author: Kylene Jo Hall Date: Wed Feb 1 03:05:03 2006 -0800 [PATCH] tpm: tpm-bios: fix module license issue Attempting to insert the tpm modules fails because the tpm_bios file is missing a license statement. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c40f7d4f0a9d5242f19b02b00e3e5a8ee218a20 Author: Andrew Morton Date: Wed Feb 1 03:05:02 2006 -0800 [PATCH] tpm_bios indexing fix It generates warnings: drivers/char/tpm/tpm_bios.c: In function `get_event_name': drivers/char/tpm/tpm_bios.c:223: warning: cast from pointer to integer of different size drivers/char/tpm/tpm_bios.c:223: warning: cast from pointer to integer of different size drivers/char/tpm/tpm_bios.c:223: warning: cast from pointer to integer of different size drivers/char/tpm/tpm_bios.c:224: warning: cast from pointer to integer of different size drivers/char/tpm/tpm_bios.c:224: warning: cast from pointer to integer of different size drivers/char/tpm/tpm_bios.c:224: warning: cast from pointer to integer of different size and I'm not sure what the code is doing there, but it seems wrong. We're using the address of the buffer rather than the contents of it. The patch adds more nasty typecasting, but I think the whole arrangement could be done in a more typesafe manner. Cc: Kylene Jo Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca4a031f6b43edb8745ebc0a1b7307c24719dae4 Author: Andrew Morton Date: Wed Feb 1 03:05:01 2006 -0800 [PATCH] tpm_bios: securityfs error checking fix These functions return ERR_PTR()s on error, not NULL. Spotted by Randy. Cc: Serge Hallyn Cc: Kylene Jo Hall Cc: "Randy.Dunlap" Acked-by: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed5a92700d3ce2646cb7763792a5f7ad1bade7e8 Author: Randy Dunlap Date: Wed Feb 1 03:05:00 2006 -0800 [PATCH] tpm_bios: needs more securityfs_ functions tpm_bios.c needs securityfs_xyz() functions. Does include/linux/security.h need stubs for these, or should char/tpm/Makefile just be modified to say: ifdef CONFIG_ACPI ifdef CONFIG_SECURITY obj-$(CONFIG_TCG_TPM) += tpm_bios.o endif endif drivers/char/tpm/tpm_bios.c:494: warning: implicit declaration of function 'securityfs_create_dir' drivers/char/tpm/tpm_bios.c:494: warning: assignment makes pointer from integer without a cast drivers/char/tpm/tpm_bios.c:499: warning: implicit declaration of function 'securityfs_create_file' drivers/char/tpm/tpm_bios.c:501: warning: assignment makes pointer from integer without a cast drivers/char/tpm/tpm_bios.c:508: warning: assignment makes pointer from integer without a cast drivers/char/tpm/tpm_bios.c:523: warning: implicit declaration of function 'securityfs_remove' *** Warning: "securityfs_create_file" [drivers/char/tpm/tpm_bios.ko] undefined! *** Warning: "securityfs_create_dir" [drivers/char/tpm/tpm_bios.ko] undefined! *** Warning: "securityfs_remove" [drivers/char/tpm/tpm_bios.ko] undefined! There are also some gcc and sparse warnings that could be fixed. (see http://www.xenotime.net/linux/doc/build-tpm.out) Signed-off-by: Randy Dunlap Cc: Serge Hallyn Cc: Greg KH Cc: Kylene Jo Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ee26aa04d4dbd5e006b2f184d6028c71384681f Author: Randy Dunlap Date: Wed Feb 1 03:04:59 2006 -0800 [PATCH] tpm_infineon: fix printk format warning drivers/char/tpm/tpm_infineon.c:443: warning: format '%04x' expects type 'unsigned int', but argument 4 has type 'long unsigned int' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94f91def998efe3b79780f3b39b6c87d390dbe4c Author: Rocky Craig Date: Wed Feb 1 03:04:58 2006 -0800 [PATCH] IPMI: remove invalid acpi register spacing check At the 2.6.12 timeframe ipmi_si_intf.c was patched to provide default register spacings in try_init_acpi() if the register spacing was set to zero, similar to code in other routines. Unfortunately, another patch was simultaneously added that exits early from try_init_acpi() if the register spacings are set to zero, circumventing the new defaults. This patch removes the early exit code and some incorrect comments that aren't present in other common code snippets. Signed-off-by: Rocky Craig Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 386093ef9a6c88576d8b418bf1c8616d5e410a20 Author: Alexey Dobriyan Date: Wed Feb 1 03:04:57 2006 -0800 [PATCH] ipw2200: fix ->eeprom[EEPROM_VERSION] check priv->eeprom is a pointer. Signed-off-by: Alexey Dobriyan Acked-by: Yi Zhu Cc: James Ketrenos Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce5f8d70ba6e3d7ffcaff86b2cf91a42c27f77af Author: Alexey Dobriyan Date: Wed Feb 1 03:04:56 2006 -0800 [PATCH] alpha: dma-mapping.h: add "struct scatterlist;" On alpha-jensen: CC drivers/base/platform.o In file included from include/linux/dma-mapping.h:24, from drivers/base/platform.c:16: include/asm/dma-mapping.h:36: warning: "struct scatterlist" declared inside parameter list include/asm/dma-mapping.h:36: warning: its scope is only this definition or declaration, which is probably not what you want Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ee247ebce93a526f482d6bc714ce796fa85a81a Author: Alasdair G Kergon Date: Wed Feb 1 03:04:55 2006 -0800 [PATCH] dm: dm-table warning fix drivers/md/dm-table.c:500: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4aac0a63fe8d418a2b74e43708f59380ba379a3b Author: Alasdair G Kergon Date: Wed Feb 1 03:04:55 2006 -0800 [PATCH] device-mapper snapshot: barriers not supported The snapshot and origin targets are incapable of handling barriers and need to indicate this. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3eaf840e0b0046f56602c524c7ba58a82f5526c5 Author: Jun'ichi "Nick" Nomura Date: Wed Feb 1 03:04:53 2006 -0800 [PATCH] device-mapper disk statistics: timing Record I/O timing statistics The start time is added to struct dm_io, an existing structure allocated privately internally within dm and attached to each incoming bio. We export disk_round_stats() from block/ll_rw_blk.c instead of creating a private clone. Signed-off-by: Jun'ichi "Nick" Nomura Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12f03a49cf0ab5e8511911142d28699499a572c4 Author: Kevin Corry Date: Wed Feb 1 03:04:52 2006 -0800 [PATCH] device-mapper statistics: basic Record basic I/O statistics for mapped devices. Signed-off-by: Kevin Corry Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dab6a42915554f70220e5a2ff55c59c749582c7b Author: Alasdair G Kergon Date: Wed Feb 1 03:04:52 2006 -0800 [PATCH] device-mapper ioctl: reduce PF_MEMALLOC usage Reduce substantially the amount of code using PF_MEMALLOC, as envisaged in the original FIXME. If you're using lvm2, for this patch to work correctly you should update to lvm2 version 2.02.01 or later and device-mapper version 1.02.02 or later. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4fc4717fc55a3bcd3cfdafa285b7af164b83051 Author: Patrick Caulfield Date: Wed Feb 1 03:04:51 2006 -0800 [PATCH] device-mapper log bitset: fix endian Clean up the code responsible for the on-disk mirror logs by using the set_le_bit test_le_bit functions of ext2. That makes the BE machines keep the bitmap internally in LE order - it does mean you can't use any other type of operations on the bitmap words but that looks to be OK in this instance. The efficiency tradeoff is very minimal as you would expect for something that ext2 uses. This allows us to remove bits_to_core(), bits_to_disk() and log->disk_bits. Also increment the mirror log disk version transparently to avoid sharing with older kernels that suffered from the 64-bit BE bug. Signed-off-by: Patrick Caulfield Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa14edeb994f8f7e223d02ad14780bf2fa719f6d Author: Alasdair G Kergon Date: Wed Feb 1 03:04:50 2006 -0800 [PATCH] device-mapper snapshot: load metadata on creation Move snapshot metadata loading to happen when the table is created instead of when the device is resumed. Writes to the origin device don't trigger exceptions until each snapshot table becomes active when resume() is called on each snapshot. If you're using lvm2, for this patch to work properly you should update to lvm2 version 2.02.01 or later and device-mapper version 1.02.02 or later. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb82a6cdf994d6656ad0a25ed28395af3416a27c Author: Andrew Morton Date: Wed Feb 1 03:04:49 2006 -0800 [PATCH] compat_sys_pselect7() fix fs/compat.c: In function `compat_sys_pselect7': fs/compat.c:1820: warning: passing arg 5 of `compat_core_sys_select' from incompatible pointer type Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ff0c007b2854b9ca4dca3a104ee3e4c146c02d6 Author: Alexey Dobriyan Date: Wed Feb 1 03:04:48 2006 -0800 [PATCH] lp486e: remove SLOW_DOWN_IO It's not used. Fix the following on alpha-eb66 as a side effect: In file included from drivers/net/lp486e.c:75: include/asm/io.h:20:1: warning: "SLOW_DOWN_IO" redefined drivers/net/lp486e.c:59:1: warning: this is the location of the previous definition Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70e51015768439a5c305a42fdaa0abe5cc109bcf Author: Alexey Dobriyan Date: Wed Feb 1 03:04:48 2006 -0800 [PATCH] tsunami_flash: fix "parse error before ';' token" Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc0fa84a01d328a1ad70076b90f08281c4c79f92 Author: Ben Collins Date: Wed Feb 1 03:04:47 2006 -0800 [PATCH] powerpc: enable irq's for platform functions. Make the platform function interrupt functions actually work. Calls irq_enable() for the first in the list, and irq_disable() for the last. Added *func to struct irq_client so the the user can pass just that to pmf_unregister_irq_client(). Signed-off-by: Ben Collins Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b62735d9c6212de6fd1b5e96b41d978939fb0dd2 Author: Mikael Pettersson Date: Wed Feb 1 03:04:45 2006 -0800 [PATCH] ide-scsi: fix for IDE probe/remove ops changes Kernel 2.6.16-rc1 broke the ide-scsi driver: ide-scsi loads but fails to find any devices to bind to. It also triggers a message "Driver 'ide-scsi' needs updating - please use bus_type methods" from the driver core. The IDE core in 2.6.16-rc1 changed the location of an IDE driver's ->probe()/->remove()/->shutdown() methods: they are now in the ide_driver_t struct not in the gen_driver sub-struct. drivers/ide/ was updated for this change but ide-scsi.c wasn't. Hence the breakage. This patch repairs ide-scsi and also eliminates the driver core warning. Signed-off-by: Mikael Pettersson Cc: Russell King Cc: Greg KH Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6292d9aaf3047f1abd970bc64ab6d952eda258ac Author: Ashok Raj Date: Wed Feb 1 03:04:44 2006 -0800 [PATCH] __cpuinit functions wrongly marked __meminit __meminit has overzelously been modified and crept its way into marking cpuup callbacks as __meminit. Signed-off-by: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88356e908521a84b2220c9e8850d1a356a851aa9 Author: Benjamin Herrenschmidt Date: Wed Feb 1 03:04:43 2006 -0800 [PATCH] sound/ppc/pmac.c typo In 2.6.16-rc1 there is a small typo introduced by the 'Remove device_node addrs/n_addr' changes which prevents my Powerbook G4 sound from working: Advanced Linux Sound Architecture Driver Version 1.0.11rc2 (Wed Jan 04 08:57:20 2006 UTC). snd: can't request rsrc 0 (Sound Control: 0x80000000:80004fff) ALSA device list: No soundcards found. The patch below fixes it. Of course, the patch fixing the i2c issues ('i2c_smbus_write_i2c_block_data' patch) needs to be applied to in order for the sound to completly work. Signed-off-by: Stelian Pop Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9cd684551124e71630ab96d238747051463f5b56 Author: Miklos Szeredi Date: Wed Feb 1 03:04:40 2006 -0800 [PATCH] fuse: fix async read for legacy filesystems While asynchronous reads mean a performance improvement in most cases, if the filesystem assumed that reads are synchronous, then async reads may degrade performance (filesystem may receive reads out of order, which can confuse it's own readahead logic). With sshfs a 1.5 to 4 times slowdown can be measured. There's also a need for userspace filesystems to know whether asynchronous reads are supported by the kernel or not. To achive these, negotiate in the INIT request whether async reads will be used and the maximum readahead value. Update interface version to 7.6 If userspace uses a version earlier than 7.6, then disable async reads, and set maximum readahead value to the maximum read size, as done in previous versions. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit caf736085f2f0d22a992a855d9caae14973f7ea4 Author: Andrew Morton Date: Wed Feb 1 03:04:39 2006 -0800 [PATCH] smbfs readdir vs signal fix An old patch designed to fix http://bugme.osdl.org/show_bug.cgi?id=4497, "getdents gives empty/random result upon signal". If smbfs's readdir() is interupted by a signal, smb_readdir() failed to noticed that and proceeded to treat the unread-into page as valid directory contents. Fix that up by handling the -ERESTARTSYS. Thanks to Stian Skjelstad for reporting and testing. Cc: Stian Skjelstad Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 389d1ea50849f84c3a9f8640fcb66827746b4ab4 Author: Ingo Molnar Date: Wed Feb 1 03:04:35 2006 -0800 [PATCH] CONFIG_DOUBLEFAULT Kconfig fix Move CONFIG_DOUBLEFAULT from the main Kconfig menu (!) into its proper place: the "Processor Type and features" submenu. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fb803a990cd17546bd89c38e0e29a891f71ce7d Author: Andreas Gruenbacher Date: Wed Feb 1 03:04:34 2006 -0800 [PATCH] knfsd: Restore recently broken ACL functionality to NFS server A recent patch to Allow run-time selection of NFS versions to export meant that NO nfsacl service versions were exported. This patch restored that functionality. Signed-off-by: Andreas Gruenbacher Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a2ca64496cc1c9aeab1076e06d092b3ec74a43d Author: Ulrich Drepper Date: Wed Feb 1 03:04:33 2006 -0800 [PATCH] prototypes for *at functions & typo fix Here's the follow-up patch which introduces the prototypes for the new syscalls. There was also a typo in one of the new symbols. Signed-off-by: Ulrich Drepper Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 577bca9eff94193a06e426f8dbf6b3152247a209 Author: Olaf Hering Date: Wed Feb 1 03:04:33 2006 -0800 [PATCH] CONFIG_ISA does not make sense for CONFIG_PPC_PSERIES Older pSeries systems with serial ports dont get any console output after recent changes. CONFIG_ISA does not make sense for CONFIG_PPC_PSERIES because it enables lots of old drivers. Instead, remove the dependency on CONFIG_ISA from the serial port discovery code. Signed-off-by: Olaf Hering Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3833a70585fd4b0f64e275ba0cc3f5e5038253fd Author: Andrew Morton Date: Wed Feb 1 03:04:32 2006 -0800 [PATCH] x86_64: compat_sys_futimesat fix We need to use the compat function here. Pointer out by Heiko Carstens Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1494a92f4c2b1d5abdaa1f823dd19f797bb137de Author: Takashi Iwai Date: Tue Jan 31 10:58:46 2006 +0100 [ALSA] hda-codec - Fix typos in alc882 model table Modules: HDA Codec driver Fixed typos in alc882 model table. Signed-off-by: Takashi Iwai commit bae2bdb334c1ca5f4721e4fab1ca947f44455117 Author: Arnaud Patard Date: Fri Jan 27 12:05:02 2006 +0100 [ALSA] patch_realtek.c: Add new model Modules: HDA Codec driver This little patch add the model for the motherboard K8N51 from Gigabyte to the known models of ALC boards. Signed-off-by: Arnaud Patard Signed-off-by: Takashi Iwai commit 44275f18ec22a31980469567052e932d1023971f Author: Giuliano Pochini Date: Fri Jan 27 12:02:05 2006 +0100 [ALSA] fix typos in writing-an-alsa-driver Modules: Documentation Fixed typos in writing-an-alsa-driver document. Signed-off-by: Giuliano Pochini Signed-off-by: Takashi Iwai commit 869264c45a6a77d73ec6caa543616a10a9dfd951 Author: Matt Porter Date: Wed Jan 25 19:20:50 2006 +0100 [ALSA] hda: sigmatel fixes Modules: HDA Codec driver * Fix init sequence so manually retaskable jacks don't get added to the line_out list. * Update intel mobo config defaults to specify surround outputs as line outs rather than speakers. Signed-off-by: Matt Porter Signed-off-by: Takashi Iwai commit 1d79716ab07710465fa9fc1ae7328cc6095d2526 Author: Alexey Dobriyan Date: Wed Jan 25 14:30:44 2006 +0100 [ALSA] Fix adding second dma channel Modules: OPL3SA2 driver,GUS Classic driver dma2 is a global array. sprintf below suggests there was a typo. Signed-off-by: Alexey Dobriyan Signed-off-by: Takashi Iwai commit 89ac9c256495cbdbe130be5ed192c8911c89ed87 Author: Takashi Iwai Date: Tue Jan 24 10:36:57 2006 +0100 [ALSA] intel8x0 - Add MCP51 PCI ID Modules: Documentation,Intel8x0 driver Added MCP51 PCI ID to intel8x0 driver. Also, updated the supported chips in documentation. Signed-off-by: Takashi Iwai commit fd56f2db9385a651d31fe86eb4cc6cacbb0c5a63 Author: Jonathan Woithe Date: Tue Jan 24 10:35:46 2006 +0100 [ALSA] hda-codec - Fix init verb of ALC260 Modules: HDA Codec driver Fixed the wrong widget id for line-2 selector in the init verb of ALC260. Signed-off-by: Takashi Iwai commit ad0651f97a3f8c5982921cb57fbedc877279e03d Author: Takashi Iwai Date: Tue Jan 24 10:34:34 2006 +0100 [ALSA] hda-codec - Fix max_channels computation for STAC92xx codecs Modules: HDA Codec driver Fix max_channels computation for STAC92xx codecs in the case only HP pin without line-out pins is detected in the default pin config. Signed-off-by: Takashi Iwai commit 802c00f2f3700423df06a1149c23cd60dd59159c Author: Takashi Iwai Date: Mon Jan 23 15:31:11 2006 +0100 [ALSA] via82xx - Add dxs entry for P4M800/VIA8237R Modules: VIA82xx driver Added the dxs entry for P4M800/VIA8237R, reported by OGAWA Hirofumi Signed-off-by: Takashi Iwai commit 3cc08dc6ea677ed4e843120aa070e145b6781a4b Author: Matt Porter Date: Mon Jan 23 15:27:49 2006 +0100 [ALSA] hda-codec - add sigmatel 927x codec support Modules: HDA Codec driver Adds support for the SigmaTel STAC927x HDA codec family. Signed-off-by: Matt Porter Signed-off-by: Takashi Iwai commit d62c40e04cfcec3cef8093bd79d72fe86c8f2195 Author: Matt Porter Date: Mon Jan 23 15:26:27 2006 +0100 [ALSA] hda-codec - add D975XBK support to sigmatel patch Modules: HDA Codec driver Add SigmaTel HDA support for the Intel D975XBK motherboard. Signed-off-by: Matt Porter Signed-off-by: Takashi Iwai commit e061bf1aa3af8a3f2ae7e1b5f8a110eae7936615 Author: Sasha Khapyorsky Date: Mon Jan 23 15:24:16 2006 +0100 [ALSA] hda-codec - support for Agere's HDA soft modem Modules: HDA Codec driver This adds support for Agere's variant of Si3054/5 based HDA modem. Signed-off-by: Sasha Khapyorsky Signed-off-by: Takashi Iwai commit 50f794c8dcfd0e63f3034d7cfd41e563f35741aa Author: Lukasz Stemach Date: Mon Jan 23 15:22:13 2006 +0100 [ALSA] cs4236 - Add PnP ids for Netfinity 3000 Modules: CS4236+ driver PnP ids for Netfinity 3000 builtin soundcard. This one works for me. This patch was submitted through kernel Bugzilla #4214. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Takashi Iwai commit 68b8bc05213567cfc58d8bdb8917b36c314ba7fd Author: Takashi Iwai Date: Mon Jan 23 15:21:28 2006 +0100 [ALSA] serial-uart16550 - Fix a compile warning Modules: Generic drivers Fix a gcc-4.1 compile warning regarding uninitialized variables. Signed-off-by: Takashi Iwai commit 91134859702e66e5946383f66e6eb50ba4325458 Author: Takashi Iwai Date: Mon Jan 23 15:21:05 2006 +0100 [ALSA] opti93x - Fix a compile warning Modules: Opti9xx drivers Fix a gcc-4.1 compile warning regarding uninitialized variables. Signed-off-by: Takashi Iwai commit fe25ad8a84c798a82591e5ed14519c001500fa61 Author: Takashi Iwai Date: Mon Jan 23 15:20:38 2006 +0100 [ALSA] wavefront - Fix a compile warning Modules: Wavefront drivers Fix a gcc-4.1 compile warning regarding uninitialized variables. Signed-off-by: Takashi Iwai commit 51c2bbfcdb10162b294f31e2b1c7106639caaec2 Author: Takashi Iwai Date: Mon Jan 23 15:20:03 2006 +0100 [ALSA] via82xx - Add dxs entry for a FSC board Modules: VIA82xx driver Add dxs entry for a FSC board. Signed-off-by: Takashi Iwai commit bd3f8f2b12bcf4ea25c89b84adeaafad232662c8 Author: Chris Wright Date: Tue Jan 31 19:10:23 2006 -0800 [PATCH] Make sure to always check upper bits of tv_nsec in timespec_valid. Signed-off-by: Chris Wright Signed-off-by: Linus Torvalds commit 3103039cc2a8dc6ababc29afac5c3cadbfa69af9 Author: Andi Kleen Date: Fri Jan 27 02:03:50 2006 +0100 [PATCH] PCI: handle bogus MCFG entries Handle more bogus MCFG entries Some Asus P4 boards seem to have broken MCFG tables with only a single entry for busses 0-0. Special case these and assume they mean all busses can be accessed. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 877be3f0304de16a77f11b2b47f1291b800d5479 Author: Arthur Othieno Date: Wed Jan 18 21:12:57 2006 -0500 [PATCH] PCI: cyblafb: remove pci_module_init() return, really. Richard Knutsson did the original pci_module_init() cleanups: http://marc.theaimsgroup.com/?l=linux-kernel&m=113330872125068&w=2 http://marc.theaimsgroup.com/?l=linux-kernel&m=113330888507321&w=2 Greg, on it's way upstream, pci_module_init() return sneaked back in for cyblafb? http://marc.theaimsgroup.com/?l=linux-pci&m=113652969209562&w=2 http://marc.theaimsgroup.com/?l=linux-pci&m=113683930220421&w=2 Remove for good. Signed-off-by: Arthur Othieno Signed-off-by: Greg Kroah-Hartman commit 8737d6a90cd8b085c2ea9cb4c7443c87f86c3429 Author: linas@austin.ibm.com Date: Thu Jan 12 18:35:23 2006 -0600 [PATCH] powerpc/PCI hotplug: shuffle error checking to better location. Error checking is scattered through various layers of the dlpar code, leading to a somewhat opaque code structure. This patch consolidates error checking in one routine, simplifying the code a tad. There's also some whitespace cleanup here too. Signed-off-by: Linas Vepstas Acked-by: John Rose Signed-off-by: Greg Kroah-Hartman commit b64a71ab5c9098a79ccb463af968933483458a0f Author: linas@austin.ibm.com Date: Thu Jan 12 18:32:58 2006 -0600 [PATCH] powerpc/PCI hotplug: minor cleanup forward decls Minor cleanup. Move structure initializer to bottom of file, this allows elimination of eyeball-strain-inducing forward declarations. Signed-off-by: Linas Vepstas Acked-by: John Rose Signed-off-by: Greg Kroah-Hartman commit f6afbad82c6b7bab0198442592b110341fb419ba Author: linas@austin.ibm.com Date: Thu Jan 12 18:31:01 2006 -0600 [PATCH] powerpc/PCI hotplug: cleanup: add prefix Minor cleanup. Add the prefix rpaphp_* to several generic-sounding routines. Remove rpaphp_remove_slot(), which is a one-liner. Signed-off-by: Linas Vepstas Acked-by: John Rose Signed-off-by: Greg Kroah-Hartman commit e06b80b78db96ca272db4ec0b26ce1092a1a9704 Author: linas@austin.ibm.com Date: Thu Jan 12 18:28:22 2006 -0600 [PATCH] powerpc/PCI hotplug: merge rpaphp_enable_pci_slot() Remove general baroqueness. The function rpaphp_enable_pci_slot() has a fairly simple logic structure, once all of the debug printk's are removed. Its called from only one place, and that place also has a very simple structure once he printk's are removed. Merge the two together. Signed-off-by: Linas Vepstas Acked-by: John Rose Signed-off-by: Greg Kroah-Hartman commit 8fe64399cccf8dddcc4e5eaff270a12064f6fe9f Author: linas@austin.ibm.com Date: Thu Jan 12 18:26:27 2006 -0600 [PATCH] powerpc/PCI hotplug: de-convolute rpaphp_unconfig_pci_adap Remove general baroqueness. The function rpaphp_unconfig_pci_adapter() is really just three lines of code, once all the dbg printks are removed. And its called in only one place. So replace the call by the thre lines. Also, provide proper semaphore locking in the affected function disable_slot() Signed-off-by: Linas Vepstas Acked-by: John Rose Signed-off-by: Greg Kroah-Hartman commit 8a85a70db8c65fd1703b4597f72fe6ee25642234 Author: linas@austin.ibm.com Date: Thu Jan 12 18:24:27 2006 -0600 [PATCH] powerpc/PCI hotplug: remove remove_bus_device() The function rpaphp_eeh_remove_bus_device() is a dupe of eeh_remove_bus_device(). Remove it. Signed-off-by: Linas Vepstas Acked-by: John Rose Signed-off-by: Greg Kroah-Hartman commit 7fec77e4793f307b30846a3d4015d329ffc0b685 Author: linas@austin.ibm.com Date: Thu Jan 12 18:22:07 2006 -0600 [PATCH] powerpc/PCI hotplug: merge config_pci_adapter Remove general baroqueness. The function rpaphp_config_pci_adapter() is really just one line of code, once all the dbg printks are removed. And its called in only one place. So replace the call by the one line. Signed-off-by: Linas Vepstas Acked-by: John Rose Signed-off-by: Greg Kroah-Hartman commit eca845c71816669dace4bf1954d9ab276abb0002 Author: linas@austin.ibm.com Date: Thu Jan 12 18:20:26 2006 -0600 [PATCH] powerpc/PCI hotplug: remove rpaphp_fixup_new_pci_devices() The function rpaphp_fixup_new_pci_devices() has been migrated to pcibios_fixup_new_pci_devices() in arch/powerpc/platforms/pseries/pci_dlpar.c This patch removes the old version. Signed-off-by: Linas Vepstas Acked-by: John Rose Signed-off-by: Greg Kroah-Hartman commit 01657868be1c21b2b8b0e683ea24bdcc2331d522 Author: linas@austin.ibm.com Date: Thu Jan 12 18:18:26 2006 -0600 [PATCH] powerpc/PCI hotplug: remove rpaphp_find_bus() The function rpaphp_find_pci_bus() has been migrated to pcibios_find_pci_bus() in arch/powerpc/platforms/pseries/pci_dlpar.c This patch removes the old version. Signed-off-by: Linas Vepstas Acked-by: John Rose Signed-off-by: Greg Kroah-Hartman commit 53044f357448693f218cc4f053affe92ed414f9d Author: Keck, David Date: Mon Jan 16 15:22:36 2006 -0600 [PATCH] PCI Hotplug: shpchp: AMD POGO errata fix This patch fixes the AMD POGO errata on the hotplug controller where the platform will lock up or reboot if PERR/SERR generation is enabled and a slot is sent an enable command. This fix disables PERR/SERR generation before a slot is sent the enable command by first saving related registers, turning off SERR/PERR generation, enabling the slot, then restoring the registers. Signed-off-by: David Keck Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 3c0c6441883be7676b795939e268b90d6acab360 Author: linas Date: Thu Jan 12 14:36:25 2006 -0600 [PATCH] PCI Hotplug: PCI panic on dlpar add (add pci slot to running partition) Removing and then adding a PCI slot to a running partition results in a kernel panic. The current code attempts to add iospace for an entire root bus, which is inappropriate, and silently fails. When a pci device tries to use the iospace, a page fault is taken, as the iospace had not been mapped, and of course the page fault cannot be resolved. This only occurs for PCI adapters using pio, which may be why it hadn't been seen earlier (this seems to have been broken for a while). This patch has survived testing of dozens of slot add and removes. Signed-off-by: Linas Vepstas Acked-by: John Rose Signed-off-by: Greg Kroah-Hartman commit dd8c49966854a5245f3ed4769c9114e7afd819ef Author: linas Date: Tue Jan 10 15:15:47 2006 -0600 [PATCH] PCI Hotplug/powerpc: module build break The RPAPHP hoplug driver will not build as a module, because it calls on pci_claim_resource(), which is not exported. This exports the symbol. Problem reported by Olaf Hering A grep indicates that building drivers/parisc/lba_pci.c would have trouble building as a module for the same reason. Signed-off-by: Linas Vepstas Signed-off-by: Greg Kroah-Hartman commit 2181c971952ec2af56cd9cc68453f7ad5a0a38d6 Author: Grant Coady Date: Sun Jan 15 16:21:27 2006 +1100 [PATCH] PCI: pci_ids: remove duplicates gathered during merge period pci_ids.h: remove duplicates. Compile tested allmodconfig. Signed-off-by: Grant Coady Signed-off-by: Greg Kroah-Hartman commit 8cea8e9303d45556cb606cc8d9e41f889ff600c0 Author: Mark Rustad Date: Thu Jan 5 22:47:29 2006 -0800 [PATCH] PCI: restore 2 missing pci ids Somewhere between 2.6.14 and 2.6.15-rc3, some PCI ids were apparently removed. The ecc.c module, which is not a part of the kernel.org tree, but included in some distributions, fails to compile. Signed-off-by: Mark Rustad Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 654143ee3a73b2793350b039a135d9cd3101147b Author: Pavel Machek Date: Mon Jan 9 16:16:00 2006 +0100 [PATCH] PCI Hotplug: fix up Kconfig help text