commit fc5870f66279fabedc9dbba7c28451bbb8f47778 tree f0beaef2e55404663ef0872c923813df9a0fa7b5 parent ab9b32ee626e9b6df4ce2560a70ae15e62423cf4 author Andi Kleen Sun, 26 Feb 2006 04:18:55 +0100 committer Linus Torvalds Sun, 26 Feb 2006 09:53:31 -0800 [PATCH] x86_64: Fix ioctl compat code for /dev/rtc RTC_IRQP_SET/RTC_EPOCH_SET don't take a pointer to an argument, but the argument itself. This actually simplifies the code and makes it work. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ab9b32ee626e9b6df4ce2560a70ae15e62423cf4 tree 4bae7b0a38b9e69d33dc7b80ad434274019d9e38 parent e8b917775b572bc27de105f1317c2de4335db5b3 author Andi Kleen Sun, 26 Feb 2006 04:18:52 +0100 committer Linus Torvalds Sun, 26 Feb 2006 09:53:31 -0800 [PATCH] x86_64: Better ATI timer fix The previous experiment for using apicmaintimer on ATI systems didn't work out very well. In particular laptops with C2/C3 support often don't let it tick during idle, which makes it useless. There were also some other bugs that made the apicmaintimer often not used at all. I tried some other experiments - running timer over RTC and some other things but they didn't really work well neither. I rechecked the specs now and it turns out this simple change is actually enough to avoid the double ticks on the ATI systems. We just turn off IRQ 0 in the 8254 and only route it directly using the IO-APIC. I tested it on a few ATI systems and it worked there. In fact it worked on all chipsets (NVidia, Intel, AMD, ATI) I tried it on. According to the ACPI spec routing should always work through the IO-APIC so I think it's the correct thing to do anyways (and most of the old gunk in check_timer should be thrown away for x86-64). But for 2.6.16 it's best to do a fairly minimal change: - Use the known to be working everywhere-but-ATI IRQ0 both over 8254 and IO-APIC setup everywhere - Except on ATI disable IRQ0 in the 8254 - Remove the code to select apicmaintimer on ATI chipsets - Add some boot options to allow to override this (just paranoia) In 2.6.17 I hope to switch the default over to this for everybody. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e8b917775b572bc27de105f1317c2de4335db5b3 tree 940351af2d1690331d82a65331acf34254621936 parent e2c0388866dc12bef56b178b958f9b778fe6c687 author Andi Kleen Sun, 26 Feb 2006 04:18:49 +0100 committer Linus Torvalds Sun, 26 Feb 2006 09:53:31 -0800 [PATCH] x86_64: Move the SMP time selection earlier SMP time selection originally ran after all CPUs were brought up because it needed to know the number of CPUs to decide if it needs an MP safe timer or not. This is not needed anymore because we know present CPUs early. This fixes a couple of problems: - apicmaintimer didn't always work because it relied on state that was set up time_init_gtod too late. - The output for the used timer in early kernel log was misleading because time_init_gtod could actually change it later. Now always print the final timer choice Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e2c0388866dc12bef56b178b958f9b778fe6c687 tree 8a029b1e859215340fd7a029194bffdd7661e4c8 parent 2eb1bdbad89b19c99f8ac1de1492cdabbff6b3d3 author Andi Kleen Sun, 26 Feb 2006 04:18:46 +0100 committer Linus Torvalds Sun, 26 Feb 2006 09:53:30 -0800 [PATCH] x86_64: Fix the additional_cpus=.. option It didn't set up the CPU possible map early enough, so the option didn't actually work. Noticed by Heiko Carstens Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2eb1bdbad89b19c99f8ac1de1492cdabbff6b3d3 tree eb0182da181df8022003182a8566629f8ca56c22 parent 1f9921539208f6d88f600a801e333d718e4a13ff author Andi Kleen Sun, 26 Feb 2006 04:18:43 +0100 committer Linus Torvalds Sun, 26 Feb 2006 09:53:30 -0800 [PATCH] x86_64: Disable ACPI blacklist by year for now on x86-64 ACPI is initialized very early on x86-64, before the DMI code is initialized. This means it would often discover a 0 year and then turn off ACPI because it thought the BIOS was too old. Some systems don't boot without ACPI so this was a problem. I have a full fix by adding new very early DMI detection, but it needs more testing before it can be merged. For 2.6.16 let's just turn the check off. It never made much sense anyways because there are no x86-64 systems older than 2002 or so and they generally all have working ACPI. Cc: len.brown@intel.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1f9921539208f6d88f600a801e333d718e4a13ff tree 2630bb5cf7ce4396c2e034fb333f673ed432008b parent e78256b8f3e2850ad55c2d69e1429e6c2607afd3 author Chris McDermott Sun, 26 Feb 2006 04:18:40 +0100 committer Linus Torvalds Sun, 26 Feb 2006 09:53:30 -0800 [PATCH] x86_64: Fix NMI watchdog on x460 [description from AK] Old check for the IO-APIC watchdog during the timer check was wrong - it obviously should only drop into this if the IO-APIC watchdog is used. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e78256b8f3e2850ad55c2d69e1429e6c2607afd3 tree 0d0e0f7d49000d3b047beaaa7f47a273c16b047d parent 6070f9ec6b03cc46cd0242523326f7a296f47c1c author Andi Kleen Sun, 26 Feb 2006 04:18:37 +0100 committer Linus Torvalds Sun, 26 Feb 2006 09:53:30 -0800 [PATCH] x86-64/i386: Use common X86_PM_TIMER option and make it EMBEDDED This makes x86-64 use the common X86_PM_TIMER Kconfig entry in drivers/acpi And since PM timer is needed for correct timing on a lot of systems now (e.g. AMD dual cores) and we often get bug reports from people who forgot to set it make it depend on CONFIG_EMBEDDED. x86-64 had this change before and it's a good thing. I also fixed the description slightly to make this more clear. Cc: len.brown@intel.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6070f9ec6b03cc46cd0242523326f7a296f47c1c tree ba976c8458cfc2429d32883141170bbc4dfd5049 parent 13a229abc25640813f1480c0478dfc6bdbc1c19e author Andreas Deresch Sun, 26 Feb 2006 04:18:34 +0100 committer Linus Torvalds Sun, 26 Feb 2006 09:53:30 -0800 [PATCH] i386: Handle non existing APICs without panicing [description from AK] This fixes booting in APIC mode on some ACER laptops. x86-64 did a similar change some time ago. See http://bugzilla.kernel.org/show_bug.cgi?id=4700 for details Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 13a229abc25640813f1480c0478dfc6bdbc1c19e tree bdb9da6ba327bd4f6ee64aa3ca1548670be395f2 parent 5342fba5412cead88b61ead07168615dbeba1ee3 author Andi Kleen Sun, 26 Feb 2006 04:18:31 +0100 committer Linus Torvalds Sun, 26 Feb 2006 09:53:30 -0800 [PATCH] x86_64: Only do the clustered systems have unsynchronized TSC assumption on IBM systems Big Unisys systems have multiple clusters too, but they have an synchronized TSC. I'm using the SMBIOS to check for vendor == IBM. Cc: Chris McDermott Cc: "Protasevich, Natalie" Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 5342fba5412cead88b61ead07168615dbeba1ee3 tree 1ec0936cff22284b2226f431033b1a36b27615c7 parent f83f2b5fbab4585f4de4523c7879d60e3f85a248 author Suresh Siddha Sun, 26 Feb 2006 04:18:28 +0100 committer Linus Torvalds Sun, 26 Feb 2006 09:53:30 -0800 [PATCH] x86_64: Check for bad elf entry address. Fixes a local DOS on Intel systems that lead to an endless recursive fault. AMD machines don't seem to be affected. Signed-off-by: Suresh Siddha Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f83f2b5fbab4585f4de4523c7879d60e3f85a248 tree 93377911ff62ca519e918bd061c77c79cb90fbda parent 60b08c67220cf6faef7410ac6adba23a8a743bf7 author Jan Beulich Sun, 26 Feb 2006 04:18:25 +0100 committer Linus Torvalds Sun, 26 Feb 2006 09:53:30 -0800 [PATCH] x86_64: fix USER_PTRS_PER_PGD The value, while currently unused in the native kernel, was off by one. Signed-Off-By: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 60b08c67220cf6faef7410ac6adba23a8a743bf7 tree ad3c5f6933f06ce46ff41b0fe456a10900a04567 parent 04a3d311c01d3ad287750c5c8d03fa614475af91 author Jon Mason Sun, 26 Feb 2006 04:18:22 +0100 committer Linus Torvalds Sun, 26 Feb 2006 09:53:29 -0800 [PATCH] x86_64: no_iommu removal in pci-gart.c In previous versions of pci-gart.c, no_iommu was used to determine if IOMMU was disabled in the GART DMA mapping functions. This changed in 2.6.16 and now gart_xxx() functions are only called if gart is enabled. Therefore, uses of no_iommu in the GART code are no longer necessary and can be removed. Also, it removes double deceleration of no_iommu and force_iommu in pci.h and proto.h, by removing the deceleration in pci.h. Lastly, end_pfn off by one error. Tested (along with patch 1/2) on dual opteron with gart enabled, iommu=soft, and iommu=off. Signed-off-by: Jon Mason Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 04a3d311c01d3ad287750c5c8d03fa614475af91 tree e3d4f7f3d242ed687d7417c3619622fa224f2d9c parent 489708007785389941a89fa06aedc5ec53303c96 author Marc Zyngier Sun, 26 Feb 2006 12:02:56 +0100 committer Linus Torvalds Sun, 26 Feb 2006 09:10:58 -0800 [PATCH] Fix Specialix SI probing As the (probably) last user of a Specialix SI board, I noticed that recent kernels would fail to probe the sucker. Quick investigation indicate a few missing braces... I left the double probing in place, as it looks like it's been here forever. Signed-off-by: Marc Zyngier Signed-off-by: Linus Torvalds commit 489708007785389941a89fa06aedc5ec53303c96 tree 425e0dda8d5fec842ffdd3b2cdadfeaf60f5a668 parent a0124d780d06db711e8a92135d774940588a27da author Al Viro Sun, 26 Feb 2006 08:34:10 -0600 committer Linus Torvalds Sun, 26 Feb 2006 09:09:49 -0800 [PATCH] sd: fix memory corruption with broken mode page headers There's a problem in sd where we blindly believe the length of the headers and block descriptors. Some devices return insane values for these and cause our length to end up greater than the actual buffer size, so check to make sure. Signed-off-by: Al Viro Also removed the buffer size magic number (512) and added DPOFUA of zero to the defaults Signed-off-by: James Bottomley Signed-off-by: Linus Torvalds commit a0124d780d06db711e8a92135d774940588a27da tree ff4e7fa1b314db2a30d78b0af00c2ea499b7e8fa parent 5c1ca65c93503b2c94359ba39640f9687bd192a3 author Dave Jones Sat, 25 Feb 2006 03:55:38 -0500 committer Linus Torvalds Sat, 25 Feb 2006 11:12:15 -0800 [PATCH] x86-64: react to new topology.c location Commit 9c869edac591977314323a4eaad5f7633fca684f moved the i386 topology.c file. That change broke x86-64 compiles, as it uses the same file. Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 5c1ca65c93503b2c94359ba39640f9687bd192a3 tree 74dfbe4da8d39e302ae343379e20585ffee4b940 parent c946160e601c70a0ae0aa807461dd0232bcaf3a7 parent d856c66618f953fc3cd1e613226d5f098ad322c8 author Linus Torvalds Fri, 24 Feb 2006 16:01:07 -0800 committer Linus Torvalds Fri, 24 Feb 2006 16:01:07 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-serial commit c946160e601c70a0ae0aa807461dd0232bcaf3a7 tree 0554732c1bb8ff38dac0ad143a6f455de11677f9 parent 2cb5b6beef3a3357ef1f2a580d5e2284516efc39 parent abbea7187296a7fb316a55f2319438c2bf881f0a author Linus Torvalds Fri, 24 Feb 2006 16:00:36 -0800 committer Linus Torvalds Fri, 24 Feb 2006 16:00:36 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 2cb5b6beef3a3357ef1f2a580d5e2284516efc39 tree 8f9e12f91652c510632cb9965f2c4b92d2b19717 parent 329dda083e496bc5ffbb4b1973243bd8a9420e24 parent 1cf3109ffb26a6ea572fd02436bd10458b4b2187 author Linus Torvalds Fri, 24 Feb 2006 14:36:42 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:36:42 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6 commit 329dda083e496bc5ffbb4b1973243bd8a9420e24 tree 03a2e4b1ac12275d2faa10009170c91b66618fcd parent 4853a615bbfb5aae4c3e2203b4b2742c109784c9 author Kumar Gala Fri, 24 Feb 2006 10:54:52 -0600 committer Linus Torvalds Fri, 24 Feb 2006 14:34:50 -0800 [PATCH] powerpc: Fix mem= cmdline handling on arch/powerpc for !MULTIPLATFORM mem= command line option was being ignored in arch/powerpc if we were not a CONFIG_MULTIPLATFORM (which is handled via prom_init stub). The initial command line extraction and parsing needed to be moved earlier in the boot process and have code to actual parse mem= and do something about it. Also, fixed a compile warning in the file. Signed-off-by: Kumar Gala Acked-by: Segher Boessenkool Signed-off-by: Linus Torvalds commit 4853a615bbfb5aae4c3e2203b4b2742c109784c9 tree 535e45ef271ad5778ba4e6aca8f432b504a4ca39 parent 9c869edac591977314323a4eaad5f7633fca684f parent d91675f9c7f5752e8657df1e1d926bd6a624434f author Linus Torvalds Fri, 24 Feb 2006 14:32:18 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:32:18 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 9c869edac591977314323a4eaad5f7633fca684f tree 9455f4e8e78cd62f87b19dd7abe2c65ca23d9ceb parent ad329b1519c0091806046b0e49ab073ea590dc11 author Zachary Amsden Fri, 24 Feb 2006 13:04:27 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:39 -0800 [PATCH] Fix topology.c location When compiling a non-default subarch, topology.c is missing from the kernel build. This causes builds with CONFIG_HOTPLUG_CPU to fail. In addition, on Intel processors with cpuid level > 4, it causes intel_cacheinfo.c to reference uninitialized data that should have been set up by the initcall in topology.c which calls register_cpu. This causes a kernel panic on boot on newer Intel processors. Moving topology.c to arch/i386/kernel fixes both of these problems. Thanks to Dan Hecht for finding and fixing this problem. Signed-off-by: Zachary Amsden Signed-off-by: Dan Hecht Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad329b1519c0091806046b0e49ab073ea590dc11 tree 37ba48803043629e4c10b03bd448da02faaefa9f parent 63d94e482df769f31e8b1097f06c3a3fba7bced4 author Hugh Dickins Fri, 24 Feb 2006 13:04:26 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:39 -0800 [PATCH] tmpfs: recommend remount for mpol akpm points out that switching to a non-NUMA kernel could be irritating if mounting tmpfs fails on an mpol option: tmpfs.txt recommend remount. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63d94e482df769f31e8b1097f06c3a3fba7bced4 tree 0461197daa1d7df50087b4dfa2b692dfcd81d745 parent d9dde59ba03095e526640988c0fedd75e93bc8b7 author Jun'ichi Nomura Fri, 24 Feb 2006 13:04:25 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:39 -0800 [PATCH] dm: free minor after unlink gendisk Minor number should be freed after del_gendisk(). Otherwise, there could be a window where 2 registered gendisk has same minor number. Signed-off-by: Jun'ichi Nomura Acked-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9dde59ba03095e526640988c0fedd75e93bc8b7 tree 5a56884f1e380906ad41cc257891f93ff6cb2cb5 parent 8dde0509e74ff6044cf1788c917a22facce9f68d author Jun'ichi Nomura Fri, 24 Feb 2006 13:04:24 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:39 -0800 [PATCH] dm: missing bdput/thaw_bdev at removal Need to unfreeze and release bdev otherwise the bdev inode with inconsistent state is reused later and cause problem. Signed-off-by: Jun'ichi Nomura Acked-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8dde0509e74ff6044cf1788c917a22facce9f68d tree e9242b771b1b6b1528090ece3eea6b7659474eb6 parent d4f7796e9b387e471ab0e8ed4e0c2bd616b3c193 author Andrew Morton Fri, 24 Feb 2006 13:04:23 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:39 -0800 [PATCH] ramfs: update dir mtime and ctime Phil Marek points out that ramfs forgets to update a directory's mtime and ctime when it is modified. Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4f7796e9b387e471ab0e8ed4e0c2bd616b3c193 tree e68b20c1952e3d1bfc6bb51c1b38cd6323e2c771 parent c04030e16dbea2f7581f82cc6688695927f6ac5b author Christoph Lameter Fri, 24 Feb 2006 13:04:22 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:39 -0800 [PATCH] vmscan: fix zone_reclaim - PF_SWAPWRITE needs to be set for RECLAIM_SWAP to be able to write out pages to swap. Currently RECLAIM_SWAP may not do that. - remove setting nr_reclaimed pages after slab reclaim since the slab shrinking code does not use that and the nr_reclaimed pages is just right for the intended follow up action. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c04030e16dbea2f7581f82cc6688695927f6ac5b tree 7ff5cd2494a133f1bf571f7af02e656bb01d124f parent ee713059d4922e4ee17700496d9eb3b95b1ab836 author Ulrich Drepper Fri, 24 Feb 2006 13:04:21 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:39 -0800 [PATCH] flags parameter for linkat I'm currently at the POSIX meeting and one thing covered was the incompatibility of Linux's link() with the POSIX definition. The name. Linux does not follow symlinks, POSIX requires it does. Even if somebody thinks this is a good default behavior we cannot change this because it would break the ABI. But the fact remains that some application might want this behavior. We have one chance to help implementing this without breaking the behavior. For this we could use the new linkat interface which would need a new flags parameter. If the new parameter is AT_SYMLINK_FOLLOW the new behavior could be invoked. I do not want to introduce such a patch now. But we could add the parameter now, just don't use it. The patch below would do this. Can we get this late patch applied before the release more or less fixes the syscall API? Signed-off-by: Ulrich Drepper Signed-off-by: Ralf Baechle Cc: Heiko Carstens Cc: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee713059d4922e4ee17700496d9eb3b95b1ab836 tree fe56c8f04342938813edce2bb0c92a984b125457 parent cacfc8cf4ed6e05a0d9a8bd17ab85536abd0f6c5 author Antonino A. Daplas Fri, 24 Feb 2006 13:04:20 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:39 -0800 [PATCH] Fix pseudo_palette setup in asiliantfb_setcolreg() The setcolreg function will attempt to write 24 color entries to the pseudo_pallette. However, the pseudo_palette has only space for 16 entries. Thanks to Atsushi Nemoto for reporting this bug. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cacfc8cf4ed6e05a0d9a8bd17ab85536abd0f6c5 tree 51969d297683c72da0bc9af5317fd15ba89d8e9b parent 80c410dc14f7783411b4becf083069d69daaa4a7 author Freddy Spierenburg Fri, 24 Feb 2006 13:04:17 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:38 -0800 [PATCH] au1100fb: replaced io_remap_page_range() with io_remap_pfn_range() Replaced the no longer existing io_remap_page_range() routine with the io_remap_pfn_range() routine. Did not have a chance yet to test the functionality of the driver, but at least the kernel compiles cleanly again. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80c410dc14f7783411b4becf083069d69daaa4a7 tree 7783c93df94ea059272a672d2aa6764aee3485a6 parent 68b06deb2b343c040485a9fc6c813577bf6d5cf5 author Martin Michlmayr Fri, 24 Feb 2006 13:04:16 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:38 -0800 [PATCH] gbefb: Set default of FB_GBE_MEM to 4 MB Allocating more than 4 MB memory for the GBE (SGI O2) framebuffer completely breakfs gbefb support at the moment. According to comments on #mipslinux, more than 4 MB has never worked correctly in Linux. Therefore, the default should be 4 MB. Signed-off-by: Martin Michlmayr Signed-off-by: Antonino Daplas Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68b06deb2b343c040485a9fc6c813577bf6d5cf5 tree 19cde23467a006c488f46bfebca19b7207b2d553 parent 2b932f6cf052920fb3a6281499e08209b08f5086 author Kaj-Michael Lang Fri, 24 Feb 2006 13:04:15 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:38 -0800 [PATCH] gbefb: IP32 gbefb depth change fix The gbefb driver does not update the framebuffer layers visual setting when depth is changed with fbset, resulting in strange colors (very dark blue in 16-bit, almost black in 24-bit). Signed-off-by: Kaj-Michael Lang Signed-off-by: Martin Michlmayr Signed-off-by: Antonino Daplas Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b932f6cf052920fb3a6281499e08209b08f5086 tree c2710e09dd40ee9733bcd77234d6373acec741d2 parent 1e275d406bf6b88e4de6925cf594b64bb2ec49bc author James Bottomley Fri, 24 Feb 2006 13:04:14 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:38 -0800 [PATCH] x86: fix broken SMP boot sequence Recent GDT changes broke the SMP boot sequence if the booting CPU is numbered anything other than zero. There's also a subtle source of error in that the boot time CPU now uses cpu_gdt_table (which is actually the GDT for booting CPUs in head.S). This patch fixes both problems by making GDT descriptors themselves allocated from a per_cpu area and switching to them in cpu_init(), which now means that cpu_gdt_table is exclusively used for booting CPUs again. Signed-off-by: James Bottomley Cc: Zachary Amsden Cc: Matt Tolentino Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e275d406bf6b88e4de6925cf594b64bb2ec49bc tree 6fe143317fbc442407244a3c55ecf475072a28f3 parent f68a106f224c21148c5264a429fac149dc7ad0ac author Christoph Lameter Fri, 24 Feb 2006 13:04:12 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:38 -0800 [PATCH] page migration: Fix MPOL_INTERLEAVE behavior for migration via mbind() migrate_pages_to() allocates a list of new pages on the intended target node or with the intended policy and then uses the list of new pages as targets for the migration of a list of pages out of place. When the pages are allocated it is not clear which of the out of place pages will be moved to the new pages. So we cannot specify an address as needed by alloc_page_vma(). This causes problem for MPOL_INTERLEAVE which will currently allocate the pages on the first node of the set. If mbind is used with vma that has the policy of MPOL_INTERLEAVE then the interleaving of pages may be destroyed. This patch fixes that by generating a fake address for each alloc_page_vma which will result is a distribution of pages as prescribed by MPOL_INTERLEAVE. Lee also noted that the sequence of nodes for the new pages seems to be inverted. So we also invert the way the lists of pages for migration are build. Signed-off-by: Christoph Lameter Signed-off-by: Lee Schermerhorn Looks-ok-to: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f68a106f224c21148c5264a429fac149dc7ad0ac tree cf5942e34eb09d6b7a0ba4db837d528f4eda272c parent 8d5c822b2920be9016806f61fd552d2301cfa2fc author James Bottomley Fri, 24 Feb 2006 13:04:11 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:38 -0800 [PATCH] voyager: fix the cpu_possible_map to make voyager boot again Right at the moment (thanks to a patch from Andrew), cpu_possible_map on voyager is CPU_MASK_NONE, which means the machine always thinks it has no CPUs. Fix that by doing an early initialisation of the cpu_possible_map from the cpu_phys_present_map. (akpm: we aim to please) Signed-off-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d5c822b2920be9016806f61fd552d2301cfa2fc tree f93da6d34191a26e3d9d38230da39e1ec2109989 parent c314b6f1fa462acdb89323c75c597eeaae056e7c author James Bottomley Fri, 24 Feb 2006 13:04:10 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:38 -0800 [PATCH] voyager: fix boot panic by adding topology export It looks like I can't get away without exporting topology functions from voyager any longer, so add them to the voyager subarchitecture. Signed-off-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c314b6f1fa462acdb89323c75c597eeaae056e7c tree af2b8f4ea1d4d04bf34deee23b70625104cb07ab parent 124d90be62343f71bbb7a6b4a907b5584181e6d5 author Simon Vogl Fri, 24 Feb 2006 13:04:09 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:37 -0800 [PATCH] cfi: init wait queue in chip struct Fix a kernel oops for Intel P30 flashes, where the wait queue head was not initialized for the flchip struct, which in turn caused a crash at the first read operation. Signed-off-by: Thomas Gleixner Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 124d90be62343f71bbb7a6b4a907b5584181e6d5 tree 6e9a53f6bee52bb551724ec29e7710a656fbb187 parent d1521260f57d70d0ba86d2a309ec1ce7979be2fc author Prasanna S Panchamukhi Fri, 24 Feb 2006 13:04:08 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:37 -0800 [PATCH] Kprobes causes NX protection fault on i686 SMP Fix a problem seen on i686 machine with NX support where the instruction could not be single stepped because of NX bit set on the memory pages allocated by kprobes module. This patch provides allocation of instruction solt so that the processor can execute the instruction from that location similar to x86_64 architecture. Thanks to Bibo and Masami for testing this patch. Signed-off-by: Prasanna S Panchamukhi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1521260f57d70d0ba86d2a309ec1ce7979be2fc tree 1dcdb33e5c9a82a137d15f6857faf02acb435755 parent fe1db50c7222c67466e41241bc7ef17b469bcf1d author Samuel Thibault Fri, 24 Feb 2006 13:03:59 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:37 -0800 [PATCH] vgacon: no vertical resizing on EGA EGA boards suck: they mostly have write-only registers. This is particularly problematic for the overflow register: for being able to write to it, we would have to handle vertical sync & such too, which (I'd say) would potentially break a lot of configurations. Instead, just disabling vertical resize for EGA boards is just nice enough (horizontal resize still works). Fixes http://bugzilla.kernel.org/show_bug.cgi?id=6106 Signed-off-by: Samuel Thibault Cc: Rafal Olearski Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe1db50c7222c67466e41241bc7ef17b469bcf1d tree 1956b61473d8e9cc8a1a0849e75a728b1395f902 parent f462e8f913bdc7a28ce55508d0c045a0c445b157 author Paolo 'Blaisorblade' Giarrusso Fri, 24 Feb 2006 13:03:58 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:37 -0800 [PATCH] uml: tidying COW code Improve (especially for coherence) some prototypes, and return code of init_cow_file in error case - for a short write return -EINVAL, otherwise return the error we got! Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f462e8f913bdc7a28ce55508d0c045a0c445b157 tree ce584e748f632d90307d3c2cd62294f3b209c903 parent dc1561ac019ff7b6f75c5175abd2ec65c8dbd581 author Paolo 'Blaisorblade' Giarrusso Fri, 24 Feb 2006 13:03:57 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:37 -0800 [PATCH] uml: better error reporting for read_output Do precise error handling: print precise error messages, distinguishing short reads and read errors. This functions fails frequently enough for me so I bothered doing this fix. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc1561ac019ff7b6f75c5175abd2ec65c8dbd581 tree 4820ed1be1024c2f09382dbeade4f7c4e5a8b3e8 parent 635dd50b7dc69b698e8808ff2802a6cfc31385a8 author Paolo 'Blaisorblade' Giarrusso Fri, 24 Feb 2006 13:03:56 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:37 -0800 [PATCH] uml: os_connect_socket error path fixup Fix an fd leak and a return of -1 instead of -errno in the error path - this showed up in intensive testing of HPPFS, the os_connect_socket user. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 635dd50b7dc69b698e8808ff2802a6cfc31385a8 tree d2d699dc7890eae52674b91a5ac34be645ce0e29 parent 07f4e2c61c76e8b543c0a2589063aea85c15fb25 author Paolo 'Blaisorblade' Giarrusso Fri, 24 Feb 2006 13:03:55 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:37 -0800 [PATCH] uml: fix ((unused)) attribute Use __attribute_used__ instead of __attribute__ ((unused)). This will help with GCC > 3.2. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07f4e2c61c76e8b543c0a2589063aea85c15fb25 tree 7a43503115b18d26b5baed9c5bb9263469a5587f parent 31bc5a33346b6dd35be219d1416449e0064e9123 author Paolo 'Blaisorblade' Giarrusso Fri, 24 Feb 2006 13:03:55 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:37 -0800 [PATCH] uml: fix usage of kernel_errno in place of errno To avoid conflicts, in kernel files errno is expanded to kernel_errno, to distinguish it from glibc errno. In this case, the code wants to use the libc errno but the kernel one is used; in the other usage, we return errno in place of -errno in case of an error. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31bc5a33346b6dd35be219d1416449e0064e9123 tree ce4c3d105b5ec6cfa69b8300a885c9c26908eafe parent b1a3aa209161af3b7ca8ce8eae89b15faa96f612 author Paolo 'Blaisorblade' Giarrusso Fri, 24 Feb 2006 13:03:53 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:36 -0800 [PATCH] uml: correct error messages in COW driver Improve some error messages in the COW driver, and say V3, not V2, when talking about V3 format. Also resync with our userspace code utility a bit more. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1a3aa209161af3b7ca8ce8eae89b15faa96f612 tree 2722e41c29c0d7d271a3db9afc512838e06dd853 parent 6f595cffedc09da3f5bed13afc86aac64e67c4d7 author Takashi Iwai Fri, 24 Feb 2006 13:03:52 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:36 -0800 [PATCH] alsa: fix bogus snd_device_free() in opl3-oss.c Remove snd_device_free() for an opl3-oss instance which should have been released. Signed-off-by: Takashi Iwai Cc: Jaroslav Kysela Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f595cffedc09da3f5bed13afc86aac64e67c4d7 tree 4d6405462b45d1572405acb42dc5aa71636ff624 parent 6ced13cdcab440931b87829b0f2d0dedacfb3f2d author Rene Herman Fri, 24 Feb 2006 13:03:51 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:36 -0800 [PATCH] snd-cs4236 typo fix I noticed on 2.6.16-rc4 that my MPU-401 wasn't functional, due to a simple copy & paste error in sound/isa/cs423x/cs4236.c. Acked-by: Takashi Iwai Cc: Jaroslav Kysela Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ced13cdcab440931b87829b0f2d0dedacfb3f2d tree 8bdd7a80685a7069b30a0e03d32892a81ea8ca9c parent cde05cf2145b0aa06dd61277060bfba5d38acb0b author Hirokazu Takata Fri, 24 Feb 2006 13:03:51 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:36 -0800 [PATCH] m32r: fix and update for gcc-4.0 Fix and update for gcc-4.0. - arch/m32r/kernel/signal.c: Change type of the 8th parameter of sys_rt_sigsuspend() from 'struct pt_regs' to 'struct pt_regs *'. This functions make use of the 'regs' parameter to return status value, but gcc-4.0 optimizes and removes it as a dead code. Functions, sys_sigaltstack() and sys_rt_sigreturn(), have also modified. - arch/m32r/lib/usercopy.c, include/asm-m32r/uaccess.h: Add early-clobber constraints('&') to output values of asm statements; these constraints seems to be required for gcc-4.0 register assignment. Signed-off-by: Hayato Fujiwara Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cde05cf2145b0aa06dd61277060bfba5d38acb0b tree bc31a01ab1d9642f5f84454cd0c3cd54f66704ed parent f52ee1410d563cd409b08822492273a5bc235821 author Hirokazu Takata Fri, 24 Feb 2006 13:03:50 -0800 committer Linus Torvalds Fri, 24 Feb 2006 14:31:36 -0800 [PATCH] m32r: enable asm code optimization Add -O2 option to AFLAGS to enable asm code optimization for m32r. On m32r gas, "-m32r2 -O" option enables assembler's parallel code generation optimization for M32R2 ISA as a default. So, "-no-parallel" option is required explicitly for a cpu core with single instuction issuing, for example, VDEC2. Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abbea7187296a7fb316a55f2319438c2bf881f0a tree 28e8988de3cc8e81691bfd0170b1d03032dc7da7 parent f52ee1410d563cd409b08822492273a5bc235821 author Andrew Victor Fri, 24 Feb 2006 22:27:50 +0000 committer Russell King Fri, 24 Feb 2006 22:27:50 +0000 [ARM] 3348/1: Disable GPIO interrupts Patch from Andrew Victor disable_irq() lazily disables the interrupt, so the IRQ is only disabled once the interrupt occurs again. The GPIO interrupt handler therefore must first check disable_depth to see if the IRQ needs to be disabled. Orignal patch by Bill Gatliff. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit d91675f9c7f5752e8657df1e1d926bd6a624434f tree c0285999dc00ca9c8af84606ee98224c67c71e96 parent 0c0888908dec145aaaa40d8a49d34913573f5a27 author YOSHIFUJI Hideaki Fri, 24 Feb 2006 13:18:33 -0800 committer David S. Miller Fri, 24 Feb 2006 13:18:33 -0800 [IPV6]: Do not ignore IPV6_MTU socket option. Based on patch by Hoerdt Mickael . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 0c0888908dec145aaaa40d8a49d34913573f5a27 tree aec1c2ada56fe338934bad1ca916328beff0a1c3 parent f52ee1410d563cd409b08822492273a5bc235821 author Hugo Santos Fri, 24 Feb 2006 13:16:25 -0800 committer David S. Miller Fri, 24 Feb 2006 13:16:25 -0800 [IPV6] ip6_tunnel: release cached dst on change of tunnel params The included patch fixes ip6_tunnel to release the cached dst entry when the tunnel parameters (such as tunnel endpoints) are changed so they are used immediatly for the next encapsulated packets. Signed-off-by: Hugo Santos Acked-by: Ville Nuorvala Signed-off-by: David S. Miller commit 1cf3109ffb26a6ea572fd02436bd10458b4b2187 tree 446f6e1c2160565f8dd1bf4da0e211c00fcce284 parent 78af34f03d33d2ba179c9d35685860170b94a285 author Anton Altaparmakov Fri, 24 Feb 2006 10:48:14 +0000 committer Anton Altaparmakov Fri, 24 Feb 2006 10:48:14 +0000 NTFS: Do more detailed reporting of why we cannot mount read-write by special casing the VOLUME_MODIFIED_BY_CHKDSK flag. Signed-off-by: Anton Altaparmakov commit 78af34f03d33d2ba179c9d35685860170b94a285 tree dc41d99f07193a581e7dd3734671c3854aa185eb parent 7b875affd49fbc8978a1a898a0a80ebfff11f8c6 author Anton Altaparmakov Fri, 24 Feb 2006 10:32:33 +0000 committer Anton Altaparmakov Fri, 24 Feb 2006 10:32:33 +0000 NTFS: Implement support for sector sizes above 512 bytes (up to the maximum supported by NTFS which is 4096 bytes). commit 7b875affd49fbc8978a1a898a0a80ebfff11f8c6 tree c611237ddce08f33c858254a67c4858fe643861d parent 3672b638ec1d5b1020ea27986060b830f09c96c1 parent 944d79559d154c12becde0dab327016cf438f46c author Anton Altaparmakov Fri, 24 Feb 2006 10:04:22 +0000 committer Anton Altaparmakov Fri, 24 Feb 2006 10:04:22 +0000 Merge ../ntfs-2.6-devel commit 3672b638ec1d5b1020ea27986060b830f09c96c1 tree dca562635528062a8c04c416978a1133b95310fc parent fab8d6ddf6dee2608869005d45fe97f70e4f5bdd author Anton Altaparmakov Fri, 24 Feb 2006 09:55:07 +0000 committer Anton Altaparmakov Fri, 24 Feb 2006 09:55:07 +0000 NTFS: - Cope with attribute list attribute having invalid flags. Windows copes with this and even chkdsk does not detect or fix this so we have to cope with it, too. Thanks to Pawel Kot for reporting the problem. - Miscellaneous updates to layout.h. Signed-off-by: Anton Altaparmakov commit fab8d6ddf6dee2608869005d45fe97f70e4f5bdd tree fecf566e03a87b2a44c7f3363ddb5c0d4bebdca7 parent 64419d93a5906600af5817ad0cae3c6ecf7fb389 parent f52ee1410d563cd409b08822492273a5bc235821 author Anton Altaparmakov Fri, 24 Feb 2006 09:06:36 +0000 committer Anton Altaparmakov Fri, 24 Feb 2006 09:06:36 +0000 Merge branch 'master' of /home/src/linux-2.6/ commit f52ee1410d563cd409b08822492273a5bc235821 tree 18694453f85c25cf7ffea2d9111067451cbaed0b parent c0eea79bd2adcc4708973fdbf72a0a292aa60d71 parent ad9f6713ae59f319ed676c2d014a7756b62f1c51 author Linus Torvalds Thu, 23 Feb 2006 22:21:29 -0800 committer Linus Torvalds Thu, 23 Feb 2006 22:21:29 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit ad9f6713ae59f319ed676c2d014a7756b62f1c51 tree ac693004a23586ab8294c46a0eb19903547aa518 parent 22fe472cb430ce45c4fb9b6d13060dd724d6dbc8 author Adrian Bunk Sun, 05 Feb 2006 00:37:47 +0100 committer Jeff Garzik Fri, 24 Feb 2006 00:20:08 -0500 [PATCH] drivers/net/tlan.c: #ifdef CONFIG_PCI the PCI specific code drivers/net/tlan.c compiles with CONFIG_PCI=n only with a warning and due to the dead code elimination of gcc. Additionally, this fixes the only compile error I found with CONFIG_PCI=n and the gcc -Werror-implicit-function-declaration flag on i386. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit c0eea79bd2adcc4708973fdbf72a0a292aa60d71 tree 5736f242252532e65098e13398c9609f256de548 parent adb9c9ac2e82ddbae4f635a9488ea4ee0a88feb6 parent 35eaa31e5d6b0653c11b5661572152295b45b7a7 author Linus Torvalds Thu, 23 Feb 2006 20:40:17 -0800 committer Linus Torvalds Thu, 23 Feb 2006 20:40:17 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit adb9c9ac2e82ddbae4f635a9488ea4ee0a88feb6 tree 0c43684d343e6e59015b402ff7c73e2e6b9ef3dd parent a80614d1adba903a1e5cb22bf14ebc640fc2ba4c parent fb5c594c2acc441f0d2d8f457484a0e0e9285db3 author Linus Torvalds Thu, 23 Feb 2006 20:38:50 -0800 committer Linus Torvalds Thu, 23 Feb 2006 20:38:50 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge commit 22fe472cb430ce45c4fb9b6d13060dd724d6dbc8 tree 8dc87d464537feb9b74cde1d171867685a9e0f37 parent a80614d1adba903a1e5cb22bf14ebc640fc2ba4c parent 80dd857daca1cf541b10118991569470d62c1d38 author Jeff Garzik Thu, 23 Feb 2006 21:16:07 -0500 committer Jeff Garzik Thu, 23 Feb 2006 21:16:07 -0500 Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 commit fb5c594c2acc441f0d2d8f457484a0e0e9285db3 tree 0465b7b5fb518f21f6d4689e027f0f04bb3ebe35 parent 4558f417f49595337b7e9cc3e92bc0856c588ac1 author Michal Ostrowski Sat, 18 Feb 2006 09:29:59 -0500 committer Paul Mackerras Fri, 24 Feb 2006 11:36:40 +1100 [PATCH] Fix race condition in hvc console. tty_schedule_flip() would schedule a thread that would call flush_to_ldisc(). If tty_buffer_request_room() gets called prior to that thread running -- which is likely in this loop in hvc_poll(), it would set the active flag in the tty buffer and consequently flush_to_ldisc() would ignore it. The result is that input on the hvc console is not processed. This fix calls tty_flip_buffer_push (and flags the tty as "low_latency"). The push to the ldisc thus happens synchronously. Signed-off-by: Michal Ostrowski Signed-off-by: Paul Mackerras commit 4558f417f49595337b7e9cc3e92bc0856c588ac1 tree 85fe8e04f4917629a90a4a48a98918af97e587a8 parent 72b138198cd6307c679b35d677ed64105b94ab48 author Segher Boessenkool Fri, 17 Feb 2006 11:30:30 +0100 committer Paul Mackerras Fri, 24 Feb 2006 11:36:39 +1100 [PATCH] powerpc: Don't re-assign PCI resources on Maple Maple firmware does not need PCI resource allocation, and in fact, it can cause problems in some strange cases. Signed-off-by: Segher Boessenkool Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 72b138198cd6307c679b35d677ed64105b94ab48 tree c48af4520274df67846647097eafaf45631d8bc5 parent 7c375b9aba4cabaeb1ca8f82807d40fd0a37103a author Segher Boessenkool Fri, 17 Feb 2006 11:25:42 +0100 committer Paul Mackerras Fri, 24 Feb 2006 11:36:37 +1100 [PATCH] powerpc: Fix some MPIC + HT APIC buglets Do disable, not enable, the HT APIC IRQ in the function that is supposed to. Enable the MPIC IRQ before enabling the downstream APIC IRQ, avoids potentially losing an interrupt. Signed-off-by: Segher Boessenkool Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 7c375b9aba4cabaeb1ca8f82807d40fd0a37103a tree 016eab0fb6c6ef8fe0c89d76ef974b79bcd55327 parent f1870f772c5e884862b4dd8f1ec2147247dda0ef author Olof Johansson Sun, 12 Feb 2006 17:30:31 -0600 committer Paul Mackerras Fri, 24 Feb 2006 11:36:35 +1100 [PATCH] powerpc: Update {g5,pseries,ppc64}_defconfig Update defconfigs for g5, pseries and generic ppc64. Default choices for everything, with the following exceptions: * Enable WINDFARM_PM112 on g5 and ppc64. * Increase CONFIG_NR_CPUS to 4 in g5_defconfig * CONFIG_TIGON3=y instead of =m in g5_defconfig Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit f1870f772c5e884862b4dd8f1ec2147247dda0ef tree 652414b8090a4b24e03aba76ddd37d83b762b88b parent cb2c9b2741346eb23b177187a51ff5abf08295bd author Anton Blanchard Mon, 13 Feb 2006 18:11:13 +1100 committer Paul Mackerras Fri, 24 Feb 2006 11:36:33 +1100 [PATCH] powerpc64: remove broken/bitrotted HMT support HMT support is currently broken and needs to be reworked to play nicely with the SMT scheduler. Remove the bit rotten bits for the time being. I also updated an incorrect comment, we enter __secondary_hold with the physical cpu id in r3. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit cb2c9b2741346eb23b177187a51ff5abf08295bd tree 31433b46f96a00e22ca7e8402fd0bfe1fea3408d parent 47f78a49206b7f9b0d283ba46a2a5a6ee1796472 author Anton Blanchard Mon, 13 Feb 2006 14:48:35 +1100 committer Paul Mackerras Fri, 24 Feb 2006 11:36:31 +1100 [PATCH] powerpc: Fix runlatch performance issues The runlatch SPR can take a lot of time to write. My original runlatch code would set it on every exception entry even though most of the time this was not required. It would also continually set it in the idle loop, which is an issue on an SMT capable processor. Now we cache the runlatch value in a threadinfo bit, and only check for it in decrementer and hardware interrupt exceptions as well as the idle loop. Boot on POWER3, POWER5 and iseries, and compile tested on pmac32. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 47f78a49206b7f9b0d283ba46a2a5a6ee1796472 tree c58b73bf34271888016873699001f54e4b205dbc parent 611ae59c62e688792cd1e6a68b9dc0f68d0e0dff author R Sharada Wed, 22 Feb 2006 21:43:08 +0530 committer Paul Mackerras Fri, 24 Feb 2006 11:36:29 +1100 [PATCH] powerpc64: fix spinlock recursion in native_hpte_clear native_hpte_clear has a spinlock recursion problem with the native_tlbie_lock being called twice, once in native_hpte_clear() and once within tlbie(). Fix the problem by changing the call to tlbie() in native_hpte_clear() to __tlbie(). It still supports only 4k pages for now. Signed-off-by: R Sharada Signed-off-by: Paul Mackerras commit 611ae59c62e688792cd1e6a68b9dc0f68d0e0dff tree 94a67d3e91407e6641f709471890c09e43c0df8b parent 1775dbbcd02cab0c41329dd2cec5b69c7fafd13f author Kelly Daly Thu, 23 Feb 2006 14:32:59 +1100 committer Paul Mackerras Fri, 24 Feb 2006 11:36:27 +1100 [PATCH] powerpc: disable OProfile for iSeries Disable OProfile in Kconfig for iSeries to prevent hangs. OProfile was not originally intended to work with legacy iSeries. Signed-off-by: Kelly Daly Signed-off-by: Paul Mackerras commit 1775dbbcd02cab0c41329dd2cec5b69c7fafd13f tree 86043c098e2cc8c86780e1ddb0d76e1430cbed9c parent f1434a4854407a262d194411245eb9ee66221f90 author Kumar Gala Wed, 22 Feb 2006 09:46:02 -0600 committer Paul Mackerras Fri, 24 Feb 2006 11:36:25 +1100 [PATCH] powerpc: Enable coherency for all pages on 83xx to fix PCI data corruption On the 83xx platform to ensure the PCI inbound memory is handled properly we have to turn on coherency for all pages in the MMU. Otherwise we see corruption if inbound "prefetching/streaming" is enabled on the PCI controller. Signed-off-by: Randy Vinson Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit f1434a4854407a262d194411245eb9ee66221f90 tree 8a4cb8b766a372519041c8601bfedd96faf2e1ba parent 01aaed9d43d5fff1ddb4c8de859f87ed7ee3608a author Alan Curry Wed, 22 Feb 2006 01:42:37 -0500 committer Paul Mackerras Fri, 24 Feb 2006 11:36:23 +1100 [PATCH] powerpc: fix altivec_unavailable_exception Oopses altivec_unavailable_exception is called without setting r3... it looks like the r3 that actually gets passed in as struct pt_regs *regs is the undisturbed value of r3 at the time the altivec instruction was encountered. The user actually gets to choose the pt_regs printed in the Oops! This fixes the oops by passing the correct pt_regs pointer to altivec_unavailable_exception. Signed-off-by: Alan Curry Signed-off-by: Paul Mackerras commit 01aaed9d43d5fff1ddb4c8de859f87ed7ee3608a tree 857cb0f1d28f980176f9cc5c7a2327b1cf35413a parent c57914a4f24322a8f7ef06a8e2fca5f0b2c98878 author Haren Myneni Tue, 07 Feb 2006 15:47:03 -0800 committer Paul Mackerras Fri, 24 Feb 2006 11:36:21 +1100 [PATCH] powerpc: Trivial fix to set the proper timeout value for kdump The panic CPU is waiting forever due to some large timeout value if some CPU is not responding to an IPI. This patch fixes the problem - the maximum waiting period will be 10 seconds and then the kdump boot will go ahead. Signed-off-by: Haren Myneni Signed-off-by: Paul Mackerras commit c57914a4f24322a8f7ef06a8e2fca5f0b2c98878 tree bbfeea19e4320891009b386d8f50c3f0821ed86f parent 337a7128dbe68ebe7627b6f954cb32d30d7b11c6 author Olaf Hering Tue, 21 Feb 2006 21:06:41 +0100 committer Paul Mackerras Fri, 24 Feb 2006 11:36:20 +1100 [PATCH] ppc: fix adb breakage in xmon Fix up xmon compilation after the last change. Remove lots of dead code, all the pmac and chrp support is in arch/powerpc Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 337a7128dbe68ebe7627b6f954cb32d30d7b11c6 tree 6189f61386f3be72cffab14ed1b42a508ef1793c parent bd6ef57e08d6cce32e93f9fc7b93d361b6a7884f author Michael Ellerman Tue, 21 Feb 2006 17:22:55 +1100 committer Paul Mackerras Fri, 24 Feb 2006 11:36:18 +1100 [PATCH] powerpc: Only calculate htab_size in one place for kexec For kexec we need to know the size of the MMU hash table. Currently we calculate the size once in the htab code, and then twice more in the kexec code, once using htab_hash_mask and once using ppc64_pft_size. On some machines the ppc64_pft_size calculation is broken because ppc64_pft_size is not set. So we need to fix the second calculation, but better still we should just calculate the size once and use it everywhere else. Tested on Power5 LPAR, Power4 non-LPAR and Power3. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 35eaa31e5d6b0653c11b5661572152295b45b7a7 tree fa62ae77e50253a558fdf39e66fb6cb750774f2e parent 4da3089f2b582b21e1374ccc6df722d4361eb915 author Richard Lucassen Thu, 23 Feb 2006 16:23:51 -0800 committer David S. Miller Thu, 23 Feb 2006 16:23:51 -0800 [NET]: Increase default IFB device count. The most usable number of ifb devices is 2. Change the default to 2. Signed-off-by: Richard Lucassen Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 4da3089f2b582b21e1374ccc6df722d4361eb915 tree fe29539a688f524ef58eab1178c1ef1bea2bff66 parent f8d0e3f11593928ac3f968c378a44e80b04488c9 author Herbert Xu Thu, 23 Feb 2006 16:19:26 -0800 committer David S. Miller Thu, 23 Feb 2006 16:19:26 -0800 [IPSEC]: Use TOS when doing tunnel lookups We should use the TOS because it's one of the routing keys. It also means that we update the correct routing cache entry when PMTU occurs. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit f8d0e3f11593928ac3f968c378a44e80b04488c9 tree 53412bcf3c5860acc821e9a7ec210eb69b83a32f parent 21380b81ef8699179b535e197a95b891a7badac7 author Jamal Hadi Salim Thu, 23 Feb 2006 16:18:01 -0800 committer David S. Miller Thu, 23 Feb 2006 16:18:01 -0800 [NET] ethernet: Fix first packet goes out with MAC 00:00:00:00:00:00 When you turn off ARP on a netdevice then the first packet always goes out with a dstMAC of all zeroes. This is because the first packet is used to resolve ARP entries. Even though the ARP entry may be resolved (I tried by setting a static ARP entry for a host i was pinging from), it gets overwritten by virtue of having the netdevice disabling ARP. Subsequent packets go out fine with correct dstMAC address (which may be why people have ignored reporting this issue). To cut the story short: the culprit code is in net/ethernet/eth.c::eth_header() ---- /* * Anyway, the loopback-device should never use this function... */ if (dev->flags & (IFF_LOOPBACK|IFF_NOARP)) { memset(eth->h_dest, 0, dev->addr_len); return ETH_HLEN; } if(daddr) { memcpy(eth->h_dest,daddr,dev->addr_len); return ETH_HLEN; } ---- Note how the h_dest is being reset when device has IFF_NOARP. As a note: All devices including loopback pass a daddr. loopback in fact passes a 0 all the time ;-> This means i can delete the check totaly or i can remove the IFF_NOARP Alexey says: -------------------- I think, it was me who did this crap. It was so long ago I do not remember why it was made. I remember some troubles with dummy device. It tried to resolve addresses, apparently, without success and generated errors instead of blackholing. I think the problem was eventually solved at neighbour level. After some thinking I suspect the deletion of this chunk could change behaviour of some parts which do not use neighbour cache f.e. packet socket. I think safer approach would be to move this chunk after if (daddr). And the possibility to remove this completely could be analyzed later. -------------------- Patch updated with Alexey's safer suggestions. Signed-off-by: Jamal Hadi Salim Acked-by: Alexey Kuznetsov Signed-off-by: David S. Miller commit 21380b81ef8699179b535e197a95b891a7badac7 tree 1a6be9864cabbed59db6357b2f0244413acac4c4 parent 85259878499d6c428cba191bb4e415a250dcd75a author Herbert Xu Wed, 22 Feb 2006 14:47:13 -0800 committer David S. Miller Thu, 23 Feb 2006 16:10:53 -0800 [XFRM]: Eliminate refcounting confusion by creating __xfrm_state_put(). We often just do an atomic_dec(&x->refcnt) on an xfrm_state object because we know there is more than 1 reference remaining and thus we can elide the heavier xfrm_state_put() call. Do this behind an inline function called __xfrm_state_put() so that is more obvious and also to allow us to more cleanly add refcount debugging later. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 85259878499d6c428cba191bb4e415a250dcd75a tree 6b9c1592f66886917b6ec09dd55f9c52eb850561 parent 42cf93cd464e0df3c85d298c647411bae6d99e6e author Suresh Bhogavilli Tue, 21 Feb 2006 13:42:22 -0800 committer David S. Miller Thu, 23 Feb 2006 16:10:52 -0800 [IPV4]: Fix garbage collection of multipath route entries When garbage collecting route cache entries of multipath routes in rt_garbage_collect(), entries were deleted from the hash bucket 'i' while holding a spin lock on bucket 'k' resulting in a system hang. Delete entries, if any, from bucket 'k' instead. Signed-off-by: Suresh Bhogavilli Signed-off-by: David S. Miller commit 42cf93cd464e0df3c85d298c647411bae6d99e6e tree f68f155f6eedbac8ac8c32c8c947d5a2f6cb2033 parent a80614d1adba903a1e5cb22bf14ebc640fc2ba4c author Patrick McHardy Tue, 21 Feb 2006 13:37:35 -0800 committer David S. Miller Thu, 23 Feb 2006 16:10:51 -0800 [NETFILTER]: Fix bridge netfilter related in xfrm_lookup The bridge-netfilter code attaches a fake dst_entry with dst->ops == NULL to purely bridged packets. When these packets are SNATed and a policy lookup is done, xfrm_lookup crashes because it tries to dereference dst->ops. Change xfrm_lookup not to dereference dst->ops before checking for the DST_NOXFRM flag and set this flag in the fake dst_entry. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 80dd857daca1cf541b10118991569470d62c1d38 tree a02a62684dee38af8bb91bb261de8659f08e9d55 parent 0781191cf69b7635e0d3ea55c6019e789d1936fa author Stephen Hemminger Wed, 22 Feb 2006 10:28:35 -0800 committer Francois Romieu Thu, 23 Feb 2006 23:07:08 +0100 skge: protect interrupt mask There is a race between updating the irq mask and setting it which can be triggered on SMP with a bad cable. Similar patch from Ingo Molnar and Thomas Gleixner Signed-off-by: Stephen Hemminger commit 0781191cf69b7635e0d3ea55c6019e789d1936fa tree 439cf41fdfe02dd501d3820095f96c3a0e2a45f7 parent a9cdab869ec343ccc601484fb535813e16c25f70 author Stephen Hemminger Wed, 22 Feb 2006 10:28:34 -0800 committer Francois Romieu Thu, 23 Feb 2006 23:07:07 +0100 skge: genesis phy initialzation The SysKonnect Genesis based board would fail on initialization with phy_read errors caused by not waiting for last phy write. Signed-off-by: Stephen Hemminger commit a9cdab869ec343ccc601484fb535813e16c25f70 tree 64d12d8befe316c1e7ef1254612b84acfc8024d4 parent 61a4dcc2f9b5c6861e7198b80dd73dd6e9247b7b author Stephen Hemminger Wed, 22 Feb 2006 10:28:33 -0800 committer Francois Romieu Thu, 23 Feb 2006 23:07:07 +0100 skge: NAPI/irq race fix Fix a race in the receive NAPI, irq handling. The interrupt clear and the start need to be separated. Otherwise there is a window between the last frame received and the NAPI done level handling. Signed-off-by: Stephen Hemminger commit 61a4dcc2f9b5c6861e7198b80dd73dd6e9247b7b tree af9a8e4c32af8dc92bf443361337a0b8e58ff4c6 parent 5d06a99f543e734ceb53bbc9e550537be97f0c49 author Francois Romieu Thu, 23 Feb 2006 00:55:25 +0100 committer Francois Romieu Thu, 23 Feb 2006 23:06:48 +0100 r8169: enable wake on lan Similar to 8139cp code but more inspired/lucky. Signed-off-by: Francois Romieu commit 5d06a99f543e734ceb53bbc9e550537be97f0c49 tree 7b8112f808f59ecde35b3de9900b1221e9aeb162 parent 791917deb63c6d8beb3f347ea0911371deff1624 author Francois Romieu Thu, 23 Feb 2006 00:47:58 +0100 committer Francois Romieu Thu, 23 Feb 2006 23:06:07 +0100 r8169: fix broken ring index handling in suspend/resume rtl8169_hw_start() requires that the descriptor ring indexes be set to zero. Let a deferred invocation of rtl8169_reset_task() handle it. Enabling a few power management bits will not hurt either. suspend/resume is issued with irq on: the spinlock do not need to save the irq flag. Signed-off-by: Francois Romieu commit bd6ef57e08d6cce32e93f9fc7b93d361b6a7884f tree d2a7553c425a574d7204281fada8a14dd7e84ace parent 9e956c2dac9bec602ed1ba29181b45ba6d2b6448 author Michael Ellerman Mon, 20 Feb 2006 19:07:31 +1100 committer Paul Mackerras Thu, 23 Feb 2006 21:44:19 +1100 [PATCH] powerpc: Initialise hvlpevent_queue.lock correctly When I changed the hvlpevent_queue code to use a spinlock instead of a custom atomic (719d1cd86780c156f954fc34f34481adac197aec) I didn't initialise the lock anywhere, oops. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit d856c66618f953fc3cd1e613226d5f098ad322c8 tree dce2070e912327921ad2d1635eaa0bf2cfb12047 parent 85edae14e4ee5e68cf037e9e4bca7498ea16874d author Russell King Thu, 23 Feb 2006 10:22:13 +0000 committer Russell King Thu, 23 Feb 2006 10:22:13 +0000 [SERIAL] Add comment about early_serial_setup() early_serial_setup() must not be called after console initialisation. Add a comment prior to the function explicitly stating this. Signed-off-by: Russell King commit 85edae14e4ee5e68cf037e9e4bca7498ea16874d tree 846868bfd34a51c3a687576636a1cc7d8ed80e89 parent 9e956c2dac9bec602ed1ba29181b45ba6d2b6448 author Michal Janusz Miroslaw Thu, 23 Feb 2006 09:49:35 +0000 committer Russell King Thu, 23 Feb 2006 09:49:35 +0000 [SERIAL] Trivial comment fix: include/linux/serial_reg.h Trivial comment fix for include/linux/serial_reg.h Signed-off-by: Russell King commit a80614d1adba903a1e5cb22bf14ebc640fc2ba4c tree 353e980f946f22cd49805794da70ff221981a8fb parent 35bdddb83f62978b5fad82a14fbfd78cc3a5a60c author Stefan Richter Tue, 14 Feb 2006 22:04:19 -0500 committer Jody McIntyre Thu, 23 Feb 2006 00:29:31 -0500 sbp2: update 36byte inquiry workaround (fix compatibility regression) Since about Linux 2.6.14, sbp2's inquiry workaround did not work anymore due to changes in the SCSI layer. Update it to become effective again. Testing one of the two known affected bridges has shown that skip_ms_page_8 is required as well. Also, make force_inquiry_hack tunable via /sys/module/sbp2/parameters. Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre (cherry picked from 99496037c6744fd938ffb8ccfc8fc91762322ff8 commit) commit 35bdddb83f62978b5fad82a14fbfd78cc3a5a60c tree b5fcfd00b9af8815dd42e3d65e2f9f2e453f4a89 parent bf637ec3ef4159da3dd156ecf6f6987d8c8c5dae author Stefan Richter Tue, 31 Jan 2006 00:13:33 -0500 committer Jody McIntyre Thu, 23 Feb 2006 00:28:52 -0500 sbp2: variable status FIFO address (fix login timeout) Let the ieee1394 core select a suitable 1394 address range for sbp2's status FIFO instead of using a fixed range. Since the core only selects addresses which are guaranteed to be out of the "physical range" as per OHCI 1.1, this patch also fixes an old bug: OHCI controllers which implement a writeable PhysicalUpperBound register included sbp2's status FIFO in the physical range. That way sbp2 was never notified of a succesful login and always failed after timeout. Affected OHCI host adapters include ALi and Fujitsu controllers. As another side effect of this patch, the status FIFO is no longer located in a range for which OHCI chips perform "posted writes". Each status write now requires a response subaction. But since large data transfers involve only few status writes, there is no measurable decrease of I/O throughput. What's more, the status FIFO is now safe from potential host bus errors. Nevertheless, posted writes could be re-enabled by extensions to the ARM features of the 1394 stack. Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre (cherry picked from b2d38cccad4ef80d6b672b8f89aae5fe2907b113 commit) commit bf637ec3ef4159da3dd156ecf6f6987d8c8c5dae tree 4d90e883515171529e74ab9446e19bc1030abe4c parent 9e956c2dac9bec602ed1ba29181b45ba6d2b6448 author Stefan Richter Tue, 31 Jan 2006 00:13:06 -0500 committer Jody McIntyre Thu, 23 Feb 2006 00:25:08 -0500 sbp2: fix another deadlock after disconnection If there were commands enqueued but not completed before an SBP-2 unit was unplugged (or an attempt to reconnect failed), knodemgrd or any process which tried to remove the device would sleep uninterruptibly in blk_execute_rq(). Therefore make sure that all commands are completed when sbp2 retreats. Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre (cherry picked from 61daa34c132c5d4ed8630e2c46e9bf2f0c7b3428 commit) commit 791917deb63c6d8beb3f347ea0911371deff1624 tree 170bc081f03326f75b6b5ccce7d7d1df28a2c833 parent 56a645cc1bc16ab33b33a3e0854a46c5d2c864f3 author Stephen Hemminger Wed, 22 Feb 2006 11:45:03 -0800 committer Francois Romieu Thu, 23 Feb 2006 01:25:26 +0100 [PATCH] sky2: close race on IRQ mask update. Need to avoid race in updating IRQ mask. This can probably be replaced smarter use of the interrupt control registers (if/when chipset docs are available). Signed-off-by: Stephen Hemminger commit 56a645cc1bc16ab33b33a3e0854a46c5d2c864f3 tree 22ecf36723c1a60d87168583dd2f85f049ccfd88 parent 9a6d343188f5f1e9537e700fc4139c2d905ff129 author Stephen Hemminger Wed, 22 Feb 2006 11:45:02 -0800 committer Francois Romieu Thu, 23 Feb 2006 01:25:23 +0100 [PATCH] sky2: use device iomem to access PCI config To avoid problems with PCI config access without ACPI (or busted ACPI tables), use the device's window into PCI config space. I know this probably will upset the purists, but I would rather have users than ACPI testers. It also generates less code. Signed-off-by: Stephen Hemminger commit 9a6d343188f5f1e9537e700fc4139c2d905ff129 tree 6e41f133f4e229b4cd301c36c4deb8c04e5038c7 parent a8fd6266dafd564bae6758cb78c8c152e7d4115e author Stephen Hemminger Wed, 22 Feb 2006 11:45:01 -0800 committer Francois Romieu Thu, 23 Feb 2006 01:25:03 +0100 [PATCH] sky2: force early transmit status Need to force a transmit coalesce timer restart after processing transmit packets. Otherwise, can get transmit status after last update and chip doesn't send the next one. Can go with the chip defaults for coalescing timers, except for Tx timer which needs to be bigger. Signed-off-by: Stephen Hemminger commit a8fd6266dafd564bae6758cb78c8c152e7d4115e tree 0a06bcd302199fa55f7a04958ab84c46f19c342e parent ff81fbbe321c3a468b6225c673ca57efa501fbed author Stephen Hemminger Wed, 22 Feb 2006 11:45:00 -0800 committer Francois Romieu Thu, 23 Feb 2006 01:24:04 +0100 [PATCH] sky2: poke coalescing timer to fix hang Need to restart the interrupt coalescing timer after clearing the interrupt, to avoid races with interrupt timer and processing. Patch from Carl-Daniel Halfinger Signed-off-by: Stephen Hemminger commit ff81fbbe321c3a468b6225c673ca57efa501fbed tree ae715c27debaee2ef0bc1f36faccc7ef8bac2b09 parent 977bdf06ca8dd7ed081fab8d30249d9e6b1c24d3 author Stephen Hemminger Wed, 22 Feb 2006 11:44:59 -0800 committer Francois Romieu Thu, 23 Feb 2006 01:23:40 +0100 [PATCH] sky2: limit coalescing values to ring size Don't allow coalescing values to be bigger than the transmit ring. Since if you set them that big, the interrupt never happens and driver livelocks. Signed-off-by: Stephen Hemminger commit 977bdf06ca8dd7ed081fab8d30249d9e6b1c24d3 tree dd12c7e2ad88e6dc33e70af401910d70941645d5 parent c45ec6566021ba3162233b575e7bc76d57b86688 author Stephen Hemminger Wed, 22 Feb 2006 11:44:58 -0800 committer Francois Romieu Thu, 23 Feb 2006 01:23:36 +0100 [PATCH] sky2: yukon-ec-u chipset initialization Add more complete setup code for Yukon EC_U chipset. Based on matching code in 8.31 code in SysKonnect vendor driver. Signed-off-by: Stephen Hemminger commit 9e956c2dac9bec602ed1ba29181b45ba6d2b6448 tree e5c715e51dd56b199d542852ca2b60f76d32ddc2 parent 1a6a35894f10870d5590199d1785d3a718927abe parent a6ceda7457b2303dcb07d3c472b25d52bbdb5a29 author Linus Torvalds Wed, 22 Feb 2006 15:23:05 -0800 committer Linus Torvalds Wed, 22 Feb 2006 15:23:05 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 1a6a35894f10870d5590199d1785d3a718927abe tree ab3ab04b0ff2614ed7c322b31cbde9b6481addc1 parent 245599f573f302bfa27a0436408c80f13b457046 parent 06e4479bd092eca4125e5507e7c22619a491dab3 author Linus Torvalds Wed, 22 Feb 2006 15:21:57 -0800 committer Linus Torvalds Wed, 22 Feb 2006 15:21:57 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 245599f573f302bfa27a0436408c80f13b457046 tree 4683cf7b59ec75b0efd9a1aaf7fc1ecafcbd6f6c parent 6cec2aed8686840906f6298391dc4fd04d9ba843 parent 5bd546aa78b5d74f3162815e41940f862215d9e3 author Linus Torvalds Wed, 22 Feb 2006 15:21:22 -0800 committer Linus Torvalds Wed, 22 Feb 2006 15:21:22 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-mmc commit 6cec2aed8686840906f6298391dc4fd04d9ba843 tree a6ae4784522a03c5b8eb6041ef0da5e8c81b14dc parent c45ec6566021ba3162233b575e7bc76d57b86688 author Steve French Wed, 22 Feb 2006 17:31:52 -0600 committer Linus Torvalds Wed, 22 Feb 2006 15:20:33 -0800 [PATCH] CIFS: CIFSSMBRead was returning an invalid pointer in buf on socket error Thanks to Adrian Bunk for debugging the problem and to Shaggy for helping find the solution. Also added a fix for 64K pages we found in loosely-related testing Signed-off-by: Dave Kleikamp Signed-off-by: Steve French Signed-off-by: Linus Torvalds commit a6ceda7457b2303dcb07d3c472b25d52bbdb5a29 tree 39b4831d384f690b1cec0435f2678258cde63436 parent c45ec6566021ba3162233b575e7bc76d57b86688 author Christoph Hellwig Wed, 22 Feb 2006 14:35:52 -0800 committer David S. Miller Wed, 22 Feb 2006 14:35:52 -0800 [SCSI] esp: fix eh locking esp_reset didn't get fixed when the EH locking changed. ->eh_bus_reset_handler is now called without the host lock held. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 06e4479bd092eca4125e5507e7c22619a491dab3 tree cc73ceba3232070ce353f297dfdb3535145f5822 parent df666b9c510fd27fd3b1afd9ddfa1eaa62ce12b3 author Mårten Wikström Wed, 22 Feb 2006 22:27:23 +0000 committer Russell King Wed, 22 Feb 2006 22:27:23 +0000 [ARM] 3347/1: Bugfix for ixp4xx_set_irq_type() Patch from Mårten Wikström This patch fixes a bug in ixp4xx_set_irq_type() which leads to GPIO being incorrectly set to both edge triggered for raising as well as falling edge interrupt types. See the previous discussion on patch 3312/1. Signed-off-by: Mårten Wikström Signed-off-by: Russell King commit df666b9c510fd27fd3b1afd9ddfa1eaa62ce12b3 tree 825879502f74636641a86724514f2ea4e3c9c240 parent 43cc19816b3fc5286258e6f5e43ef4ead458f9a3 author Andrew Victor Wed, 22 Feb 2006 21:23:35 +0000 committer Russell King Wed, 22 Feb 2006 21:23:35 +0000 [ARM] 3325/2: GPIO function to control multi-drive (open collector) capability Patch from Andrew Victor This patch adds the at91_set_multi_drive() function to enable/disable the multi-drive (open collector) pin capability on the AT91RM9200 processor. This is necessary to fix the UDC (USB Gadget) driver for the AT91RM9200 board as it will not allow the board reset line to be pulled low if the pullup is not driven as an open collector output as the boards are wired to the USB connector on both the DK/EK. This version of the patch updates it to 2.6.16-rc4. Orignal patch by Jeff Warren. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 43cc19816b3fc5286258e6f5e43ef4ead458f9a3 tree 8ea24fe2df9218d7fab8a3607ac5e644d2456e10 parent 75d2f18088ded458f5bc4014b6c4e2d9651d41d4 author Russell King Wed, 22 Feb 2006 21:13:28 +0000 committer Russell King Wed, 22 Feb 2006 21:13:28 +0000 [ARM] CONFIG_CPU_MPCORE -> CONFIG_CPU_32v6K CONFIG_CPU_MPCORE has never been a configuration symbol - it should be CONFIG_CPU_32v6K. Signed-off-by: Russell King commit 75d2f18088ded458f5bc4014b6c4e2d9651d41d4 tree ce564f2a6909a20b5ecc86dd290c8c8386980755 parent bc66d4496f106a8e3a936dc24c9965a2f9c13e50 author Uli Luckas Wed, 22 Feb 2006 21:12:07 +0000 committer Russell King Wed, 22 Feb 2006 21:12:07 +0000 [ARM] 3345/1: Fix interday RTC alarms Patch from Uli Luckas This is a bugfix. The comment in arch/arm/common/rtctime.c explains it: * FIXME: for now, we just copy the alarm time because we're lazy (and * is therefore buggy - setting a 10am alarm at 8pm will not result in * the alarm triggering.) This patch adds one day to the alarm iff the alarm wrapped beyond midnight and therefore appears to be in the past. Signed-off-by: Uli Luckas Signed-off-by: Russell King commit bc66d4496f106a8e3a936dc24c9965a2f9c13e50 tree 2a5f55829332e7e1e737bf274e2e6201135b0ee6 parent af898b8f602441a3bebe918a3b26adc92b30762e author Alessandro Zummo Wed, 22 Feb 2006 21:12:06 +0000 committer Russell King Wed, 22 Feb 2006 21:12:06 +0000 [ARM] 3344/1: NSLU2: beeper support Patch from Alessandro Zummo This patch adds support for the beeper embedded in the NSLU2 to the machine setup code. Signed-off-by: Alessandro Zummo Signed-off-by: Rod Whitby Signed-off-by: Russell King commit af898b8f602441a3bebe918a3b26adc92b30762e tree c9908cb1910a20bb1cc314dff3e34d5040dc49ec parent d7353b25c855b3a8103647503deaa98f512bd439 author Alessandro Zummo Wed, 22 Feb 2006 21:12:06 +0000 committer Russell King Wed, 22 Feb 2006 21:12:06 +0000 [ARM] 3343/1: NAS100d: Fix incorrect I2C pin assignment Patch from Alessandro Zummo The I2C pin assignment for the Iomega NAS100d board was incorrect. This patch fixes it. The correct assignment has now been tested using the new RTC class and a new driver for the RTC on the NAS100d. Signed-off-by: Rod Whitby Signed-off-by: Alessandro Zummo Signed-off-by: Russell King commit d7353b25c855b3a8103647503deaa98f512bd439 tree 226a56a10ee90cd721c21b778fcb7a0497514477 parent c27a2164a32cfda80dc1647638a940103669af3d author Alessandro Zummo Wed, 22 Feb 2006 21:12:05 +0000 committer Russell King Wed, 22 Feb 2006 21:12:05 +0000 [ARM] 3342/1: NSLU2: Protect power button init routine with machine_is_nslu2() Patch from Alessandro Zummo The power button exit routine for the Linksys NSLU2 was not protected by a machine_is_nslu2(). This patch fixes it. Signed-off-by: Rod Whitby Signed-off-by: Alessandro Zummo Signed-off-by: Russell King commit c27a2164a32cfda80dc1647638a940103669af3d tree f136628871fa0c84c8a3961ed93feddc92c77199 parent a43c7ff8bafe841502cab52b7795e2825c2e42c4 author Catalin Marinas Wed, 22 Feb 2006 19:51:38 +0000 committer Russell King Wed, 22 Feb 2006 19:51:38 +0000 [ARM] 3340/1: Fix the PCI setup for direct master access to SDRAM Patch from Catalin Marinas The initial code did not configure the inbound memory windows for direct master access to the SDRAM. This patch creates a 1:1 mapping between the Versatile/PB PCI memory windows and its SDRAM. Note that an updated FPGA image is needed for Versatile/PB since the original windows were 1MB and not able to cover the whole SDRAM (now extended to 256MB). The patch also fixes the PCI IRQ mapping for slot #2. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit c45ec6566021ba3162233b575e7bc76d57b86688 tree bd994acbbadc78fce745fac3de44ee5cf5ff5a1a parent 102d60a2d8a6b54a20317a855dca3b598a2fd581 parent fa675765afed59bb89adba3369094ebd428b930b author Linus Torvalds Wed, 22 Feb 2006 10:24:52 -0800 committer Linus Torvalds Wed, 22 Feb 2006 10:24:52 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 commit fa675765afed59bb89adba3369094ebd428b930b tree 777a8c1bb48ef7de39073104f974209f4a462b6f parent b00dc3ad74fdb676552d46ee573b88e927240d0c author Greg Kroah-Hartman Wed, 22 Feb 2006 09:39:02 -0800 committer Greg Kroah-Hartman Wed, 22 Feb 2006 09:39:02 -0800 Revert mount/umount uevent removal This change reverts the 033b96fd30db52a710d97b06f87d16fc59fee0f1 commit from Kay Sievers that removed the mount/umount uevents from the kernel. Some older versions of HAL still depend on these events to detect when a new device has been mounted. These events are not correctly emitted, and are broken by design, and so, should not be relied upon by any future program. Instead, the /proc/mounts file should be polled to properly detect this kind of event. A feature-removal-schedule.txt entry has been added, noting when this interface will be removed from the kernel. Signed-off-by: Greg Kroah-Hartman commit 102d60a2d8a6b54a20317a855dca3b598a2fd581 tree 628b1beb285eed657adc127982ebf014333b82c8 parent b00dc3ad74fdb676552d46ee573b88e927240d0c author Herbert Xu Wed, 22 Feb 2006 23:43:40 +1100 committer Linus Torvalds Wed, 22 Feb 2006 07:47:07 -0800 [PATCH] padlock: Fix typo that broke 256-bit keys A typo crept into the le32_to_cpu patch which broke 256-bit keys in the padlock driver. The following patch based on observations by Michael Heyse fixes the problem. Signed-off-by: Herbert Xu Signed-off-by: Linus Torvalds commit a43c7ff8bafe841502cab52b7795e2825c2e42c4 tree cd18a22718a0c082d35bb1db5a7a34aff3996c3c parent 31867499b21b2374eb0cc6b3d1ea6b4ade4d1cc2 author Russell King Mon, 20 Feb 2006 10:18:38 +0000 committer Russell King Wed, 22 Feb 2006 09:33:23 +0000 [ARM] Update mach-types Signed-off-by: Russell King commit 31867499b21b2374eb0cc6b3d1ea6b4ade4d1cc2 tree 8df8d87709b5415dced9dc8ac1e135f695403cd4 parent b00dc3ad74fdb676552d46ee573b88e927240d0c author Russell King Sun, 19 Feb 2006 19:53:56 +0000 committer Russell King Wed, 22 Feb 2006 09:33:22 +0000 [ARM] Add panic-on-oops support Although you could ask the kernel for panic-on-oops, it remained non-functional because the architecture specific code fragment had not been implemented. Add it, so it works as advertised. Signed-off-by: Russell King commit 5bd546aa78b5d74f3162815e41940f862215d9e3 tree a80adfbb09e2714830762ffdc7c7ec7567b469df parent b00dc3ad74fdb676552d46ee573b88e927240d0c author Russell King Fri, 17 Feb 2006 20:23:29 +0000 committer Russell King Wed, 22 Feb 2006 09:32:46 +0000 [MMC] Fix mmc_cmd_type() mask It's MMC_CMD_MASK not MMC_CMD_TYPE. Signed-off-by: Russell King commit b00dc3ad74fdb676552d46ee573b88e927240d0c tree 6dcf7806f1f0fc791d3455dcf233a11088b18b3a parent 808c783e9bfb217a90be5a996a867c41a69b40bd author Hugh Dickins Tue, 21 Feb 2006 23:49:47 +0000 committer Linus Torvalds Tue, 21 Feb 2006 17:10:15 -0800 [PATCH] tmpfs: fix mount mpol nodelist parsing I've been dissatisfied with the mpol_nodelist mount option which was added to tmpfs earlier in -rc. Replace it by mpol=policy:nodelist. And it was broken: a nodelist is a comma-separated list of numbers and ranges; the mount options are a comma-separated list of token=values. Whoops, blindly strsep'ing on commas doesn't work so well: since we've no numeric tokens, and unlikely to add them, use that to distinguish. Move the mpol= parsing to shmem_parse_mpol under CONFIG_NUMA, reject all its options as invalid if not NUMA. /proc shows MPOL_PREFERRED as "prefer", so use that name for the policy instead of "preferred". Enforce that mpol=default has no nodelist; that mpol=prefer has one node only; that mpol=bind has a nodelist; but let mpol=interleave use node_online_map if no nodelist given. Describe this in tmpfs.txt. Signed-off-by: Hugh Dickins Acked-by: Robin Holt Acked-by: Andi Kleen Signed-off-by: Linus Torvalds commit 808c783e9bfb217a90be5a996a867c41a69b40bd tree 0aaeaa1a4bd4324f727e9bb9d46d29baea03e9b7 parent 52aa536f5a78bbba9205d296f53d2f8a424a3b08 parent 8db41685c73ad1893d8571861171e183a551e90d author Linus Torvalds Tue, 21 Feb 2006 10:13:22 -0800 committer Linus Torvalds Tue, 21 Feb 2006 10:13:22 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus commit 52aa536f5a78bbba9205d296f53d2f8a424a3b08 tree 29ccde2430d7dd34420761b7fde4a8c8976fe76c parent 5914811acf36c3ff091f860a6964808f668f27d0 parent 2e242fa994428bd1a40b6a7e97430413246d0a16 author Linus Torvalds Tue, 21 Feb 2006 10:11:32 -0800 committer Linus Torvalds Tue, 21 Feb 2006 10:11:32 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 8db41685c73ad1893d8571861171e183a551e90d tree 2c6a368af3f0e2008940698bf29a21a5e2dc167b parent 1e93e70d035a26c0e108f0a9e8f735dabcf948ac author Ralf Baechle Tue, 21 Feb 2006 13:46:01 +0100 committer Ralf Baechle Tue, 21 Feb 2006 16:58:24 +0000 [MIPS] Disable CONFIG_ISCSI_TCP; it triggers a gcc 3.4 endless loop. Signed-off-by: Ralf Baechle commit 1e93e70d035a26c0e108f0a9e8f735dabcf948ac tree 42a37ee50c75ae5099d28ee6dde6ba55782cce6d parent 909fa64c8bf0ef20722cddaa402404fb1aa14a4a author Ralf Baechle Tue, 21 Feb 2006 00:17:50 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] Yosemite: Fix build damage by dc8f6029cd51af1b148846a32e68d69013a5cc0f. Signed-off-by: Ralf Baechle commit 909fa64c8bf0ef20722cddaa402404fb1aa14a4a tree 6729397505d8039b6220c0753775ceb3918789f8 parent 1e35aabab82f8a6f7ab884b642e68be260f92f2c author Atsushi Nemoto Tue, 21 Feb 2006 01:25:06 +0900 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] jiffies_to_compat_timeval fix The last argument of div_long_long_rem() must be long. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 1e35aabab82f8a6f7ab884b642e68be260f92f2c tree 0daef6084bb1b35f40d129245579dc358df480fb parent 76e1daee7db153400aaed55646e05a312da353b3 author Rojhalat Ibrahim Mon, 20 Feb 2006 13:35:27 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] Add topology_init. A recent patch introduced cpu topology in sysfs. When you run a kernel with SMP and sysfs enabled, you now get an Oops on boot. The following patch fixes that by adding topology_init to arch/mips/kernel/smp.c. The code is copied from arch/s390/kernel/smp.c. Signed-off-by: Rojhalat Ibrahim Signed-off-by: Ralf Baechle commit 76e1daee7db153400aaed55646e05a312da353b3 tree d52f863856d598283fb7334eb1944b05321f90dd parent 124273773596cbf8aa9c79304b01091d4693f368 author Martin Michlmayr Mon, 20 Feb 2006 04:57:00 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] Fix compiler warnings in arch/mips/sibyte/bcm1480/irq.c Fix the following compiler warnings: CC arch/mips/sibyte/bcm1480/irq.o arch/mips/sibyte/bcm1480/irq.c: In function ‘bcm1480_set_affinity’: arch/mips/sibyte/bcm1480/irq.c:168: warning: ISO C90 forbids mixed declarations and code arch/mips/sibyte/bcm1480/irq.c: In function ‘ack_bcm1480_irq’: arch/mips/sibyte/bcm1480/irq.c:230: warning: ISO C90 forbids mixed declarations and code Signed-off-by: Martin Michlmayr Signed-off-by: Ralf Baechle commit 124273773596cbf8aa9c79304b01091d4693f368 tree 46925c5aa94867d8a72f80275b0c57b168c95b86 parent 77607635c3f15e6bf6366e6d7db731a5cb209fb1 author Ralf Baechle Tue, 14 Feb 2006 14:22:10 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] Follow Uli's latest *at syscall changes. (This really is only the half of the patch which was forgotten in 326a625748535c4cdb1c632b1dcb07030989a393 ...) Signed-off-by: Ralf Baechle commit 77607635c3f15e6bf6366e6d7db731a5cb209fb1 tree 0b5aa1613f1369c8bd2a102f8fe66640160dde0c parent 51939fbb79f66cc471f5bde9845be797ea61ad0b author Ralf Baechle Thu, 10 Nov 2005 16:32:14 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] Sibyte: Config option names shouldn't be prefixed with CONFIG_ Signed-off-by: Ralf Baechle commit 51939fbb79f66cc471f5bde9845be797ea61ad0b tree 030683c83f7916c166536b171b669c5dda341533 parent f3468e0c34c8de919062582575a01e2434c8e727 author Ralf Baechle Thu, 10 Nov 2005 16:35:03 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] Sibyte: #if CONFIG_* doesn't fly. Signed-off-by: Ralf Baechle commit f3468e0c34c8de919062582575a01e2434c8e727 tree cb21a54f7b04e1408ea23016066c4c55aa3620cd parent 82ad93f4a002294820e9a5e6f84beef2222a54b7 author Ralf Baechle Sun, 19 Feb 2006 03:42:11 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] N32: Make sure pointer is good before passing it to sys_waitid(). After all we're calling sys_waitid() with fs set to KERNEL_DS ... Signed-off-by: Ralf Baechle commit 82ad93f4a002294820e9a5e6f84beef2222a54b7 tree 24423db4db76379224daeb5716fbe8b3885cd234 parent 304416da860b8cd548e61ee7038f852418008a85 author Ralf Baechle Sat, 18 Feb 2006 22:47:26 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:22 +0000 [MIPS] N32: Fix N32 rt_sigtimedwait and rt_sigsuspend breakage. Originally found through an oops in the Gentoo N32 userland build; patch based on original patch by Daniel Jacobwitz. Signed-off-by: Ralf Baechle commit 304416da860b8cd548e61ee7038f852418008a85 tree ee69d1de7bd7d4133ee934db57f74876c0a9cff6 parent dda73d0bb1d358e4337d2c4da9c61903873664cf author Ralf Baechle Sat, 18 Feb 2006 18:20:47 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:22 +0000 [MIPS] Reformat _sys32_rt_sigsuspend with tabs instead of space for consistency. Signed-off-by: Ralf Baechle commit dda73d0bb1d358e4337d2c4da9c61903873664cf tree 7e4bdd49287519899769aa40c5e2b011d401b704 parent 68fa383f3e58b5adf1d8089c93c83ab8d0d00e8d author Martin Michlmayr Sat, 18 Feb 2006 15:21:30 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:22 +0000 [MIPS] Make do_signal32 return void. do_signal has been changed to return void since the "return value is ignored everywhere". Convert do_signal32 accordingly. Signed-off-by: Martin Michlmayr Signed-off-by: Ralf Baechle commit 68fa383f3e58b5adf1d8089c93c83ab8d0d00e8d tree 56af539c87b0c2adeb66d19ec500d79ea7a93432 parent 8ecbbcaf08c13c57d6602472478739d64650ee0e author Martin Michlmayr Sat, 18 Feb 2006 14:55:45 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:22 +0000 [MIPS] Add support for TIF_RESTORE_SIGMASK for signal32 Following the recent implementation of TIF_RESTORE_SIGMASK in arch/mips/kernel/signal.c, 64-bit kernels with 32-bit user-land compatibility oops when starting init. signal32.c needs to be converted to use TIF_RESTORE_SIGMASK too. Signed-off-by: Martin Michlmayr Signed-off-by: Ralf Baechle commit 8ecbbcaf08c13c57d6602472478739d64650ee0e tree c59cf7f91e45bf95f7e9b85f43d524f3cf627505 parent 36ccf1c0e3917f1f73abc17c38ad704c59f8d1b6 author Atsushi Nemoto Tue, 14 Feb 2006 15:57:50 +0900 committer Ralf Baechle Tue, 21 Feb 2006 16:58:22 +0000 [MIPS] Fixes for uaccess.h with gcc >= 4.0.1 It seems current get_user() incorrectly sign-extend an unsigned int value on 64bit kernel. I think this is because '(__typeof__(val))' cast in final assignment. I suppose the cast should be '(__typeof__(*(addr))'. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 36ccf1c0e3917f1f73abc17c38ad704c59f8d1b6 tree 7f16183fafe1a1b9d37a0478d37dda0766f5a355 parent 5914811acf36c3ff091f860a6964808f668f27d0 author Ralf Baechle Tue, 14 Feb 2006 21:04:54 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:22 +0000 [MIPS] Make integer overflow exceptions in kernel mode fatal. Signed-off-by: Ralf Baechle commit 5914811acf36c3ff091f860a6964808f668f27d0 tree 04317a64fa5e76a13f29de655fe354abd627445d parent 6d7b9efacba9f4e5f4d5ca165b1a4350da52ddd7 author Björn Steinbrink Sat, 18 Feb 2006 18:12:43 +0100 committer Linus Torvalds Mon, 20 Feb 2006 20:27:38 -0800 [PATCH] kjournald keeps reference to namespace In daemonize() a new thread gets cleaned up and 'merged' with init_task. The current fs_struct is handled there, but not the current namespace. This adds the namespace part. [ Eric Biederman pointed out the namespace wrappers, and also notes that we can't ever count on using our parents namespace because we already have called exit_fs(), which is the only way to the namespace from a process. ] Signed-off-by: Björn Steinbrink Acked-by: Eric Biederman Signed-off-by: Linus Torvalds commit 6d7b9efacba9f4e5f4d5ca165b1a4350da52ddd7 tree df6160e759c186fe8a7321d15cc886bf142d2f91 parent cf70a6f264f6e1a4c06553699159d94996b2f916 parent 73d72cffe53407e447df0cbb0bf15a2c931108b3 author Linus Torvalds Mon, 20 Feb 2006 20:23:14 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:23:14 -0800 Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 commit cf70a6f264f6e1a4c06553699159d94996b2f916 tree 7a5993585e7e8b80c37cae75468fca45da6519d2 parent 0b1fc9b86f49e1e73e473e06a16556ca0dce53ae parent ad6b97fc929e5844bfd1d708ab1d74d131d7960d author Linus Torvalds Mon, 20 Feb 2006 20:09:44 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:09:44 -0800 Merge branch 'fixes.b8' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird commit 0b1fc9b86f49e1e73e473e06a16556ca0dce53ae tree 0a8dae6c730dfe5279d61cdd4b5c2936f9e471a1 parent 6bd25e78211d0591060db3ece10443096ef96c50 parent b41c82eb5fb49912ce26c51ec221ba35e06c7d9b author Linus Torvalds Mon, 20 Feb 2006 20:08:23 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:08:23 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart commit 6bd25e78211d0591060db3ece10443096ef96c50 tree 95262e041c1451c8672cfcc580fc1e0e112a2603 parent 35e622a67e6d2c5f7e3d3e2da92ebdb2f46db783 parent 496b7a5159b8366b003bbc17f8c4e27f69b6779e author Linus Torvalds Mon, 20 Feb 2006 20:05:45 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:05:45 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge commit 35e622a67e6d2c5f7e3d3e2da92ebdb2f46db783 tree 724155d228e083b321899f9261a6a85a930be1b2 parent f24211e7b3e6d02251c53c48821003c77495efef author Ralf Baechle Mon, 20 Feb 2006 12:41:55 +0000 committer Linus Torvalds Mon, 20 Feb 2006 20:04:19 -0800 [PATCH] H8/300: CONFIG_CONFIG_ doesn't fly. All actual uses of the symbol refer to CONFIG_SH_STANDARD_BIOS so this option could never be activated on H8/300. Signed-off-by: Ralf Baechle Signed-off-by: Linus Torvalds commit f24211e7b3e6d02251c53c48821003c77495efef tree 1ac0e99cb2a8af160b852d2779eab712806381b7 parent cf535ea52e68e3ee6f4a90cc383faa1ee857f14d parent a8372f035aa2f6717123eb30679a08b619321dd4 author Linus Torvalds Mon, 20 Feb 2006 20:03:01 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:03:01 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit cf535ea52e68e3ee6f4a90cc383faa1ee857f14d tree 1217d6b27e99c81b4e9cf003ddd4f71a93ad0c2b parent b04ec261bd64f927bf3fce5cf9eeb0225557939d author Hirokazu Takata Mon, 20 Feb 2006 18:28:17 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:12 -0800 [PATCH] m32r: update sys_tas() routine This patch updates and fixes sys_tas() routine for m32r. In the previous implementation, a lockup rarely caused at sys_tas() routine in SMP environment. > > The problem is that touching *addr will generate an oops if that page isn't > > paged in. If we convert it to use get_user() then that's an improvement, > > but we must not run get_user() under spinlock or local_irq_disable(). I rewrote sys_tas() routine by using "lock -> unlock" instructions, and utilizing the m32r's interrupt handling characteristics; the m32r processor can accept interrupts only at the 32-bit instruction boundary. So, the "unlock" instruction can be executed continuously after the "lock" instruction execution without any interruptions. In addition, to solve such a page_fault problem, I use a fixup code like get_user(). And, as for the kernel lockup problem, we found that a calling do_page_fault() routine with disabling interrupts might cause a lockup at flush_tlb_others(), because we checked a completion of IPI handler's operations in a spin-locked critical section. Therefore, by using "lock -> unlock" code, we can implement the sys_tas() rouitine without disabling interrupts explicitly, then no lockups would happen at flush_tlb_others(), I hope. Compile check and some working test in SMP environment have done. Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b04ec261bd64f927bf3fce5cf9eeb0225557939d tree 2ad7a66b6f0dc6e0e641bef088865c5c140d0ae1 parent 49d9c81a699b57a5b6488f3a761669d05e116588 author Hirokazu Takata Mon, 20 Feb 2006 18:28:15 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:12 -0800 [PATCH] m32r: __cmpxchg_u32 fix This patch fixes a bug of include/asm-m32r/system.h:__cmpxchg_u32(). static __inline__ unsigned long __cmpxchg_u32(volatile unsigned int *p, unsigned int old, unsigned int new); In __cmpxchg_u32(), the "old" value must not be changed to the previous "*p" value. But the former code modifies the previous "*p" value. A deadlock at _atomic_dec_and_lock sometimes happened due to this bug. Signed-off-by: Hayato Fujiwara Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49d9c81a699b57a5b6488f3a761669d05e116588 tree a26af993889b1fe6af95fcff7d911740b008db6c parent aa88861fc3184a7d830954661dd281de4ae8d2ba author Heiko Carstens Mon, 20 Feb 2006 18:28:14 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:12 -0800 [PATCH] s390: revert dasd eer module Revert dasd eer module until we have a common understanding of how the interface should be. Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa88861fc3184a7d830954661dd281de4ae8d2ba tree ac1ff810dd3b8426c727aba3ea57bb6381978f7d parent 15c73691780252a5571bfa7902b4dc227ec66c84 author Peter Oberparleiter Mon, 20 Feb 2006 18:28:13 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:12 -0800 [PATCH] s390: dasd reference counting When using the dasd diag discipline, the base discipline module (eckd or fba) can be unloaded, even though the dasd driver requires both discipline modules (base and diag) to work correctly. Implement reference counting for both base and diag discipline modules in order to fix this. Signed-off-by: Peter Oberparleiter Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15c73691780252a5571bfa7902b4dc227ec66c84 tree 2a2829292ca09b1774c3941ef8fdb2f5cf0f39c6 parent a1909e631caa3a02c25e493ac4004cd67984e0e0 author Frank Pavlic Mon, 20 Feb 2006 18:28:12 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:12 -0800 [PATCH] s390: V=V qdio fixes Using FCP devices with V=V support, the input queue stalled when CCQ 97 had been returned in qdio_do_eqbs. When this happen we have to reissue the eqbs instruction. Another bug was when V=V was enabled we checked if hardware has SIGA-sync support. If not we returned with 0 from tiqdio_is_inbound_q_done. Thus qdio lost initiative on FCP devices and input queue stalled. Running devices in V=V there is no SIGA-sync support but nevertheless we have to process tiqdio_is_inbound_q_done either. Signed-off-by: Frank Pavlic Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1909e631caa3a02c25e493ac4004cd67984e0e0 tree ff8f4a40cf80f5ed9e24137985959301f6ac2dab parent ec33b5fe1a6f68c0a494aab476b9667945e029c4 author Carl-Daniel Hailfinger Mon, 20 Feb 2006 18:28:11 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] radeonfb: resume support for Samsung P35 laptops Make resume from suspend-to-ram possible for Samsung P35 laptops. The radeon mobility 9700 chip on Samsung P35 laptops locks up everything on resume from suspend-to-ram if it is not reinitialized. VGA compatible controller: ATI Technologies Inc RV350 [Mobility Radeon 9600 M10] Class 0300: 1002:4e50 Subsystem: 144d:c00c Unfortunately, the DMI strings are mostly identical for all Samsung laptops. So we match the PCI ID and subsystem ID of the graphics card which is unique for each Samsung laptop model. Signed-off-by: Carl-Daniel Hailfinger Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec33b5fe1a6f68c0a494aab476b9667945e029c4 tree d3de877dabfbb378665d3d6541eacedf33e3b93d parent fcab6f351305029fc5e3c632209d45cae57e4835 author Alexey Dobriyan Mon, 20 Feb 2006 18:28:10 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] drivers/fc4/fc.c: memset correct length Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fcab6f351305029fc5e3c632209d45cae57e4835 tree 21a84b35d172b63a47421190af83eb12c006a8e2 parent 1dd31b6c89611ee91c0ff309c8733c0af61579e8 author Alexey Dobriyan Mon, 20 Feb 2006 18:28:10 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] mm/mempolicy.c: fix 'if ();' typo [akpm; it happens that the code was still correct, only inefficient ] Signed-off-by: Alexey Dobriyan Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1dd31b6c89611ee91c0ff309c8733c0af61579e8 tree 5d936be4f0856c80cf7a98dba309653a0dfbd744 parent 7fd105e758c8d746d57ab7e77f100e096bf153c8 author Zhu Yi Mon, 20 Feb 2006 18:28:09 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] ipw2200: Suppress warning message The following message will be only printed if DEBUG_NOTIF is on. "Unknown notification: subtype=40,flags=0xa0,size=40" Signed-off-by: Zhu Yi Cc: James Ketrenos Cc: Jeff Garzik Cc: "John W. Linville" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fd105e758c8d746d57ab7e77f100e096bf153c8 tree a0d531bf9fba9e2937ad9ffe47e6fc3b8d8ec79a parent 7a9166e3b037296366cea6f3c97f705d33e209e6 author Stephen Rothwell Mon, 20 Feb 2006 18:28:08 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] Fix compile for CONFIG_SYSVIPC=n or CONFIG_SYSCTL=n The compat syscalls are added to sys_ni.c since they are not defined if the above CONFIG options are off. Also, nfs would not build with CONFIG_SYSCTL off. Noticed by Arthur Othieno. Signed-off-by: Stephen Rothwell Cc: "David S. Miller" Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a9166e3b037296366cea6f3c97f705d33e209e6 tree 275c713bc92309b6f90e5c66699753c0268c6be5 parent c8b8b1f2e0eeb91cca22211950742b5f51564672 author Luke Yang Mon, 20 Feb 2006 18:28:07 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] Fix undefined symbols for nommu architecture Signed-off-by: Luke Yang Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8b8b1f2e0eeb91cca22211950742b5f51564672 tree 430672466bd000cae001752275e3535346789d6a parent e1c92117558261d5504c59712751f6c7925ff3ba author Benjamin Herrenschmidt Mon, 20 Feb 2006 18:28:06 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] powermac: Fix loss of ethernet PHY on sleep Some recent PowerBook models tend to lose the ethernet PHY on suspend/resume. It -seems- that they use a combo ethernet-firewire PHY chip and the firewire PHY seems to die the same way when that happens. Not trying to toggle the firewire cable power appears to fix it. So this patch disables changes to the firewire cable power control GPIO on those models. Signed-off-by: Benjamin Herrenschmidt Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1c92117558261d5504c59712751f6c7925ff3ba tree 782fccd28ad4c1037580a1b0f322cfb7fafeeb4e parent 9db91546570ca1b3bc90b4c2d25d5bb74a44be24 author Eric Van Hensbergen Mon, 20 Feb 2006 18:28:05 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] v9fs: update documentation and fix debug flag Minor updates to the documentation to bring them into sync with current websites and available features. The debug flag was switched back to hex to match the documentation. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9db91546570ca1b3bc90b4c2d25d5bb74a44be24 tree 9163ca7b347399d541ab4b543bf7097dc1e9f8ab parent ab863ec342cf148d02ed180b8ecf3a71a024e4be author Peter Osterlund Mon, 20 Feb 2006 18:28:04 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] pktcdvd: Only return -EROFS when appropriate When attempting to open the device for writing, only return -EROFS if the disc appears to be readable but not writable. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab863ec342cf148d02ed180b8ecf3a71a024e4be tree e13f614947329b305c32f9dddb99bda164440e70 parent 3b4828047d4ebe3703dedbfc739958c319ff0b24 author Peter Osterlund Mon, 20 Feb 2006 18:28:04 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] pktcdvd: Fix the logic in the pkt_writable_track function Fix the pkt_writable_track() function to make it work correctly for all types of CD/DVD discs. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b4828047d4ebe3703dedbfc739958c319ff0b24 tree 845301240690c223591f5658551014729b58c3ab parent 7c613d593370292d1685f5794c743a2323be3a09 author Peter Osterlund Mon, 20 Feb 2006 18:28:03 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] pktcdvd: Remove useless printk statements Writing the detected disc type in the kernel log is not useful during normal use of the driver, so remove the printk statements. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c613d593370292d1685f5794c743a2323be3a09 tree f15deb96433b1684ef1f00ec292fffd05e730e56 parent cef289633a9321cd99dd5f6cc935657dc487e9f0 author Peter Osterlund Mon, 20 Feb 2006 18:28:02 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] pktcdvd: Rename functions and make their return values sane Boolean functions should return non-zero when they mean "true", otherwise the calling code looks weird. (As suggested by Linus.) Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cef289633a9321cd99dd5f6cc935657dc487e9f0 tree 2cbe0a2c177817d666c2b626a7627f14b6c9595e parent aa657ca9245a06fa435e00332a13da1fce182abc author Peter Osterlund Mon, 20 Feb 2006 18:28:01 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] pktcdvd: Correctly set rq->cmd_len in pkt_generic_packet() It looks like the code in pkt_generic_packet() worked by luck in the past, but after commit 186d330e682210100c671355580a8592e4a21692 leaving rq->cmd_len uninitialized doesn't work any more. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa657ca9245a06fa435e00332a13da1fce182abc tree 51e89251d12cd496cb502920467b8fa9a47b47b0 parent a9c930bac163c5e616ca0ba9378e7dc746c93227 author Juergen Kreileder Mon, 20 Feb 2006 18:28:00 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] Fix snd-usb-audio in 32-bit compat environment I'm getting oopses with snd-usb-audio in 32-bit compat environments: control_compat.c:get_ctl_type() doesn't initialize 'info', so 'itemlist[uinfo->value.enumerated.item]' in usbmixer.c:mixer_ctl_selector_info() might access random memory (The 'if ((int)uinfo->value.enumerated.item >= cval->max)' doesn't fix all problems because of the unsigned -> signed conversion.) Signed-off-by: Juergen Kreileder Cc: Jaroslav Kysela Acked-by: Takashi Iwai Cc: Greg KH Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9c930bac163c5e616ca0ba9378e7dc746c93227 tree 58ff339858cee3a87893c094561eb72381044a08 parent c255d844dd73616f23e4b4733edcc2e5fa4042b2 author Andi Kleen Mon, 20 Feb 2006 18:27:59 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] Fix units in mbind check maxnode is a bit index and can't be directly compared against a byte length like PAGE_SIZE Signed-off-by: Andi Kleen Cc: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c255d844dd73616f23e4b4733edcc2e5fa4042b2 tree 33665c47a67c3e168095e13329e71c6b5d18fd4d parent 6303dbf570e410067380daec670fdb4137ac0d1d author Pavel Machek Mon, 20 Feb 2006 18:27:58 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] suspend-to-ram: allow video options to be set at runtime Currently, acpi video options can only be set on kernel command line. That's little inflexible; I'd like userland s2ram application that just works, and modifying kernel command line according to whitelist is not fun. It is better to just allow s2ram application to set video options just before suspend (according to the whitelist). This implements sysctl to allow setting suspend video options without reboot. (akpm: Documentation updates for this new sysctl are pending..) Signed-off-by: Pavel Machek Cc: "Brown, Len" Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6303dbf570e410067380daec670fdb4137ac0d1d tree 19ae622f55fb1717a09617d1de8f0672e47ee6c1 parent 2e2b42636614f3c152672b5da67947ccbcbe0d32 author Heiko Carstens Mon, 20 Feb 2006 18:27:58 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] cpu hotplug documentation fix Looks like there was a merge conflict when patches 8f8b1138fc9f65e3591aac83a4ee394fef34ac1d and 255acee706b333b79f593dd366f16e1f107cccc3 were applied which wasn't properly resolved. Fix this and add some additional description. Signed-off-by: Heiko Carstens Cc: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e2b42636614f3c152672b5da67947ccbcbe0d32 tree d4af50e5ac2a35bdeca2b99fa4622abad15aca97 parent d2799f083dcad0413ad1a396e9bc32d9afb70535 author Andi Kleen Mon, 20 Feb 2006 18:27:57 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] x86_64: Don't set CONFIG_DEBUG_INFO in defconfig Undo setting of CONFIG_DEBUG_INFO in the previous defconfig update. It will make every build much slower and need more disk space and isn't a good default. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2799f083dcad0413ad1a396e9bc32d9afb70535 tree e3ff753888f2e03437b9ab951269d213fe522e20 parent d86d43706a27bb87c2873de369f94a10f8758063 author Stephen Street Mon, 20 Feb 2006 18:27:56 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:09 -0800 [PATCH] spi: Fix modular master driver remove and device suspend/remove Fix two problems in the spi subsystem: 1) spi subsystem core dumps when modular spi master is unloaded. 2) spi subsystem core dumps when spi slave device is suspended/resumed and module slave driver is not loaded. Signed-off-by: Stephen Street Signed-off-by: David Brownell Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d86d43706a27bb87c2873de369f94a10f8758063 tree 58b59f28120448b529b76cc24c5076a113e5af08 parent 7d4c8e56109e0799ab9fb644c08a8daf4a026675 author Alexey Korolev Mon, 20 Feb 2006 18:27:55 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:09 -0800 [PATCH] cfi_cmdset_0001: fix range for cache invalidation I found an issue in cfi_cmdset0001.c. It is related to cache region invalidation in the buffered write procedure. The code performs cache invalidation from "cmd_addr" to "cmd_adr + len" in do_write_buffer() while we modify region from "adr" to "adr+len". This issue affects writes + reads of data by small chunks. Signed-off-by: Nicolas Pitre Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d4c8e56109e0799ab9fb644c08a8daf4a026675 tree 31e94080489cf7c1348dac86d0606179742555e7 parent 9b0f8b040acd8dfd23860754c0d09ff4f44e2cbc author Daniel Yeisley Mon, 20 Feb 2006 18:27:54 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:09 -0800 [PATCH] i386: need to pass virtual address to smp_read_mpc() I'm seeing a kernel panic on an ES7000-600 when booting in virtual wire mode. The panic happens because smp_read_mpc() is passed a physical address, and it should be virtual. I tested the attached patch on the ES7000-600 and on a 2 cpu Dell box, and saw no problems on either. Signed-off-by: Dan Yeisley Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b0f8b040acd8dfd23860754c0d09ff4f44e2cbc tree 33c69908705c88b86f14d9e835b6dee6a9c3a31b parent 9827b781f20828e5ceb911b879f268f78fe90815 author Christoph Lameter Mon, 20 Feb 2006 18:27:52 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:09 -0800 [PATCH] Terminate process that fails on a constrained allocation Some allocations are restricted to a limited set of nodes (due to memory policies or cpuset constraints). If the page allocator is not able to find enough memory then that does not mean that overall system memory is low. In particular going postal and more or less randomly shooting at processes is not likely going to help the situation but may just lead to suicide (the whole system coming down). It is better to signal to the process that no memory exists given the constraints that the process (or the configuration of the process) has placed on the allocation behavior. The process may be killed but then the sysadmin or developer can investigate the situation. The solution is similar to what we do when running out of hugepages. This patch adds a check before we kill processes. At that point performance considerations do not matter much so we just scan the zonelist and reconstruct a list of nodes. If the list of nodes does not contain all online nodes then this is a constrained allocation and we should kill the current process. Signed-off-by: Christoph Lameter Cc: Nick Piggin Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9827b781f20828e5ceb911b879f268f78fe90815 tree 9ba223facf6071a1fd21bf8471801ab794738c05 parent bd71c2b17468a2531fb4c81ec1d73520845e97e1 author Kurt Garloff Mon, 20 Feb 2006 18:27:51 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:09 -0800 [PATCH] OOM kill: children accounting In the badness() calculation, there's currently this piece of code: /* * Processes which fork a lot of child processes are likely * a good choice. We add the vmsize of the children if they * have an own mm. This prevents forking servers to flood the * machine with an endless amount of children */ list_for_each(tsk, &p->children) { struct task_struct *chld; chld = list_entry(tsk, struct task_struct, sibling); if (chld->mm = p->mm && chld->mm) points += chld->mm->total_vm; } The intention is clear: If some server (apache) keeps spawning new children and we run OOM, we want to kill the father rather than picking a child. This -- to some degree -- also helps a bit with getting fork bombs under control, though I'd consider this a desirable side-effect rather than a feature. There's one problem with this: No matter how many or few children there are, if just one of them misbehaves, and all others (including the father) do everything right, we still always kill the whole family. This hits in real life; whether it's javascript in konqueror resulting in kdeinit (and thus the whole KDE session) being hit or just a classical server that spawns children. Sidenote: The killer does kill all direct children as well, not only the selected father, see oom_kill_process(). The idea in attached patch is that we do want to account the memory consumption of the (direct) children to the father -- however not fully. This maintains the property that fathers with too many children will still very likely be picked, whereas a single misbehaving child has the chance to be picked by the OOM killer. In the patch I account only half (rounded up) of the children's vm_size to the parent. This means that if one child eats more mem than the rest of the family, it will be picked, otherwise it's still the father and thus the whole family that gets selected. This is heuristics -- we could debate whether accounting for a fourth would be better than for half of it. Or -- if people would consider it worth the trouble -- make it a sysctl. For now I sticked to accounting for half, which should IMHO be a significant improvement. The patch does one more thing: As users tend to be irritated by the choice of killed processes (mainly because the children are killed first, despite some of them having a very low OOM score), I added some more output: The selected (father) process will be reported first and it's oom_score printed to syslog. Description: Only account for half of children's vm size in oom score calculation This should still give the parent enough point in case of fork bombs. If any child however has more than 50% of the vm size of all children together, it'll get a higher score and be elected. This patch also makes the kernel display the oom_score. Signed-off-by: Kurt Garloff Cc: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b41c82eb5fb49912ce26c51ec221ba35e06c7d9b tree 25cfbb37391320dd3359ceeb9a4565faf0e4a47c parent cf5e40221bc509e13e22dc83c77c0c115eab531f author Dave Jones Mon, 20 Feb 2006 18:34:37 -0500 committer Dave Jones Mon, 20 Feb 2006 18:34:37 -0500 [AGPGART] Add some informational printk to nforce GART failure path. Signed-off-by: Dave Jones commit 2e242fa994428bd1a40b6a7e97430413246d0a16 tree 8ba101ac6b2f9d6e5d14eebb9091d43c9177626c parent cc1887f3d8ae8ea61efa1a75af8ec0467b9dd546 author Tejun Heo Mon, 20 Feb 2006 23:48:38 +0900 committer Jeff Garzik Mon, 20 Feb 2006 16:48:18 -0500 [PATCH] libata: make ata_sg_setup_one() trim zero length sg This patch makes ata_sg_setup_one() trim sg entry (thus making qc->n_elem zero) if padding results in zero length sg entry. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit cc1887f3d8ae8ea61efa1a75af8ec0467b9dd546 tree 3d02d3dfef8803fe9130ebac2172b6271b907109 parent 9ae61c6cb69f5251d160576c324948805f97e901 author Tejun Heo Mon, 20 Feb 2006 23:48:38 +0900 committer Jeff Garzik Mon, 20 Feb 2006 16:48:18 -0500 [PATCH] libata: fix qc->n_elem == 0 case handling in ata_qc_next_sg This patch makes ata_for_each_sg() start with pad_sgent when qc->n_elem is zero. Previously, ata_for_each_sg() unconditionally started with qc->__sg, handling the first sg to fill_sg() routines even when the entry was invalid. And while at it, unwind ?: in ata_qc_next_sg() into if statement. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 9ae61c6cb69f5251d160576c324948805f97e901 tree 14ab65b577a916c777823468889fc593d6838b12 parent bd71c2b17468a2531fb4c81ec1d73520845e97e1 author Tejun Heo Mon, 20 Feb 2006 23:48:37 +0900 committer Jeff Garzik Mon, 20 Feb 2006 16:48:17 -0500 [PATCH] libata: fix WARN_ON() condition in *_fill_sg() For ATAPI commands, padding can reduce qc->n_elem by one and thus to zero making assert(qc->n_elem > 0)'s in ata_fill_sg() and qs_fill_sg() fail for legal commands. This patch fixes the assert()'s to take qc->pad_len into account. Although the condition check seems a bit excessive, as this part of code isn't still stable yet, I think it's worth to keep those. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit a8372f035aa2f6717123eb30679a08b619321dd4 tree 8f4980a847ba961513340ac4200a1a918773c0a9 parent 8e249f088131cde5f77fd073bf0b0e8b3e9ea4ac author YOSHIFUJI Hideaki Sun, 19 Feb 2006 22:32:06 -0800 committer David S. Miller Sun, 19 Feb 2006 22:32:06 -0800 [NET]: NETFILTER: remove duplicated lines and fix order in skb_clone(). Some of netfilter-related members are initalized / copied twice in skb_clone(). Remove one. Pointed out by Olivier MATZ . And this patch also fixes order of copying / clearing members. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 8e249f088131cde5f77fd073bf0b0e8b3e9ea4ac tree e0113097593dd2b805310bf525b0d2a6823f0a06 parent 669d32a293a348e692c365ddac2b23f3b907fcf1 author Patrick McHardy Sun, 19 Feb 2006 22:29:47 -0800 committer David S. Miller Sun, 19 Feb 2006 22:29:47 -0800 [NETFILTER]: Fix outgoing redirects to loopback When redirecting an outgoing packet to loopback, it keeps the original conntrack reference and information from the outgoing path, which falsely triggers the check for DNAT on input and the dst_entry is released to trigger rerouting. ip_route_input refuses to route the packet because it has a local source address and it is dropped. Look at the packet itself to dermine if it was NATed. Also fix a missing inversion that causes unneccesary xfrm lookups. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 669d32a293a348e692c365ddac2b23f3b907fcf1 tree 3ff874623fd3200bf4dc2ca23b39e589a1b6fbf1 parent bc6e14b6f0b06fe93d809d22e257ddd275feeda9 author Jean Tourrilhes Sun, 19 Feb 2006 22:28:25 -0800 committer David S. Miller Sun, 19 Feb 2006 22:28:25 -0800 [IRDA]: irda-usb bug fixes This patch fixes 2 bugs in the USB-IrDA code. The first one is a buffer overrun in the RX path. We are now using IRDA_SKB_MAX_MTU when initializing the Rx URB. The second one is a potential stack recursion when unplugging the USB dongle. It seems that first we get the Rx URB with a generic error code, and after a while the Rx URB comes again with a "disconnect" error code. Since we are resubmitting the Rx URB immediately after receiving the first error one, we might enter an endless loop. When getting an error Rx URB, the patch defers the Rx URB resubmitting so that it gives us a chance to catch the disconnect one, in case the dongle has juts been unplugged. Tested against 2.6.16-rc2. Patch from Jean Tourrilhes Signed-off-by: Jean Tourrilhes Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit bc6e14b6f0b06fe93d809d22e257ddd275feeda9 tree ca4ef0d384a904c6fd5a4f995a500034a4733fce parent 995110143880fd9cb255fa5df05f8950c56fb43a author Patrick McHardy Sun, 19 Feb 2006 22:26:40 -0800 committer David S. Miller Sun, 19 Feb 2006 22:26:40 -0800 [NETFILTER]: Fix NAT PMTUD problems ICMP errors are only SNATed when their source matches the source of the connection they are related to, otherwise the source address is not changed. This creates problems with ICMP frag. required messages originating from a router behind the NAT, if private IPs are used the packet has a good change of getting dropped on the path to its destination. Always NAT ICMP errors similar to the original connection. Based on report by Al Viro. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 995110143880fd9cb255fa5df05f8950c56fb43a tree 06666d72e4a4e06c646cb0ca683ee9ce0f286c82 parent bd71c2b17468a2531fb4c81ec1d73520845e97e1 author Patrick McHardy Sun, 19 Feb 2006 22:11:50 -0800 committer David S. Miller Sun, 19 Feb 2006 22:11:50 -0800 [XFRM]: Fix policy double put The policy is put once immediately and once at the error label, which results in the following Oops: kernel BUG at net/xfrm/xfrm_policy.c:250! invalid opcode: 0000 [#2] PREEMPT [...] CPU: 0 EIP: 0060:[] Not tainted VLI EFLAGS: 00210246 (2.6.16-rc3 #39) EIP is at __xfrm_policy_destroy+0xf/0x46 eax: d49f2000 ebx: d49f2000 ecx: f74bd880 edx: f74bd280 esi: d49f2000 edi: 00000001 ebp: cd506dcc esp: cd506dc8 ds: 007b es: 007b ss: 0068 Process ssh (pid: 31970, threadinfo=cd506000 task=cfb04a70) Stack: <0>cd506000 cd506e34 c028e92b ebde7280 cd506e58 cd506ec0 f74bd280 00000000 00000214 0000000a 0000000a 00000000 00000002 f7ae6000 00000000 cd506e58 cd506e14 c0299e36 f74bd280 e873fe00 c02943fd cd506ec0 ebde7280 f271f440 Call Trace: [] show_stack_log_lvl+0xaa/0xb5 [] show_registers+0x126/0x18c [] die+0x14e/0x1db [] do_trap+0x7c/0x96 [] do_invalid_op+0x89/0x93 [] error_code+0x4f/0x54 [] xfrm_lookup+0x349/0x3c2 [] ip6_datagram_connect+0x317/0x452 [] inet_dgram_connect+0x49/0x54 [] sys_connect+0x51/0x68 [] sys_socketcall+0x6f/0x166 [] syscall_call+0x7/0xb Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 496b7a5159b8366b003bbc17f8c4e27f69b6779e tree 7108aa506b80e8af73f23d6e3b520fdb20a0b808 parent 8fca92705ef462f39e7db5a0f7100bcaae91bfd3 author Michael Ellerman Thu, 16 Feb 2006 14:13:53 +1100 committer Paul Mackerras Mon, 20 Feb 2006 12:03:37 +1100 [PATCH] powerpc: Fix bug in spinup of renumbered secondary threads If the logical and physical cpu ids of a secondary thread don't match, we will fail to spin the thread up on pSeries machines due to a bug in pseries/smp.c We call the RTAS "start-cpu" method with the physical cpu id, the address of pSeries_secondary_smp_init and the value to pass that function in r3. Currently we pass "lcpu", the logical cpu id, but pSeries_secondary_smp_init expects the physical cpu id in r3. We should be passing pcpu instead. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 8fca92705ef462f39e7db5a0f7100bcaae91bfd3 tree e9b4db50bb523b869616bcb5dcea763b34069f42 parent f018b36f3e1f21318066de8d01740d30e38b03d5 author Michael Ellerman Thu, 16 Feb 2006 14:13:51 +1100 committer Paul Mackerras Mon, 20 Feb 2006 12:03:36 +1100 [PATCH] powerpc: Make UP -> SMP kexec work again For UP to SMP kexec to work we need to jump into pSeries_secondary_smp_init event on a UP + KEXEC kernel. The secondary cpus will not find their hw_cpu_id in the paca and so they'll jump into kexec_wait, ready for a kexec. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit f018b36f3e1f21318066de8d01740d30e38b03d5 tree a893342f794d08a2ee79cbe960b312c54cb47e44 parent 2b9a32edba3af9ad4ccb23574bea0cc34455dc43 author Michael Ellerman Thu, 16 Feb 2006 14:13:50 +1100 committer Paul Mackerras Mon, 20 Feb 2006 12:03:34 +1100 [PATCH] powerpc: Don't start secondary CPUs in a UP && KEXEC kernel Because smp_release_cpus() is built for SMP || KEXEC, it's not safe to unconditionally call it from setup_system(). On a UP && KEXEC kernel we'll start up the secondary CPUs which will then go beserk and we die. Simple fix is to conditionally call smp_release_cpus() in setup_system(). With that in place we don't need the dummy definition of smp_release_cpus() because all call sites are #ifdef'ed either SMP or KEXEC. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 2b9a32edba3af9ad4ccb23574bea0cc34455dc43 tree dafc13a20cd4f4c280a3e66411189b0b37f9996c parent 0728a2f99ef6efd1984f9e0ed59834c1cc602e6f author Olof Johansson Wed, 15 Feb 2006 21:40:44 -0600 committer Paul Mackerras Mon, 20 Feb 2006 10:44:34 +1100 [PATCH] powerpc: Fix OOPS in lparcfg on G5 Fallback gracefully when reading /proc/ppc64/lparcfg when the /rtas device node can't be found. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 0728a2f99ef6efd1984f9e0ed59834c1cc602e6f tree 5ea69ff5f0b51a36347bcd84f0b7bf13491cbe2a parent 092b8f3488a3e50a4ab5f2f3f7c8bbf56b3144e1 author Olaf Hering Sat, 11 Feb 2006 18:21:47 +0100 committer Paul Mackerras Mon, 20 Feb 2006 10:44:31 +1100 [PATCH] powerpc: remove duplicate exports A few symbols are exported twice, remove them from ppc_ksyms.c Remove users of sys_ctrler in arch/ppc/ WARNING: vmlinux: duplicate symbol '__delay' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol '__up' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol '__down' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol '__down_interruptible' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'sys_ctrler' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'strncat' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'strncmp' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'strchr' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'strrchr' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'strnlen' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'strpbrk' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'memscan' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'strstr' previous definition was in vmlinux Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 092b8f3488a3e50a4ab5f2f3f7c8bbf56b3144e1 tree fe9aa2dc2de1ed23109ef77ce8bd38120c2d643d parent bd71c2b17468a2531fb4c81ec1d73520845e97e1 author Paul Mackerras Mon, 20 Feb 2006 10:38:56 +1100 committer Paul Mackerras Mon, 20 Feb 2006 10:38:56 +1100 powerpc: Keep xtime and gettimeofday in sync This fixes a regression which was introduced by moving ppc32 to use the same sort of lockless gettimeofday as ppc64 has been using for some time. This involves getting the timebase and performing some simple arithmetic to convert it to seconds and microseconds. However, the factor and offset used there weren't being updated when NTP varied the tick length using adjtimex. 64-bit didn't notice the problem because it had a hook in the 32-bit adjtimex compat routine that attempted to work out what the generic timekeeping code would do and alter the factor and offset to match. However, that code was very complex and it wasn't clear that it still matched what the generic code would do. Now we use the generic current_tick_length() routine that was recently added to check that the current tick will be as long as we expect; if not we recompute the factor and offset. This keeps gettimeofday and xtime in sync. In addition we check that gettimeofday hasn't got ahead of xtime on each timer interrupt; if it has, we resync. Signed-off-by: Paul Mackerras commit ad6b97fc929e5844bfd1d708ab1d74d131d7960d tree a612bab865a960c88dbff2f0f19ed22be779fa81 parent cead14da59fc261534fa749886c12c16757711fd author Al Viro Fri, 03 Feb 2006 02:06:42 -0500 committer Al Viro Sat, 18 Feb 2006 16:30:40 -0500 [PATCH] iomap_copy fallout (m68k) added __raw_writel(), sanitized include order in iomap_copy.c Signed-off-by: Al Viro commit cead14da59fc261534fa749886c12c16757711fd tree 32ee8b229e443d2edf70be1f3ab398cafb5b13ff parent cc6cdac0cf11955dc81d6c50b6738d05e1dca12b author Al Viro Wed, 18 Jan 2006 19:41:35 -0500 committer Al Viro Sat, 18 Feb 2006 16:30:20 -0500 [PATCH] m68k: pm_power_off() breakage Signed-off-by: Al Viro commit cc6cdac0cf11955dc81d6c50b6738d05e1dca12b tree 7d5d033ea4f59605ae0d8c21e1284af999ba6fb2 parent 00fc00df9e7b637cd13fe1f163da0a2957273947 author Al Viro Sat, 18 Feb 2006 16:02:18 -0500 committer Al Viro Sat, 18 Feb 2006 16:02:18 -0500 [PATCH] missing ntohs() in ip6_tunnel ->payload_len is net-endian Signed-off-by: Al Viro commit 00fc00df9e7b637cd13fe1f163da0a2957273947 tree 9968c24785369e37a9eaa4bd9852b4c3b10f9130 parent 76b6159ba094544e003a237cedcf555d82fa3bfe author Al Viro Wed, 18 Jan 2006 21:22:55 -0500 committer Al Viro Sat, 18 Feb 2006 15:59:06 -0500 [PATCH] m68k: restore disable_irq_nosync() Patch claiming to remove enable_irq_nosync() had left it alive but killed disable_irq_nosync() instead... Signed-off-by: Al Viro commit 76b6159ba094544e003a237cedcf555d82fa3bfe tree 134d104a2e1568d752a8d509cdeba86815f8f66d parent e30809fde59d591809f00caa1a4c960cca5916af author Al Viro Wed, 08 Feb 2006 14:37:40 -0500 committer Al Viro Sat, 18 Feb 2006 15:54:36 -0500 [PATCH] fix handling of st_nlink on procfs root 1) it should use nr_processes(), not nr_threads; otherwise we are getting very confused find(1) and friends, among other things. 2) better do that at stat() time than at every damn lookup in procfs root. Patch had been sitting in FC4 kernels for many months now... Signed-off-by: Al Viro commit e30809fde59d591809f00caa1a4c960cca5916af tree 370d85a6158e45db26edf233404ac70d290c618b parent ef20c8c197df9b8d5bd4af0679123826da028861 author Al Viro Wed, 08 Feb 2006 14:09:00 -0500 committer Al Viro Sat, 18 Feb 2006 15:54:13 -0500 [PATCH] don't mangle INQUIRY if cmddt or evpd bits are set sbp2.c mangles INQUIRY response in a way that only applies to standard inquiry data (i.e. when both cmddt and evpd bits are 0). Leave other cases alone; e.g. when asking for VPD the length of reply is in byte 3, not 4 and byte 4 is the first byte of device serial number. Signed-off-by: Al Viro commit ef20c8c197df9b8d5bd4af0679123826da028861 tree 764632d00ca11f241013b1e203d1b9a5c9e30acb parent bd71c2b17468a2531fb4c81ec1d73520845e97e1 author Al Viro Sat, 18 Feb 2006 15:41:50 -0500 committer Al Viro Sat, 18 Feb 2006 15:41:50 -0500 [PATCH] GFP_KERNEL allocations in atomic (auditsc) audit_log_exit() is called from atomic contexts and gets explicit gfp_mask argument; it should use it for all allocations rather than doing some with gfp_mask and some with GFP_KERNEL. Signed-off-by: Al Viro commit 73d72cffe53407e447df0cbb0bf15a2c931108b3 tree c6f282d3a45068df28d3891e28303eac8452ff86 parent 4e5e2e2560aa1d1d01f7af97af2f72706f61da27 author Dave Airlie Sat, 18 Feb 2006 16:30:54 +1100 committer Dave Airlie Sat, 18 Feb 2006 16:30:54 +1100 drm: fix brace placement Signed-off-by: Dave Airlie commit 4e5e2e2560aa1d1d01f7af97af2f72706f61da27 tree 80a02e0cc1871cc1f528e8fbf8544130c7790635 parent 91e3738ebc6d858e784090382e02afeae5a93b08 author Dave Airlie Sat, 18 Feb 2006 15:51:35 +1100 committer Dave Airlie Sat, 18 Feb 2006 15:51:35 +1100 drm: radeon add r300 TX_CNTL and verify bitblt packets The Xgl on r300 doesn't work unless you add a verify bitblt function to the DRM, and we need to pass TX_CNTL to flush texture caches. Signed-off-by: Dave Airlie commit 91e3738ebc6d858e784090382e02afeae5a93b08 tree 985021be6624126bcbebd8e038a324668703736b parent bd71c2b17468a2531fb4c81ec1d73520845e97e1 author Dave Airlie Sat, 18 Feb 2006 15:17:04 +1100 committer Dave Airlie Sat, 18 Feb 2006 15:17:04 +1100 drm: fixup i915 interrupt on X server exit Fixes: IRQ disabled (i915?) when switchig between gnome themes (gnome-theme-manager) Signed-off-by: Dave Airlie commit cf5e40221bc509e13e22dc83c77c0c115eab531f tree 1203ab413a83f8ae13e4a97273d653b2de3bd106 parent 1311c24fad3b2acad5c6545d2107c226774f02e8 author Dave Jones Sun, 12 Feb 2006 21:05:32 -0500 committer Dave Jones Sun, 12 Feb 2006 21:05:32 -0500 [AGPGART] Improve the error message shown when we detect a ServerWorks CNB20HE This chipset is unsupported, and likely to remain that way. Signed-off-by: Dave Jones commit 1311c24fad3b2acad5c6545d2107c226774f02e8 tree 8aabb61237dba6c432d6876586c17c5b818d8005 parent 3b0e8eadc511eaceba6d6b8d0743359a34ee23c6 author Adrian Bunk Fri, 10 Feb 2006 11:56:30 +0100 committer Dave Jones Fri, 10 Feb 2006 14:41:00 -0500 [AGPGART] help text updates This patch contains help text updates including the following: - XFree86 * -> X - there is no need for repeating part of the help text of the AGP option and having "If unsure, say Y/N." in the chip specific options. Signed-off-by: Adrian Bunk Signed-off-by: Dave Jones commit 64419d93a5906600af5817ad0cae3c6ecf7fb389 tree 9bb76dcc8b19580a2b177418c3a3cbe91c703126 parent 0f36b018b2e314d45af86449f1a97facb1fbe300 author Pekka Enberg Sun, 05 Feb 2006 21:43:57 +0000 committer Anton Altaparmakov Sun, 05 Feb 2006 21:43:57 +0000 NTFS: We have struct kmem_cache now so use it instead of the typedef. Signed-off-by: Pekka Enberg Signed-off-by: Anton Altaparmakov commit 944d79559d154c12becde0dab327016cf438f46c tree 50c101806f4d3b6585222dda060559eb4f3e005a parent d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b parent 0f36b018b2e314d45af86449f1a97facb1fbe300 author Anton Altaparmakov Thu, 19 Jan 2006 16:39:33 +0000 committer Anton Altaparmakov Thu, 19 Jan 2006 16:39:33 +0000 Merge branch 'master' of /usr/src/ntfs-2.6/ commit d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b tree c2db1b4958bbf617a25398b7ef93d82006b26a17 parent 292d4ed32e35df4755052b5002e533348d1648fd parent 88026842b0a760145aa71d69e74fbc9ec118ca44 author Anton Altaparmakov Tue, 03 Jan 2006 12:51:07 +0000 committer Anton Altaparmakov Tue, 03 Jan 2006 12:51:07 +0000 Merge branch 'master' of /usr/src/ntfs-2.6/ commit 292d4ed32e35df4755052b5002e533348d1648fd tree 8522e6bab962696bd25a6c02fb068c674a09b7ee parent 3c6af7fa787f21f8873a050568ed892312899eb5 parent e4f5c82a92c2a546a16af1614114eec19120e40a author Anton Altaparmakov Mon, 05 Dec 2005 15:48:41 +0000 committer Anton Altaparmakov Mon, 05 Dec 2005 15:48:41 +0000 Merge branch 'master' of /usr/src/ntfs-2.6/ commit 3c6af7fa787f21f8873a050568ed892312899eb5 tree 39f8df4d83f0f60ab9a1581a4ff2588ae870b5a8 parent 33bc227e4e48ddadcf2eacb381c19df338f0a6c8 author Anton Altaparmakov Thu, 24 Nov 2005 13:41:33 +0000 committer Anton Altaparmakov Thu, 24 Nov 2005 13:41:33 +0000 NTFS: Fix a potential overflow by casting (index + 1) to s64 before doing a left shift using PAGE_CACHE_SHIFT in fs/ntfs/file.c. Thanks to Andrew Morton pointing this out to. Signed-off-by: Anton Altaparmakov