commit e4903fb59590f86190280a549420f6cb85bd7f7e Merge: 6a28a05... cb2e091... Author: Linus Torvalds Date: Wed Jul 25 15:50:20 2007 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Nail two more simple section mismatch errors [IA64] fix section mismatch warnings [IA64] rename partial_page [IA64] Ensure that machvec is set up takes place before serial console [IA64] vector-domain - fix vector_table [IA64] vector-domain - handle assign_irq_vector(AUTO_ASSIGN) commit 6a28a05f9b1b4db920e390ac89968ed6d2e4b8ec Merge: 4bf3b0b... cb7e51d... Author: Linus Torvalds Date: Wed Jul 25 15:49:59 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kbuild: fix modpost warnings for xtensa kbuild: be more foregiving on init section naming kbuild: rearrange a few function in modpost kbuild: use LDFLAGS_MODULE only for .ko links kconfig: remove unused members from struct symbol kconfig: attach help text to menus kbuild: fix up printing of Linux C Library version in scripts/ver_linux kbuild: do not do section mismatch checks on vmlinux in 2nd pass commit cb7e51d8b1f8e2390970f4bb7d095c414b1bf3cf Author: Sam Ravnborg Date: Wed Jul 25 22:24:52 2007 +0200 kbuild: fix modpost warnings for xtensa The Xtensa architecture places literal pools in sections separate from the instructions. The corresponsing text sections, therefore, reference the .literal section, and we have to suppress those warnings. The naming convention defines the name for a literal section as .SECTION.literal, unless .SECTION is .text. In that case the name is only .literal. Using strncmp() instead of strcmp() to compare the from-section with .SECTION.init.refok in pattern 0 should not cause any regressions for other architectures. We also need to suppress warnings for two informational sections (.xt.lit and .xt.prop) used by the Xtensa architecture. Signed-off-by: Chris Zankel Signed-off-by: Sam Ravnborg commit cb2e0912f714b116812ef5834b5ba80d894ac967 Author: Tony Luck Date: Fri Jul 20 16:14:28 2007 -0700 [IA64] Nail two more simple section mismatch errors pcibios_setup (between 'pci_setup' and 'quirk_mellanox_tavor') setup_profiling_timer (between 'write_profile' and 'delayed_put_task_struct') Signed-off-by: Tony Luck commit 9d6f40b86b47928ffde8a41cb2ef332da34b3de2 Author: Tony Luck Date: Fri Jul 20 14:39:24 2007 -0700 [IA64] fix section mismatch warnings In 741f98fe298a73c9d47ed53703c1279a29718581 Sam added full checking across the entire vmlinux image. This flushed out a dozen new section mismatch warnings. Start the whack-a-mole game again to stomp them out. Signed-off-by: Tony Luck commit 3b74d18e54e20fc1d398eb391bea5b9aed22aca5 Author: akpm@linux-foundation.org Date: Tue Jul 24 19:44:55 2007 -0700 [IA64] rename partial_page Jens has added a partial_page thing in splice whcih conflicts with the ia64 one. Rename ia64 out of the way. (ia64 chose poorly). Signed-off-by: Andrew Morton Signed-off-by: Tony Luck commit 83cda2bb37cb8476cd84659d9698ab48553be974 Author: Sam Ravnborg Date: Wed Jul 25 21:52:31 2007 +0200 kbuild: be more foregiving on init section naming In the whitelist function of modpost now use the same check to identify init_section as in other places of modpost. This has the effect that we now recognize sections named .init.text.19 as init sections and we no longer warn when we see these. At the same time make surrounding code readable by dropping use of temporary flags. Signed-off-by: Sam Ravnborg commit 2f5ee619045d923de9137b6a263a99cc2428391a Author: Sam Ravnborg Date: Wed Jul 25 21:46:40 2007 +0200 kbuild: rearrange a few function in modpost This is a preparational patch that just move two functions and add one (for now unused) function. Signed-off-by: Sam Ravnborg commit 114f51577724b782a30f4f5ceaee9880de93d776 Author: Roland McGrath Date: Mon Jul 23 01:12:08 2007 -0700 kbuild: use LDFLAGS_MODULE only for .ko links Sam Ravnborg pointed out that Documentation/kbuild/makefiles.txt already says this is what it's for. This patch makes the reality live up to the documentation. This fixes the problem of LDFLAGS_BUILD_ID getting into too many places. Signed-off-by: Roland McGrath Signed-off-by: Sam Ravnborg commit 1edf1c00acf8d9b60d436d6a0a55e395353a446c Author: Sam Ravnborg Date: Sat Jul 21 00:05:26 2007 +0200 kconfig: remove unused members from struct symbol dep and dep2 in struct symbol was unused - remove them. Signed-off-by: Sam Ravnborg Cc: Roman Zippel commit 03d29122738f0bd81afd44b1f566e64ebf8d06fe Author: Sam Ravnborg Date: Sat Jul 21 00:00:36 2007 +0200 kconfig: attach help text to menus Roman Zippel wrote: > A simple example would be > help texts, right now they are per symbol, but they should really be per > menu, so archs can provide different help texts for something. This patch does this and at the same time introduce a few API funtions used to access the help text. The relevant api functions are introduced in the various frontends. Signed-off-by: Sam Ravnborg Cc: Roman Zippel commit 4a645d5ea65baaa5736bcb566673bf4a351b2ad8 Author: Jesper Juhl Date: Fri Jul 20 02:49:23 2007 +0200 kbuild: fix up printing of Linux C Library version in scripts/ver_linux I noticed, when running scripts/ver_linux on both a Gentoo system and a Slackware system, that the line printing the C library version looked a little odd. So I fixed it up to be in line with all the rest. Old output: Linux C Library > libc.2.5 New output: Linux C Library 2.5 Signed-off-by: Jesper Juhl Signed-off-by: Sam Ravnborg commit 8d8d8289df65cb116d2721becafb37272074f25a Author: Sam Ravnborg Date: Fri Jul 20 22:36:56 2007 +0200 kbuild: do not do section mismatch checks on vmlinux in 2nd pass We already check and warn about section mismatches from vmlinux (build as vmlinux.o) during first pass so skip the checks during the 2nd pass where we process modules. Signed-off-by: Sam Ravnborg commit 4bf3b0bc3e98f77de88b336fd8d673649601b557 Author: H. Peter Anvin Date: Wed Jul 25 11:06:02 2007 -0700 [x86 setup] Make struct apm_bios_info cross-architecture struct apm_bios_info uses "unsigned short" and "unsigned long" to mean u16 and u32 respectively. Correct. Signed-off-by: H. Peter Anvin commit 238b706da1c6ebacc55986ac8668f3ede4621f2c Author: H. Peter Anvin Date: Wed Jul 18 17:19:30 2007 -0700 [x86 setup] Make struct ist_info cross-architecture, and use in setup code Make "struct ist_info" valid on both i386 and x86-64, and use the structure by name in the setup code. Additionally, "Intel SpeedStep IST" is redundant, refer to it as IST consistently. Signed-off-by: H. Peter Anvin commit f77b1ab383c8745447a3385e25729b92f2ec58a4 Author: H. Peter Anvin Date: Wed Jul 18 17:16:19 2007 -0700 [x86 setup] Fix typos in struct efi_info Fix missing letters in the structure members of struct efi_info. Signed-off-by: H. Peter Anvin commit 1a13286b104faeeb4f4bc3bfbf4d4fcdcd2569ed Author: H. Peter Anvin Date: Mon Jul 23 15:37:14 2007 -0700 [x86 setup] APM: BX should be zero when disconnecting For APM calls, BX contains the device index, which is zero for the system BIOS. Disconnect requres BX = 0. Signed-off-by: H. Peter Anvin commit 1514ab09edb071345fe17cd230c97f9e72c9478e Author: Mikael Pettersson Date: Tue Jul 24 00:25:59 2007 +0200 [x86 setup] APM detection logic bug fix Starting with kernel 2.6.23-rc1, the i386 APM driver fails on several of my machines with the message: apm: BIOS not found This happens because of a bug in the i386 boot code rewrite from assembler to C. The original assembly code had the following code in its APM BIOS presence test (boot/setup.S): andw $0x02, %cx # Is 32 bit supported? je done_apm_bios # No 32-bit, no (good) APM BIOS That is, the code bails out if bit 2 is zero. In the new C version, this is coded as (boot/apm.c): if (cx & 0x02) /* 32 bits supported? */ return -1; Here we see that the test has been accidentally inverted. The fix is to negate the test. I've verified that this allows the APM driver to work again on my affected machines. Signed-off-by: Mikael Pettersson Signed-off-by: H. Peter Anvin commit 80492cc797ea15572de8eac766cbf606626ee338 Merge: a4fb212... 910949a... Author: Linus Torvalds Date: Wed Jul 25 11:28:19 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: SELinux: null-terminate context string in selinux_xfrm_sec_ctx_alloc commit a4fb2122f1fc4a22bd6a5b8a195b952c2d31c54d Merge: bc72450... 323ef30... Author: Linus Torvalds Date: Wed Jul 25 11:28:00 2007 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: Kconfig: remove CONFIG_ACPI_SLEEP from source ACPI: quiet ACPI Exceptions due to no _PTC or _TSS ACPI: Remove references to ACPI_STATE_S2 from acpi_pm_enter ACPI: Kconfig: always enable CONFIG_ACPI_SLEEP on X86 ACPI: Kconfig: fold /proc/acpi/sleep under CONFIG_ACPI_PROCFS ACPI: Kconfig: CONFIG_ACPI_PROCFS now defaults to N ACPI: autoload modules - Create __mod_acpi_device_table symbol for all ACPI drivers ACPI: autoload modules - Create ACPI alias interface ACPI: autoload modules - ACPICA modifications ACPI: asus-laptop: Fix failure exits ACPI: fix oops due to typo in new throttling code ACPI: ignore _PSx method for hotplugable PCI devices ACPI: Use ACPI methods to select PCI device suspend state ACPI, PNP: hook ACPI D-state to PNP suspend/resume ACPI: Add acpi_pm_device_sleep_state helper routine ACPI: Implement the set_target() callback from pm_ops commit a07ee86205808d36973440e68c7277f9ed63b87f Author: Horms Date: Wed Jul 25 16:06:25 2007 +0900 [IA64] Ensure that machvec is set up takes place before serial console Parse the machvec command line option outside of the early_param() so that ia64_mv is set before any console intialisation that may result from early_param parsing. Signed-off-by: Simon Horman Signed-off-by: Tony Luck commit 6ffbc82351c62eeeeaeb9e817ddf93049353493d Author: Kenji Kaneshige Date: Wed Jul 25 17:59:22 2007 +0900 [IA64] vector-domain - fix vector_table Fix wrong access to vector_table[]. Signed-off-by: Kenji Kaneshige Signed-off-by: Tony Luck commit 8f5ad1a8227aa110d633b5ed04dde535381c16c7 Author: Yasuaki Ishimatsu Date: Tue Jul 24 22:09:09 2007 +0900 [IA64] vector-domain - handle assign_irq_vector(AUTO_ASSIGN) This change fixes a panic when assign_irq_vector(irq) is called with irq = AUTO_ASSIGN. Signed-off-by: Yasuaki Ishimatsu Signed-off-by: Tony Luck commit bc72450aebe73587f80bbae8fc0b62c3d81b85fe Author: Greg Ungerer Date: Wed Jul 25 22:07:20 2007 +1000 m68knommu: make BOOTPARAM setup common Currently most of the m68knommu cpu/board setup files are handling the setup of fixed boot parameters (via CONFIG_BOOTPARAM) themselves. Move all this into the common setup code. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 020f9e16c306f929382ad81e5a0ecf4f41887616 Author: Greg Ungerer Date: Wed Jul 25 22:07:20 2007 +1000 m68knommu: fix reset register address casting Fix types used for reset register address setup. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 906a2621fc14005ac6e29a2b85aa8685b68bb016 Author: Greg Ungerer Date: Wed Jul 25 22:07:20 2007 +1000 m68knommu: add configure support for Intec boards Add configure support for the Intec Wildfire and WildFireMod boards. Signed-Off-By: Steve Bennett Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 7160a67305f08d52284b333f1403abbf8b0a1970 Author: Greg Ungerer Date: Wed Jul 25 22:07:20 2007 +1000 m68knommu: simplify ColdFire resume code It is useless to preserve THREAD_SR in `resume'. The real user's sr is actually in the stack. We also don't need to disable interrupts : we'll never be in an invalid state, the sp switch is atomic. Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 063586a6b1e877eb10621d191aeb67e361383d77 Author: Greg Ungerer Date: Wed Jul 25 22:07:20 2007 +1000 m68knommu: create hw_irq.h Need an include/asm-m68knommu/hw_irq.h for kernel/hrtimer.c Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit a6fcafd09959cf9204f0cdb7a2545ffd7d95d5dd Author: Philippe De Muyter Date: Wed Jul 25 22:07:20 2007 +1000 m68knommu: fix definition of MCFDMA_DIR_INV Fix a small typo in the definition of MCFDMA_DIR_INV (MCF5272 specific). Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 33e7a72a9c7ebb822d419a07840c3546513feff0 Author: Greg Ungerer Date: Wed Jul 25 22:07:20 2007 +1000 m68knommu: add build support for more Arcturus boards Add build support for the new Arcturus boards. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 85e026bc0d9c9962de5ad65e3be40733f0f8d99c Author: Greg Ungerer Date: Wed Jul 25 22:07:20 2007 +1000 m68knommu: need to include linux/device.h in dma.c Need to explicitly include linux/device.h. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 5c4f5264d503f0650c954a181b0ba255913bb382 Author: Greg Ungerer Date: Wed Jul 25 22:07:20 2007 +1000 m68knommu: fix tick timer definition for coldfire CLOCK_TICK_RATE should give the underlying frequency of the tick timer, to make ntp happy. For Coldfires, that's the main clock. Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 36995223872df6642e604aab2be84377a5d12a19 Author: David Wu Date: Wed Jul 25 22:07:20 2007 +1000 m68knommu: add configure support for more Arcturus boards Add configure support for the Arcturus UC5272 and UC5282 boards. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit 931f9cde5c3f9dc7827759db258eaf979bfa92b6 Author: Greg Ungerer Date: Wed Jul 25 22:07:20 2007 +1000 m68knommu: fix workqueues in 68328 serial driver Fix workqueues in 68328 serial driver. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit a427138712f388987aa13475bf591685b6b8cd46 Author: Greg Ungerer Date: Wed Jul 25 22:07:20 2007 +1000 m68knommu: remove legacy power managament from 68328 serial driver Remove the legacy power management code from the 68328 serial driver. It is not used, and there is no current kernel support for power management on the 68328. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds commit a9417357cff6027f9d6b1740f821baa59f2381f4 Merge: 17c38b7... d37c855... Author: Linus Torvalds Date: Wed Jul 25 11:01:10 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: KVM: disable writeback for 0x0f 0x01 instructions. KVM: Fix removal of nx capability from guest cpuid Revert "KVM: Avoid useless memory write when possible" KVM: Fix unlikely kvm_create vs decache_vcpus_on_cpu race KVM: Correctly handle writes crossing a page boundary commit 17c38b7490b3f0300c7812aefdae2ddda7ab4112 Author: john stultz Date: Tue Jul 24 18:38:34 2007 -0700 Cache xtime every call to update_wall_time This avoids xtime lag seen with dynticks, because while 'xtime' itself is still not updated often, we keep a 'xtime_cache' variable around that contains the approximate real-time that _is_ updated each time we do a 'update_wall_time()', and is thus never off by more than one tick. IOW, this restores the original semantics for 'xtime' users, as long as you use the proper abstraction functions (ie 'current_kernel_time()' or 'get_seconds()' depending on whether you want a timespec or just the seconds field). [ Updated Patch. As penance for my sins I've also yanked another #ifdef that was added to avoid the xtime lag w/ hrtimers. ] Signed-off-by: John Stultz Cc: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Linus Torvalds commit 2c6b47de17c75d553de3e2fb426d8298d2074585 Author: john stultz Date: Tue Jul 24 17:47:43 2007 -0700 Cleanup non-arch xtime uses, use get_seconds() or current_kernel_time(). This avoids use of the kernel-internal "xtime" variable directly outside of the actual time-related functions. Instead, use the helper functions that we already have available to us. This doesn't actually change any behaviour, but this will allow us to fix the fact that "xtime" isn't updated very often with CONFIG_NO_HZ (because much of the realtime information is maintained as separate offsets to 'xtime'), which has caused interfaces that use xtime directly to get a time that is out of sync with the real-time clock by up to a third of a second or so. Signed-off-by: John Stultz Cc: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Linus Torvalds commit 910949a66839ff5f59fede5b7cb68ecf1453e22c Author: Venkat Yekkirala Date: Tue Jul 24 09:53:23 2007 -0500 SELinux: null-terminate context string in selinux_xfrm_sec_ctx_alloc xfrm_audit_log() expects the context string to be null-terminated which currently doesn't happen with user-supplied contexts. Signed-off-by: Venkat Yekkirala Acked-by: Stephen Smalley Signed-off-by: James Morris commit d37c85571904a622cbabc7a2e04b8c919de75ac0 Author: Aurelien Jarno Date: Wed Jul 25 10:19:54 2007 +0200 KVM: disable writeback for 0x0f 0x01 instructions. 0x0f 0x01 instructions (ie lgdt, lidt, smsw, lmsw and invlpg) does not use writeback. This patch set no_wb=1 when emulating those instructions. This fixes a regression booting the FreeBSD kernel on AMD. Signed-off-by: Aurelien Jarno Signed-off-by: Avi Kivity commit 4c981b43d7ec18818754bf85b829865abd0ce340 Author: Avi Kivity Date: Wed Jul 25 09:22:12 2007 +0300 KVM: Fix removal of nx capability from guest cpuid Testing the wrong bit caused kvm not to disable nx on the guest when it is disabled on the host (an mmu optimization relies on the nx bits being the same in the guest and host). This allows Windows to boot when nx is disabled on te host (e.g. when host pae is disabled). Signed-off-by: Avi Kivity commit 7cfa4b0a43286b1da3afa4f5f99d52e65a8f30fc Author: Avi Kivity Date: Mon Jul 23 18:33:14 2007 +0300 Revert "KVM: Avoid useless memory write when possible" This reverts commit a3c870bdce4d34332ebdba7eb9969592c4c6b243. While it does save useless updates, it (probably) defeats the fork detector, causing a massive performance loss. Signed-off-by: Avi Kivity commit 5e58cfe41c7e5902c32bb7f62993d43fb4c48ccf Author: Rusty Russell Date: Mon Jul 23 17:08:21 2007 +1000 KVM: Fix unlikely kvm_create vs decache_vcpus_on_cpu race We add the kvm to the vm_list before initializing the vcpu mutexes, which can be mutex_trylock()'ed by decache_vcpus_on_cpu(). Signed-off-by: Rusty Russell Signed-off-by: Avi Kivity commit b0fcd903e6f3f47189baddf3fe085bdf78c9644c Author: Avi Kivity Date: Sun Jul 22 18:48:54 2007 +0300 KVM: Correctly handle writes crossing a page boundary Writes that are contiguous in virtual memory may not be contiguous in physical memory; so split writes that straddle a page boundary. Thanks to Aurelien for reporting the bug, patient testing, and a fix to this very patch. Signed-off-by: Aurelien Jarno Signed-off-by: Avi Kivity commit 323ef30af3a0da47cc761b04b262d98d0fe79126 Merge: cb3e0c1... 1ba90e3... Author: Len Brown Date: Wed Jul 25 01:36:53 2007 -0400 Pull auto-load-modules into release branch commit cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4 Merge: 1e1f3f2... 50ad147... Author: Len Brown Date: Wed Jul 25 01:36:31 2007 -0400 Pull d-states into release branch Conflicts: drivers/acpi/sleep/main.c Signed-off-by: Len Brown commit 1e1f3f24cdbc53e67acd7b2e37e6cf0cb11bd13c Merge: c30c620... e8b2fd0... Author: Len Brown Date: Wed Jul 25 01:35:25 2007 -0400 Pull kconfig into release branch commit e8b2fd01228f690c3e0cb3f14facfa8d93d4adae Author: Len Brown Date: Tue Jul 24 22:26:33 2007 -0400 ACPI: Kconfig: remove CONFIG_ACPI_SLEEP from source As it was a synonym for (CONFIG_ACPI && CONFIG_X86), the ifdefs for it were more clutter than they were worth. For ia64, just add a few stubs in anticipation of future S3 or S4 support. Signed-off-by: Len Brown commit c30c620ee1cc351bcc149c4280e1166998df0064 Author: Len Brown Date: Wed Jul 25 00:57:46 2007 -0400 ACPI: quiet ACPI Exceptions due to no _PTC or _TSS ACPI Exception (processor_throttling-0084): AE_NOT_FOUND, Evaluating _PTC [20070126] ACPI Exception (processor_throttling-0147): AE_NOT_FOUND, Evaluating _TSS [20070126] These methods are optional, so Linux should not alarm users when they are not found. http://bugzilla.kernel.org/show_bug.cgi?id=8802 Signed-off-by: Len Brown Acked-by: Luming Yu commit 0de085bb474f64e4fdb2f1ff3268590792648c7b Merge: 3836df6... e587121... Author: Linus Torvalds Date: Tue Jul 24 20:26:25 2007 -0700 Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc * 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc: (25 commits) [POWERPC] 85xx: Added needed MPC85xx PCI device IDs [POWERPC] Add Freescale PCI VENDOR ID and 8641 device IDs [POWERPC] 85xxCDS: MPC8548 DTS cleanup. [POWERPC] 85xxCDS: Misc 8548 PCI Corrections. [POWERPC] 85xxCDS: Delay 8259 cascade hookup. [POWERPC] 85xxCDS: Make sure restart resets the PCI bus. [POWERPC] 85xxCDS: Allow 8259 cascade to share an MPIC interrupt line. [POWERPC] FSL: Add support for PCI-X controllers [POWERPC] Make sure virtual P2P bridge registers are setup on PCIe PHB [POWERPC] Provide ability to setup P2P bridge registers from struct resource [POWERPC] Add basic PCI/PCI Express support for 8544DS board [POWERPC] Make endianess of cfg_addr for indirect pci ops runtime [POWERPC] Removed setup_indirect_pci_nomap [POWERPC] 85xx: Add quirk to ignore bogus FPGA on CDS [POWERPC] 85xx: Added 8568 PCIe support [POWERPC] Fixup resources on pci_bus for PCIe PHB when no device is connected [POWERPC] Add basic PCI node for mpc8568mds board [POWERPC] Use Freescale pci/pcie common code for 85xx boards [POWERPC] Update PCI nodes in the 83xx/85xx boards device tree [POWERPC] Add 8548 CDS PCI express controller node and PCI-X device node ... commit 3836df6b520a2f93033bf53200b12a2cb5137395 Author: Jens Axboe Date: Tue Jul 24 10:17:50 2007 +0200 ocfs2: bad kunmap_atomic() kunmap_atomic() takes the virtual address, not the mapped page as argument. Signed-off-by: Jens Axboe Cc: Mark Fasheh Signed-off-by: Linus Torvalds commit 2f66b529d9d131971e2509aee5478c61ca258ece Merge: 1e66239... cdcc9eb... Author: Linus Torvalds Date: Tue Jul 24 16:00:26 2007 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix marge error due to conflict in arch/mips/kernel/head.S [MIPS] ARC: Remove unused arch/mips/arc/console.c [MIPS] SNI: sniprom [MIPS] Jazz: remove unneeded reset functions [MIPS] Whitespace cleanup. [MIPS] Make resources for ds1742 "static __initdata" [MIPS] Replace __attribute_used__ with __used [MIPS] Jazz: Remove unused arch/mips/jazz/io.c [MIPS] Mark prom_free_prom_memory as __init_refok [MIPS] MIPSsim: Fix cflags commit 1e66239e23dd0422baf891bf6af0b65ac632b676 Merge: 7742c0b... 64a8170... Author: Linus Torvalds Date: Tue Jul 24 15:58:51 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: pata_hpt37x: Fix 2.6.22 clock PLL regression pata_ali: Correct HP detect ata_piix: fix suspend/resume for some TOSHIBA laptops PCI: export __pci_reenable_device() commit 7742c0bc8594cf1bcbad1f3e876acae5b644dc7b Merge: 9e72ea8... 88accb4... Author: Linus Torvalds Date: Tue Jul 24 15:58:15 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (26 commits) netdev: i82596 Ethernet needs forcedeth: mcp73 device addition forcedeth: new device ids in pci_ids.h atl1: make atl1_init_ring_ptrs static eHEA: net_poll support drivers/net/acenic.c: fix check-after-use defxx: Use __maybe_unused rather than a local hack Fix error checking in Vitesse IRQ config ps3: reduce allocation size of rx skb buffers atl1: use kernel provided ethernet length constants atl1: fix typo in dma_req_block atl1: change cmb write threshold atl1: fix typo in DMA engine setup atl1: change tpd_avail function name ps3: fix rare issue that reenabling rx DMA fails ps3: removed calling netif_poll_enable() in open() ps3: use ethX as the name of irq ps3: use net_device_stats of net_device structure ps3: removed conditional ethtool support ps3: removed defines no longer used ... commit 9e72ea82e62dd714bc11ed29bfe09a7fc8ac24fe Merge: 03746ba... 1966287... Author: Linus Torvalds Date: Tue Jul 24 15:57:43 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Mark most of initial bootup asm as .text.init.ref_ok [SPARC32]: Fix bug in sparc optimized memset. [SPARC64]: Update defconfig. [SPARC]: Add missing NOTES section. [SPARC32]: missing exports [SPARC32]: Deal with rtc/sun_mostek_rtc conflict. commit 03746bad30890284cc14fc39184c5b60b9cb8bc9 Merge: 719be62... 3f5f434... Author: Linus Torvalds Date: Tue Jul 24 15:57:12 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [8021Q]: vlan_ioctl_handler: fix return value [GENETLINK]: Correctly report errors while registering a multicast group [GENETLINK]: Fix adjustment of number of multicast groups [GENETLINK]: Fix race in genl_unregister_mc_groups() [NETFILTER]: Clean up duplicate includes in net/netfilter/ [NETFILTER]: Clean up duplicate includes in net/bridge/ [NETFILTER]: Fix logging regression [TCPv6] MD5SIG: Ensure to reset allocation count to avoid panic. commit 3f5f4346b6d3c8bc33780a941da2473c4be2c989 Author: Andrew Morton Date: Tue Jul 24 15:37:11 2007 -0700 [8021Q]: vlan_ioctl_handler: fix return value net/8021q/vlan.c: In function 'vlan_ioctl_handler': net/8021q/vlan.c:700: warning: 'err' may be used uninitialized in this function The warning is incorrect, but from my reading this ioctl will return -EINVAL on success. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 79d310d01ec2a55e0ac1810aee56886ebee58c53 Author: Thomas Graf Date: Tue Jul 24 15:34:53 2007 -0700 [GENETLINK]: Correctly report errors while registering a multicast group Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 2c04ddb707b4d50c314186249f466b6720ee4289 Author: Thomas Graf Date: Tue Jul 24 15:33:51 2007 -0700 [GENETLINK]: Fix adjustment of number of multicast groups The current calculation of the maximum number of genetlink multicast groups seems odd, fix it. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 79dc4386aec655ad829f320ab90888bacbc7037b Author: Thomas Graf Date: Tue Jul 24 15:32:46 2007 -0700 [GENETLINK]: Fix race in genl_unregister_mc_groups() family->mcast_groups is protected by genl_lock so it must be held while accessing the list in genl_unregister_mc_groups(). Requires adding a non-locking variant of genl_unregister_mc_group(). Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 85ccc365e91de9f0053c94de4cbc6ce97f8170e7 Author: Jesper Juhl Date: Tue Jul 24 15:31:05 2007 -0700 [NETFILTER]: Clean up duplicate includes in net/netfilter/ This patch cleans up duplicate includes in net/netfilter/ Signed-off-by: Jesper Juhl Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 62c7931873f203ce4ad8f62942b43a1126b37378 Author: Jesper Juhl Date: Tue Jul 24 15:30:30 2007 -0700 [NETFILTER]: Clean up duplicate includes in net/bridge/ This patch cleans up duplicate includes in net/bridge/ Signed-off-by: Jesper Juhl Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7e2acc7e2711d51705373ac201333c9a0ebd3950 Author: Patrick McHardy Date: Tue Jul 24 15:29:55 2007 -0700 [NETFILTER]: Fix logging regression Loading one of the LOG target fails if a different target has already registered itself as backend for the same family. This can affect the ipt_LOG and ipt_ULOG modules when both are loaded. Reported and tested by: Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ca983cefd950ec929582dd95ba6e46d12c2c6959 Author: YOSHIFUJI Hideaki Date: Tue Jul 24 15:27:30 2007 -0700 [TCPv6] MD5SIG: Ensure to reset allocation count to avoid panic. After clearing all passwords for IPv6 peers, we need to set allocation count to zero as well as we free the storage. Otherwise, we panic when a user trys to (re)add a password. Discovered and fixed by MIYAJIMA Mitsuharu . Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 1966287dfa07b2aa125009587a5d2b8375775c53 Author: David S. Miller Date: Tue Jul 24 15:17:33 2007 -0700 [SPARC64]: Mark most of initial bootup asm as .text.init.ref_ok We can't mark the whole thing init because there are dependencies in bootloaders that assume that _start, or whatever the image entry value, is 2 instructions before the "HdrS" signature. In fact, TILO assumes this entry is always at 0x4000, yikes! Also, right after the bootloader info area there are OBP strings and values that get used later in the boot process, and those are not all provably .init yet. Signed-off-by: David S. Miller commit 64a8170975947978ea4094dd6c4b1f41119d6ae6 Author: Alan Cox Date: Tue Jul 24 15:17:48 2007 +0100 pata_hpt37x: Fix 2.6.22 clock PLL regression Just one version of Linux ago The PLL code broke - oh no! But set the right mode And fix up the code Makes the PLL timing sync go [whatever happened to the sailor from Nantucket, hero of many limericks? -jg] Closes-bug: #8791 Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 5c8d52015c09b42632a73896f8a80cff64c5c1d1 Author: Alan Cox Date: Fri Jul 20 15:34:49 2007 +0100 pata_ali: Correct HP detect Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit b8b275efc28e34f9b1d1e382d0b02dfa381b2a79 Author: Tejun Heo Date: Tue Jul 10 15:55:43 2007 +0900 ata_piix: fix suspend/resume for some TOSHIBA laptops ACPI implementations in several TOSHIBA laptops are weird and burn cpu cycles for tens of seconds while trying to suspend if the PCI device for the ATA controller is disabled when the ACPI suspend is called. This patch uses DMI to match those machines and bypass device disable on those machines during suspend. As the device needs to be put into enabled state on resume without affecting PCI enable count, matching resume callback uses __pci_reenable_device(). This bug is reported in bugzilla bug 7780. http://bugzilla.kernel.org/show_bug.cgi?id=7780 Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f0a664bbd1839fbe9f57564983f39bfc6c6f931d Author: Tejun Heo Date: Tue Jul 10 15:36:05 2007 +0900 PCI: export __pci_reenable_device() Some odd ACPI implementations choke if certain controller is disabled when ACPI suspend is invoked but we still need to make sure the PCI device is enabled during resume. Simply using pci_enable_device() unbalances device enable count. Export __pci_reenable_device(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f61698e6489f229f9fcfe29e68f228389a772993 Author: Alexander Shmelev Date: Tue Jul 24 13:41:44 2007 -0700 [SPARC32]: Fix bug in sparc optimized memset. Sparc optimized memset (arch/sparc/lib/memset.S) does not fill last byte of the memory area, if area size is less than 8 bytes and start address is not word (4-bytes) aligned. Here is code chunk where bug located: /* %o0 - memory address, %o1 - size, %g3 - value */ 8: add %o0, 1, %o0 subcc %o1, 1, %o1 bne,a 8b stb %g3, [%o0 - 1] This code should write byte every loop iteration, but last time delay instruction stb is not executed because branch instruction sets "annul" bit. Patch replaces bne,a by bne instruction. Error can be reproduced by simple kernel module: -------------------- #include #include #include #include #include static void do_memset(void **p, int size) { memset(p, 0x00, size); } static int __init memset_test_init(void) { char fooc[8]; int *fooi; memset(fooc, 0xba, sizeof(fooc)); do_memset((void**)(fooc + 3), 1); fooi = (int*) fooc; printk("%08X %08X\n", fooi[0], fooi[1]); return -1; } static void __exit memset_test_cleanup(void) { return; } module_init(memset_test_init); module_exit(memset_test_cleanup); MODULE_LICENSE("GPL"); EXPORT_NO_SYMBOLS; -------------------- Signed-off-by: Alexander Shmelev Signed-off-by: David S. Miller commit 88accb498fc92998d7b30b7515ba39f3e6070978 Author: Geert Uytterhoeven Date: Fri Jul 20 18:40:45 2007 +0200 netdev: i82596 Ethernet needs netdev: i82596 Ethernet needs on m68k drivers/net/82596.c: In function 'init_rx_bufs': drivers/net/82596.c:552: error: implicit declaration of function 'cache_clear' drivers/net/82596.c: In function 'i596_start_xmit': drivers/net/82596.c:1104: error: implicit declaration of function 'cache_push' The driver still compiles on ia32 (CONFIG_APRICOT=y) Signed-off-by: Geert Uytterhoeven Signed-off-by: Jeff Garzik commit 1398661b0d5f8570704fc267c9323cf1dde61e0a Author: Ayaz Abdulla Date: Sun Jul 22 20:43:26 2007 -0400 forcedeth: mcp73 device addition This patch contains new device settings for MCP73 chipset. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 6a0e09af44ef0ee7bf68bf89c8fd65eed0092d7a Author: Ayaz Abdulla Date: Sun Jul 22 20:43:15 2007 -0400 forcedeth: new device ids in pci_ids.h This patch contains new device ids for MCP73 chipset. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 3d2557f681162ff6a483ae689072f9811e6a6d8d Author: Chris Snook Date: Mon Jul 23 16:38:39 2007 -0400 atl1: make atl1_init_ring_ptrs static Sparse (correctly) thinks this function should be static. Make it so. Signed-off-by: Chris Snook Signed-off-by: Jeff Garzik commit 8d22c9711aa5e704fc5f89027f5cf64838767c98 Author: Jan-Bernd Themann Date: Mon Jul 23 16:05:03 2007 +0200 eHEA: net_poll support net_poll support for eHEA added Signed-off-by: Jan-Bernd Themann Signed-off-by: Jeff Garzik commit dde9f93c205a791c5647c14d43003c578ebf6f2d Author: Adrian Bunk Date: Mon Jul 23 10:02:32 2007 +0200 drivers/net/acenic.c: fix check-after-use The Coverity checker noted that we've already dereferenced "dev" when we check whether it's NULL. Since it's impossible that "dev" is NULL at this place this patch removes the NULL check. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit fcdff13905934874016f1899b15a9221c055d6ea Author: Maciej W. Rozycki Date: Fri Jul 20 13:14:07 2007 +0100 defxx: Use __maybe_unused rather than a local hack This is a change to remove a local hack in favour to __maybe_unused that has been recently added. Signed-off-by: Maciej W. Rozycki Signed-off-by: Jeff Garzik commit 52cb1c2b70d9d2a81e842b90456b7a8158541ffd Author: Andy Fleming Date: Wed Jul 18 01:06:28 2007 -0500 Fix error checking in Vitesse IRQ config phy_read() returns a negative number if there's an error, but the error-checking code in the Vitesse driver's config_intr function triggers if phy_read() returns non-zero. Correct that. Signed-off-by: Andy Fleming Signed-off-by: Jeff Garzik commit fe6d3a4049ec9d859d75ddfcc6865a0f58178924 Author: Masakazu Mokuno Date: Fri Jul 20 17:39:25 2007 +0900 ps3: reduce allocation size of rx skb buffers Reduced allocation size for rx skb buffers, from 2308 bytes to 1356 per buffer. Signed-off-by: Masakazu Mokuno Signed-off-by: Jeff Garzik commit a3093d9b07101f2461f88dfd0a20aaaa8853e976 Author: Jay Cliburn Date: Thu Jul 19 18:45:14 2007 -0500 atl1: use kernel provided ethernet length constants Use constants already provided by the kernel for ethernet related lengths. Signed-off-by: Jay Cliburn Signed-off-by: Jeff Garzik commit ef76e3e2505db01f7d4b537854f4a177220c26c8 Author: Jay Cliburn Date: Thu Jul 19 18:45:13 2007 -0500 atl1: fix typo in dma_req_block s/dam/dma Signed-off-by: Jay Cliburn Signed-off-by: Jeff Garzik commit 91a500ac5654766e4d9a6502dfcceb7e0a235f98 Author: Jay Cliburn Date: Thu Jul 19 18:45:12 2007 -0500 atl1: change cmb write threshold Change the threshold number of descriptors used to trigger CMB writes. The vendor reports that under certain conditions this will reduce the number of unnecessary tx interrupts and improve rx performance. This change is lifted directly from vendor version 1.2.40.2 of the L1 driver. Signed-off-by: Jay Cliburn Signed-off-by: Jeff Garzik commit 3f516c00d416bd39aab6cfb348b68919e295fe23 Author: Jay Cliburn Date: Thu Jul 19 18:45:11 2007 -0500 atl1: fix typo in DMA engine setup The DMA engine setup contains a typo that can result in an incorrect dmaw_block setting. Signed-off-by: Jay Cliburn Signed-off-by: Jeff Garzik commit e6a7ff4a617ad3f6a59e2576d430b9292299d067 Author: Jay Cliburn Date: Thu Jul 19 18:45:10 2007 -0500 atl1: change tpd_avail function name Change tpd_avail() to atl1_tpd_avail(). Signed-off-by: Jay Cliburn Signed-off-by: Jeff Garzik commit 583aae1094d28aa1d58360318388c11d2ae7ed9c Author: Masakazu Mokuno Date: Fri Jul 20 17:35:54 2007 +0900 ps3: fix rare issue that reenabling rx DMA fails Fixed rare issue that 'lv1_net_start_rx_dma failed, status=-9" was shown in dmesg. This meant restarting rx DMA had been rejected by the hypervisor. This issue would caused if the guest os requested starting DMA when the hypervisor thought the DMA was in progress. The state machine for DMA status of the hypervisor would be updated by processing interrupt in the hypervisor. Thus we should wait for the interrupt delivery before restarting DMA. Signed-off-by: Masakazu Mokuno Signed-off-by: Jeff Garzik commit 39a3d2d19cc8dc9d7ec3a1fefe95d7de0c6dc317 Author: Masakazu Mokuno Date: Fri Jul 20 17:34:07 2007 +0900 ps3: removed calling netif_poll_enable() in open() Removed use of netif_poll_enable() in open function. Signed-off-by: Masakazu Mokuno Signed-off-by: Jeff Garzik commit f0861f82d9976fab8624f056fa6880e6f420e89f Author: Masakazu Mokuno Date: Fri Jul 20 17:33:02 2007 +0900 ps3: use ethX as the name of irq Use net_device name for registration of irq as many network drivers do. Signed-off-by: Masakazu Mokuno Signed-off-by: Jeff Garzik commit 92548d601c45d76db337795d71c34846631dc7d6 Author: Masakazu Mokuno Date: Fri Jul 20 17:31:07 2007 +0900 ps3: use net_device_stats of net_device structure Removed the statistics information from private structre. Instead, use net_device_stats in net_device structure. Signed-off-by: Masakazu Mokuno Signed-off-by: Jeff Garzik commit 78f710dc186f34fb14d8b22a33749a56013e7b85 Author: Masakazu Mokuno Date: Fri Jul 20 17:28:59 2007 +0900 ps3: removed conditional ethtool support Removed conditional ethtool support. Always enabled. Signed-off-by: Masakazu Mokuno Signed-off-by: Jeff Garzik commit b3bd6fe96da32e4e818b51826f04349cee9b15ba Author: Masakazu Mokuno Date: Fri Jul 20 17:27:12 2007 +0900 ps3: removed defines no longer used Removed defines no longer used. Signed-off-by: Masakazu Mokuno Signed-off-by: Jeff Garzik commit 48544cc267da96a85e4d38aa1999a011229948d6 Author: Masakazu Mokuno Date: Fri Jul 20 17:24:56 2007 +0900 ps3: tx descriptor handling cleanup gelic: TX descriptor handling cleanup - Emitted return value of NETDEV_TX_LOCKED when DMA map or kick failure. Now it would free the skb, update drop packet statistics and return OK. Requested from Jeff Garzik. - Enable tx queue if number of free descriptors are more than 2 - Fixed descriptor leak if dma map for second descriptor failed - Stopped calling xmit handler from interrupt handler in order to recheck tx queue. Instead, call appropriate helper functions. Signed-off-by: Masakazu Mokuno Signed-off-by: Jeff Garzik commit ea6992aa1f6ed514fe450f46befa56d8d2b6a7fb Author: Masakazu Mokuno Date: Fri Jul 20 17:22:51 2007 +0900 ps3: some minor cleanups - Removed the embarrassing definition which was used in only one place. - Fixed wrong initialization of dmac_cmd_status. Signed-off-by: Masakazu Mokuno Signed-off-by: Jeff Garzik commit 9f6c9a8c50bc84ec748fec779ead321ee2b2debc Author: Masakazu Mokuno Date: Fri Jul 20 17:20:54 2007 +0900 ps3: fix wrong calculation of rx descriptor address Fixed the bug that calculation of the address of rx descriptor was wrong. Signed-off-by: Masakazu Mokuno Signed-off-by: Jeff Garzik commit ceded32f097ba753fb4d339ad5c74f265ea8a03d Author: dhananjay@netxen.com Date: Thu Jul 19 14:41:09 2007 +0530 netxen: Load firmware during probe, dma watchdog fix. The firmware should be loaded after resetting hardware during PCI probe, besides module unload. This fixes issue with 2nd port of multiport adapter on powerpc blades. This patch also fixes a bug that PCI resources are not freed if dma watchdog shutdown failed. The dma watchdog poll messages during module unload are also suppressed. Signed-off-by: Dhananjay Phadke Signed-off-by: Milan Bag Signed-off-by: Wen Xiong Signed-off-by: Jeff Garzik commit 890de95e8fe617a978e0fcad3c5dd2be99db4532 Author: Li Yang Date: Thu Jul 19 11:48:29 2007 +0800 ucc_geth: add support to netif message level Adds netif message level control to the ucc_geth driver. The level can be set by module parameter and ethtool. Signed-off-by: Li Yang Signed-off-by: Jeff Garzik commit ac421852b3a01e7440ac7bb2e635b60a99d0a391 Author: Li Yang Date: Thu Jul 19 11:47:47 2007 +0800 ucc_geth: add ethtool support The patch enables statistics in ucc_geth and adds ethtool support to ucc_geth driver. Signed-off-by: Li Yang Signed-off-by: Jeff Garzik commit 1b64e7abe742c0d32cdb1545d9a67f80cc6e81f3 Author: David S. Miller Date: Sun Jul 22 19:25:03 2007 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 0c0d345e2516dd6285834e6b0d54825e40823d5a Author: David S. Miller Date: Sun Jul 22 19:19:05 2007 -0700 [SPARC]: Add missing NOTES section. This fixes boot failures when the build-id LD option is actually used, because without it we end up with multiple PT_LOAD sections which the SILO boot loader cannot handle. Signed-off-by: David S. Miller commit 86ac92ee694e3cd5991c076bab2f4c63526f38bc Author: Al Viro Date: Sun Jul 22 00:38:24 2007 -0700 [SPARC32]: missing exports Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 2240598c24683df1e1a6cdd1f461efd85547903c Author: Al Viro Date: Sun Jul 22 00:37:48 2007 -0700 [SPARC32]: Deal with rtc/sun_mostek_rtc conflict. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 719be62903a6e6419789557cb3ed0e840d3e4ca9 Author: Alan Cox Date: Mon Jul 23 14:51:05 2007 +0100 aacraid: fix security hole On the SCSI layer ioctl path there is no implicit permissions check for ioctls (and indeed other drivers implement unprivileged ioctls). aacraid however allows all sorts of very admin only things to be done so should check. Signed-off-by: Alan Cox Acked-by: Mark Salyzyn Signed-off-by: Linus Torvalds commit 6e8a43c8432649686921b57255db8172edcebf6f Merge: b2e961e... 0ec8abd... Author: Linus Torvalds Date: Tue Jul 24 12:32:12 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: SELinux: fix memory leak in security_netlbl_cache_add() commit b2e961eb2e7a54ffaae82f8e0198b26b54ade98e Merge: b8c1c5d... 71f65e6... Author: Linus Torvalds Date: Tue Jul 24 12:26:44 2007 -0700 Merge branch 'request-queue-t' of git://git.kernel.dk/linux-2.6-block * 'request-queue-t' of git://git.kernel.dk/linux-2.6-block: [BLOCK] Add request_queue_t and mark it deprecated [BLOCK] Get rid of request_queue_t typedef commit b8c1c5da1520977cb55a358f20fc09567d40cad9 Author: Andrew Morton Date: Tue Jul 24 12:02:40 2007 -0700 slab: correctly handle __GFP_ZERO Use the correct local variable when calling into the page allocator. Local `flags' can have __GFP_ZERO set, which causes us to pass __GFP_ZERO into the page allocator, possibly from illegal contexts. The page allocator will later do prep_zero_page()->kmap_atomic(..., KM_USER0) from irq contexts and will then go BUG. Cc: Mike Galbraith Acked-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01e457cfcd5b6b6f18d0bb8cec0c5d43df56557e Author: Arnd Bergmann Date: Mon Jul 23 18:44:00 2007 -0700 loop.h build fix include/linux/loop.h:66: error: expected specifier-qualifier-list before 'request_queue_t' Cc: Sebastian Siewior Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ab3ee7b1cd5c91eb2272764f9d7d1fe4749681e Author: Ken Chen Date: Mon Jul 23 18:44:00 2007 -0700 fix hugetlb page allocation leak dequeue_huge_page() has a serious memory leak upon hugetlb page allocation. The for loop continues on allocating hugetlb pages out of all allowable zone, where this function is supposedly only dequeue one and only one pages. Fixed it by breaking out of the for loop once a hugetlb page is found. Signed-off-by: Ken Chen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be1ff386e768ee4fc19bb7da48cee4fc4cb4e75b Author: David Brownell Date: Mon Jul 23 18:43:57 2007 -0700 minor gpio doc update Fix doc bug noted by Uwe Kleine-König: gpio_set_direction() is long gone, replaced by gpio_direction_input() and gpio_direction_output(). Signed-off-by: David Brownell Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6570c45995a6339597462434a81f358a38941ac4 Author: Rusty Russell Date: Mon Jul 23 18:43:56 2007 -0700 link lguest example launcher non-static S.Caglar Onur points out that many distributions don't ship a static zlib. Unfortunately the launcher currently maps virtual device memory where shared libraries want to go. The solution is to pre-scan the args to figure out how much memory we have, then allocate devices above that, rather than down from the top possible address. This also turns out to be simpler. Signed-off-by: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ddb23c78aeef40f549c5ad22a3e8dfa1f8297e0 Author: Stephen Rothwell Date: Mon Jul 23 18:43:55 2007 -0700 fault_inject: silence a warning lib/fault-inject.c:168: warning: 'debugfs_create_ul_MAX_STACK_TRACE_DEPTH' defined but not used Signed-off-by: Stephen Rothwell Cc: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d316ee5787153765980ca0f55ee864ec883979ab Author: Al Viro Date: Mon Jul 23 18:43:54 2007 -0700 Fix failure exits in asus-laptop Fallout from f8a7c6fe14f556ca8eeddce258cb21392d0c3a2f. However, looking at it shows that checks done in ASUS_LED_UNREGISTER() can't trigger at all (we never get to asus_led_exit() if registration fails) and if that registration fails, we actually leak stuff. IOW, it's worse than just replacing class_dev with dev in there - the tests themselves had been papering over the lousy cleanup logics. Signed-off-by: Al Viro Michal Piotrowski Cc: Corentin Chary Cc: Karol Kozimor Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c51aea80a9fbb423b49d432e89e515257bb2b983 Author: Adrian Bunk Date: Mon Jul 23 18:43:54 2007 -0700 include/asm-xtensa/io.h must #include CC kernel/time/clocksource.o In file included from /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/include/linux/clocksource.h:18, from /home/bunk/linux/kernel-2.6/linux-2.6.22-rc6-mm1/kernel/time/clocksource.c:27: include2/asm/io.h: In function 'virt_to_phys': include2/asm/io.h:46: error: implicit declaration of function '__pa' include2/asm/io.h: In function 'phys_to_virt': include2/asm/io.h:51: error: implicit declaration of function '__va' include2/asm/io.h:51: warning: return makes pointer from integer without a cast make[3]: *** [kernel/time/clocksource.o] Error 1 Signed-off-by: Adrian Bunk Cc: Christian Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2c863bd2daa2b2e36d66db58bc1e18f37151829 Author: Christoph Hellwig Date: Mon Jul 23 18:43:53 2007 -0700 spusched: fix mismerge in spufs.h spufs.h now has two enums for the sched_flags leading to identical values for SPU_SCHED_WAS_ACTIVE and SPU_SCHED_NOTIFY_ACTIVE. Merge them into a single enum as they were in the IBM development tree. Signed-off-by: Christoph Hellwig Acked-by: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb276805803b8e0616159d80a441ab26a931ada4 Author: J. Bruce Fields Date: Mon Jul 23 18:43:52 2007 -0700 nfsd: fix possible oops on re-insertion of rpcsec_gss modules The handling of the re-registration case is wrong here; the "test" that was returned from auth_domain_lookup will not be used again, so that reference should be put. And auth_domain_lookup never did anything with "new" in this case, so we should just clean it up ourself. Thanks to Akinobu Mita for bug report, analysis, and testing. Cc: Akinobu Mita Signed-off-by: "J. Bruce Fields" Cc: Neil Brown Cc: Trond Myklebust Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1709e477f203c0538f94c4d1ac981d08325eebf Author: Ralf Baechle Date: Mon Jul 23 18:43:50 2007 -0700 Fix Au1100 fb dependencies, add helptext Signed-off-by: Ralf Baechle Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97a1fcbb20fcbb0177567fd2dbcc6ed1bcc450ce Author: Jeff Dike Date: Mon Jul 23 18:43:48 2007 -0700 uml: more __init annotations 2.6.23-rc1 turned up another batch of references from non-__init code to __init code. In most cases, these were missing __init annotations. In one case (os_drop_memory), the annotation was present but wrong. init_maps is __init, but for some reason was being very careful about the mechanism by which it allocated memory, checking whether it was OK to use kmalloc (at this point in the boot, it definitely isn't) and using either alloc_bootmem_low_pages or kmalloc/vmalloc. So, the kmalloc/vmalloc code is removed. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da3e30e78ed9652322dccb49fa149e7b4e985f74 Author: Jeff Dike Date: Mon Jul 23 18:43:47 2007 -0700 uml: fix aio compilation bug Restructure do_aio thanks to commments from Ulrich and Al. Uli started this by seeing that UML's initialization of a struct iocb initialized fields that it shouldn't. Al followed up by adding the following cleanups: eliminating a variable by just using an anonymous structure in its place. hoisting a duplicated line out of the switch. simplifying the error checking at the end. I added a severity to the printk. Signed-off-by: Jeff Dike Cc: Al Viro Cc: Ulrich Drepper Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a65f493c335abc3822291b52f3565776ce39a1b Author: Jeff Dike Date: Mon Jul 23 18:43:46 2007 -0700 uml: fix string exporting on UML/i386 In 2.6.23-rc1, i386 fiddled its string support such that UML started getting undefined references from modules. The UML asm/string.h was including the i386 string.h, which defined __HAVE_ARCH_STR*, but the corresponding implementations weren't being pulled in. This is fixed by adding arch/i386/lib/string.h to the list of host architecture files to be pulled in to UML. A complication is that the libc exports file assumed that the generic strlen and strstr weren't in use (i.e. __HAVE_ARCH_STR is defined), then they aren't exported. This is untrue for strlen, which is exported in either case, so this logic is not needed. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d786d4a2773f06a791e8c3730d049077fb81df6 Author: Ulrich Drepper Date: Mon Jul 23 18:43:46 2007 -0700 fallocate syscall interface deficiency The fallocate syscall returns ENOSYS in case the filesystem does not support the operation and expects the userlevel code to fill in. This is good in concept. The problem is that the libc code for old kernels should be able to distinguish the case where the syscall is not at all available vs not functioning for a specific mount point. As is this is not possible and we always have to invoke the syscall even if the kernel doesn't support it. I suggest the following patch. Using EOPNOTSUPP is IMO the right thing to do. Cc: Amit Arora Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f640efb3170dbcf99a37a3cc99060647b95428c Author: Josh Boyer Date: Mon Jul 23 18:43:44 2007 -0700 Use resource_size_t for serial port IO addresses At present, various parts of the serial code use unsigned long to define resource addresses. This is a problem, because some 32-bit platforms have physical addresses larger than 32-bits, and have mmio serial uarts located above the 4GB point. This patch changes the type of mapbase in both struct uart_port and struct plat_serial8250_port to resource_size_t, which can be configured to be 64 bits on such platforms. The mapbase in serial_struct can't safely be changed, because that structure is user visible. Signed-off-by: David Gibson Signed-off-by: Josh Boyer Cc: Russell King Cc: Paul Mackerras Cc: Jason Wessel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e58712111fe6eb7573fd6dd12d80de3bec13f277 Author: Kumar Gala Date: Mon Jul 23 15:47:26 2007 -0500 [POWERPC] 85xx: Added needed MPC85xx PCI device IDs Added the MPC85xx PCI device IDs that we need for the quirks we have. Also, fixed the MPC8567E, MPC8567 device IDs which had the wrong value. Signed-off-by: Kumar Gala commit c26c372cdbe7de1b9d0c88adce2ae21ef9249e9a Author: Jon Loeliger Date: Mon Jun 4 12:27:14 2007 -0500 [POWERPC] Add Freescale PCI VENDOR ID and 8641 device IDs Also add 8641/8641D device IDs as well. All of which already exist or have been submitted to The Linux PCI ID Repository at: http://pci-ids.ucw.cz/ CC-to: pci-ids@ucw.cz Signed-off-by: Jon Loeliger Signed-off-by: Kumar Gala commit 6af012574207bd35455f4a4ba0437cf5b9deaee5 Author: Randy Vinson Date: Tue Jul 17 16:37:12 2007 -0700 [POWERPC] 85xxCDS: MPC8548 DTS cleanup. Added the P2P bridge present on the Arcadia base board and moved the VIA Southbridge behind the bridge to reflect its actual position in the bus organization. Added the RTC that's in the VIA Southbridge and expanded the ranges array for the SOC node to allow proper address translation of the RTC registers. Signed-off-by: Randy Vinson Signed-off-by: Kumar Gala commit 8d7bc8f9d1c23fdfbf60a6554027c40d66e66d11 Author: Randy Vinson Date: Thu Jul 19 10:40:53 2007 -0700 [POWERPC] 85xxCDS: Misc 8548 PCI Corrections. Setting the host bridge @8000 as primary. Also fixing a bug in setting the USB interrupt numbers. Signed-off-by: Randy Vinson Signed-off-by: Kumar Gala commit bca03c6bddc03bba893c86fdf735ecef418159ea Author: Randy Vinson Date: Thu Jun 14 11:02:54 2007 -0700 [POWERPC] 85xxCDS: Delay 8259 cascade hookup. The interrupts of an E100 card inserted in PCI slot 4 may be on at bootup. The resulting interrupt flood interacts with the 8259 cascade handler and prevents proper boot up. There is a quirk for the E100 that will disable the E100's interrupts but to use it, the 8259 cascade hookup must be delayed until after the quirk has run. This patch delays the 8259 cascade hookup by registering a device_initcall() which runs after the PCI quirk for the E100. Signed-off-by: Randy Vinson Signed-off-by: Kumar Gala commit 50ad147aa09c829cd452fae6ca99396c0b5b0695 Author: Rafael J. Wysocki Date: Tue Jul 24 11:58:39 2007 +0200 ACPI: Remove references to ACPI_STATE_S2 from acpi_pm_enter Remove references to ACPI_STATE_S2, introduced by acpi-implement-the-set_target-callback-from-pm_ops.patch, from acpi_pm_enter(). Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit cdcc9eb5e014a58aba047193a73a0de8b61b988d Author: Atsushi Nemoto Date: Mon Jul 23 00:07:34 2007 +0900 [MIPS] Fix marge error due to conflict in arch/mips/kernel/head.S __INIT directive just before kernel_entry was ignored for most platforms. This patch fixes it and get rid of this warning: WARNING: vmlinux.o(.text+0x478): Section mismatch: reference to .init.text:start_kernel (between '_stext' and 'run_init_process') Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 18d0e9b4799ff6e43613a068eba289ba4e002535 Author: Yoichi Yuasa Date: Tue Jul 24 16:38:04 2007 +0900 [MIPS] ARC: Remove unused arch/mips/arc/console.c Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit cbe7b45c1d0fbf51eea19452ffb56aa3002fe90c Author: Thomas Bogendoerfer Date: Tue Jul 24 03:49:27 2007 +0200 [MIPS] SNI: sniprom - fix compile error due to missing #include - fix section mismatch warning Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 34ec6e76a6354b04df3d2e94cd34d27af76a07bc Author: Yoichi Yuasa Date: Sun Jul 22 13:06:49 2007 +0900 [MIPS] Jazz: remove unneeded reset functions Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit eeea55163dac3e891558253751fcbfa0815a2e1a Author: Ralf Baechle Date: Tue Jul 24 16:02:47 2007 +0100 [MIPS] Whitespace cleanup. Signed-off-by: Ralf Baechle commit 4614c32645c536e30eaf895c7e0cd42dfb145634 Author: Atsushi Nemoto Date: Tue May 1 01:49:20 2007 +0900 [MIPS] Make resources for ds1742 "static __initdata" We can make resources for platform_device_register_simple() "static __initdata". Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f5dbeaf5ed3938beea8e58ee473982a4bcadc172 Author: David Rientjes Date: Sun Jul 22 01:01:39 2007 -0700 [MIPS] Replace __attribute_used__ with __used Replaces the deprecated __attribute_used__ with __used. Also makes some style adjustments to abide by the kernel coding conventions. Cc: Ralf Baechle Signed-off-by: David Rientjes Signed-off-by: Ralf Baechle commit fce2303166a8f214a890bd405e0088febdce765f Author: Yoichi Yuasa Date: Sun Jul 22 13:03:37 2007 +0900 [MIPS] Jazz: Remove unused arch/mips/jazz/io.c Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit fb4bb133ada7423b2504bb64bb6cc95c079a7d9d Author: Atsushi Nemoto Date: Sun Jul 22 23:44:20 2007 +0900 [MIPS] Mark prom_free_prom_memory as __init_refok > WARNING: vmlinux.o(.text+0xbf20): Section mismatch: reference to > .init.text:prom_free_prom_memory (between 'free_initmem' and 'copy_from_user_page') prom_free_prom_memory() is called _before_ freeing init sections, so it is false positive. __init_refok can be used for such cases. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 9a0f3b73601a146998236237d82b55ae80337f10 Author: Yoichi Yuasa Date: Fri Jul 13 16:36:57 2007 +0900 [MIPS] MIPSsim: Fix cflags Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 71f65e6bd7651610d2d6aeb3c12aab63667ace30 Author: Jens Axboe Date: Tue Jul 24 10:29:42 2007 +0200 [BLOCK] Add request_queue_t and mark it deprecated Andrew thinks I should be nice and allow outside code to at least just compile, so add the request_queue_t typedef back and mark it deprecated. It'll warn people that this type is going away soonish. Signed-off-by: Jens Axboe commit 165125e1e480f9510a5ffcfbfee4e3ee38c05f23 Author: Jens Axboe Date: Tue Jul 24 09:28:11 2007 +0200 [BLOCK] Get rid of request_queue_t typedef Some of the code has been gradually transitioned to using the proper struct request_queue, but there's lots left. So do a full sweet of the kernel and get rid of this typedef and replace its uses with the proper type. Signed-off-by: Jens Axboe commit 7c5aa6642fa26641ebf286966a165aec71c91991 Author: Len Brown Date: Tue Jul 24 02:25:03 2007 -0400 ACPI: Kconfig: always enable CONFIG_ACPI_SLEEP on X86 The SMP dependency on HOTPLUG_CPU and SUSPEND_SMP caused more harm than good -- making ACPI sleep support vanish for configs missing those options. So simply select them on the (ACPI && SMP && X86) systems that need them. Also, remove the prompt for ACPI_SLEEP, virtually nobody (intentionally) enables ACPI without it. Signed-off-by: Len Brown commit 43532c8a46ae313c2da3baa7598a1de4d403ba83 Author: Len Brown Date: Tue Jul 24 02:16:50 2007 -0400 ACPI: Kconfig: fold /proc/acpi/sleep under CONFIG_ACPI_PROCFS /proc/acpi/sleep has had its own "default n" option, ACPI_SLEEP_PROC_SLEEP, for many months. Time to delete ACPI_SLEEP_PROC_SLEEP. Users that still need /proc/acpi/sleep can still get it along with the other deprecated /proc/acpi files by enabling CONFIG_ACPI_PROCFS. Also delete ACPI_SLEEP_PROC_FS, which was an umbrella for /proc/acpi/sleep, wakeup, alarm, because it was effectively just a synonym for ACPI_SLEEP. Signed-off-by: Len Brown commit fb804714560463534ebcb538a3b0a3c687a830ec Author: Len Brown Date: Tue Jul 24 01:50:46 2007 -0400 ACPI: Kconfig: CONFIG_ACPI_PROCFS now defaults to N delete "default y" from CONFIG_ACPI_PROCFS (effectively making the default 'N') List exactly what /proc files this option controls, and clarify that it doesn't change non-deprecated files. Signed-off-by: Len Brown commit 637e9e13a1f87d414954c854bcf8c5b16dc6face Author: Randy Vinson Date: Fri Mar 23 15:43:37 2007 -0700 [POWERPC] 85xxCDS: Make sure restart resets the PCI bus. The current 85xxCDS restart code fails to reset the PCI bus which can lead to odd behavior after the restart. This patch uses the VIA Super Southbridge to perform a PCI reset which will reset the entire system. NOTE: Since the VIA chip is behind a PCI-to-PCI bridge which can be disabled with a switch setting, it may not be possible to perform the PCI bus reset. In this case, the code defaults to the previous restart mechanism. Signed-off-by: Randy Vinson Signed-off-by: Kumar Gala commit 3620fc1da28ad32d10d7c83eab33f48ec5b1da54 Author: Randy Vinson Date: Wed Jun 6 16:26:15 2007 -0700 [POWERPC] 85xxCDS: Allow 8259 cascade to share an MPIC interrupt line. The Freescale MPC8555CDS and MPC8548CDS reference hardware has a legacy 8259 interrupt controller pair contained within a VIA VT82C686B Southbridge on the main carrier board. The processor complex plugs into the carrier card using a PCI slot which limits the available interrupts to the INTA-INTD PCI interrupts. The output of the 8259 cascade pair is routed through a gate array and connected to the PCI INTA interrupt line. The normal interrupt chaining hook (set_irq_chained_handler) does not allow sharing of the chained interrupt which prevents the use of PCI INTA by PCI devices. This patch allows the 8259 cascade pair to share their interrupt line with PCI devices. NOTE: The addition of the .end routine for the MPIC is not strictly necessary for this patch. It's there so this code will run from within the threaded interrupt context used by the Real Time patch. Signed-off-by: Randy Vinson Signed-off-by: Kumar Gala commit eb12af43333dd9d54158f35147a79628c41152db Author: Kumar Gala Date: Fri Jul 20 16:29:09 2007 -0500 [POWERPC] FSL: Add support for PCI-X controllers Some set of 85xx platforms have PCI-X controllers. The old arch/ppc code setup these controllers and we haven't moved it over to arch/powerpc. We use the PCI-X Capabilties to know if we are in PCI-X mode instead of the Global Utilities PORDEVSR. Signed-off-by: Kumar Gala commit 7391ff35b241dbcba471e05059b5c05fdc8196db Author: Kumar Gala Date: Fri Jul 20 13:49:29 2007 -0500 [POWERPC] Make sure virtual P2P bridge registers are setup on PCIe PHB For the Freescale PCIe PHBs Not all firmwares setup the virtual P2P bridge registers properly. Make sure they get setup based on what the struct pci_controller got from the device tree. Signed-off-by: Kumar Gala commit f64fddbeac737bfc8d966423f067a9af9eeec887 Author: Kumar Gala Date: Fri Jul 20 13:35:34 2007 -0500 [POWERPC] Provide ability to setup P2P bridge registers from struct resource We need the ability to set P2P bridge registers to properly setup the virtual P2P bridges that exist in PCIe controllers for some of the embedded setups. Signed-off-by: Kumar Gala commit f16dab981aa9d423bdfe096e3422acd33d905c1e Author: Roy Zang Date: Fri Jul 13 18:05:08 2007 +0800 [POWERPC] Add basic PCI/PCI Express support for 8544DS board Add basic support for the PCIe PHB and enable the ULI bridge. Signed-off-by: York Sun Signed-off-by: Roy Zang Signed-off-by: Kumar Gala commit 2e56ff206b7c6c28b847ccdbe46ad69b3263ac32 Author: Kumar Gala Date: Thu Jul 19 16:07:35 2007 -0500 [POWERPC] Make endianess of cfg_addr for indirect pci ops runtime Make it so we do a runtime check to know if we need to write cfg_addr as big or little endian. This is needed if we want to allow 86xx support to co-exist in the same kernel as other 6xx PPCs. Signed-off-by: Kumar Gala commit 1ba90e3a87c46500623afdc3898573e4a5ebb21b Author: Thomas Renninger Date: Mon Jul 23 14:44:41 2007 +0200 ACPI: autoload modules - Create __mod_acpi_device_table symbol for all ACPI drivers modpost is going to use these to create e.g. acpi:ACPI0001 in modules.alias. Signed-off-by: Thomas Renninger Signed-off-by: Len Brown commit 29b71a1ca74491fab9fed09e9d835d840d042690 Author: Thomas Renninger Date: Mon Jul 23 14:43:51 2007 +0200 ACPI: autoload modules - Create ACPI alias interface Modify modpost (file2alias.c) to add acpi*:XYZ0001: alias in modules.alias like: grep acpi /lib/modules/2.6.22-rc4-default/modules.alias alias acpi*:SNY5001:* sony_laptop alias acpi*:SNY6001:* sony_laptop for e.g. the sony_laptop module. This module matches against all ACPI devices with a HID or CID of SNY5001 or SNY6001 Export an uevent and modalias sysfs file containing the string: [MODALIAS=]acpi:PNP0C0C: additional CIDs are concatenated at the end. Signed-off-by: Thomas Renninger Signed-off-by: Kay Sievers Signed-off-by: Len Brown commit 8c8eb78f673c07b60f31751e1e47ac367c60c6b7 Author: Thomas Renninger Date: Mon Jul 23 14:43:32 2007 +0200 ACPI: autoload modules - ACPICA modifications Define standardized HIDs - Rename current acpi_device_id to acpica_device_id Signed-off-by: Thomas Renninger Signed-off-by: Len Brown commit 3b0d71170d37878bbb1203ebc3f92e36d6151a80 Author: Al Viro Date: Mon Jul 23 11:21:34 2007 +0100 ACPI: asus-laptop: Fix failure exits > Subject : drivers/misc/asus-laptop.c:*: error: 'struct led_classdev' has no member named 'class_dev' > References : http://lkml.org/lkml/2007/7/22/299 > Submitter : Gabriel C Fallout from f8a7c6fe14f556ca8eeddce258cb21392d0c3a2f. However, looking at it shows that checks done in ASUS_LED_UNREGISTER() can't trigger at all (we never get to asus_led_exit() if registration fails) and if that registration fails, we actually leak stuff. IOW, it's worse than just replacing class_dev with dev in there - the tests themselves had been papering over the lousy cleanup logics. Signed-off-by: Al Viro Signed-off-by: Len Brown commit 3cc2649b879f0e83fd51b14c82bad5f8f208591e Author: Luming Yu Date: Mon Jul 23 12:39:28 2007 -0400 ACPI: fix oops due to typo in new throttling code Signed-off-by: Luming Yu Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit d5269966e57484548bc5d38e117f161bf2f56ce9 Author: Kumar Gala Date: Thu Jul 19 15:44:52 2007 -0500 [POWERPC] Removed setup_indirect_pci_nomap We don't use setup_indirect_pci_nomap in arch/powerpc and it appears the users that needed it from arch/ppc are now using setup_indirect_pci. Signed-off-by: Kumar Gala commit 4e7982115e8e426ee885f48c8aedd5e533e23c5b Author: Kumar Gala Date: Thu Jul 19 15:39:24 2007 -0500 [POWERPC] 85xx: Add quirk to ignore bogus FPGA on CDS The newer Arcadia boards for CDS have an FPGA that shows up on PCI however isn't a real PCI device. Add a quirk to just ignore the FPGA. This is based on the following patch from Andy & York: http://ozlabs.org/pipermail/linuxppc-dev/2007-February/032042.html Signed-off-by: Kumar Gala commit aa3c112146e387dcd68bea2a8354514fe725da0d Author: Kumar Gala Date: Mon Jul 16 10:45:07 2007 -0500 [POWERPC] 85xx: Added 8568 PCIe support Added the PCIe device node to the 8568 dts and the needed quirk entries. Signed-off-by: Kumar Gala commit 6c0a11c118471f79795202348fbd0e6580341794 Author: Kumar Gala Date: Thu Jul 19 15:29:53 2007 -0500 [POWERPC] Fixup resources on pci_bus for PCIe PHB when no device is connected On the 85xx/86xx PCIe controllers if there is no device connected to the PHB we will still allocate a pci_bus for downstream bus of the virtual P2P bridge. However the resources allocated to the downstream bus are not correct and so we just mimic the resources from the upstream pci_bus. Signed-off-by: Kumar Gala commit 66afe8780f297edb4c4716bc326e127ec2923422 Author: Roy Zang Date: Tue Jul 10 18:47:52 2007 +0800 [POWERPC] Add basic PCI node for mpc8568mds board Signed-off-by: Haiying Wang Signed-off-by: Ebony Zhu Signed-off-by: Roy Zang Signed-off-by: Kumar Gala commit 3f6c5dae277d43b4fe2dd77a5984b0ef9aee52c6 Author: Roy Zang Date: Tue Jul 10 18:47:06 2007 +0800 [POWERPC] Use Freescale pci/pcie common code for 85xx boards Switch the 85xx platform over to using the FSL generic PCI code. This gets ups PCIe support in addition to base PCI support. Signed-off-by: Roy Zang Signed-off-by: Kumar Gala commit 344ffde71e65fb0ef4b73590015362005a59b3c0 Author: Roy Zang Date: Tue Jul 10 18:47:21 2007 +0800 [POWERPC] Update PCI nodes in the 83xx/85xx boards device tree Updated the 83xx & 85xx device tree PCI related compartible property. Used the following compatible properties: PCI "fsl,mpc8349-pci" PCI "fsl,mpc8540-pci" PCI-X: "fsl,mpc8540-pcix" PCIe: "fsl,mpc8548-pcie" Signed-off-by: Roy Zang Signed-off-by: Kumar Gala commit 02edff59c9383acd01f4f2205d663c8abc57070f Author: Roy Zang Date: Tue Jul 10 18:46:47 2007 +0800 [POWERPC] Add 8548 CDS PCI express controller node and PCI-X device node Add 8548 CDS PCI express controller node and PCI-X device node. The current dts file is suitable for 8548 Rev 2.0 board with Arcadia 3.1. This kind of board combination is the most popular. Used the following compatible properties: PCI "fsl,mpc8540-pci" PCI-X: "fsl,mpc8540-pcix" PCIe: "fsl,mpc8548-pcie" Signed-off-by: Roy Zang Signed-off-by: Kumar Gala commit 957ecffc2527ebd414c6e35b65f0f744739b012d Author: Kumar Gala Date: Wed Jul 11 13:31:58 2007 -0500 [POWERPC] FSL: Cleanup how we detect if we are a PCIe controller Use the PCI capabilities to determine if we are PCIe PHB. Also use PPC_INDIRECT_TYPE_NO_PCIE_LINK since the Freescale PCIe controllers will lock the system if they don't have link and you try to do a config access to anything but the PHB. Signed-off-by: Kumar Gala commit 62c66c8e55fae40d93d8f79d60e2ed50379e46f9 Author: Kumar Gala Date: Wed Jul 11 13:22:41 2007 -0500 [POWERPC] Added indirect quirk to handle PCIe PHB that have issue w/no link Added PPC_INDIRECT_TYPE_NO_PCIE_LINK flag to the indirect pci handling code to ensure that we don't talk to any device other than the PHB if we don't have PCIe link. Some controllers will lockup if they try to do a config cycle to any device on the bus except the PHB. Signed-off-by: Kumar Gala commit 38805e5f096162867a70c7468c654d7f9bb507da Author: Kumar Gala Date: Tue Jul 10 23:37:45 2007 -0500 [POWERPC] Add the ability to find PCI capabilities early on Added early_find_capability that wraps pci_bus_find_capability and uses fake_pci_bus() to allow us to call it before we've fully setup the pci_controller. Signed-off-by: Kumar Gala commit 9ac4dd301eebb3cd8de801e02bfc91f296e56f63 Author: Zang Roy-r61911 Date: Tue Jul 10 18:46:35 2007 +0800 [POWERPC] Rewrite Freescale PCI/PCIe support for 8{3,5,6}xx Rewrite the Freescale PCI code to support PCI on 83xx/85xx/86xx and PCIe on 85xx/86xx. Signed-off-by: Roy Zang Signed-off-by: Kumar Gala commit 55c44991e2910519bab274c857d95a08100ff5f7 Author: Roy Zang Date: Tue Jul 10 18:44:34 2007 +0800 [POWERPC] Create common fsl pci/e files based on 86xx platforms Move arch/powerpc/platforms/86xx/pci.c -> arch/powerpc/sysdev/fsl_pci.c arch/powerpc/sysdev/fsl_pcie.h -> arch/powerpc/sysdev/fsl_pci.h as the base to unify 83xx/85xx/86xx pci and pcie. Add CONFIG_FSL_PCI to build fsl_pci.c for Freescale pci and pcie option. The code still works for 86xx platforms. Signed-off-by: Roy Zang Signed-off-by: Kumar Gala commit 0ec8abd7086ee4f760cb1b477fe376805b17558c Author: Jesper Juhl Date: Sat Jul 21 00:12:44 2007 +0200 SELinux: fix memory leak in security_netlbl_cache_add() Fix memory leak in security_netlbl_cache_add() Note: The Coverity checker gets credit for spotting this one. Signed-off-by: Jesper Juhl Signed-off-by: James Morris Acked-by: Stephen Smalley commit 10b3dcae0f275e2546e55303d64ddbb58cec7599 Author: Shaohua Li Date: Fri Jul 20 10:03:25 2007 +0800 ACPI: ignore _PSx method for hotplugable PCI devices If the ACPI device has _EJ0, ignore the device. _PSx will set power for the slot, and the hotplug driver will take care of _PSx. Signed-off-by: Shaohua Li Signed-off-by: Len Brown commit ab826ca4cf2fe8ebcfd21189ca8bfeb47ca88359 Author: Shaohua Li Date: Fri Jul 20 10:03:22 2007 +0800 ACPI: Use ACPI methods to select PCI device suspend state applied after Rafel's 'PM: Update global suspend and hibernation operations framework' patch set Signed-off-by: Shaohua Li Signed-off-by: Len Brown commit fc30e68e88baf463683bde43347756889ba2ffae Author: Shaohua Li Date: Fri Jul 20 10:03:20 2007 +0800 ACPI, PNP: hook ACPI D-state to PNP suspend/resume applied after Rafel's 'PM: Update global suspend and hibernation operations framework' patch set Signed-off-by: Shaohua Li Signed-off-by: Len Brown commit fd4aff1a28eecbd729b409bf7d3eff5948f20414 Author: Shaohua Li Date: Tue Jul 17 22:40:25 2007 +0200 ACPI: Add acpi_pm_device_sleep_state helper routine Based on the David Brownell's patch at http://marc.info/?l=linux-acpi&m=117873972806360&w=2 updated by: Rafael J. Wysocki Add a helper routine returning the lowest power (highest number) ACPI device power state that given device can be in while the system is in the sleep state indicated by acpi_target_sleep_state . Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Len Brown commit e9b3aba887f47f9cd64de20fec9c333a932b70dc Author: Rafael J. Wysocki Date: Tue Jul 17 22:40:06 2007 +0200 ACPI: Implement the set_target() callback from pm_ops In the future some drivers may need to use ACPI to determine the low power states in which to place their devices, but to provide the drivers with this information the ACPI core needs to know what sleep state the system is going to enter. Namely, the device's state should not be too high power for given system sleep state and, if the device is supposed to be able to wake up the system, its state should not be too low power for the wake up to be possible). For this purpose, the ACPI core needs to implement the set_target() method in 'struct pm_ops' and store the target system sleep state passed by the PM core in a variable. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Acked-by: David Brownell Signed-off-by: Len Brown