commit a7ec3f5289681e9d63b65db5f56857f998812b4b Merge: de9e957... 7b37b06... Author: Linus Torvalds Date: Wed Jan 3 17:34:54 2007 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] drivers/char/agp/sgi-agp.c: check kmalloc() return value [AGPGART] Fix PCI-posting flush typo. [AGPGART] fix detection of aperture size versus GTT size on G965 [AGPGART] Remove unnecessary flushes when inserting and removing pages. [AGPGART] K8M890 support for amd-k8. commit de9e957f12d09793aac7d44ee0f7987dc8019b94 Merge: 9c5b0ce... 43c8f12... Author: Linus Torvalds Date: Wed Jan 3 17:34:12 2007 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq * master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] longhaul: Kill off warnings introduced by recent changes. [CPUFREQ] Uninitialized use of cmd.val in arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c:acpi_cpufreq_target() [CPUFREQ] Longhaul - Always guess FSB [CPUFREQ] Longhaul - Fix up powersaver assumptions. [CPUFREQ] longhaul: Fix up unreachable code. [CPUFREQ] speedstep-centrino: missing space and bracket [CPUFREQ] Bug fix for acpi-cpufreq and cpufreq_stats oops on frequency change notification [CPUFREQ] select consistently commit 9c5b0ce43d0e4e4799c6cdc77c5ed7a95b763035 Author: Jens Axboe Date: Wed Jan 3 18:15:20 2007 +0100 [PATCH] ide-cd maintainer Alan agreed to take over casual maintenance of the ide-cd atapi cdrom driver, so I'm happy to sign it over to him. Alan, I hope the address is the one you want to use. I also changed the list to linux-ide as that seems more appropriate. Signed-off-by: Jens Axboe Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 2e11c207b029cfaf57159cabac4b002204445258 Author: Jens Axboe Date: Wed Jan 3 08:10:35 2007 +0100 [PATCH] cdrom: set default timeout to 7 seconds It's a known fact that Windows times out commands after 7 seconds, so drives generally try and respond if they can before that happens. We default to 5 seconds, which sometimes is a bit too short. Jeremy Higdon reported here: http://lkml.org/lkml/2007/1/1/145 that his drive takes longer than 5 seconds for a "read track information" command, later confirming that it is about 6.7 seconds. So just do the sane thing and change the default command timeout to 7 seconds to avoid other surprises. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 7523c4dd9923cab748dad9b79d0165e118e3d03b Author: OGAWA Hirofumi Date: Thu Jan 4 01:21:28 2007 +0900 [PATCH] x86_64: Fix dump_trace() If caller passed the tsk, we should use it to validate a stack ptr. Otherwise, sysrq-t and other debugging stuff doesn't work. Signed-off-by: OGAWA Hirofumi Signed-off-by: Linus Torvalds commit 43c8f12f9f4a7cb4140693fc9baed35a02165898 Author: Dave Jones Date: Tue Jan 2 23:42:16 2007 -0500 [CPUFREQ] longhaul: Kill off warnings introduced by recent changes. Bunch of unused vars + one case where gcc isn't smart enough. Signed-off-by: Dave Jones commit 76ff28c941e73a0de0db12bd5009124e8dc010e7 Author: Guillaume Chazarain Date: Tue Jan 2 19:58:13 2007 +0100 [CPUFREQ] Uninitialized use of cmd.val in arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c:acpi_cpufreq_target() cmd.val was used uninitialized on the line below. Signed-off-by: Guillaume Chazarain Acked-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 24ebead82bbf9785909d4cf205e2df5e9ff7da32 Author: Rafał Bilski Date: Mon Jan 1 23:49:34 2007 +0100 [CPUFREQ] Longhaul - Always guess FSB This is patch that solves Ebox mini PC issue and make FSB code more specification compilant. At start guess_fsb function is guessing 200MHz FSB too. It is better to make it in this way because, thanks to this function, driver will fail for bogus FSB values caused by bogus multiplier value. For PowerSaver processors we can't depend on Max / MinMHzFSB because these values are only used for PowerSaver 2.0 and 3.0. Most processors on which Longhaul is used are PowerSaver 1.0 only. I'm changing code for older CPU's too, but not so much as previously, and this code was already used for Ezra. Using MinMHzBR for Ezra-T is outside spec. It is for voltage scaling purpose and don't have to be equal to minmult (but it is). Same for Nehemiah (it isn't for sure). Added mult - current multiplier value. Signed-off-by: Rafał Bilski Signed-off-by: Dave Jones commit 7b37b064c294af350c462f77d7a9a44485a93684 Author: akpm@osdl.org Date: Tue Jan 2 14:44:31 2007 -0800 [AGPGART] drivers/char/agp/sgi-agp.c: check kmalloc() return value drivers/char/agp/sgi-agp.c: check kmalloc() return value Signed-off-by: Amit Choudhary Signed-off-by: Dave Jones Signed-off-by: Andrew Morton commit b06b5a53adcc3ace1a82b324edf2b0c37e7be00e Merge: c6b33cc... d02b161... Author: Linus Torvalds Date: Tue Jan 2 18:50:57 2007 -0800 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4081/1: Add definition for TI Sync Serial Protocol [ARM] 4080/1: Fix for the SSCR0_SlotsPerFrm macro [ARM] Fix VFP initialisation issue for SMP systems [ARM] 4078/1: Fix ARM copypage cache coherency problems [ARM] 4077/1: iop13xx: fix __io() macro [ARM] 4074/1: Flat loader stack alignment [ARM] 4073/1: Prevent s3c24xx drivers from including asm/arch/hardware.h and asm/arch/irqs.h [ARM] 4071/1: S3C24XX: Documentation update [ARM] 4066/1: correct a comment about PXA's sched_clock range [ARM] 4065/1: S3C24XX: dma printk fixes [ARM] 4064/1: make pxa_get_cycles() static [ARM] 4063/1: ep93xx: fix IRQ_EP93XX_GPIO?MUX numbering commit d02b161eda65528ad3e89d642e416c265c17ceb8 Author: Philipp Zabel Date: Tue Jan 2 21:06:57 2007 +0100 [ARM] 4081/1: Add definition for TI Sync Serial Protocol Of the possible SSP frame formats (FRF bits in SSCR0), only SSCR0_PSP is defined. Other possible formats are Motorola SPI (0<<4), TI SSP (1<<4) and Microwire (2<<4). Attached patch adds a definition SSCR0_TISSP. This mode is used for the sound codec attached to the PXA272 SSP1 of some HTC PDA phones. Signed-off-by: Philipp Zabel Signed-off-by: Russell King commit f566b2b22d89c4785f25e6e4d60163b5ae6251f4 Author: Philipp Zabel Date: Tue Jan 2 20:59:38 2007 +0100 [ARM] 4080/1: Fix for the SSCR0_SlotsPerFrm macro The SSCR0_SlotsPerFrm macro writes a 3-bit value to bits [2:0], while the correct location of FRDC in SSCR0 is at bits [26:24]. This patch adds the missing "<< 24". Signed-off-by: Philipp Zabel Signed-off-by: Russell King commit 8e140362f71ed801c69c5df63a68fc2cd07da3a9 Author: Russell King Date: Tue Jan 2 23:40:30 2007 +0000 [ARM] Fix VFP initialisation issue for SMP systems When we install the handlers for context switching, we must enable VFP on all CPU cores, otherwise undefined (and random) effects occur. Signed-off-by: Russell King commit c6b33cc4e9882b44f1b0c36396f420076e04a4e2 Author: Segher Boessenkool Date: Tue Jan 2 11:41:47 2007 +0530 [PATCH] Fix insta-reboot with "i386: Relocatable kernel support" Commit 968de4f02621db35b8ae5239c8cfc6664fb872d8 ("i386: Relocatable kernel support") caused problems for people with old binutils versions that didn't mark ".text.*" sections automatically allocated. So we should use .section command to specifically mark .text.head section as AX (allocatable and executable) to solve the problem. This should be unnecessary with binutils 2.15 and later, which is already three years old, but it doesn't hurt supporting older toolchains where possible. Signed-off-by: Vivek Goyal Acked-by: Jean Delvare Cc: Eric W. Biederman Cc: Andi Kleen Signed-off-by: Linus Torvalds commit 9883a13c72dbf8c518814b6091019643cdb34429 Author: Parag Warudkar Date: Tue Jan 2 21:09:31 2007 +0100 [PATCH] selinux: fix selinux_netlbl_inode_permission() locking do not call a sleeping lock API in an RCU read section. lock_sock_nested can sleep, its BH counterpart doesn't. selinux_netlbl_inode_permission() needs to use the BH counterpart unconditionally. Compile tested. From: Ingo Molnar added BH disabling, because this function can be called from non-atomic contexts too, so a naked bh_lock_sock() would be deadlock-prone. Boot-tested the resulting kernel. Signed-off-by: Parag Warudkar Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit ec8acb6904fabb8e741f741ec99bb1c18f2b3dee Author: Jens Axboe Date: Tue Jan 2 18:32:11 2007 +0100 [PATCH] cfq-iosched: merging problem Two issues: - The final return 1 should be a return 0, otherwise comparing cfqq is a noop. - bio_sync() only checks the sync flag, while rq_is_sync() checks both for READ and sync. The latter is what we want. Expand the bio check to include reads, and relax the restriction to allow merging of async io into sync requests. In the future we want to clean up the SYNC logic, right now it means both sync request (such as READ and O_DIRECT WRITE) and unplug-on-issue. Leave that for later. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit dc3c3377f03634d351fafdfe35b237b283586c04 Author: Alan Date: Tue Jan 2 11:58:34 2007 +0000 [PATCH] libata: fix combined mode This is a slight variant on the patch I posted December 16th to fix libata combined mode handling. The only real change is that we now correctly also reserve BAR1,2,4. That is basically a neatness issue. Jeff was unhappy about two things 1. That it didn't work in the case of one channel native one channel legacy. This is a silly complaint because the SFF layer in libata doesn't handle this case yet anyway. 2. The case where combined mode is in use and IDE=n. In this case the libata quirk code reserves the resources in question correctly already. Once the combined mode stuff is redone properly (2.6.21) then the entire mess turns into a single pci_request_regions() for all cases and all the ugly resource hackery goes away. I'm sending this now rather than after running full test suites so that it can get the maximal testing in a short time. I'll be running tests on this after lunch. Signed-off-by: Alan Cox Cc: Jeff Garzik Acked-by: Alessandro Suardi Acked-by: Theodore Tso Signed-off-by: Linus Torvalds commit e22a9a8b703d05f13366c3f2e7e1aa0550bb5ca6 Author: Leonard NorrgĂ„rd Date: Mon Jan 1 19:00:54 2007 +0200 [PATCH] sound: hda: detect ALC883 on MSI K9A Platinum motherboards (MS-7280) Recognize the Realtek ALC883 chip on MSI K9A Platinum motherboards (model no. MS-7280), enabling full sound capabilities. Signed-off-by: Leonard NorrgĂ„rd Signed-off-by: Linus Torvalds commit 36f696cd7ffc82c48bf5826bbb4e005370fb9c6a Author: Linus Torvalds Date: Mon Jan 1 10:55:45 2007 -0800 Revert "[PATCH] x86_64: fix boot hang caused by CALGARY_IOMMU_ENABLED_BY_DEFAULT" This reverts commit a9622f6219ce58faba1417743bf3078501eb3434. Now that the Calgary code apparently detects itself properly, it's not needed any more. Signed-off-by: Linus Torvalds commit 1c9d3df5e88ad7db23f5b22f4341c39722a904a4 Author: Richard Purdie Date: Sat Dec 30 16:08:50 2006 +0100 [ARM] 4078/1: Fix ARM copypage cache coherency problems If PG_dcache_dirty is set for a page, we need to flush the source page before performing any copypage operation using a different virtual address. This fixes the copypage implementations for XScale, StrongARM and ARMv6. This patch fixes segmentation faults seen in the dynamic linker under the usage patterns in glibc 2.4/2.5. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit b0b1d60a64054697ef828e0565f006cc0f823590 Author: Dan Williams Date: Fri Dec 29 01:30:24 2006 +0100 [ARM] 4077/1: iop13xx: fix __io() macro Since iop13xx defines the PCI I/O spaces with physical resource addresses the __io macro needs to perform the physical to virtual conversion. I incorrectly assumed that this would be handled by ioremap, but drivers (like e1000) directly dereference the address returned from __io. Signed-off-by: Dan Williams Signed-off-by: Russell King commit 4cc2f7a84d64d25a16bb9383148c1467284e2356 Author: Paul Brook Date: Thu Dec 28 01:54:16 2006 +0100 [ARM] 4074/1: Flat loader stack alignment The ARM EABI requires doubleword (8-byte) stack alignment at all public entry points. The patch below makes the bFLT loader honour this. It's always safe to start with a doubleword aligned stack so it doesn't seem worth making this conditional on CONFIG_AEABI. Paul Signed-off-by: Paul Brook Signed-off-by: Russell King commit 431d2cd99f9721ad09f859dc65895f30385cc5c6 Author: Arnaud Patard Date: Wed Dec 27 22:56:44 2006 +0100 [ARM] 4073/1: Prevent s3c24xx drivers from including asm/arch/hardware.h and asm/arch/irqs.h As reminded in http://lkml.org/lkml/2006/12/23/26, one should use asm/hardware.h and asm/irq.h but absent-minded devs like me tends to use asm/arch/hardware.h and/or asm/arch/irqs.h. This patch aims at preventing such things. In order to make it work, I had to modify asm-arm/irq.h too so that it can be included from assembly files. Also, as a side effect, I had to modify some headers who were using the asm/arch/hardware.h or asm/arch/irqs.h. Signed-off-by: Arnaud Patard Signed-off-by: Russell King commit eb3b4783ba664fd80d337ae6649f6489493b2387 Author: Ben Dooks Date: Sun Dec 24 10:08:09 2006 +0100 [ARM] 4071/1: S3C24XX: Documentation update Add documentation for the following items: - new machines (AML M5900, VMTS, NexVision) - updated rtc section - removed comments about mtd cvs - added spi section - led section Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 0c48d314b16f485e89e0f13fa37c9bd98b6a064d Author: Nicolas Pitre Date: Fri Dec 22 18:52:56 2006 +0100 [ARM] 4066/1: correct a comment about PXA's sched_clock range Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit ae2aa9073acf8f810f18297f586e03d4b2b97588 Author: Arnaud Patard Date: Fri Dec 22 18:44:42 2006 +0100 [ARM] 4065/1: S3C24XX: dma printk fixes The commit 505788cccbb96cd496b646594c8a5fcdc26bc2d9 in linus kernel tree introduced some printks (for debugging ?) which are flooding the logs on my h1940. This patch replace them with pr_debug calls. Signed-off-by: Arnaud Patard Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 35108fb9b3f291b594a8019cb9188da6be2f7990 Author: Nicolas Pitre Date: Fri Dec 22 18:36:30 2006 +0100 [ARM] 4064/1: make pxa_get_cycles() static ... and fix a comment as well. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 2ca2c570b0e38b0c214426b1708ee1b0c3a5067d Author: Lennert Buytenhek Date: Fri Dec 22 14:33:18 2006 +0100 [ARM] 4063/1: ep93xx: fix IRQ_EP93XX_GPIO?MUX numbering Fix incorrect IRQ numbering in arch-ep93xx/irqs.h (source: Applied Data Systems 2.6.17 kernel tree.) Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 264166e604a7e14c278e31cadd1afb06a7d51a11 Author: Rafał Bilski Date: Sun Dec 24 14:04:23 2006 +0100 [CPUFREQ] Longhaul - Fix up powersaver assumptions. ACPI PM2 register was fallback for "Longhaul ver. 1" CPU's. My assumption that this register isn't present at "PowerSaver" motherboards is so far true, but current code will not work correctly in other case. There are three possible supports: ACPI C3, PM2 and northbridge. That was my assumption that ACPI C3 and northbridge is for PS and northbridge and PM2 is for V1. In current code we can only check if it is ACPI support or not by port22_en. So remove port22_en and add longhaul_flags. If USE_ACPI_C3 and USE_NORTHBRIDGE are both clear then it means ACPI PM2 support. Also change order of support probe from ACPI C3, PM2, northbridge to ACPI C3, northbridge, ACPI PM2. Paranoid protection against port 0x22 cast as ACPI PM2 register. Bit 1 clear in such case - lockup on AGP DMA. And obvious (now) fixup for do_powersaver. Use cx->address only for ACPI C3 ("PowerSaver" processor using PM2 support). Signed-off-by: Rafaż Bilski Signed-off-by: Dave Jones commit 1cfe2014263a879691d0262935a2649c97a02559 Author: Dave Jones Date: Thu Dec 28 22:30:16 2006 -0500 [CPUFREQ] longhaul: Fix up unreachable code. Signed-off-by: RafaƂ Bilski Signed-off-by: Dave Jones commit 7f02d687b44aba0cfc393102ea1ccc78eadf8a04 Author: Thomas Hellstrom Date: Wed Dec 27 13:16:49 2006 +0100 [AGPGART] Fix PCI-posting flush typo. Unfortunately there was a typo in one of the patches I sent, (The one now committed to the agpgart tree). It may cause a bus error on i810 type hardware. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Jones commit c41e0deb50c44f9d119c2268f1be05e6a6bb5772 Author: Eric Anholt Date: Tue Dec 19 12:57:24 2006 -0800 [AGPGART] fix detection of aperture size versus GTT size on G965 On the G965, the GTT size may be larger than is required to cover the aperture. (In fact, on all hardware we've seen, the GTT is 512KB to the aperture's 256MB). A previous commit forced the aperture size to 512MB on G965 to match GTT, which would likely result in hangs at best if users tried to rely on agpgart's aperture size information. Instead, we use the resource length for the aperture size and the system's reported GTT size when available for the GTT size. Because the MSAC registers which had been read for aperture size detection on i9xx chips just cause a change in the resource size, we can use generic code for aperture detection on all i9xx. Signed-off-by: Eric Anholt Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit d349c4a5ae1f17be8d6d5de30135ce17e0a8623b Author: Brice Goglin Date: Wed Dec 20 14:11:21 2006 +0100 [CPUFREQ] speedstep-centrino: missing space and bracket A space and a bracket are missing (and indentation is wrong). Signed-off-by: Brice Goglin Signed-off-by: Dave Jones commit 8edc59d939ad233c24385fb67a62bd39db532901 Author: Venkatesh Pallipadi Date: Tue Dec 19 12:58:55 2006 -0800 [CPUFREQ] Bug fix for acpi-cpufreq and cpufreq_stats oops on frequency change notification Fixes the oops in cpufreq_stats with acpi_cpufreq driver. The issue was that the frequency was reported as 0 in acpi-cpufreq.c. The bug is due to different indicies for freq_table and ACPI perf table. Also adds a check in cpufreq_stats to check for error return from freq_table_get_index() and avoid using the error return value. Patch fixes the issue reported at http://www.ussg.iu.edu/hypermail/linux/kernel/0611.2/0629.html and also other similar issue here http://bugme.osdl.org/show_bug.cgi?id=7383 comment 53 Signed-off-by: Dhaval Giani Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit 917325d30ab12f9f23aee5c91dc96dfe81b0c6be Author: Randy Dunlap Date: Tue Dec 19 12:58:54 2006 -0800 [CPUFREQ] select consistently Make x86_64 ACPI_CPU_FREQ select CPU_FREQ_TABLE like other methods do. (although we should still eliminate as much use of 'select' as possible) Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit 5aa80c72263904f1e52eee8ed8cb75887b1d1dc3 Author: Thomas Hellstrom Date: Wed Dec 20 16:33:41 2006 +0100 [AGPGART] Remove unnecessary flushes when inserting and removing pages. This patch is to speed up flipping of pages in and out of the AGP aperture as needed by the new drm memory manager. A number of global cache flushes are removed as well as some PCI posting flushes. The following guidelines have been used: 1) Memory that is only mapped uncached and that has been subject to a global cache flush after the mapping was changed to uncached does not need any more cache flushes. Neither before binding to the aperture nor after unbinding. 2) Only do one PCI posting flush after a sequence of writes modifying page entries in the GATT. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Jones commit d5cb8d38cd0029b3573e1c8d5d99d99c86dbdbd6 Author: Gabriel Mansi Date: Sat Dec 16 20:24:27 2006 -0300 [AGPGART] K8M890 support for amd-k8. Signed-off-by: Dave Jones