commit d95a1b4818f2fe38a3cfc9a7d5817dc9a1a69329 tree 7f3e1e4ec9070d6db9ab0f8fb0d9cb94afed4791 parent 194d0710e1a7fe92dcf860ddd31fded8c3103b7a parent 8066eff0a1a0703ad901dbe5646a47dbfc089ef2 author Linus Torvalds Wed, 03 Aug 2005 16:50:19 -0700 committer Linus Torvalds Wed, 03 Aug 2005 16:50:19 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus commit 8066eff0a1a0703ad901dbe5646a47dbfc089ef2 tree 9d46f66ae3f1002073c317e10218a78775ff7e2d parent 9a351e30d72d409ec62c83f380e330e0baa584b4 parent 79cda7d0e1c8629996242c036d6fe0466038d8ba author Len Brown Wed, 03 Aug 2005 18:15:15 -0400 committer Len Brown Wed, 03 Aug 2005 18:15:15 -0400 /home/lenb/src/to-linus branch 'acpi-2.6.12' commit 79cda7d0e1c8629996242c036d6fe0466038d8ba tree 95cba1ce344cb0e9840143ebec8349dc9a6fdc65 parent b34a8030eeab4d59dcdd86de38f6927b9edd441f author Luming Yu Wed, 03 Aug 2005 18:07:59 -0400 committer Len Brown Wed, 03 Aug 2005 18:11:22 -0400 [ACPI] CONFIG_ACPI_HOTKEY is now "n" by default For 2.6.12 behaviour, this (EXPERIMENTAL) driver should not be built. Update the driver source with latest from Luming. Signed-off-by: Luming Yu Signed-off-by: Len Brown commit b34a8030eeab4d59dcdd86de38f6927b9edd441f tree b0bdf2532175ea0209b2782b9a077d25a6f33aec parent 7b15f5e7bb180ac7bfb8926dbbd8835fecc07fad author Alexey Starikovskiy Wed, 03 Aug 2005 17:55:21 -0400 committer Len Brown Wed, 03 Aug 2005 17:57:24 -0400 [ACPI] restore /proc/acpi/button/ (ala 2.6.12) Signed-off-by Alexey Starikovskiy Signed-off-by Len Brown commit 7b15f5e7bb180ac7bfb8926dbbd8835fecc07fad tree fa5b48a0041c2f4896805a4762befabdfcea3031 parent ecc21ebe603af31f172c43b8b261df79040790ef author Luming Yu Wed, 03 Aug 2005 17:38:04 -0400 committer Len Brown Wed, 03 Aug 2005 17:40:43 -0400 [ACPI] revert Embedded Controller to polling-mode by default (ala 2.6.12) Burst mode isn't ready for prime time, but can be enabled for test via "ec_burst=1" Signed-off-by: Luming Yu Signed-off-by: Len Brown commit 194d0710e1a7fe92dcf860ddd31fded8c3103b7a tree da03b56fa4dee221c53af5770492d391f0d09459 parent a68d2ebc1581a3aec57bd032651e013fa609f530 parent 9bbd03758945858c9303f3258b418b94c4ffd735 author Linus Torvalds Wed, 03 Aug 2005 13:09:43 -0700 committer Linus Torvalds Wed, 03 Aug 2005 13:09:43 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 9bbd03758945858c9303f3258b418b94c4ffd735 tree 74dca48bdcec507933ea3285d08c4f065563da8c parent 8c741ed74d121dbc97c9fb7f9a66c768d4c547c4 author Ian Campbell Wed, 03 Aug 2005 20:34:52 +0100 committer Russell King Wed, 03 Aug 2005 20:34:52 +0100 [PATCH] ARM: 2833/2: Remove support for WDIOF_MAGICCLOSE from sa1100-wdt Patch from Ian Campbell On PXA255 there is no way to disable the watchdog. Turning off OIER[E3] as suggested in the existing comment does not work. I posted a note to the ARM mailing list a little while ago asking for opinions from people using SA1100. There was one reponse from Nico who believes that the SA1100 is the same as the PXA255 in this respect. You also asked me to involve the watchdog maintainer which I tried to do but didn't hear anything back. There are only a couple of other drivers which can't stop the watchdog and there seems to be no consistancy regarding printing an error etc. I decided to print something since that matches the case for all the other drivers when NOWAYOUT is turned on. Also, I changed the device .name to "watchdog" like most of the other watchdogs. udev uses it as the device name (by default) and spaces etc. get in the way. Superceded 2833/1 because 2.6.13-rc4 caused rejects. Signed-off-by: Ian Campbell Signed-off-by: Russell King commit 8c741ed74d121dbc97c9fb7f9a66c768d4c547c4 tree f76456dabc65f20688993ae9fe4dc99354228432 parent 7b1fbf292bb4c855ddae8add8c459e94684f7543 author Deepak Saxena Wed, 03 Aug 2005 19:58:21 +0100 committer Russell King Wed, 03 Aug 2005 19:58:21 +0100 [PATCH] ARM: 2835/1: Add UPF_SKIP_TEST to IXP4xx serial ports Patch from Deepak Saxena This allows the serial driver autconf to work properly on all the IXP serial ports. W/o it we basically put the serial port in an unrecoverable state and lose console. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 7b1fbf292bb4c855ddae8add8c459e94684f7543 tree 8269bb5c858aaa0a0483cb81759ca947e0b396c1 parent 858297509590ef4aa5690e30c2f5505077b4f369 author Catalin Marinas Wed, 03 Aug 2005 19:53:25 +0100 committer Russell King Wed, 03 Aug 2005 19:53:25 +0100 [PATCH] ARM: 2841/1: Fix VFP +/-0 case for doubles addition Patch from Catalin Marinas The IEEE 754 standard specifies that the result of (x - x), where x is a valid number, should be -0 if the rounding mode is towards minus infinity or +0 otherwise. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 858297509590ef4aa5690e30c2f5505077b4f369 tree 3297d3fcf09f9ea28e0d4360902558aaadae337c parent 975ad141eecccb24fc8db1e0f4a08f5580f4a9a9 author Michael Burian Wed, 03 Aug 2005 19:49:18 +0100 committer Russell King Wed, 03 Aug 2005 19:49:18 +0100 [PATCH] ARM: 2840/1: Add mach-types to Documentation/dontdiff Patch from Michael Burian This file is maintained by RMK's machine registry, it should not be patched. Signed-off-by: Michael Burian Signed-off-by: Russell King commit 975ad141eecccb24fc8db1e0f4a08f5580f4a9a9 tree cc392df5cf9909b22bfa608755e0285fccb9b187 parent f148af2593ef76ac705d1cc6abe48f455c9912cc author Deepak Saxena Wed, 03 Aug 2005 19:49:17 +0100 committer Russell King Wed, 03 Aug 2005 19:49:17 +0100 [PATCH] ARM: 2839/1: Remove XScale cache and TLB locking code Patch from Deepak Saxena The XScale locking code is not something that has been validated on 2.6 and needs to be replaced with a more generic API to use with other ARMs that support locking features. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit f148af2593ef76ac705d1cc6abe48f455c9912cc tree cd1e0b0959624234ca3489df8888434ffea5050e parent 1fcf844861eb08ee05e05dba13b5436f2f2e29ed author Richard Purdie Wed, 03 Aug 2005 19:49:17 +0100 committer Russell King Wed, 03 Aug 2005 19:49:17 +0100 [PATCH] ARM: 2837/2: Re: ARM: Make NWFPE preempt safe Patch from Richard Purdie NWFPE used global variables which meant it wasn't safe for use with preemptive kernels. This patch removes them and communicates the information between functions in a preempt safe manner. Generation of some exceptions was broken and this has also been corrected. Tests with glibc's maths test suite show no change in the results before/after this patch. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 1fcf844861eb08ee05e05dba13b5436f2f2e29ed tree 980c21c85eff8550c3fbada9e6f922dcf90f7f37 parent 5cb4cc0d8211c490537c8568001958fc76741312 author Ben Dooks Wed, 03 Aug 2005 19:49:16 +0100 committer Russell King Wed, 03 Aug 2005 19:49:16 +0100 [PATCH] ARM: 2832/1: BAST - limit clock-rate for IIC bus Patch from Ben Dooks The default clock rate does not specify a maximum, so the default of 400KHz is used. This rate is too fast for the PMU on the EB2410ITX, so we now specify platform data with a rate of around 100KHz. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a68d2ebc1581a3aec57bd032651e013fa609f530 tree b41977c7157d7e26f37e9cb502cd1afbbddcbc17 parent f33ea7f404e592e4563b12101b7a4d17da6558d7 author Linus Torvalds Wed, 03 Aug 2005 10:07:09 -0700 committer Linus Torvalds Wed, 03 Aug 2005 10:07:09 -0700 Fix up recent get_user_pages() handling The VM_FAULT_WRITE thing is an extra bit, not a valid return value, and has to be treated as such by get_user_pages(). Signed-off-by: Linus Torvalds commit f33ea7f404e592e4563b12101b7a4d17da6558d7 tree 1d587ad8a06cb6d2e3a187f0312c8a524ffefe53 parent 5cb4cc0d8211c490537c8568001958fc76741312 author Nick Piggin Wed, 03 Aug 2005 20:24:01 +1000 committer Linus Torvalds Wed, 03 Aug 2005 09:12:05 -0700 [PATCH] fix get_user_pages bug Checking pte_dirty instead of pte_write in __follow_page is problematic for s390, and for copy_one_pte which leaves dirty when clearing write. So revert __follow_page to check pte_write as before, and make do_wp_page pass back a special extra VM_FAULT_WRITE bit to say it has done its full job: once get_user_pages receives this value, it no longer requires pte_write in __follow_page. But most callers of handle_mm_fault, in the various architectures, have switch statements which do not expect this new case. To avoid changing them all in a hurry, make an inline wrapper function (using the old name) that masks off the new bit, and use the extended interface with double underscores. Yes, we do have a call to do_wp_page from do_swap_page, but no need to change that: in rare case it's needed, another do_wp_page will follow. Signed-off-by: Hugh Dickins [ Cleanups by Nick Piggin ] Signed-off-by: Linus Torvalds commit ecc21ebe603af31f172c43b8b261df79040790ef tree d2468578cb327adbd3d69feb610a79b8b8a0f84d parent 3d35600a9de8e2816d0e3726f64b7271af6fdda4 author David Shaohua Li Wed, 03 Aug 2005 11:00:11 -0400 committer Len Brown Wed, 03 Aug 2005 11:04:10 -0400 [ACPI] PCI interrupt link suspend/resume - revert to 2.6.12 behaviour This patch disables the PCI Interrupt Link refernece counts, which should not co-exist with the 2.6.12 irq_router.resume method or else a double acpi_pci_link_set() could result on resume. Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit 5cb4cc0d8211c490537c8568001958fc76741312 tree 3a3844a79cff56d84ecafd65ba5d8da25e158d2b parent 0b2bfb4e7ff61f286676867c3508569bea6fbf7a author Haren Myneni Wed, 03 Aug 2005 15:08:18 +1000 committer Linus Torvalds Tue, 02 Aug 2005 22:16:45 -0700 [PATCH] Xmon bug fix for soft-reset For soft reset during system hang, got an error "CPU did not take control" for some CPUs even though they responded to soft-reset (called SystemReset, die and called debugger - xmon). First these CPUs entered into xmon by IPI callback and then got a soft-reset exception and re-entered into xmon again. The first CPU which re-entered into xmon got the output lock and made into xmon successfully without unlocking. Hence, the next CPU(s) which re-entered into xmon try to acquire a lock (get_output_lock). Therefore, we can not view state of those CPU(s). [This is a simple, very low risk, obvious fix for an obvious bug, and should go into 2.6.13. -- paulus] Signed-off-by: Haren Myneni Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 3d35600a9de8e2816d0e3726f64b7271af6fdda4 tree 47b234ce27a0a6b0857ded04b95075a18e0462bb parent 87bec66b9691522414862dd8d41e430b063735ef author Len Brown Wed, 03 Aug 2005 00:22:52 -0400 committer Len Brown Wed, 03 Aug 2005 00:23:45 -0400 [ACPI] fix 64-bit build warning in processor_idle.c Signed-off-by: Len Brown commit 0b2bfb4e7ff61f286676867c3508569bea6fbf7a tree 39c39d75aa916afcc3a3f736d3a5fd00a48ea003 parent 71db63acff69618b3d9d3114bd061938150e146b author Ivan Kokshaysky Wed, 03 Aug 2005 03:09:03 +0400 committer Linus Torvalds Tue, 02 Aug 2005 18:21:25 -0700 [PATCH] ACPI: increase PCIBIOS_MIN_IO on x86 We have increased PCIBIOS_MIN_IO to 0x4000, but still want motherboard resources to be allocated properly. So we need to state 0x1000 (according to the comment) limit explicitely. Signed-off-by: Ivan Kokshaysky Signed-off-by: Linus Torvalds commit 71db63acff69618b3d9d3114bd061938150e146b tree 49c43f9115648cd730e4a11e455877ad5ee680c5 parent 688d191821de7893043f5a37970472627aaffa4e author Ivan Kokshaysky Wed, 03 Aug 2005 02:59:47 +0400 committer Linus Torvalds Tue, 02 Aug 2005 18:21:25 -0700 [PATCH] increase PCIBIOS_MIN_IO on x86 There is a number of x86 laptops that have some non-PCI IO ports in the 0x1000-0x1fff range, and it's quite hard to control the correct order of resource allocation between PCI and other subsystems controlling these ports. Especially with modular kernel. So just increase PCIBIOS_MIN_IO to 0x4000 to prevent any new PCI resource allocations in the problematic range (this limitation must apply _only_ to the root bus resources - see Linus' change in pci_bus_alloc_resource). As PCIBIOS_MIN_IO and PCIBIOS_MIN_CARDBUS_IO are the same now on i386 and x86-64, we can remove the latter. Signed-off-by: Ivan Kokshaysky Signed-off-by: Linus Torvalds commit 688d191821de7893043f5a37970472627aaffa4e tree bee038b981147f4f9f3ac0ca23348376044678dd parent d7ed538a02c219119adb20f1dccbf0f8015e53f3 author Linus Torvalds Tue, 02 Aug 2005 14:55:40 -0700 committer Linus Torvalds Tue, 02 Aug 2005 14:55:40 -0700 pci: make bus resource start address override minimum IO address The reason we have PCIBIOS_MIN_IO and PCIBIOS_MIN_CARDBUS_IO is because we want to protect badly documented motherboard PCI resources and thus don't want to allocate new resources in low IO/MEM space. However, if we have already discovered a PCI bridge with a specified resource base, that should override that decision. This change will allow us to move the "careful" region upwards without resulting in problems allocating resources in low mappings. This was brought on by us having allocated a bus resource at 0x1000, conflicting with a undocumented VAIO Sony PI resources. commit d7ed538a02c219119adb20f1dccbf0f8015e53f3 tree d716ae7dc2e986b36c8180333839312dc0eab7e2 parent f7c80c9f77b0e8a59a19506fd3caf323408a5166 author Jens Axboe Tue, 02 Aug 2005 20:08:02 +0200 committer Linus Torvalds Tue, 02 Aug 2005 11:19:18 -0700 [PATCH] cfq-iosched: fix problem with barriers and max_depth == 1 CFQ will currently stall when using write barriers and the default max_depth setting of 1, since we artificially need a depth of 2 when pre-pending the first flush. So never deny the barrier request going to the device. This is a regression since 2.6.12, it was found in SUSE testing. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit f7c80c9f77b0e8a59a19506fd3caf323408a5166 tree 5306a5d77d38b363a1f04abeaf4bb7a234037e87 parent f7d1d23c301e0ce82c801f3b5800be6341752a1f author Olaf Hering Tue, 19 Jul 2005 20:04:24 +0200 committer Linus Torvalds Tue, 02 Aug 2005 08:43:59 -0700 [PATCH] aic byteorder fixes after recent cleanup Rebuild the aic7xxx firmware doesn't work anymore after this change which appeared int 2.6.13-rc1: [SCSI] aic7xxx/aic79xx: remove useless byte order macro cruft Two files did not include byteorder.h, resulting in aic dying with a panic "Unknown opcode encountered in seq program" This fixes it for me. Signed-off-by: Olaf Hering Acked-by: Christoph Hellwig Signed-off-by: Linus Torvalds commit f7d1d23c301e0ce82c801f3b5800be6341752a1f tree 12095ed260df39f8ee870f38d108d90519feb32f parent 9a351e30d72d409ec62c83f380e330e0baa584b4 author Paul Mackerras Tue, 02 Aug 2005 21:51:36 +1000 committer Linus Torvalds Tue, 02 Aug 2005 08:28:48 -0700 [PATCH] Obvious bugfix for yenta resource allocation Recent changes (well, dating from 12 July) have broken cardbus on my powerbook: I get 3 messages saying "no resource of type xxx available, trying to continue", and if I plug in my wireless card, it complains that there are no resources allocated to the card. This all worked in 2.6.12. Looking at the code in yenta_socket.c, function yenta_allocate_res, it's obvious what is wrong: if we get to line 639 (i.e. there wasn't a usable preassigned resource), we will always flow through to line 668, which is the printk that I was seeing, even if a resource was successfully allocated. It looks to me as though there should be a return statement after the two config_writel's in each of the 3 branches of the if statements, so that the function returns after successfully setting up the resource. The patch below adds these return statements, and with this patch, cardbus works on my powerbook once again. Signed-off-by: Paul Mackerras Acked-by: Dominik Brodowski Signed-off-by: Linus Torvalds