commit ad8456361fa19068cf49b50a4f98e41b73c08e76 Merge: 39d1121 d8d9129 Author: Linus Torvalds Date: Thu Jun 3 15:48:15 2010 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: implement on-demand HPA unlocking libata: use the enlarged capacity after late HPA unlock SCSI: implement sd_unlock_native_capacity() libata-sff: trivial corrections to Kconfig help text sata_nv: don't diddle with nIEN on mcp55 sata_via: magic vt6421 fix for transmission problems w/ WD drives commit 39d112100e561686ab1e2b19c57984163ad6c1fa Merge: 167b712 02f7269 Author: Linus Torvalds Date: Thu Jun 3 15:47:51 2010 -0700 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched, trace: Fix sched_switch() prev_state argument sched: Fix wake_affine() vs RT tasks sched: Make sure timers have migrated before killing the migration_thread commit 167b7129042a4b4c09bb4ede5482ff79340a3999 Merge: 39059cc 4adc8b7 Author: Linus Torvalds Date: Thu Jun 3 15:47:22 2010 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, smpboot: Fix cores per node printing on boot x86/amd-iommu: Fall back to GART if initialization fails x86/amd-iommu: Fix crash when request_mem_region fails x86/mm: Remove unused DBG() macro arch/x86/kernel: Add missing spin_unlock commit 39059cceeda478cd040d521b9541d1113035c908 Merge: b01b7dc c2cdf6a Author: Linus Torvalds Date: Thu Jun 3 15:46:37 2010 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/macio: Fix probing of macio devices by using the right of match table agp/uninorth: Fix oops caused by flushing too much powerpc/pasemi: Update MAINTAINERS file powerpc/cell: Fix integer constant warning powerpc/kprobes: Remove resume_execution() in kprobes powerpc/macio: Don't dereference pointer before null check commit b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2 Merge: f150dba6 b3831cb Author: Linus Torvalds Date: Thu Jun 3 15:46:09 2010 -0700 Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6 * 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6: xen: avoid allocation causing potential swap activity on the resume path xen: ensure timer tick is resumed even on CPU driving the resume commit f150dba6d4a1e275b62ca76572c2786c71b91e85 Merge: 636667a c6df8d5 Author: Linus Torvalds Date: Thu Jun 3 15:45:26 2010 -0700 Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: Fix crash in swevents perf buildid-list: Fix --with-hits event processing perf scripts python: Give field dict to unhandled callback perf hist: fix objdump output parsing perf-record: Check correct pid when forking perf: Do the comm inheritance per thread in event__process_task perf: Use event__process_task from perf sched perf: Process comm events by tid blktrace: Fix new kernel-doc warnings perf_events: Fix unincremented buffer base on partial copy perf_events: Fix event scheduling issues introduced by transactional API perf_events, trace: Fix perf_trace_destroy(), mutex went missing perf_events, trace: Fix probe unregister race perf_events: Fix races in group composition perf_events: Fix races and clean up perf_event and perf_mmap_data interaction commit 636667a545b2d16797f27002a65d688c195c9b60 Merge: ceadda0 60e5e0b Author: Linus Torvalds Date: Thu Jun 3 15:45:03 2010 -0700 Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: virtio: console: Fix crash when port is unplugged and blocked for write virtio: console: Fix crash when hot-unplugging a port and read is blocked virtio-blk: fix minimum number of S/G elements commit ceadda057c000fa82e6bbe508923d8181414dea7 Merge: 95619be fbae3fb Author: Linus Torvalds Date: Thu Jun 3 15:44:43 2010 -0700 Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c: Remove all i2c_set_clientdata(client, NULL) in drivers i2c/busses: Move two drivers to embedded section i2c: Rename i2c_check_addr to i2c_check_addr_busy i2c: Document reserved I2C addresses i2c: Check for address validity on client registration i2c: Share the I2C device presence detection code Documentation/i2c: Checkpatch cleanup commit 95619be590638bd48469ac81c0f6236f349f5640 Merge: 03cd373 0f0a8fa Author: Linus Torvalds Date: Thu Jun 3 15:42:21 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: crypto4xx - Fix build breakage n2_crypto: Plumb fallback ahash requests properly. n2_crypto: Fix MAU kmem_cache name. n2_crypto: Fix build after of_device/of_platform_driver changes. commit c6df8d5ab87a246942d138321e1721edbb69f6e1 Author: Peter Zijlstra Date: Thu Jun 3 11:21:20 2010 +0200 perf: Fix crash in swevents Frederic reported that because swevents handling doesn't disable IRQs anymore, we can get a recursion of perf_adjust_period(), once from overflow handling and once from the tick. If both call ->disable, we get a double hlist_del_rcu() and trigger a LIST_POISON2 dereference. Since we don't actually need to stop/start a swevent to re-programm the hardware (lack of hardware to program), simply nop out these callbacks for the swevent pmu. Reported-by: Frederic Weisbecker Signed-off-by: Peter Zijlstra LKML-Reference: <1275557609.27810.35218.camel@twins> Signed-off-by: Ingo Molnar commit 03cd3739818d3fa7f973d0fb6d3aa63122ea00a0 Merge: 1067b6c 06b4367 Author: Linus Torvalds Date: Thu Jun 3 07:20:28 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: fix page refcount leak commit 1067b6c2bea7fd2cc9da290d865ab3f3b91c8130 Merge: a652883 d8dcaa1 Author: Linus Torvalds Date: Thu Jun 3 07:19:45 2010 -0700 Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (41 commits) drm/radeon/kms: make sure display hw is disabled when suspending drm/vmwgfx: Allow userspace to change default layout. Bump minor. drm/vmwgfx: Fix framebuffer modesetting drm/vmwgfx: Fix vga save / restore with display topology. vgaarb: use MIT license vgaarb: convert pr_devel() to pr_debug() drm: fix typos in Linux DRM Developer's Guide drm/radeon/kms/pm: voltage fixes drm/radeon/kms/pm: radeon_set_power_state fixes drm/radeon/kms/pm: patch default power state with default clocks/voltages on r6xx+ drm/radeon/kms/pm: enable SetVoltage on r7xx/evergreen drm/radeon/kms/pm: add support for SetVoltage cmd table (V2) drm/radeon/kms/evergreen: add initial CS parser drm/kms: disable/enable poll around switcheroo on/off drm/nouveau: fixup confusion over which handle the DSM is hanging off. drm/nouveau: attempt to get bios from ACPI v3 drm/nv50: cast IGP memory location to u64 before shifting drm/ttm: Fix ttm_page_alloc.c drm/ttm: Fix cached TTM page allocation. drm/vmwgfx: Remove some leftover debug messages. ... commit a652883a244901742d6c9733a9eebdf72e3114ea Merge: a57ee62 ee227c5 Author: Linus Torvalds Date: Thu Jun 3 07:17:31 2010 -0700 Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 * 'merge' of git://git.secretlab.ca/git/linux-2.6: of/powerpc: fix fsl_msi device node pointer of/watchdog: gef_wdt.c: fix build breakage of/edac: fix build breakage in drivers of/net: fs_enet/mii-bitbang.c: fix build breakage of/usb: fsl_qe_udc.c: fix build breakage of/crypto: crypto4xx_core.c: fix build breakage of/dma: fix build breakage in ppc4xx adma driver of/mtd: nand: fix build breakage in drivers of/video: fix build breakage in FB drivers of/pcmcia: m8xx_pcmcia.c: Fix build failures of/rtc: rtc-mpc5121.c: Fix build failures of/dma: mpc512x_dma.c: Fix build failures of/mtd/nand: mpc5121_nfc.c: Fix build failures of/spi: mpc512x_psc_spi.c: Fix build failures watchdog: Fix build failure with OF changes of/spi: Fix build failure on spi_ppc4xx.c of/usb: fix build error due to of_node pointer move of/powerpc: fix 85xx RapidIO device node pointer commit 60e5e0b84045ce0f6ab07a02c7fcd6627b53d2d3 Author: Amit Shah Date: Thu May 27 13:24:40 2010 +0530 virtio: console: Fix crash when port is unplugged and blocked for write When a program that has a virtio port opened and blocked for a write operation, a port hot-unplug event will later led to a crash when SIGTERM was sent to the program. Fix that. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 0047634d3daebca9e99a22eb89167bf77f35cdfa Author: Amit Shah Date: Thu May 27 13:24:39 2010 +0530 virtio: console: Fix crash when hot-unplugging a port and read is blocked When removing a port we don't check if a program was blocked for read. This leads to a crash when SIGTERM is sent to the program after hot-unplugging the port. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit a5b365a652206ca300256974ed9301a7d241a6ed Author: Christoph Hellwig Date: Tue May 25 14:17:54 2010 +0200 virtio-blk: fix minimum number of S/G elements We need at least one S/G element to operate properly, as does the block layer which increments it to one anyway. We hit this due to a qemu bug which advertises a sg_elements of 0 under some circumstances. Signed-off-by: Christoph Hellwig Signed-off-by: Rusty Russell (tweaked logic) commit fbae3fb1546e199ab0cd185348f8124411a1ca9d Author: Wolfram Sang Date: Thu Jun 3 11:33:58 2010 +0200 i2c: Remove all i2c_set_clientdata(client, NULL) in drivers I2C drivers can use the clientdata-pointer to point to private data. As I2C devices are not really unregistered, but merely detached from their driver, it used to be the drivers obligation to clear this pointer during remove() or a failed probe(). As a couple of drivers forgot to do this, it was agreed that it was cleaner if the i2c-core does this clearance when appropriate, as there is no guarantee for the lifetime of the clientdata-pointer after remove() anyhow. This feature was added to the core with commit e4a7b9b04de15f6b63da5ccdd373ffa3057a3681 to fix the faulty drivers. As there is no need anymore to clear the clientdata-pointer, remove all current occurrences in the drivers to simplify the code and prevent confusion. Signed-off-by: Wolfram Sang Acked-by: Mark Brown Acked-by: Greg Kroah-Hartman Acked-by: Richard Purdie Acked-by: Dmitry Torokhov Signed-off-by: Jean Delvare commit 35bfc353dcaecc99c277e3646564f3f785760bde Author: Wolfram Sang Date: Thu Jun 3 11:33:56 2010 +0200 i2c/busses: Move two drivers to embedded section And fix a typo while we are here Signed-off-by: Wolfram Sang Signed-off-by: Jean Delvare commit 3b5f794b8b647409155cade4eac2825bc49b4a66 Author: Jean Delvare Date: Thu Jun 3 11:33:55 2010 +0200 i2c: Rename i2c_check_addr to i2c_check_addr_busy Otherwise it's not clear what it is checking. Also move the function to save a forward declaration. Signed-off-by: Jean Delvare commit 656b8761ab21715eb1a35bb078dfd05e901be4ec Author: Jean Delvare Date: Thu Jun 3 11:33:53 2010 +0200 i2c: Document reserved I2C addresses Move strict I2C address validity check to a single function, and document the reserved I2C addresses there. Signed-off-by: Jean Delvare Cc: Hans Verkuil commit 3a89db5f30576654bf1b0036af9b50ed5ab1b6c5 Author: Jean Delvare Date: Thu Jun 3 11:33:52 2010 +0200 i2c: Check for address validity on client registration Do basic address validity checks when a client is being registered. We already had checks in place for devices which are being detected, but not for devices which are simply instantiated. This is a very basic check. We don't want to do strict checking here because some devices are known to infringe the I2C address constraints (e.g. IR receivers at 7-bit address 0x7a while this value is supposedly reserved for 10-bit addresses.) So we assume the caller knows what it is doing. Signed-off-by: Jean Delvare Cc: Matthieu Castet commit 63e4e80218803ff506b3ea4f2349b17916a35730 Author: Jean Delvare Date: Thu Jun 3 11:33:51 2010 +0200 i2c: Share the I2C device presence detection code Use the same I2C device presence detection code for legacy and new device detection functions. This is more consistent and makes the code smaller. Signed-off-by: Jean Delvare Cc: Matthieu Castet commit 89140f41575ae2a7a5c24e856880594ccbdfcaff Author: Andrea Gelmini Date: Thu Jun 3 11:33:50 2010 +0200 Documentation/i2c: Checkpatch cleanup Remove all trailing whitespace in Documentation/i2c. Signed-off-by: Andrea Gelmini Signed-off-by: Jean Delvare commit b3831cb55d383e8eb55d3b56c715fb48459b87c9 Author: Ian Campbell Date: Tue May 25 10:45:35 2010 +0100 xen: avoid allocation causing potential swap activity on the resume path Since the device we are resuming could be the device containing the swap device we should ensure that the allocation cannot cause IO. On resume, this path is triggered when the running system tries to continue using its devices. If it cannot then the resume will fail; to try to avoid this we let it dip into the emergency pools. The majority of these changes were made when linux-2.6.18-xen.hg changeset e8b49cfbdac0 was ported upstream in a144ff09bc52ef3f3684ed23eadc9c7c0e57b3aa but somehow this hunk was dropped. Signed-off-by: Ian Campbell Acked-by: Jeremy Fitzhardinge Cc: Stable Kernel # .32.x commit cd52e17ea8278f8449b6174a8e5ed439a2e44ffb Author: Ian Campbell Date: Wed May 19 16:19:25 2010 +0100 xen: ensure timer tick is resumed even on CPU driving the resume The core suspend/resume code is run from stop_machine on CPU0 but parts of the suspend/resume machinery (including xen_arch_resume) are run on whichever CPU happened to schedule the xenwatch kernel thread. As part of the non-core resume code xen_arch_resume is called in order to restart the timer tick on non-boot processors. The boot processor itself is taken care of by core timekeeping code. xen_arch_resume uses smp_call_function which does not call the given function on the current processor. This means that we can end up with one CPU not receiving timer ticks if the xenwatch thread happened to be scheduled on CPU > 0. Use on_each_cpu instead of smp_call_function to ensure the timer tick is resumed everywhere. Signed-off-by: Ian Campbell Acked-by: Jeremy Fitzhardinge Cc: Stable Kernel # .32.x commit 0f0a8fa735bbde4b0bc3e96e4bb2e5b380a324db Author: Anatolij Gustschin Date: Thu Jun 3 16:53:49 2010 +1000 crypto: crypto4xx - Fix build breakage Fixes build error caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Herbert Xu commit ee227c577cde47f78e2df359f9c32ba047060767 Author: Wolfram Sang Date: Thu Jun 3 06:03:46 2010 +0200 of/powerpc: fix fsl_msi device node pointer Signed-off-by: Wolfram Sang Signed-off-by: Grant Likely commit d8dcaa1dc50f5aecd38d34180cd99d6af8566c88 Author: Alex Deucher Date: Wed Jun 2 12:08:41 2010 -0400 drm/radeon/kms: make sure display hw is disabled when suspending Disable the display hw when suspending. Should fix bug: https://bugzilla.redhat.com/show_bug.cgi?id=522393 Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit d8bd19d2aff95e52c7f356cc2fc722584a656065 Author: Jakob Bornecrantz Date: Tue Jun 1 11:54:20 2010 +0200 drm/vmwgfx: Allow userspace to change default layout. Bump minor. The host may change the layout and, since the change is communicated to the master, the master needs a way to communicate the change to the kernel driver. The minor version number is bumped to advertize the availability of this feature. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 991b7b44f8cfa1b9beff8c4c2f2ec888b925c2a7 Author: Jakob Bornecrantz Date: Tue Jun 1 11:38:16 2010 +0200 drm/vmwgfx: Fix framebuffer modesetting Must set SVGA_NUM_REG_GUEST_DISPLAY before setting up the display information. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 7c4f77801f103c9eb0465bf42313d5e1721d2991 Author: Thomas Hellstrom Date: Tue Jun 1 11:38:17 2010 +0200 drm/vmwgfx: Fix vga save / restore with display topology. vga save / restore previously didn't handle the display topology case. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit c0db9cbc73338d8e2987a19a02388d67aeec0bfe Author: Tiago Vignatti Date: Mon May 24 18:24:31 2010 +0300 vgaarb: use MIT license Signed-off-by: Tiago Vignatti Cc: Henry Zhao Signed-off-by: Dave Airlie commit 2d6e9b91971034103ac51b20fa692258bf6bdd40 Author: Tiago Vignatti Date: Mon May 24 18:24:30 2010 +0300 vgaarb: convert pr_devel() to pr_debug() We want to be able to use CONFIG_DYNAMIC_DEBUG in arbiter code, switch the few existing pr_devel() calls to pr_debug(). Also, add one more debug information regarding decoding count. Signed-off-by: Tiago Vignatti Signed-off-by: Dave Airlie commit ce04cc089b22862f7d6ad5aa3ada0dd07e41b833 Author: Nicolas Kaiser Date: Fri May 28 07:33:49 2010 +0200 drm: fix typos in Linux DRM Developer's Guide A few typos in the DRM Developer's Guide. Signed-off-by: Nicolas Kaiser Acked-by: Jesse Barnes Signed-off-by: Dave Airlie commit 84d88f4c92763f519b9e081cdd685a44de14f8c0 Author: Alex Deucher Date: Thu May 27 17:01:42 2010 -0400 drm/radeon/kms/pm: voltage fixes - Enable GPIO voltage for non pm modes as well so resetting the default voltage works. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 92645879d07a48897fe8888c2e37607aa1189cc9 Author: Alex Deucher Date: Thu May 27 17:01:41 2010 -0400 drm/radeon/kms/pm: radeon_set_power_state fixes - wait for vbl for both profile and dynpm - unify profile and dynpm code paths more - call pm_misc before of after clocks to make sure voltage is changed in the proper order. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit c5e8ce61d64995f4076c6a9b2f8b4b71e0be2e37 Author: Alex Deucher Date: Thu May 27 17:01:40 2010 -0400 drm/radeon/kms/pm: patch default power state with default clocks/voltages on r6xx+ The default power state does not always match the default clocks and voltage for a particular card. The information in the firmware info table is correct and should be used in preference to the info the default power state. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 9349d5cc920c10845693f906ebd67f394f1d0d04 Author: Alex Deucher Date: Fri May 28 19:35:01 2010 -0400 drm/radeon/kms/pm: enable SetVoltage on r7xx/evergreen I missed these in the r6xx commit. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 7ac9aa5a1f1b87adb69bcbec2b89e228f074103a Author: Alex Deucher Date: Thu May 27 19:25:54 2010 -0400 drm/radeon/kms/pm: add support for SetVoltage cmd table (V2) - This enables voltage adjustment on r6xx+ and certain r5xx asics. - Voltage drop support is already available for most r1xx-r5xx asics. V2: endian fix for voltage table. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit b74dbf2aed8d8c4f93ac2c44bab5c81f65be62a0 Author: Anatolij Gustschin Date: Thu Jun 3 03:30:31 2010 +0200 of/watchdog: gef_wdt.c: fix build breakage Fixes build error caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit a26f95fed31d917eee616d1cd6360e4ce782e3dc Author: Anatolij Gustschin Date: Thu Jun 3 03:17:42 2010 +0200 of/edac: fix build breakage in drivers Fixes build errors in EDAC drivers caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 4eecb17825a9cd2ea750c177487000fab4c19ea2 Author: Anatolij Gustschin Date: Thu Jun 3 03:06:54 2010 +0200 of/net: fs_enet/mii-bitbang.c: fix build breakage Fixes build error caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 3ed3880230288c3eba1174b865ea7cdfbcb20033 Author: Anatolij Gustschin Date: Thu Jun 3 02:59:55 2010 +0200 of/usb: fsl_qe_udc.c: fix build breakage Fixes build error caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 7cea8cc4705d25d9c7baee06efd665db27481242 Author: Anatolij Gustschin Date: Thu Jun 3 02:53:18 2010 +0200 of/crypto: crypto4xx_core.c: fix build breakage Fixes build error caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 05c02542c20aa00dc9a66f4bfb1a89d1131457f2 Author: Anatolij Gustschin Date: Thu Jun 3 02:46:37 2010 +0200 of/dma: fix build breakage in ppc4xx adma driver Fixes build error caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit c8a4d0fd2ac2ce6b3409f51fcf918dcb3617ec97 Author: Anatolij Gustschin Date: Thu Jun 3 02:37:17 2010 +0200 of/mtd: nand: fix build breakage in drivers Fixes build errors in drivers caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit d4b8b2c2c0b980fa756267e43e39e5ac3c894857 Author: Anatolij Gustschin Date: Thu Jun 3 02:20:44 2010 +0200 of/video: fix build breakage in FB drivers Fixes build errors in a number of framebuffer drivers caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 2005ce3521b7a38f12085e0420f405a8ee06f606 Author: Anatolij Gustschin Date: Thu Jun 3 01:38:57 2010 +0200 of/pcmcia: m8xx_pcmcia.c: Fix build failures Fixes build errors caused by the: - OF device_node pointer being moved into struct device - typo in match_table field in the struct device_driver (which shoud be of_match_table) Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit a57ee627499d116f6872a5634ea4f015da0eacd2 Author: Mikulas Patocka Date: Wed Jun 2 11:09:04 2010 -0400 Fix colors for Mach64 Use the same color-calculating algorithm as in atyfb_imageblit in this driver or in generic cfb_fillrect. This patch fixes bad colors when using an accelerator in 15-bit and 16-bit modes. Signed-off-by: Mikulas Patocka Signed-off-by: Linus Torvalds commit 295bdd9c52e57daf995fe80eff8c53938443fa2f Author: Grant Likely Date: Wed Jun 2 14:06:09 2010 -0600 of/rtc: rtc-mpc5121.c: Fix build failures Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Grant Likely CC: Paul Gortmaker CC: Alessandro Zummo CC: Wolfgang Denk CC: Tejun Heo CC: Anatolij Gustschin CC: rtc-linux@googlegroups.com CC: devicetree-discuss@lists.ozlabs.org commit b4a75c91b8a6cb80ba7772f69613025ddf75ebc2 Author: Anatolij Gustschin Date: Mon May 31 18:39:13 2010 +0200 of/dma: mpc512x_dma.c: Fix build failures Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 14acbbf8bada18f19930d38ce33c3947b2c718e0 Author: Anatolij Gustschin Date: Mon May 31 18:37:15 2010 +0200 of/mtd/nand: mpc5121_nfc.c: Fix build failures Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit ef7f2e831c3a563505c9bc5b16ef4bcae3cf4b53 Author: Anatolij Gustschin Date: Mon May 31 18:34:54 2010 +0200 of/spi: mpc512x_psc_spi.c: Fix build failures Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit de2b606c24f178038b95a831f21a35a29faa6eab Author: Michael Guntsche Date: Wed Jun 2 02:25:52 2010 -0600 watchdog: Fix build failure with OF changes commit 61c7a080a5a061c976988fd4b844dfb468dda255 ( of: Always use 'struct device.of_node' to get device node pointer.) missed drivers/watchdog/mpc8xxx_wdt.c. This patch fixes it Signed-off-by: Michael Guntsche Signed-off-by: Grant Likely commit b53550781b7d51036aea3b3ee63ece3c6c8f4597 Author: Grant Likely Date: Tue May 25 23:24:02 2010 -0600 of/spi: Fix build failure on spi_ppc4xx.c This patch fixes a build error caused by the OF device_node pointer being moved into struct device. Fixes bug introduced by commit 61c7a080a5a061c976988fd4b844dfb468dda255 (of: Always use 'struct device.of_node' to get device node pointer) Signed-off-by: Grant Likely CC: Sean MacLennan CC: spi-devel-general@lists.sourceforge.net CC: devicetree-discuss@lists.ozlabs.org commit ffabc9a6e8b34151a97fc91fcbef827f07504f75 Author: Grant Likely Date: Wed Jun 2 13:35:02 2010 -0600 of/usb: fix build error due to of_node pointer move Fix driver to use new location of of_node pointer (introduced by commit use new location of of_node pointer (introduced by commit 61c7a080a5a061c976988fd4b844dfb468dda255; of: Always use 'struct device.of_node' to get device node pointer) Signed-off-by: Grant Likely Reported-by: John Linn CC: Greg Kroah-Hartman CC: Alan Stern CC: linux-usb@vger.kernel.org CC: devicetree-discuss@lists.ozlabs.org commit d8d9129ea28e2177749627c82962feb26e8d11e9 Author: Tejun Heo Date: Sat May 15 20:09:34 2010 +0200 libata: implement on-demand HPA unlocking Implement ata_scsi_unlock_native_capacity() which will be called through SCSI layer when block layer notices that partitions on a device extend beyond the end of the device. It requests EH to unlock HPA, waits for completion and returns the current device capacity. This allows libata to unlock HPA on demand instead of having to decide whether to unlock upfront. Unlocking on demand is safer than unlocking by upfront because some BIOSes write private data to the area beyond HPA limit. This was suggested by Ben Hutchings. Signed-off-by: Tejun Heo Suggested-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 68939ce5fc17ee9c03ef6e543d4f82bd9f5583d4 Author: Tejun Heo Date: Sat May 15 20:09:33 2010 +0200 libata: use the enlarged capacity after late HPA unlock After late HPA unlock, libata kept using the original capacity ignoring the new larger native capacity. Enlarging device on the fly doesn't cause any harm. Use the larger native capacity instead. This will enable on-demand HPA unlocking. Signed-off-by: Tejun Heo Cc: Ben Hutchings Signed-off-by: Jeff Garzik commit 72ec24bd7725545bc149d80cbd21a7578d9aa206 Author: Tejun Heo Date: Sat May 15 20:09:32 2010 +0200 SCSI: implement sd_unlock_native_capacity() Implement sd_unlock_native_capacity() method which calls into hostt->unlock_native_capacity() if implemented. This will be invoked by block layer if partitions extend beyond the end of the device and can be used to implement, for example, on-demand ATA host protected area unlocking. Signed-off-by: Tejun Heo Cc: Ben Hutchings Signed-off-by: Jeff Garzik commit ed4e2f801cf1484a68c4b41878353f26e6554c6a Author: Stefan Richter Date: Sat May 29 12:47:45 2010 +0200 libata-sff: trivial corrections to Kconfig help text Signed-off-by: Stefan Richter Signed-off-by: Jeff Garzik commit f3faf8fc3fab45c3526efe8c9e99bb23f8723350 Author: Tejun Heo Date: Tue Jun 1 17:29:21 2010 +0200 sata_nv: don't diddle with nIEN on mcp55 On mcp55, nIEN gets stuck once set and liteon blueray rom iHOS104-08 violates ATA specification and fails to set I on D2H Reg FIS if nIEN is set when the command was issued. When the other party is following the spec, both devices can work fine but when the two flaws are put together, they can't talk to each other. mcp55 has its own IRQ masking mechanism and there's no reason to mess with nIEN in the first place. Fix it by dropping nIEN diddling from nv_mcp55_freeze/thaw(). This was originally reported by Cengiz. Although Cengiz hasn't verified the fix yet, I could reproduce this problem and verfiy the fix. Even if Cengiz is experiencing different or additional problems, this patch is needed. Signed-off-by: Tejun Heo Reported-by: Cengiz Günay Cc: stable@kernel.org Signed-off-by: Jeff Garzik commit 8b27ff4cf6d15964aa2987aeb58db4dfb1f87a19 Author: Tejun Heo Date: Mon May 31 16:26:48 2010 +0200 sata_via: magic vt6421 fix for transmission problems w/ WD drives vt6421 has problems talking to recent WD drives. It causes a lot of transmission errors while high bandwidth transfer as reported in the following bugzilla entry. https://bugzilla.kernel.org/show_bug.cgi?id=15173 Joseph Chan provided the following fix. I don't have any idea what it does but I can verify the issue is gone with the patch applied. Signed-off-by: Tejun Heo Originally-from: Joseph Chan Reported-by: Jorrit Tijben Cc: stable@kernel.org Signed-off-by: Jeff Garzik commit c2cdf6aba0dfcfb54be646ab630c1bccd180e890 Author: Benjamin Herrenschmidt Date: Wed Jun 2 17:09:18 2010 +1000 powerpc/macio: Fix probing of macio devices by using the right of match table Grant patches added an of mach table to struct device_driver. However, while he changed the macio device code to use that, he left the match table pointer in struct macio_driver and didn't update drivers to use the "new" one, thus breaking the probing. This completes the change by moving all drivers to setup the "new" one, removing all traces of the old one, and while at it (since it changes the exact same locations), I also remove two other duplicates from struct driver which are the name and owner fields. Signed-off-by: Benjamin Herrenschmidt commit 79905ad50bcf025deb81382413719ed600734941 Author: Paul Mackerras Date: Tue Jun 1 19:33:08 2010 +0000 agp/uninorth: Fix oops caused by flushing too much This fixes a sporadic oops at boot on G5 Power Macs. The table_end variable has the address of the last byte of the table. Adding on PAGE_SIZE means we flush too much, and if the page after the table is not mapped for any reason, the kernel will oops. Instead we add on 1 because flush_dcache_range() interprets its second argument as the first byte past the range to be flushed. Signed-off-by: Paul Mackerras Signed-off-by: Benjamin Herrenschmidt commit 92e197095e0aa59273decbeaa4b63de58e342355 Author: Olof Johansson Date: Sat May 22 05:17:38 2010 +0000 powerpc/pasemi: Update MAINTAINERS file PWRficient platform work is definitely in maintenance mode these days, update MAINTAINERS file to reflect reality. Website is long gone as well. Signed-off-by: Olof Johansson Signed-off-by: Benjamin Herrenschmidt commit 257d569821165a76fb4c91d74909c2e61fe41e46 Author: Denis Kirjanov Date: Thu May 27 04:19:52 2010 +0000 powerpc/cell: Fix integer constant warning Fix smatch warning: warning: constant 0x800000000 is so big it is long Signed-off-by: Denis Kirjanov Signed-off-by: Benjamin Herrenschmidt commit db97bc7f9997fef41b24c91f61c2f776d32d7ce3 Author: Ananth N Mavinakayanahalli Date: Thu May 27 19:19:20 2010 +0000 powerpc/kprobes: Remove resume_execution() in kprobes emulate_step() in kprobe_handler() would've already determined if the probed instruction can be emulated. We single-step in hardware only if the instruction couldn't be emulated. resume_execution() therefore is superfluous -- all we need is to fix up the instruction pointer after single-stepping. Thanks to Paul Mackerras for catching this. Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Benjamin Herrenschmidt commit 83aea945c21c646184a494a32ad5524248b60226 Author: Andreas Schwab Date: Tue Jun 1 05:58:40 2010 +0000 powerpc/macio: Don't dereference pointer before null check Signed-off-by: Andreas Schwab Signed-off-by: Benjamin Herrenschmidt commit 45fdf00dea92a480a8023c94d1a1aa887dcd3f69 Author: Alexandre Bounine Date: Fri May 28 13:56:17 2010 -0400 of/powerpc: fix 85xx RapidIO device node pointer Fixes bug introduced by commit 61c7a080a5a061c976988fd4b844dfb468dda255 (of: Always use 'struct device.of_node' to get device node pointer) Signed-off-by: Alexandre Bounine Signed-off-by: Grant Likely commit 4adc8b71cc142f9a7b44b13b99aab38ba897c56f Author: Borislav Petkov Date: Tue Jun 1 21:04:55 2010 +0200 x86, smpboot: Fix cores per node printing on boot Percpu initialization happens now after booting the cores on the machine and this causes them all to be displayed as belonging to node 0: Jun 8 05:57:21 kepek kernel: [ 0.106999] Booting Node 0, Processors #1 #2 #3 #4 #5 #6 #7 #8 #9 #10 #11 #12 #13 #14 #15 #16 #17 #18 #19 #20 #21 #22 #23 Ok. Use early_cpu_to_node() to get the correct node of each core instead. Signed-off-by: Borislav Petkov Cc: Mike Travis LKML-Reference: <20100601190455.GA14237@aftab> Signed-off-by: Ingo Molnar commit da3fd1a0010ccc9fe6fd5ae2b9e85e1aacc03e4d Merge: 2fb750e b5c874f Author: Ingo Molnar Date: Wed Jun 2 09:13:12 2010 +0200 Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent commit aef4b9aaae1decc775778903922bd0075cce7a88 Merge: 709d015 a7fed9f Author: Linus Torvalds Date: Tue Jun 1 14:13:14 2010 -0700 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Don't export cvt_fd & _df when CONFIG_PPC_FPU is not set powerpc/44x: icon: select SM502 and frame buffer console support powerpc/85xx: Add P1021MDS board support powerpc/85xx: Change MPC8572DS camp dtses for MSI sharing powerpc/fsl_msi: add removal path and probe failing path powerpc/fsl_msi: enable msi sharing through AMP OSes powerpc/fsl_msi: enable msi allocation in all banks powerpc/fsl_msi: fix the conflict of virt_msir's chip_data powerpc/fsl_msi: Add multiple MSI bank support powerpc/kexec: Add support for FSL-BookE powerpc/fsl-booke: Move the entry setup code into a seperate file powerpc/fsl-booke: fix the case where we are not in the first page powerpc/85xx: Enable support for ports 3 and 4 on 8548 CDS powerpc/fsl-booke: Add hibernation support for FSL BookE processors powerpc/e500mc: Implement machine check handler. powerpc/44x: Add basic ICON PPC440SPe board support powerpc/44x: Fix UART clocks on 440SPe powerpc/44x: Add reset-type to katmai.dts powerpc/44x: Adding PCI-E support for PowerPC 460SX based SOC. commit 709d015bb810a3377feaee3093d110a17e919019 Merge: 08a6685 e3a815f Author: Linus Torvalds Date: Tue Jun 1 14:12:27 2010 -0700 Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel * 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: (41 commits) drm/i915: add HAS_BSD check to i915_getparam drm/i915: Honor sync polarity from VBT panel timing descriptors drm/i915: Unmask interrupt for render engine on Sandybridge drm/i915: Fix PIPE_CONTROL command on Sandybridge drm/i915: Fix up address spaces in slow_kernel_write() drm/i915: Use non-atomic kmap for slow copy paths drm/i915: Avoid moving from CPU domain during pwrite drm/i915: Cleanup after failed initialization of ringbuffers drm/i915: Reject bind_to_gtt() early if object > aperture drm/i915: Check error code whilst moving buffer to GTT domain. drm/i915: Remove spurious warning "Failure to install fence" drm/i915: Rebind bo if currently bound with incorrect alignment. drm/i915: Include pitch in set_base debug statement. drm/i915: Only print "nothing to do" debug message as required. drm/i915: Propagate error from unbinding an unfenceable object. drm/i915: Avoid nesting of domain changes when setting display plane drm/i915: Hold the spinlock whilst resetting unpin_work along error path drm/i915: Only print an message if there was an error drm/i915: Clean up leftover bits from hws move to ring structure. drm/i915: Add CxSR support on Pineview DDR3 ... commit 08a66859e69264f3223560d06b88e80c1a6a6387 Author: Dan Carpenter Date: Tue Jun 1 20:58:22 2010 +0100 FS-Cache: Remove unneeded null checks fscache_write_op() makes unnecessary checks of the page variable to see if it is NULL. It can't be NULL at those points as the kernel would already have crashed a little higher up where we examined page->index. Furthermore, unless radix_tree_gang_lookup_tag() can return 1 but no page, a NULL pointer crash should not be encountered there as we can only get there if r_t_g_l_t() returned 1. Signed-off-by: Dan Carpenter Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit b5c874f14c5f57cc8654e9184694196c466147bb Author: Arnaldo Carvalho de Melo Date: Tue Jun 1 12:37:05 2010 -0300 perf buildid-list: Fix --with-hits event processing When we use plain 'perf buildid-list' we use only what is in the buildid table in the perf.data header. And those have absolute pathnames because at 'perf record' time we used __perf_session__process_events and that doesn't sets up the path shortening code in map__new() that happens if symbol_conf.full_paths is false, the default. On the other hand, when we use 'perf buildid-list --with-hits' we process all the events using perf_session__process_events, adding entries to the global DSO list _after_ removing the current directory from the DSO name, for presentation purposes. Because of that we end up having two entries in the DSO list when recording events for binaries using relative pathnames. Fix it minimally by setting symbol_conf.full_paths to true when marking the DSOs with hits in 'perf buildid-list --with-hits', as used by 'perf archive' Right fix longer term is to shorten the path only at presentation time. Will be done for 2.6.36. Reported-by: Stephane Eranian Tested-by: Stephane Eranian Cc: David S. Miller Cc: Frédéric Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: <20100601183837.GC4093@ghostprotocols.net> Signed-off-by: Arnaldo Carvalho de Melo commit e3a815fcd38043b8f1bb526123d8ab6ae01deb77 Author: Zou Nan hai Date: Mon May 31 13:58:47 2010 +0800 drm/i915: add HAS_BSD check to i915_getparam This will let userland only try to use the new media decode functionality when the appropriate kernel is present. Signed-off-by: Zou Nan hai Signed-off-by: Eric Anholt commit 9bc354998f8aa8a83b0cd430e8fcf2cbc3be7367 Author: Adam Jackson Date: Fri May 28 17:17:37 2010 -0400 drm/i915: Honor sync polarity from VBT panel timing descriptors I'm actually kind of shocked that it works at all otherwise. Signed-off-by: Adam Jackson Signed-off-by: Eric Anholt commit 06b43672a9e665cab18dc7b77d56d36884b90d45 Author: Jeff Layton Date: Tue Jun 1 10:54:45 2010 -0400 cifs: fix page refcount leak Commit 315e995c63a15cb4d4efdbfd70fe2db191917f7a is causing OOM kills when stress-testing a CIFS filesystem. The VFS readpages operation takes a page reference. The older code just handed this reference off to the page cache, but the new code takes an extra one. The simplest fix is to put the new reference after add_to_page_cache_lru. Signed-off-by: Jeff Layton Acked-by: Nick Piggin Signed-off-by: Steve French commit 0a6531ebea13b164825ba28e77dcbed3e9386884 Author: Randy Dunlap Date: Tue Jun 1 09:55:07 2010 -0700 Documentation/timers/hpet_example.c: only build on X86 We should only build hpet_example on x86[-64], where it is implemented. It can cause build errors on other architectures. Signed-off-by: Randy Dunlap Reported-by: Heiko Carstens Cc: Heiko Carstens Cc: Arjan van de Ven Signed-off-by: Linus Torvalds commit 037776fcbe73236408f6c9ca97c782457efd6b53 Author: Denis Kirjanov Date: Tue Jun 1 17:15:39 2010 +0100 AFS: Fix possible null pointer dereference in afs_alloc_server() Fix a possible null pointer dereference in afs_alloc_server(): the server pointer is NULL if there was an allocation failure, and under such a condition, we can't dereference it in the _leave() statement. Signed-off-by: Denis Kirjanov Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 5c113fbeed7a5a192d8431a768965f8a45c16475 Author: Daniel J Blueman Date: Tue Jun 1 12:15:11 2010 +0100 fix cpu_chain section mismatch... In commit e9fb7631ebcd ("cpu-hotplug: introduce cpu_notify(), __cpu_notify(), cpu_notify_nofail()") the new helper functions access cpu_chain. As a result, it shouldn't be marked __cpuinitdata (via section mismatch warning). Alternatively, the helper functions should be forced inline, or marked __ref or __cpuinit. In the meantime, this patch silences the warning the trivial way. Signed-off-by: Daniel J Blueman Signed-off-by: Linus Torvalds commit 1f73897861b8ef0be64ff4b801f8d6f830f683b5 Merge: b904d71 64ffc9f Author: Linus Torvalds Date: Tue Jun 1 08:55:52 2010 -0700 Merge branch 'for-35' of git://repo.or.cz/linux-kbuild * 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits) kbuild: Revert part of e8d400a to resolve a conflict kbuild: Fix checking of scm-identifier variable gconfig: add support to show hidden options that have prompts menuconfig: add support to show hidden options which have prompts gconfig: remove show_debug option gconfig: remove dbg_print_ptype() and dbg_print_stype() kconfig: fix zconfdump() kconfig: some small fixes add random binaries to .gitignore kbuild: Include gen_initramfs_list.sh and the file list in the .d file kconfig: recalc symbol value before showing search results .gitignore: ignore *.lzo files headerdep: perlcritic warning scripts/Makefile.lib: Align the output of LZO kbuild: Generate modules.builtin in make modules_install Revert "kbuild: specify absolute paths for cscope" kbuild: Do not unnecessarily regenerate modules.builtin headers_install: use local file handles headers_check: fix perl warnings export_report: fix perl warnings ... commit b904d7131d116900524bd36ec170dcd97846bfd3 Merge: 2e8949f 4150764 Author: Linus Torvalds Date: Tue Jun 1 08:51:25 2010 -0700 Merge branch 'for-linus' of git://www.jni.nu/cris * 'for-linus' of git://www.jni.nu/cris: CRIS: Don't use mask_irq as symbol name CRIS: Simplify param.h by simply including CRISv10: Whitespace fixes for hw_settings.S CRISv10: Trivial fixes. CRISv32: Fix RS485 port 4 CD Kconfig item. CRISv32: Remove duplicated Kconfig items. cris: push down BKL into some device drivers commit 2e8949f09e3097c629f33323eaf280cf5c88c81a Author: Alan Cox Date: Tue Jun 1 12:51:00 2010 +0100 intel_scu_ipc: Length fix Commands with data must set the length in the message. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 076dab234d29d1c0d60e26a5fa48aabb7fa58f79 Merge: e30c7c3 b42d916 Author: Linus Torvalds Date: Tue Jun 1 08:13:20 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (28 commits) drivers/isdn/hardware/mISDN: Use GFP_ATOMIC when a lock is held ksz884x: Add missing validate_addr hook ksz884x: convert to netdev_tx_t virtio-net: pass gfp to add_buf be2net: convert hdr.timeout in be_cmd_loopback_test() to le32 can: mpc5xxx_can.c: Fix build failure net/ipv4/tcp_input.c: fix compilation breakage when FASTRETRANS_DEBUG > 1 net: sock_queue_err_skb() dont mess with sk_forward_alloc netfilter: xtables: stackptr should be percpu netfilter: don't xt_jumpstack_alloc twice in xt_register_table greth: Fix build after OF device conversions. net: fix sk_forward_alloc corruptions Phonet: listening socket lock protects the connected socket list caif: unlock on error path in cfserl_receive() be2net: remove superfluous externs be2net: add unlock on error path net/rds: Add missing mutex_unlock drivers/isdn/hardware/mISDN: Add missing spin_unlock fs_enet: Adjust BDs after tx error skb: make skb_recycle_check() return a bool value ... commit e30c7c3b306312c157d67eedd6a01920518b756c Author: Takuya Yoshikawa Date: Tue Jun 1 14:10:47 2010 +0100 binfmt_elf_fdpic: Fix clear_user() error handling clear_user() returns the number of bytes that could not be copied rather than an error code. So we should return -EFAULT rather than directly returning the results. Without this patch, positive values may be returned to elf_fdpic_map_file() and the following error handlings do not function as expected. 1. ret = elf_fdpic_map_file_constdisp_on_uclinux(params, file, mm); if (ret < 0) return ret; 2. ret = elf_fdpic_map_file_by_direct_mmap(params, file, mm); if (ret < 0) return ret; Signed-off-by: Takuya Yoshikawa Signed-off-by: David Howells Acked-by: Mike Frysinger CC: Alexander Viro CC: Andrew Morton CC: Daisuke HATAYAMA CC: Paul Mundt Signed-off-by: Linus Torvalds commit c8fcb14fecac72bb2cd2974cf133fba6c4b4a13d Merge: e565813 d7f0776 Author: Ingo Molnar Date: Tue Jun 1 11:45:45 2010 +0200 Merge branch 'amd-iommu/2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent commit c02514850d67be8db6b2b6658cbc23ac1fbf8bc7 Author: Pierre Tardy Date: Mon May 31 23:12:09 2010 +0200 perf scripts python: Give field dict to unhandled callback trace_unhandled() callback does not allow to access event fields, this patch resolves the problem. It can also been used as a more pythonic and flexible way for script writters to demux event types This will for example greatly simplify pytimechart event demux. Acked-by: Frederic Weisbecker Acked-by: Tom Zanussi Cc: Ingo Molnar , Cc: Frederic Weisbecker Cc: Tom Zanussi LKML-Reference: <1275340329-2397-1-git-send-email-tardyp@gmail.com> Signed-off-by: Pierre Tardy Signed-off-by: Arnaldo Carvalho de Melo commit 75d9ef1707cf3db264a549142a1f54a5380d63dc Author: Konstantin Stepanyuk Date: Thu May 27 02:10:11 2010 +0400 perf hist: fix objdump output parsing hist_entry__annotate() runs objdump with -S option so the output may contain lines of any format. If a line starts with a colon strtoull() returns 0 and calculated offset will be negative. This causes perf annotate segfaults. Make sure that strtoull() has parsed at least one digit. Cc: David S. Miller Cc: Frédéric Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Konstantin Stepanyuk Signed-off-by: Arnaldo Carvalho de Melo commit d7f0776975334070a93370ae048fda0c31a91c38 Author: Joerg Roedel Date: Mon May 31 15:05:20 2010 +0200 x86/amd-iommu: Fall back to GART if initialization fails This patch implements a fallback to the GART IOMMU if this is possible and the AMD IOMMU initialization failed. Otherwise the fallback would be nommu which is very problematic on machines with more than 4GB of memory or swiotlb which hurts io-performance. Cc: stable@kernel.org Signed-off-by: Joerg Roedel commit e82752d8b5a7e0a5e4d607fd8713549e2a4e2741 Author: Joerg Roedel Date: Fri May 28 14:26:48 2010 +0200 x86/amd-iommu: Fix crash when request_mem_region fails When request_mem_region fails the error path tries to disable the IOMMUs. This accesses the mmio-region which was not allocated leading to a kernel crash. This patch fixes the issue. Cc: stable@kernel.org Signed-off-by: Joerg Roedel commit 1d61e73ab4c7470833241af888939a7aab2b0354 Merge: 84fe6c1 67a3e12 Author: Joerg Roedel Date: Tue Jun 1 09:57:49 2010 +0200 Merge commit 'v2.6.35-rc1' into amd-iommu/2.6.35 commit 02f726949f2be0967aa4871dd4e47d3967779b26 Author: Peter Zijlstra Date: Mon May 31 18:13:25 2010 +0200 sched, trace: Fix sched_switch() prev_state argument For CONFIG_PREEMPT=y kernels the sched_switch(.prev_state) argument isn't useful because we can get preempted with current->state != TASK_RUNNING without actually getting removed from the runqueue. Cure this by treating all preempted tasks as runnable from the tracer's point of view. Signed-off-by: Peter Zijlstra Cautiously-acked-by: Steven Rostedt LKML-Reference: <1275322715.27810.23323.camel@twins> Signed-off-by: Ingo Molnar commit e51fd5e22e12b39f49b1bb60b37b300b17378a43 Author: Peter Zijlstra Date: Mon May 31 12:37:30 2010 +0200 sched: Fix wake_affine() vs RT tasks Mike reports that since e9e9250b (sched: Scale down cpu_power due to RT tasks), wake_affine() goes funny on RT tasks due to them still having a !0 weight and wake_affine() still subtracts that from the rq weight. Since nobody should be using se->weight for RT tasks, set the value to zero. Also, since we now use ->cpu_power to normalize rq weights to account for RT cpu usage, add that factor into the imbalance computation. Reported-by: Mike Galbraith Tested-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1275316109.27810.22969.camel@twins> Signed-off-by: Ingo Molnar commit b42d9165e1e3d92e4e3318642463dbe592a12568 Author: Julia Lawall Date: Tue Jun 1 00:26:06 2010 -0700 drivers/isdn/hardware/mISDN: Use GFP_ATOMIC when a lock is held The function inittiger is only called from nj_init_card, where a lock is held. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @gfp exists@ identifier fn; position p; @@ fn(...) { ... when != spin_unlock_irqrestore when any GFP_KERNEL@p ... when any } @locked@ identifier gfp.fn; @@ spin_lock_irqsave(...) ... when != spin_unlock_irqrestore fn(...) @depends on locked@ position gfp.p; @@ - GFP_KERNEL@p + GFP_ATOMIC // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 96ed741e15896eea43f7203523db88bc8105c359 Author: Denis Kirjanov Date: Mon May 31 00:26:21 2010 +0000 ksz884x: Add missing validate_addr hook Add missing validate_addr hook Signed-off-by: Denis Kirjanov Signed-off-by: David S. Miller commit 5ed83663f77ee7404022d046321f69545cd311b8 Author: Denis Kirjanov Date: Mon May 31 00:24:49 2010 +0000 ksz884x: convert to netdev_tx_t Convert TX hook to netdev_tx_t type Signed-off-by: Denis Kirjanov Signed-off-by: David S. Miller commit aa989f5e46bb913e1a5966bb7d32eb2d00c1894e Author: Michael S. Tsirkin Date: Mon May 31 01:10:01 2010 +0000 virtio-net: pass gfp to add_buf virtio-net bounces buffer allocations off to a thread if it can't allocate buffers from the atomic pool. However, if posting buffers still requires atomic buffers, this is unlikely to succeed. Fix by passing in the proper gfp_t parameter. Signed-off-by: Michael S. Tsirkin Signed-off-by: Rusty Russell Signed-off-by: David S. Miller commit 3ffd05159815d477f971a3259fc758f0c3c7e640 Author: Sathya Perla Date: Tue Jun 1 00:19:33 2010 -0700 be2net: convert hdr.timeout in be_cmd_loopback_test() to le32 The current code fails on ppc as hdr.timeout is not being converted to le32. Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 6bd17eb96ffc9c3b52927913d59da9ced5109c6a Author: Anatolij Gustschin Date: Mon May 31 08:56:03 2010 +0000 can: mpc5xxx_can.c: Fix build failure Fixes build error caused by the OF device_node pointer being moved into struct device. Signed-off-by: Anatolij Gustschin Cc: Wolfgang Grandegger Cc: Grant Likely Signed-off-by: David S. Miller commit 288fcee8b7aa98796d96cd5b1b2e8005639328bf Author: Joe Perches Date: Mon May 31 23:48:19 2010 -0700 net/ipv4/tcp_input.c: fix compilation breakage when FASTRETRANS_DEBUG > 1 Commit: c720c7e8383aff1cb219bddf474ed89d850336e3 missed these. Signed-off-by: Joe Perches Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 5953a303471951a4c2f2127f0b4c74df7ceb7ac2 Merge: b1faf56 7489aec Author: David S. Miller Date: Mon May 31 23:44:57 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 commit b1faf5666438090a4dc4fceac8502edc7788b7e3 Author: Eric Dumazet Date: Mon May 31 23:44:05 2010 -0700 net: sock_queue_err_skb() dont mess with sk_forward_alloc Correct sk_forward_alloc handling for error_queue would need to use a backlog of frames that softirq handler could not deliver because socket is owned by user thread. Or extend backlog processing to be able to process normal and error packets. Another possibility is to not use mem charge for error queue, this is what I implemented in this patch. Note: this reverts commit 29030374 (net: fix sk_forward_alloc corruptions), since we dont need to lock socket anymore. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit cb5fcbd540b438a5d311bd15dc910841d01ed140 Author: Alex Deucher Date: Fri May 28 19:01:35 2010 -0400 drm/radeon/kms/evergreen: add initial CS parser Advanced validation is not implemented yet. The mesa code that uses this will be released soon. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 36d1701c502d4f46386e1000ad58d9497a11688d Merge: afa3b60 8b281db Author: Dave Airlie Date: Tue Jun 1 11:32:29 2010 +1000 Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-testing * 'nouveau/for-airlied' of ../drm-nouveau-next: drm/nv50: cast IGP memory location to u64 before shifting drm/nv50: use alternate source of SOR_MODE_CTRL for DP hack drm/nouveau: fix dual-link displays when plugged into single-link outputs drm/nv50: obey dcb->duallink_possible drm/nv50: fix duallink_possible calculation for DCB 4.0 cards drm/nouveau: don't execute INIT_GPIO unless we're really running the table drm/nv40: allow cold-booting of nv4x chipsets drm/nouveau: fix POST detection for certain chipsets drm/nouveau: Add getparam for current PTIMER time. drm/nouveau: allow cursor image and position to survive suspend commit afa3b60c905f606e8245115474d77787035e02eb Merge: c09a350 fbf8176 Author: Dave Airlie Date: Tue Jun 1 11:32:06 2010 +1000 Merge branch 'drm-switcheroo-fixes' into drm-testing * drm-switcheroo-fixes: drm/kms: disable/enable poll around switcheroo on/off drm/nouveau: fixup confusion over which handle the DSM is hanging off. drm/nouveau: attempt to get bios from ACPI v3 commit c09a35028567ae2c11d627bf69134b87a3c0efae Merge: 4abe438 1ca14e7 Author: Dave Airlie Date: Tue Jun 1 11:32:06 2010 +1000 Merge branch 'drm-vmware-fixes' into drm-testing * drm-vmware-fixes: drm/vmwgfx: Remove some leftover debug messages. drm/vmwgfx: Print warnings in kernel log about bo pinning that fails. drm/vmwgfx: Unpause overlay on update. drm/vmwgfx: Some modesetting cleanups and fixes. drm/vmwgfx: Don't use SVGA_REG_ENABLE in modesetting code. drm/vmwgfx: Remove duplicate member from struct vmw_legacy_display_unit. drm/vmwgfx: Reserve first part of VRAM for framebuffer. drm/vmwgfx: Support older hardware. drm/vmwgfx: Get connector status from detection function. drm/vmwgfx: Add kernel throttling support. Bump minor. drm/vmwgfx: Make sure to unpin old and pin new framebuffer. drm/vmwgfx: Fix single framebuffer detection. drm/vmwgfx: Assume larger framebuffer max size. commit fbf81762e385d3d45acad057b654d56972acf58c Author: Dave Airlie Date: Tue Jun 1 09:09:06 2010 +1000 drm/kms: disable/enable poll around switcheroo on/off Because we aren't in a suspend state the poll will still run when we have switcherooed a card off. Signed-off-by: Dave Airlie commit fc5ea29d72bde1bec230538becf396caad8621b8 Author: Dave Airlie Date: Mon May 31 17:10:52 2010 +1000 drm/nouveau: fixup confusion over which handle the DSM is hanging off. This fixes the DSM setup correctly since vga switcheroo. Signed-off-by: Dave Airlie commit afeb3e11147adb357603b071d6d7d1f30ea7f19d Author: Dave Airlie Date: Wed Apr 7 13:55:09 2010 +1000 drm/nouveau: attempt to get bios from ACPI v3 Some of the laptops with the switchable graphics, seem to not post the secondary GPU at all, and we can't find a copy of the BIOS anywhere except in the ACPI rom retrieval. This adds support for ACPI ROM retrieval to nouveau. Signed-off-by: Dave Airlie commit 8b281db596744a15b2abbfdbf655796c64e172ca Author: Ben Skeggs Date: Mon May 31 09:04:03 2010 +1000 drm/nv50: cast IGP memory location to u64 before shifting Signed-off-by: Ben Skeggs commit 4abe4389790d5f02569fbacdf035536ba84c7d44 Author: Thomas Hellstrom Date: Wed May 26 16:21:04 2010 +0200 drm/ttm: Fix ttm_page_alloc.c Fix a number of typos misspellings and checkpatch.pl warnings. Replace "[ttm] " with TTM_PFX Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit e8613c0e29d0018a80652e6ae58660c8a75ac74b Author: Thomas Hellstrom Date: Wed May 26 16:21:03 2010 +0200 drm/ttm: Fix cached TTM page allocation. This patch fixes a regression introduced with the pool page allocator in the event that there are no highmem pages (for example x86_64), in which case cached page allocation would fail. Tested with the vmwgfx driver on a 64-bit vm. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 1ca14e75caae504fdf957cf0c1c4f3aafc886a60 Author: Thomas Hellstrom Date: Fri May 28 11:22:06 2010 +0200 drm/vmwgfx: Remove some leftover debug messages. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 316ab13ae2ad603fd5e3a909524e68d98db1b1b6 Author: Jakob Bornecrantz Date: Fri May 28 11:22:05 2010 +0200 drm/vmwgfx: Print warnings in kernel log about bo pinning that fails. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 792778e8e058471e1909b78d7c5e6ab94962ff8e Author: Jakob Bornecrantz Date: Fri May 28 11:22:04 2010 +0200 drm/vmwgfx: Unpause overlay on update. The unpause codepath uses vmw_overlay_update() so we must unset the paused status. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 259600d593181b8a3b1d7fe99d93233b1b113fd0 Author: Jakob Bornecrantz Date: Fri May 28 11:22:03 2010 +0200 drm/vmwgfx: Some modesetting cleanups and fixes. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit d451f62a7c567654f74018be9ab8da8089660d3b Author: Jakob Bornecrantz Date: Fri May 28 11:22:02 2010 +0200 drm/vmwgfx: Don't use SVGA_REG_ENABLE in modesetting code. We should not use SVGA_REG_ENABLE anywhere but in the fifo setup code, since it controls whether the device is active. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit bbfad33663fe8de1cce84ac776664292c46fe7ae Author: Jakob Bornecrantz Date: Fri May 28 11:22:01 2010 +0200 drm/vmwgfx: Remove duplicate member from struct vmw_legacy_display_unit. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 22ee861c816689b2566290356d54e4a01c9b2e74 Author: Thomas Hellstrom Date: Fri May 28 11:22:00 2010 +0200 drm/vmwgfx: Reserve first part of VRAM for framebuffer. The host may be touching this part of VRAM at modesetting, even if we never use it ourselves, since we blit screen updates from 3D surfaces. Make sure no DMA buffers are placed in this part of VRAM. V2: Fix an error check in vmw_surface_dmabuf_pin(). Signed-off-by: Thomas Hellstrom Signed-off-by: Jakob Bornecrantz Signed-off-by: Dave Airlie commit d7e1958dbe4a7b81d4cab5fab545a068501b967e Author: Jakob Bornecrantz Date: Fri May 28 11:21:59 2010 +0200 drm/vmwgfx: Support older hardware. V2: Fix a couple of typos. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 1ae1ddd5e99bbc067414ff571ac18d4312b4c8cf Author: Jakob Bornecrantz Date: Fri May 28 11:21:58 2010 +0200 drm/vmwgfx: Get connector status from detection function. Also make sure the ldu::active member is properly initialized. Part of fix by Michel Daenzer . Signed-off-by: Jakob Bornecrantz Signed-off-by: Michel Daenzer Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 1925d4565888eb313cc923372da6a08bbfb3a859 Author: Thomas Hellstrom Date: Fri May 28 11:21:57 2010 +0200 drm/vmwgfx: Add kernel throttling support. Bump minor. The throttle_us member in the execbuf argument is now honored. If the member is 0, no waiting for lag will occur, which guarantees backwards compatibility with well-behaved clients. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 04e9e94dba3e564ce810cedab88e957dfd681b4a Author: Jakob Bornecrantz Date: Fri May 28 11:21:56 2010 +0200 drm/vmwgfx: Make sure to unpin old and pin new framebuffer. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 6a591a96d7315fbe81acc33e20bab4956d1f02a3 Author: Jakob Bornecrantz Date: Fri May 28 11:21:55 2010 +0200 drm/vmwgfx: Fix single framebuffer detection. V2: Fix a typo. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 7e71f8a59e1c9adbbc3b737b4b818c8aa4169d0e Author: Jakob Bornecrantz Date: Fri May 28 11:21:54 2010 +0200 drm/vmwgfx: Assume larger framebuffer max size. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 2fb750e825b5347de0390315f4284f13709a9856 Author: Borislav Petkov Date: Mon May 31 23:18:18 2010 +0200 perf-record: Check correct pid when forking When forking the child to be traced, we should check the correct return value from fork() and not a local variable which is otherwise unused. Signed-off-by: Borislav Petkov Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Tom Zanussi Cc: Stephane Eranian LKML-Reference: <20100531211818.GA30175@liondog.tnic> Signed-off-by: Frederic Weisbecker commit dd833d713ccc79e00176eb1b3a6c65638c44e27b Author: Frederic Weisbecker Date: Tue Jun 1 00:43:07 2010 +0200 perf: Do the comm inheritance per thread in event__process_task event__process_task() doesn't propagate the comm copy on clone, but only on process fork. So we loose all the tid:comm resolution for tasks that aren't a main process thread. Progragate the per thread granularity to event__process_task for pid resolution. This fixes various unresolved pids in perf sched, especially when we trace multithread processes. The problem is quickly reproducible with the messaging benchmark using the multithread mode "-t" : perf sched record perf bench sched messaging -t Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Tom Zanussi Cc: Stephane Eranian commit af64865ba6825e10fe62a3105fea5cadffeb52c6 Author: Frederic Weisbecker Date: Tue Jun 1 00:03:40 2010 +0200 perf: Use event__process_task from perf sched perf sched uses event__process_comm(), which means it can resolve comms from: - tasks that have exec'ed (kernel comm events) - tasks that were running when perf record started the actual recording (synthetized comm events) But perf sched can't resolve the pids of tasks that were created after the recording started. To solve this, we need to inherit the comms on fork events using event__process_task(). This fixes various unresolved pids in perf sched, easily visible with: perf sched record perf bench sched messaging Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Tom Zanussi Cc: Stephane Eranian commit 13eb04fdbeb9d21dfe4696630daefe18ef6a1a84 Author: Frederic Weisbecker Date: Mon May 31 23:38:44 2010 +0200 perf: Process comm events by tid When we synthetize the existing running tasks though procfs, we walk through every threads of a process, queuing one comm events per tid. But then on report time, event__process_comm() only creates and sets the comm on a per process granularity. This is the right thing for comm events that came from the kernel, as they are only created on exec. Sub-threads then inherit their comm from fork events. But that doesn't work with our synthetized comm events taken from procfs informations as the per thread granularity is done on comm events directly there. Hence we need event__process_comm() to work with the tid rather than the pid. It won't change anything for comm events coming from the kernel but this will fix the synthetized ones. Before: $ ./perf report -D | grep COMM | grep firefox 0x2c7b8 [0x18]: PERF_RECORD_COMM: firefox:5297 0x2c7d0 [0x18]: PERF_RECORD_COMM: firefox:5297 0x2c7e8 [0x18]: PERF_RECORD_COMM: firefox:5297 0x2c800 [0x18]: PERF_RECORD_COMM: firefox:5297 0x2c818 [0x18]: PERF_RECORD_COMM: firefox:5297 0x2c830 [0x18]: PERF_RECORD_COMM: firefox:5297 After: $ ./perf report -D | grep COMM | grep firefox 0x2c7b8 [0x18]: PERF_RECORD_COMM: firefox:5297 0x2c7d0 [0x18]: PERF_RECORD_COMM: firefox:5299 0x2c7e8 [0x18]: PERF_RECORD_COMM: firefox:5300 0x2c800 [0x18]: PERF_RECORD_COMM: firefox:5308 0x2c818 [0x18]: PERF_RECORD_COMM: firefox:5309 0x2c830 [0x18]: PERF_RECORD_COMM: firefox:5312 This fixes various unresolved pid on perf sched. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Tom Zanussi Cc: Stephane Eranian commit 293a7cfeedc2b2380a7c7274902323c3cf5f7575 Author: Rusty Russell Date: Mon May 31 19:53:50 2010 +0930 module: fix reference to mod->percpu after freeing module. Rafael sees a sometimes crash at precpu_modfree from kernel/module.c; it only occurred with another (since-reverted) patch, but that patch simply changed timing to uncover this bug, it was otherwise unrelated. The comment about the mod being freed is self-explanatory, but neither Tejun nor I read it. This bug was introduced in 259354deaa, after it had previously been fixed in 6e2b75740b. How embarrassing. Reported-by: "Rafael J. Wysocki" Signed-off-by: Rusty Russell Embarrassingly-Acked-by: Tejun Heo Cc: Masami Hiramatsu Tested-by: "Rafael J. Wysocki" Signed-off-by: Linus Torvalds commit 7489aec8eed4f2f1eb3b4d35763bd3ea30b32ef5 Author: Eric Dumazet Date: Mon May 31 16:41:35 2010 +0200 netfilter: xtables: stackptr should be percpu commit f3c5c1bfd4 (netfilter: xtables: make ip_tables reentrant) introduced a performance regression, because stackptr array is shared by all cpus, adding cache line ping pongs. (16 cpus share a 64 bytes cache line) Fix this using alloc_percpu() Signed-off-by: Eric Dumazet Acked-By: Jan Engelhardt Signed-off-by: Patrick McHardy commit c936e8bd1de2fa50c49e3df6fa5036bf07870b67 Author: Xiaotian Feng Date: Mon May 31 16:41:09 2010 +0200 netfilter: don't xt_jumpstack_alloc twice in xt_register_table In xt_register_table, xt_jumpstack_alloc is called first, later xt_replace_table is used. But in xt_replace_table, xt_jumpstack_alloc will be used again. Then the memory allocated by previous xt_jumpstack_alloc will be leaked. We can simply remove the previous xt_jumpstack_alloc because there aren't any users of newinfo between xt_jumpstack_alloc and xt_replace_table. Signed-off-by: Xiaotian Feng Cc: Patrick McHardy Cc: "David S. Miller" Cc: Jan Engelhardt Cc: Andrew Morton Cc: Rusty Russell Cc: Alexey Dobriyan Acked-By: Jan Engelhardt Signed-off-by: Patrick McHardy commit bc284f94f84c3d76e49c6f3df9028c503f9589d9 Author: David S. Miller Date: Mon May 31 05:47:32 2010 -0700 greth: Fix build after OF device conversions. Signed-off-by: David S. Miller commit 64960848abd18d0bcde3f53ffa7ed0b631e6b25d Merge: 2903037 67a3e12 Author: David S. Miller Date: Mon May 31 05:46:45 2010 -0700 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ commit e565813ab95875af0d51a6bcd537068380bb06ea Author: Akinobu Mita Date: Mon May 24 22:04:51 2010 +0900 x86/mm: Remove unused DBG() macro DBG() macro for CONFIG_DEBUG_PER_CPU_MAPS is unused. Signed-off-by: Akinobu Mita LKML-Reference: <1274706291-13554-1-git-send-email-akinobu.mita@gmail.com> Signed-off-by: Ingo Molnar commit 546cf44a1b507c1cbb5cf42bbe6169780567f36f Author: Randy Dunlap Date: Sat May 29 11:45:07 2010 -0700 blktrace: Fix new kernel-doc warnings Fix blktrace.c kernel-doc warnings: Warning(kernel/trace/blktrace.c:858): No description found for parameter 'ignore' Warning(kernel/trace/blktrace.c:890): No description found for parameter 'ignore' Signed-off-by: Randy Dunlap Cc: Jens Axboe Cc: Steven Rostedt Cc: Frederic Weisbecker LKML-Reference: <20100529114507.c466fc1e.randy.dunlap@oracle.com> Signed-off-by: Ingo Molnar commit 74048f895fa8cbf8119b4999f1f44881a825f954 Author: Frederic Weisbecker Date: Thu May 27 21:34:58 2010 +0200 perf_events: Fix unincremented buffer base on partial copy If a sample size crosses to the next page boundary, the copy will be made in more than one step. However we forget to advance the source offset for the next copy, leading to unexpected double copies that completely mess up the traces. This fixes various kinds of bad traces that have irrelevant data inside, as an example: geany-4979 [001] 5758.077775: sched_switch: prev_comm=! prev_pid=121 prev_prio=0 prev_state=S|D|Z|X|x ==> next_comm= next_pid=7497072 next_prio=0 Signed-off-by: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Signed-off-by: Peter Zijlstra LKML-Reference: <1274988898-5639-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 90151c35b19633e0cab5a6c80f1ba4a51e7c913b Author: Stephane Eranian Date: Tue May 25 16:23:10 2010 +0200 perf_events: Fix event scheduling issues introduced by transactional API The transactional API patch between the generic and model-specific code introduced several important bugs with event scheduling, at least on X86. If you had pinned events, e.g., watchdog, and were over-committing the PMU, you would get bogus counts. The bug was showing up on Intel CPU because events would move around more often that on AMD. But the problem also existed on AMD, though harder to expose. The issues were: - group_sched_in() was missing a cancel_txn() in the error path - cpuc->n_added was not properly maintained, leading to missing actions in hw_perf_enable(), i.e., n_running being 0. You cannot update n_added until you know the transaction has succeeded. In case of failed transaction n_added was not adjusted back. - in case of failed transactions, event_sched_out() was called and eventually invoked x86_disable_event() to touch the HW reg. But with transactions, on X86, event_sched_in() does not touch HW registers, it simply collects events into a list. Thus, you could end up calling x86_disable_event() on a counter which did not correspond to the current event when idx != -1. The patch modifies the generic and X86 code to avoid all those problems. First, we keep track of the number of events added last. In case the transaction fails, we substract them from n_added. This approach is necessary (as opposed to delaying updates to n_added) because not all event updates use the transaction API, e.g., single events. Second, we encapsulate the event_sched_in() and event_sched_out() in group_sched_in() inside the transaction. That makes the operations symmetrical and you can also detect that you are inside a transaction and skip the HW reg access by checking cpuc->group_flag. With this patch, you can now overcommit the PMU even with pinned system-wide events present and still get valid counts. Signed-off-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <1274796225.5882.1389.camel@twins> Signed-off-by: Ingo Molnar commit 2e97942fe57864588774f173cf4cd7bb68968b76 Author: Peter Zijlstra Date: Fri May 21 16:22:33 2010 +0200 perf_events, trace: Fix perf_trace_destroy(), mutex went missing Steve spotted I forgot to do the destroy under event_mutex. Reported-by: Steven Rostedt Signed-off-by: Peter Zijlstra LKML-Reference: <1274451913.1674.1707.camel@laptop> Signed-off-by: Ingo Molnar commit 3771f0771154675d4a0ca780be2411f3cc357208 Author: Peter Zijlstra Date: Fri May 21 12:31:09 2010 +0200 perf_events, trace: Fix probe unregister race tracepoint_probe_unregister() does not synchronize against the probe callbacks, so do that explicitly. This properly serializes the callbacks and the free of the data used therein. Also, use this_cpu_ptr() where possible. Acked-by: Frederic Weisbecker Signed-off-by: Peter Zijlstra LKML-Reference: <1274438476.1674.1702.camel@laptop> Signed-off-by: Ingo Molnar commit 8a49542c0554af7d0073aac0ee73ee65b807ef34 Author: Peter Zijlstra Date: Thu May 27 15:47:49 2010 +0200 perf_events: Fix races in group composition Group siblings don't pin each-other or the parent, so when we destroy events we must make sure to clean up all cross referencing pointers. In particular, for destruction of a group leader we must be able to find all its siblings and remove their reference to it. This means that detaching an event from its context must not detach it from the group, otherwise we can end up failing to clear all pointers. Solve this by clearly separating the attachment to a context and attachment to a group, and keep the group composed until we destroy the events. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit ac9721f3f54b27a16c7e1afb2481e7ee95a70318 Author: Peter Zijlstra Date: Thu May 27 12:54:41 2010 +0200 perf_events: Fix races and clean up perf_event and perf_mmap_data interaction In order to move toward separate buffer objects, rework the whole perf_mmap_data construct to be a more self-sufficient entity, one with its own lifetime rules. This greatly sanitizes the whole output redirection code, which was riddled with bugs and races. Signed-off-by: Peter Zijlstra Cc: LKML-Reference: Signed-off-by: Ingo Molnar commit 54e88fad223c4e1d94289611a90c7fe3ebe5631b Author: Amit K. Arora Date: Tue May 25 18:53:46 2010 +0530 sched: Make sure timers have migrated before killing the migration_thread Problem: In a stress test where some heavy tests were running along with regular CPU offlining and onlining, a hang was observed. The system seems to be hung at a point where migration_call() tries to kill the migration_thread of the dying CPU, which just got moved to the current CPU. This migration thread does not get a chance to run (and die) since rt_throttled is set to 1 on current, and it doesn't get cleared as the hrtimer which is supposed to reset the rt bandwidth (sched_rt_period_timer) is tied to the CPU which we just marked dead! Solution: This patch pushes the killing of migration thread to "CPU_POST_DEAD" event. By then all the timers (including sched_rt_period_timer) should have got migrated (along with other callbacks). Signed-off-by: Amit Arora Signed-off-by: Gautham R Shenoy Acked-by: Tejun Heo Signed-off-by: Peter Zijlstra Cc: Thomas Gleixner LKML-Reference: <20100525132346.GA14986@amitarora.in.ibm.com> Signed-off-by: Ingo Molnar commit a7fed9f7369bfcfabed7aca1d608d286f2dfa7f6 Author: Benjamin Herrenschmidt Date: Mon May 31 11:49:00 2010 +1000 powerpc: Don't export cvt_fd & _df when CONFIG_PPC_FPU is not set Signed-off-by: Benjamin Herrenschmidt commit ecca1a34befbb13fc23d9a2cc0d6b725c7727fb2 Merge: 3d00d4f 48936a0 Author: Benjamin Herrenschmidt Date: Mon May 31 10:01:50 2010 +1000 Merge commit 'kumar/next' into next Conflicts: arch/powerpc/sysdev/fsl_msi.c commit 3d00d4ff11686895925f46265f4a78dc78196c2e Merge: 67a3e12 895443c Author: Benjamin Herrenschmidt Date: Mon May 31 09:59:00 2010 +1000 Merge commit 'jwb/next' into next commit 2903037400a26e7c0cc93ab75a7d62abfacdf485 Author: Eric Dumazet Date: Sat May 29 00:20:48 2010 -0700 net: fix sk_forward_alloc corruptions As David found out, sock_queue_err_skb() should be called with socket lock hold, or we risk sk_forward_alloc corruption, since we use non atomic operations to update this field. This patch adds bh_lock_sock()/bh_unlock_sock() pair to three spots. (BH already disabled) 1) skb_tstamp_tx() 2) Before calling ip_icmp_error(), in __udp4_lib_err() 3) Before calling ipv6_icmp_error(), in __udp6_lib_err() Reported-by: Anton Blanchard Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 7dfde179c38056b91d51e60f3d50902387f27c84 Author: Rémi Denis-Courmont Date: Wed May 26 00:44:44 2010 +0000 Phonet: listening socket lock protects the connected socket list The accept()'d socket need to be unhashed while the (listen()'ing) socket lock is held. This fixes a race condition that could lead to an OOPS. Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 97dc875f90a7b88a9fa476c256345c0d40fcdf6c Author: Dan Carpenter Date: Wed May 26 05:16:48 2010 +0000 caif: unlock on error path in cfserl_receive() There was an spin_unlock missing on the error path. The spin_lock was tucked in with the declarations so it was hard to spot. I added a new line. Signed-off-by: Dan Carpenter Acked-by: Sjur Brændeland Signed-off-by: David S. Miller commit c196b02ce60d7b1f9bc62a62c5706d4d58fbfc5a Author: Dan Carpenter Date: Wed May 26 04:47:39 2010 +0000 be2net: remove superfluous externs This fixes some sparse warnings: drivers/net/benet/be_cmds.c:1503:12: warning: function 'be_cmd_enable_magic_wol' with external linkage has definition drivers/net/benet/be_cmds.c:1668:12: warning: function 'be_cmd_get_seeprom_data' with external linkage has definition Signed-off-by: Dan Carpenter Acked-by: Sarveshwar Bandi Signed-off-by: David S. Miller commit 2892d9c2d925e0d72a7a529852942e2592a970f8 Author: Dan Carpenter Date: Wed May 26 04:46:35 2010 +0000 be2net: add unlock on error path The unlock accidentally got removed from the error path in dd131e76e5: "be2net: Bug fix to avoid disabling bottom half during firmware upgrade." Signed-off-by: Dan Carpenter Acked-by: Sarveshwar Bandi Signed-off-by: David S. Miller commit 5daf47bb4e708fde32c1856a0d049e3c3d03c36c Author: Julia Lawall Date: Wed May 26 05:54:21 2010 +0000 net/rds: Add missing mutex_unlock Add a mutex_unlock missing on the error path. In each case, whenever the label out is reached from elsewhere in the function, mutex is not locked. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression E1; @@ * mutex_lock(E1); <+... when != E1 if (...) { ... when != E1 * return ...; } ...+> * mutex_unlock(E1); // Signed-off-by: Julia Lawall Reviewed-by: Zach Brown Acked-by: Andy Grover Signed-off-by: David S. Miller commit e72e9f3814cb8c1076d627c29cec90b005838ac3 Author: Julia Lawall Date: Wed May 26 05:55:10 2010 +0000 drivers/isdn/hardware/mISDN: Add missing spin_unlock Add a spin_unlock missing on the error path. The return value of write_reg seems to be completely ignored, so it seems that the lock should be released in every case. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression E1; @@ * spin_lock(E1,...); <+... when != E1 if (...) { ... when != E1 * return ...; } ...+> * spin_unlock(E1,...); // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 32f6249ba7d63d5d86dae930d63ca70ec11d59af Author: Mark Ware Date: Sat May 29 00:16:28 2010 -0700 fs_enet: Adjust BDs after tx error This patch fixes an occasional transmit lockup in the mac-fcc which occurs after a tx error. The test scenario had the local port set to autoneg and the other end fixed at 100FD, resulting in a large number of late collisions. According to the MPC8280RM 30.10.1.3 (also 8272RM 29.10.1.3), after a tx error occurs, TBPTR may sometimes point beyond BDs still marked as ready. This patch walks back through the BDs and points TBPTR to the earliest one marked as ready. Tested on a custom board with a MPC8280. Signed-off-by: Mark Ware Signed-off-by: David S. Miller commit 5b0daa3474d52bed906c4d5e92b44e10148c6972 Author: Changli Gao Date: Sat May 29 00:12:13 2010 -0700 skb: make skb_recycle_check() return a bool value Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit 6057fd78a8dcce6269f029b967051d5a2e9b0895 Author: Brian Haley Date: Fri May 28 23:02:35 2010 -0700 IPv6: fix Mobile IPv6 regression Commit f4f914b5 (net: ipv6 bind to device issue) caused a regression with Mobile IPv6 when it changed the meaning of fl->oif to become a strict requirement of the route lookup. Instead, only force strict mode when sk->sk_bound_dev_if is set on the calling socket, getting the intended behavior and fixing the regression. Tested-by: Arnaud Ebalard Signed-off-by: Brian Haley Signed-off-by: David S. Miller commit e5e5cf4c71508ed38e921b31b438b8b349409f2a Merge: 045de01 da1fdb0 Author: David S. Miller Date: Fri May 28 22:36:41 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit a1786bd270b08834a735e06c3d5430eeb0baf017 Author: Zhenyu Wang Date: Thu May 27 10:26:43 2010 +0800 drm/i915: Unmask interrupt for render engine on Sandybridge With splitted engines on Sandybridge, each engine has its own interrupt control as well. This unmasks the interrupt to properly enable pipe control notify event for render engine. Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit ca76482e0f4b64942c704fa11c620ffd1bdd8475 Author: Zhenyu Wang Date: Thu May 27 10:26:42 2010 +0800 drm/i915: Fix PIPE_CONTROL command on Sandybridge Sandybridge(Gen6) has new format for PIPE_CONTROL command, the flush and post-op control are in dword 1 now. This changes command length field for difference between Ironlake and Sandybridge. I tried to test this with noop request and issue PIPE_CONTROL command for each sequence and track notify interrupts, which seems work fine. Hopefully we don't need workaround like on Ironlake for Sandybridge. Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit ab34c226812588de8f341ce48eb32c3fef5155a9 Author: Chris Wilson Date: Thu May 27 14:15:35 2010 +0100 drm/i915: Fix up address spaces in slow_kernel_write() Since we now get_user_pages() outside of the mutex prior to performing the copy, we kmap() the page inside the copy routine and so need to perform an ordinary memcpy() and not copy_from_user(). Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 99a03df57c82ec20848d2634f652c07ac3504b98 Author: Chris Wilson Date: Thu May 27 14:15:34 2010 +0100 drm/i915: Use non-atomic kmap for slow copy paths As we do not have a requirement to be atomic and avoid sleeping whilst performing the slow copy for shmem based pread and pwrite, we can use kmap instead, thus simplifying the code. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 9b8c4a0b215e603497daebe8ecbc9b1f0f035808 Author: Chris Wilson Date: Thu May 27 14:21:01 2010 +0100 drm/i915: Avoid moving from CPU domain during pwrite We can avoid an early clflush when pwriting if we use the current CPU write domain rather than moving the object to the GTT domain for the purposes of the pwrite. This has the advantage of not flushing the presumably hot data that we want to upload into the bo, and of ascribing the clflush to the execution when profiling. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 68f95ba9e260516411411524c45263b5d53f393c Author: Chris Wilson Date: Thu May 27 13:18:22 2010 +0100 drm/i915: Cleanup after failed initialization of ringbuffers The callers expect us to cleanup any partially initialised structures before reporting the error. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit da1fdb02d9200ff28b6f3a380d21930335fe5429 Author: Christoph Fritz Date: Fri May 28 10:45:59 2010 +0200 ssb: fix NULL ptr deref when pcihost_wrapper is used Ethernet driver b44 does register ssb by it's pcihost_wrapper and doesn't set ssb_chipcommon. A check on this value introduced with commit d53cdbb94a52a920d5420ed64d986c3523a56743 and ea2db495f92ad2cf3301623e60cb95b4062bc484 triggers: BUG: unable to handle kernel NULL pointer dereference at 00000010 IP: [] ssb_is_sprom_available+0x16/0x30 Signed-off-by: Christoph Fritz Signed-off-by: John W. Linville commit 654fc6073f68efa3b6c466825749e73e7fbb92cd Author: Chris Wilson Date: Thu May 27 13:18:21 2010 +0100 drm/i915: Reject bind_to_gtt() early if object > aperture If the object is bigger than the entire aperture, reject it early before evicting everything in a vain attempt to find space. v2: Use E2BIG as suggested by Owain G. Ainsworth. Signed-off-by: Chris Wilson Cc: stable@kernel.org Signed-off-by: Eric Anholt commit 85cd4612fdab4e837d7eea048a697c75d0477d3b Author: Chris Wilson Date: Thu May 27 13:18:20 2010 +0100 drm/i915: Check error code whilst moving buffer to GTT domain. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 3d1cc47037f36004b10681d3436ef0942ebb279b Author: Chris Wilson Date: Thu May 27 13:18:19 2010 +0100 drm/i915: Remove spurious warning "Failure to install fence" This particular warning is harmless as we emit during the normal pinning process where the batch buffer requires more fences than is available without eviction. Only if we fail to evict enough fences does this become a problem, so include the requested number of fences in the ultimate *error* message. v2: Remember to compile test even trial patches to remove warnings. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit ac0c6b5ad3b3b513e1057806d4b7627fcc0ecc27 Author: Chris Wilson Date: Thu May 27 13:18:18 2010 +0100 drm/i915: Rebind bo if currently bound with incorrect alignment. Whilst pinning the buffer, check that that its current alignment matches the requested alignment. If it does not, rebind. This should clear up any final render errors whilst resuming, for reference: Bug 27070 - [i915] Page table errors with empty ringbuffer https://bugs.freedesktop.org/show_bug.cgi?id=27070 Bug 15502 - render error detected, EIR: 0x00000010 https://bugzilla.kernel.org/show_bug.cgi?id=15502 Bug 13844 - i915 error: "render error detected" https://bugzilla.kernel.org/show_bug.cgi?id=13844 Signed-off-by: Chris Wilson Cc: stable@kernel.org Signed-off-by: Eric Anholt commit a7faf32d00529b9c501e37a31d4bf8acef4f8f59 Author: Chris Wilson Date: Thu May 27 13:18:17 2010 +0100 drm/i915: Include pitch in set_base debug statement. Add the pitch that we about to write into the control register along with the base, offset and coordinates that go into the other control registers. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit a939406fda8ddc7de69ee9186356d09dc6daaa2c Author: Chris Wilson Date: Thu May 27 13:18:16 2010 +0100 drm/i915: Only print "nothing to do" debug message as required. If the FBC is already disabled, then we do not even attempt to disable FBC and so there is no point emitting a debug statement at that point, having already emitted one saying why we are disabling FBC. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 808b24d6ed8b155aac17007788390ebfde263f30 Author: Chris Wilson Date: Thu May 27 13:18:15 2010 +0100 drm/i915: Propagate error from unbinding an unfenceable object. Signed-off-by: Chris Wilson Cc: Jesse Barnes Reviewed-by: Jesse Barnes Signed-off-by: Eric Anholt commit b118c1e363befe3d74469f4a014ce6353097f08a Author: Chris Wilson Date: Thu May 27 13:18:14 2010 +0100 drm/i915: Avoid nesting of domain changes when setting display plane Nesting domain changes will cause confusion when trying to interpret the tracepoints describing the sequence of changes for the object, as well as obscuring the order of operations for the reader of the code. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 368a07d26ae99c80678a968946744fd83e7708d0 Author: Johannes Berg Date: Fri May 28 14:26:23 2010 +0200 mac80211: make a function static sparse correctly complains that __ieee80211_get_channel_mode is not static. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit c6a6368b32aa4fd145e840c8d8dac6923fae2688 Author: Prarit Bhargava Date: Thu May 27 14:41:20 2010 -0400 libertas: fix uninitialized variable warning Fixes: drivers/net/wireless/libertas/rx.c: In function process_rxed_802_11_packet: drivers/net/wireless/libertas/rx.c:354: error: radiotap_hdr.flags may be used uninitialized in this function Signed-off-by: Prarit Bhargava Signed-off-by: John W. Linville commit 468f0b44ce4b002ca7d9260f802a341854752c02 Author: Chris Wilson Date: Thu May 27 13:18:13 2010 +0100 drm/i915: Hold the spinlock whilst resetting unpin_work along error path Delay taking the mutex until we need to and ensure that we hold the spinlock when resetting unpin_work on the error path. Also defer the debugging print messages until after we have released the spinlock. Signed-off-by: Chris Wilson Cc: Jesse Barnes Cc: Kristian Høgsberg Reviewed-by: Jesse Barnes Signed-off-by: Eric Anholt commit 7c9fd60f9764373414c0a64f500a78635b0a0a7b Author: Vasanthakumar Thiagarajan Date: Wed May 26 19:06:53 2010 -0700 ath9k: Fix bug in the way "bf_tx_aborted" of struct ath_buf is used This bug was introduced by the following commit Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:38:46 2010 -0400 ath9k: Remove ATH9K_TX_SW_ABORTED and introduce a bool for this purpose Wrong buffer is checked for bf_tx_aborted field in ath_tx_num_badfrms(), this may result in a rate scaling with wrong feedback (number of unacked frames in this case). It is the last one in the chain of buffers for an aggregate frame that should be checked. Also it misses the initialization of this field in the buffer, this may lead to a situation where we stop the sw retransmission of failed subframes associated to this buffer. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 35aed2e6be2feaa227fe5c7a0b7c286c4fe71592 Author: Chris Wilson Date: Thu May 27 13:18:12 2010 +0100 drm/i915: Only print an message if there was an error Only report an error if the GPU has actually detected one, otherwise we are just hung. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 9be8ab2ea81f84c1726d79613c342141f5d19a3b Author: Justin P. Mattock Date: Wed May 26 11:00:04 2010 -0700 ath9k: Fix ath_print in xmit for hardware reset. ath_print in xmit.c should say "Reseting hardware" instead of Resetting HAL!(since HAL is being fazed out). dmesg shows: [ 8660.899624] ath: Failed to stop TX DMA in 100 msec after killing last frame [ 8660.899676] ath: Unable to stop TxDMA. Reset HAL! Signed-off-by: Justin P. Mattock Signed-off-by: John W. Linville commit becd214277ed41dc6f745f5f8db39d84c6c7ffc8 Author: Ben Skeggs Date: Sat May 29 03:06:14 2010 +1000 drm/nv50: use alternate source of SOR_MODE_CTRL for DP hack Fixes module unload+reload on Dell M4500, where the "normal" registers get reset to 0. Signed-off-by: Ben Skeggs commit 26099a74805eaf79f3058cc4097ebaa8cc55122c Author: Ben Skeggs Date: Fri May 28 10:13:16 2010 +1000 drm/nouveau: fix dual-link displays when plugged into single-link outputs When selecting the native mode for a display we weren't taking into account whether or not it was actually supported on that particular output. This patch modifies our native mode selection to run all modes through mode_valid() first. Signed-off-by: Ben Skeggs commit 2c58077541cc6859a9a9046d9c3a4d61bdbd4f18 Author: Ben Skeggs Date: Fri May 28 10:04:05 2010 +1000 drm/nv50: obey dcb->duallink_possible It was once assumed that all G8x had dual-link TMDS everywhere, this isn't actually the case - especially considering passive DP->DVI converters and some HDMI connectors only support single-link. Signed-off-by: Ben Skeggs commit 23484874e6bf837704bf1fa61605d33a12b174e3 Author: Ben Skeggs Date: Fri May 28 09:39:11 2010 +1000 drm/nv50: fix duallink_possible calculation for DCB 4.0 cards Signed-off-by: Ben Skeggs commit 73db4bedc5dde97adf59b5b5a07c6cf0ee56e668 Author: Ben Skeggs Date: Wed May 26 10:41:45 2010 +1000 drm/nouveau: don't execute INIT_GPIO unless we're really running the table This resulted in accidently switching off the eDP panel on certain laptops since the default state in the GPIO table was off. Fixes rh#582621 Signed-off-by: Ben Skeggs commit f50c0b91e7718e7deda46475cfd0ea1413daed04 Author: Ben Skeggs Date: Tue May 25 13:48:07 2010 +1000 drm/nv40: allow cold-booting of nv4x chipsets Signed-off-by: Ben Skeggs commit d13102c6b4836289138431e3fbfc08e90c925ffd Author: Ben Skeggs Date: Tue May 25 13:47:16 2010 +1000 drm/nouveau: fix POST detection for certain chipsets We totally fail at detecting un-POSTed chipsets prior to G80. This commit changes the pre-G80 POST detection to read the programmed horizontal total from CRTC 0, and assume the card isn't POSTed if it's 0. NVIDIA use some other heuristics more similar to what we do on G80, but I wasted quite a long time trying to figure out the exact specifics of what they do so we can try this for a bit instead. Signed-off-by: Ben Skeggs commit 7fc74f17e6c9b4d86371c3a947afc32bd6bc9691 Author: Marcin Kościelnicki Date: Sun May 23 11:36:04 2010 +0000 drm/nouveau: Add getparam for current PTIMER time. This will be useful for computing GPU-CPU latency, including GL_ARB_timer_query extension. Signed-off-by: Marcin Kościelnicki Signed-off-by: Ben Skeggs commit b334f2b3b68c35fd86a0cbc90ecee40e63ba2f37 Author: Maarten Maathuis Date: Sun May 9 14:49:52 2010 +0200 drm/nouveau: allow cursor image and position to survive suspend - This isn't triggered yet on a normal kernel, because it still does a VT switch, but it seemed like a good idea to fix this now. Tested-by: Maxim Levitsky Signed-off-by: Maarten Maathuis Signed-off-by: Ben Skeggs commit 64ffc9ff424c65adcffe7d590018cc75e2d5d42a Author: Michal Marek Date: Thu May 27 16:07:37 2010 +0200 kbuild: Revert part of e8d400a to resolve a conflict A more complete patch in the kernel-doc tree also contains this change. Reported-by: Stephen Rothwell Signed-off-by: Michal Marek commit 84fe6c19e4a598e8071e3bd1b2c923454eae1268 Author: Julia Lawall Date: Thu May 27 12:31:51 2010 +0200 arch/x86/kernel: Add missing spin_unlock Add a spin_unlock missing on the error path. The locks and unlocks are balanced in other functions, so it seems that the same should be the case here. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression E1; @@ * spin_lock(E1,...); <+... when != E1 if (...) { ... when != E1 * return ...; } ...+> * spin_unlock(E1,...); // Cc: stable@kernel.org Signed-off-by: Julia Lawall Signed-off-by: Joerg Roedel commit e20f9c64c79e2282f9eb531509181965ec8f0a92 Author: Eric Anholt Date: Wed May 26 14:51:06 2010 -0700 drm/i915: Clean up leftover bits from hws move to ring structure. Fixes /debug/dri/0/i915_gem_interrupt output for status page. Signed-off-by: Eric Anholt commit 9553426372eef71c849499fb1d232f4b0577c0f9 Author: Li Peng Date: Tue May 18 18:58:44 2010 +0800 drm/i915: Add CxSR support on Pineview DDR3 Pineview with DDR3 memory has different latencies to enable CxSR. This patch updates CxSR latency table to add Pineview DDR3 latency configuration. It also adds one flag "is_ddr3" for checking DDR3 setting in MCHBAR. Cc: Shaohua Li Cc: Zhao Yakui Signed-off-by: Li Peng Signed-off-by: Eric Anholt commit d8201ab6514f8dc1a0ccfac52c688d80976a425a Author: Dan Carpenter Date: Fri May 7 10:39:00 2010 +0200 i915: remove unneeded null checks The "encoder" variable can never be null because it is used as loop cursor in a list_for_each_entry() loop. Signed-off-by: Dan Carpenter Signed-off-by: Eric Anholt commit 90a78e8f60f679b0937011314a6cda39c7449d1d Author: Dan Carpenter Date: Fri May 7 10:40:09 2010 +0200 i915/intel_sdvo: remove unneeded null check The "connector" variable is used as the cursor in a list_for_each_entry() and it's always non-null so we don't need to check it. Signed-off-by: Dan Carpenter Signed-off-by: Eric Anholt commit 467b200da78c56036e58850a7f27902937d506f7 Author: Zhenyu Wang Date: Wed May 12 11:02:14 2010 +0800 drm/i915: Fix HDMI mode select for Cougarpoint PCH For real HDMI sink, CPT HDMI port has to set 'HDMI' mode flag in order to make HDMI audio work correctly. This is required patch for drm/i915 to enable HDMI audio on CPT PCH, ALSA patch is at http://mailman.alsa-project.org/pipermail/alsa-devel/2010-May/027601.html Tested-by: Fengguang Wu Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit 778c35444f7bbb8f1816d40ada650e19c5da9c02 Author: Daniel Vetter Date: Thu May 13 11:49:44 2010 +0200 drm/i915: combine all small integers into one single bitfield This saves a whooping 7 dwords. Zero functional changes. Because some of the refcounts are rather tightly calculated, I've put BUG_ONs in the code to check for overflows. Signed-off-by: Daniel Vetter Signed-off-by: Eric Anholt commit a7de64e540d2017a8e44dec1ca9d88a509aa7e05 Author: Adam Jackson Date: Thu May 13 14:45:43 2010 -0400 drm/i915/dp: Add DPCD data to debug output Signed-off-by: Adam Jackson Signed-off-by: Eric Anholt commit 9962c9252e46eda7058067cbe73bdf1ed74b0d37 Author: Adam Jackson Date: Thu May 13 14:45:42 2010 -0400 drm/i915/dp: Only enable enhanced framing if the sink supports it DisplayPort spec v1.1a, Table 2-52. Signed-off-by: Adam Jackson Signed-off-by: Eric Anholt commit 9908ff736adf261e749b4887486a32ffa209304c Author: Chris Wilson Date: Sat May 15 09:57:03 2010 +0100 drm/i915: Kill dangerous pending-flip debugging We can, by virtue of a vblank interrupt firing in the middle of setting up the unpin work (i.e. after we set the unpin_work field and before we write to the ringbuffer) enter intel_finish_page_flip() prior to receiving the pending flip notification. Therefore we can expect to hit intel_finish_page_flip() under normal circumstances without a pending flip and even without installing the pending_flip_obj. This is exacerbated by aperture thrashing whilst binding the framebuffer References: Bug 28079 - "glresize" causes kernel panic in intel_finish_page_flip. https://bugs.freedesktop.org/show_bug.cgi?id=28079 Reported-by: Nick Bowler Signed-off-by: Chris Wilson Cc: Jesse Barnes Cc: stable@kernel.org Reviewed-by: Jesse Barnes Signed-off-by: Eric Anholt commit f1befe71fa7a79ab733011b045639d8d809924ad Author: Chris Wilson Date: Tue May 18 12:24:51 2010 +0100 agp/intel: Restrict GTT mapping to valid range on i915 and i945 References: Bug 15733 - Crash when accessing nonexistent GTT entries in i915 https://bugzilla.kernel.org/show_bug.cgi?id=15733 On G33 and above, the size of the GTT space is determined by the GMCH control register. Prior to this revision, the size is determined by the size of the aperture. So we must careful to map and fill the appropriate range depending on chipset. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 9a7e8492d17394a81d5534abf90b5b2ada7ea3c0 Author: Tobias Klauser Date: Thu May 20 10:33:46 2010 +0200 drm/i915: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Signed-off-by: Tobias Klauser Signed-off-by: Eric Anholt commit 7648fa99eb77a2e1a90b7beaa420e07d819b9c11 Author: Jesse Barnes Date: Thu May 20 14:28:11 2010 -0700 drm/i915: add power monitoring support Add power monitoring support to the i915 driver for use by the IPS driver. Export the available power info to the IPS driver through a few new inter-driver hooks. When used together, the IPS driver and this patch can significantly increase graphics performance on Ironlake class chips. Signed-off-by: Jesse Barnes [anholt: Fixed 32-bit compile. stupid obfuscating div_u64()] Signed-off-by: Eric Anholt commit 7a772c492fcfffae812ffca78a628e76fa57fe58 Author: Adam Jackson Date: Mon May 24 16:46:29 2010 -0400 drm/i915/gen4: Extra CRT hotplug paranoia Disable the CRT plug interrupt while doing the force cycle, explicitly clear any CRT interrupt we may have generated, and restore when done. Should mitigate interrupt storms from hotplug detection. Signed-off-by: Adam Jackson Signed-off-by: Eric Anholt commit 734b4157b367d66405f7dab80085d17c9c8dd3b5 Author: Krzysztof Halasa Date: Tue May 25 18:41:46 2010 +0200 drm/i915: Add support for interlaced display. This doesn't change the clock limits (minimums), i.e. it won't make it output 720x576 PAL nor 720x480 NTSC, but it will work with modes like 1080i etc. (including GLX and textured Xvideo, not sure about the overlay). Tested on i915 + analog VGA, it would be worth checking if newer chips (and which ones) still support interlaced mode. Signed-off-by: Krzysztof Halasa Signed-off-by: Eric Anholt commit f953c9353f5fe6e98fa7f32f51060a74d845b5f8 Author: Daniel J Blueman Date: Mon May 17 14:23:52 2010 +0100 i915: fix lock imbalance on error path... While investigating Intel i5 Arrandale GPU lockups with -rc4, I noticed a lock imbalance. Signed-off-by: Daniel J Blueman Signed-off-by: Eric Anholt commit f41275e893191eeb7a88e431d594e167adbd5234 Author: Li Zefan Date: Mon May 24 16:25:44 2010 +0800 drm/i915: Convert more trace events to DEFINE_EVENT Convert i915_gem_object_clflush to DEFINE_EVENT, and save ~0.5K: text data bss dec hex filename 13204 2732 12 15948 3e4c i915_trace_points.o.orig 12668 2732 12 15412 3c34 i915_trace_points.o No change in functionality. Signed-off-by: Li Zefan Acked-by: Steven Rostedt Signed-off-by: Eric Anholt commit 9517a92f48b08bb02cfb616825850b82b28461cc Author: Jesse Barnes Date: Fri May 21 09:40:45 2010 -0700 drm/i915: add timeout to FBC disable waits FBC disable on 965 can take long enough to trigger latency checks in the kernel so be sure to timeout after a reasonable period. Fixes https://bugzilla.kernel.org/show_bug.cgi?id=15015. Tested-by: James Ettle Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt commit d1b851fc0d105caa6b6e3e7c92d2987dfb52cbe0 Author: Zou Nan hai Date: Fri May 21 09:08:57 2010 +0800 drm/i915: implement BSD ring buffer V2 The BSD (bit stream decoder) ring is used for accessing the BSD engine which decodes video bitstream for H.264 and VC1 on G45+. It is asynchronous with the render ring and has access to separate parts of the GPU from it, though the render cache is coherent between the two. Signed-off-by: Zou Nan hai Signed-off-by: Xiang Hai hao Signed-off-by: Eric Anholt commit 852835f343146a82a528c3b712b373661d4fa17a Author: Zou Nan hai Date: Fri May 21 09:08:56 2010 +0800 drm/i915: convert some gem structures to per-ring V2 The active list and request list move into the ringbuffer structure, so each can track its active objects in the order they are in that ring. The flushing list does not, as it doesn't matter which ring caused data to end up in the render cache. Objects gain a pointer to the ring they are active on (if any). Signed-off-by: Zou Nan hai Signed-off-by: Xiang Hai hao Signed-off-by: Eric Anholt commit 8187a2b70e34c727a06617441f74f202b6fefaf9 Author: Zou Nan hai Date: Fri May 21 09:08:55 2010 +0800 drm/i915: introduce intel_ring_buffer structure (V2) Introduces a more complete intel_ring_buffer structure with callbacks for setup and management of a particular ringbuffer, and converts the render ring buffer consumers to use it. Signed-off-by: Zou Nan hai Signed-off-by: Xiang Hai hao [anholt: Fixed up whitespace fail and rebased against prep patches] Signed-off-by: Eric Anholt commit d3301d86b4bf2bcf649982ae464211d8bcf9575a Author: Eric Anholt Date: Fri May 21 13:55:54 2010 -0700 drm/i915: Rename dev_priv->ring to dev_priv->render_ring. With the advent of the BSD ring, be clear about which ring this is. The docs are pretty consistent with calling this the Render engine at this point. commit 62fdfeaf8b1f487060b6e160e7b5cd90287607c9 Author: Eric Anholt Date: Fri May 21 13:26:39 2010 -0700 drm/i915: Move ringbuffer-related code to intel_ringbuffer.c. This is preparation for supporting multiple ringbuffers on Ironlake. The non-copy-and-paste changes are: - de-staticing functions - I915_GEM_GPU_DOMAINS moving to i915_drv.h to be used by both files. - i915_gem_add_request had only half its implementation copy-and-pasted out of the middle of it. commit 79a78dd6266a4f3e31c800e941ec62e250770a7d Author: Chris Wilson Date: Mon May 17 09:23:54 2010 +0100 drm/i915: Fail to load driver if KMS request without GEM The i915's implementation of KMS requires GEM in order to manage the memory and execution domains of the framebuffer and associated resources. By the point at which we detect broken a BIOS and need to disable GEM, we have already registered ourselves as a KMS driver with several subsystems. Rather than introducing a fragile unwind and attempt to continue with UMS, spit out an error and unload the driver. References: [Bug 15754] IP: [] drm_mm_search_free+0x49/0x90 [drm] BUG: unable to handle kernel NULL pointer dereference at (null) https://bugzilla.kernel.org/show_bug.cgi?id=15754 [drm:i915_driver_load] *ERROR* Detected broken video BIOS with 262140/262144kB of video memory stolen. [drm:i915_driver_load] *ERROR* Disabling GEM. (try reducing stolen memory or updating the BIOS to fix). i915 0000:00:02.0: irq 30 for MSI/MSI-X [drm] set up 255M of stolen space BUG: unable to handle kernel NULL pointer dereference at (null) IP: [] drm_mm_search_free+0x49/0x90 [drm] PGD 69719067 PUD 69dda067 PMD 0 Oops: 0000 [#1] PREEMPT SMP last sysfs file: /sys/module/snd_seq_oss/initstate CPU 1 Pid: 867, comm: modprobe Not tainted 2.6.33-ARCH #1 G43Twins-FullHD/To Be Filled By O.E.M. RIP: 0010:[] [] drm_mm_search_free+0x49/0x90 [drm] RSP: 0018:ffff8800699f3af8 EFLAGS: 00010246 RAX: 0000000000000000 RBX: ffffffffffffffff RCX: 0000000000000000 RDX: 0000000000001000 RSI: 0000000000001000 RDI: ffff8800693d0f78 RBP: ffff8800699f3b18 R08: 0000000000001000 R09: 0000000000000000 R10: 2222222222222222 R11: 0000000000000000 R12: ffff880068de70c0 R13: 0000000000001000 R14: 0000000000000000 R15: ffff8800689cb000 FS: 00007fa93f4e5700(0000) GS:ffff880001880000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 00000000695a0000 CR4: 00000000000406e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process modprobe (pid: 867, threadinfo ffff8800699f2000, task ffff8800694f4740) Stack: ffff880068de73c0 ffff880068de70c0 ffff8800689cb000 0000000000001000 <0> ffff8800699f3b68 ffffffffa0299f63 ffff8800693d0f78 0000120068de70c0 <0> ffff8800689cb000 ffff880068de73c0 ffff880068de70c0 ffff8800689cb000 Call Trace: [] i915_gem_object_bind_to_gtt+0x83/0x360 [i915] [] i915_gem_object_pin+0xa5/0xb0 [i915] [] i915_gem_init_ringbuffer+0xd5/0x510 [i915] [] i915_driver_load+0x4ce/0xd00 [i915] [] ? drm_sysfs_device_add+0x87/0xb0 [drm] [] ? drm_get_minor+0x1d3/0x330 [drm] [] drm_get_dev+0x326/0x580 [drm] [] i915_pci_probe+0x10/0xd0 [i915] [] local_pci_probe+0x12/0x20 [] pci_device_probe+0x80/0xb0 [] ? driver_sysfs_add+0x5a/0x90 [] driver_probe_device+0x93/0x1a0 [] __driver_attach+0x93/0xa0 [] ? __driver_attach+0x0/0xa0 [] bus_for_each_dev+0x68/0x90 [] driver_attach+0x19/0x20 [] bus_add_driver+0xcd/0x2d0 [] driver_register+0x78/0x140 [] __pci_register_driver+0x51/0xd0 [] ? i915_init+0x0/0x52 [i915] [] drm_init+0x111/0x120 [drm] [] ? register_shrinker+0x4d/0x60 [] ? i915_init+0x0/0x52 [i915] [] i915_init+0x50/0x52 [i915] [] do_one_initcall+0x37/0x1a0 [] sys_init_module+0xd7/0x250 [] system_call_fastpath+0x16/0x1b Code: eb 29 49 8b 41 28 31 d2 49 f7 f5 85 d2 74 39 44 89 c0 29 d0 48 89 c2 48 01 f2 49 39 d2 73 29 0f 1f 00 49 89 da 4c 89 d3 4d 89 d9 <4d> 8b 19 49 39 f9 41 0f 18 0b 74 2b 4d 8b 51 30 4d 89 cc 49 39 RIP [] drm_mm_search_free+0x49/0x90 [drm] RSP CR2: 0000000000000000 Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 5001960016bb53a1075bd9d62d7c067cd38c5a68 Author: Christian Lamparter Date: Tue May 25 23:58:47 2010 +0200 ar9170usb: fix read from freed driver context Commit "ar9170: wait for asynchronous firmware loading" introduced a bug, which is triggered by fatal errors while the driver is initializing the device. BUG: unable to handle kernel paging request at 6b6b6bf7 IP: [] kobject_put+0x7/0x70 *pde = 00000000 Oops: 0000 [#1] PREEMPT last sysfs file: /sys/devices/platform/hdaps/position Modules linked in: ar9170usb [...] Pid: 6246, comm: firmware/ar9170 Not tainted 2.6.34-wl #54 EIP: 0060:[] EFLAGS: 00010206 CPU: 0 EIP is at kobject_put+0x7/0x70 EAX: 6b6b6bd7 EBX: f4d3d0e0 ECX: f5ba9124 EDX: f6af2a7c ESI: 00000000 EDI: f4d3d0e0 EBP: 00000000 ESP: f5e98f9c DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068 Process firmware/ar9170 (pid: 6246) Stack: c12532ed 00000246 f5bfaa70 f8487353 f4d3d0e0 Call Trace: [] ? device_release_driver+0x1d/0x30 [] ? ar9170_usb_firmware_failed+0x43/0x70 [ar9170usb] [] ? request_firmware_work_func+0x2c/0x70 [] ? request_firmware_work_func+0x0/0x70 [] ? kthread+0x74/0x80 [] ? kthread+0x0/0x80 [] ? kernel_thread_helper+0x6/0x10 Code: 40 d3 f2 ff 85 c0 89 c3 74 0a ba 44 86 4c c1 e8 [...] EIP: [] kobject_put+0x7/0x70 SS:ESP 0068:f5e98f9c CR2: 000000006b6b6bf7 ---[ end trace e81abb992434b410 ]--- Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit b578bb490fb605c23c20b63995f26d3ab2cfb6e0 Author: John W. Linville Date: Wed May 26 14:40:32 2010 -0400 Revert "rt2x00: Fix rt2800usb TX descriptor writing." This reverts commit 663cb47cc2c5acd32850f67d051e47d62ed199c9. This patch was merged out of the proper order, so instead of fixing a problem with a prior (unmerged) patch, it creates one. Ooops! Signed-off-by: John W. Linville commit 895443c1c98a21198a0a5265041dc7ad14936d63 Author: Anatolij Gustschin Date: Wed May 26 00:36:30 2010 +0000 powerpc/44x: icon: select SM502 and frame buffer console support Enables SM502 frame buffer and framebuffer console in the default config file Signed-off-by: Anatolij Gustschin Signed-off-by: Josh Boyer commit c9aa55e5271a53d28e93fa58759d318b403c15ba Author: David S. Miller Date: Sat May 22 01:09:04 2010 -0700 n2_crypto: Plumb fallback ahash requests properly. Do this by putting the async fallback request at the end of an n2 specific ahash request context, then properly adjusting the request private size in our ahash ->cra_init(). We also need to put the writable state bits into the n2 request private instead of the n2 cra_ctx. With help from Herbert Xu. Signed-off-by: David S. Miller commit 527b9525256f97ad8d092bbfc8fdc3c5409f4a4d Author: David S. Miller Date: Sat May 22 00:50:12 2010 -0700 n2_crypto: Fix MAU kmem_cache name. Both the CWQ and MAU caches unintentionally had that same name. Signed-off-by: David S. Miller commit ff6c7341e0bc486c3e1b369ab7f3b325b98600d3 Author: David S. Miller Date: Tue May 25 17:37:08 2010 -0700 n2_crypto: Fix build after of_device/of_platform_driver changes. Signed-off-by: David S. Miller commit 4150764fbba03ce4675b02b10872c665bb05a8aa Author: Jesper Nilsson Date: Tue May 25 17:48:14 2010 +0200 CRIS: Don't use mask_irq as symbol name kernel/irq/chip.c now uses these, which lead to compile error for CRISv32. Signed-off-by: Jesper Nilsson commit 392ed655262446a7d9bc678394600a1d81614313 Author: Jesper Nilsson Date: Tue May 25 16:50:04 2010 +0200 CRIS: Simplify param.h by simply including Signed-off-by: Robert P. J. Day Signed-off-by: Jesper Nilsson commit 6b9c88e2a3961346db1a23d967585af16ff33f05 Author: Jesper Nilsson Date: Tue May 25 15:04:06 2010 +0200 CRISv10: Whitespace fixes for hw_settings.S Remove trailing whitespace. Signed-off-by: Andrea Gelmini Signed-off-by: Jesper Nilsson commit 2f941a1be362cc2966ccb63cf15ccdfdb12a5a69 Author: Jesper Nilsson Date: Tue May 25 14:55:54 2010 +0200 CRISv10: Trivial fixes. - Removed CVS id tag. - Formatting fixes Signed-off-by: Andrea Gelmini Signed-off-by: Jesper Nilsson commit d708b41c96f404b8bb572f39973bbdf6d99d5f4b Author: Jesper Nilsson Date: Tue May 25 13:35:31 2010 +0200 CRISv32: Fix RS485 port 4 CD Kconfig item. The Kconfig item for port 4 CD was controlled by the same Kconfig item as for port 3. Signed-off-by: Jesper Nilsson commit f06d8b694c9c96d460990888561b3ab3a5f8192f Author: Jesper Nilsson Date: Tue May 25 13:33:51 2010 +0200 CRISv32: Remove duplicated Kconfig items. The items were duplicated when they should have been moved. Signed-off-by: Jesper Nilsson commit 48936a08b85518c22a9467a8eaac35d43af54ab4 Author: Haiying Wang Date: Fri May 21 10:16:12 2010 -0400 powerpc/85xx: Add P1021MDS board support P1021 is a dual e500v2 core based SOC with: * 3 eTSECs (eTSEC1/3 RGMII, eTSEC2 SGMII on this board) * 2 PCIe Controller * 1 USB2.0 controller * eSDHC, eSPI, I2C, DUART * eLBC (NAND, BCSR, PMC0/1) * Security Engine (SEC 3.3.2) * Quicc Engine (QE) Signed-off-by: Haiying Wang Signed-off-by: Yu Liu Signed-off-by: Kumar Gala commit 710e33832653cccf7fc432023e7dbe8c49a1902f Author: Li Yang Date: Thu Apr 22 16:31:38 2010 +0800 powerpc/85xx: Change MPC8572DS camp dtses for MSI sharing Enable the sharing of MSI interrupt through AMP OSes in the mpc8572ds dtses. Signed-off-by: Zhao Chenhui Signed-off-by: Li Yang Signed-off-by: Kumar Gala commit 480599933a69a8a8dc1390c2164e49e20a1593b9 Author: Li Yang Date: Thu Apr 22 16:31:39 2010 +0800 powerpc/fsl_msi: add removal path and probe failing path Also cleanup the probe function. Signed-off-by: Li Yang Signed-off-by: Kumar Gala commit 061ca4adfb2e3c986a182fd30f7e939a1ff8d29d Author: Li Yang Date: Thu Apr 22 16:31:37 2010 +0800 powerpc/fsl_msi: enable msi sharing through AMP OSes Make a single PCIe MSI bank shareable through CAMP OSes. The number of MSI used by each core can be configured by dts file. Signed-off-by: Zhao Chenhui Signed-off-by: Li Yang Signed-off-by: Kumar Gala commit 694a7a3611a1c0e28d99b4955151c6ce68e89752 Author: Li Yang Date: Thu Apr 22 16:31:36 2010 +0800 powerpc/fsl_msi: enable msi allocation in all banks Put all fsl_msi banks in a linked list. The list of banks then can be traversed when allocating new msi interrupts. Also fix failing path of fsl_setup_msi_irqs(). Signed-off-by: Zhao Chenhui Signed-off-by: Li Yang Signed-off-by: Kumar Gala commit 02adac6051b0ff8df3877ae3d94e0e68063c6a30 Author: Li Yang Date: Thu Apr 22 16:31:35 2010 +0800 powerpc/fsl_msi: fix the conflict of virt_msir's chip_data In fsl_of_msi_probe(), the virt_msir's chip_data have been stored the pointer to struct mpic. We add a struct fsl_msi_cascade_data to store the pointer to struct fsl_msi and msir_index in hanler_data. Otherwise, the pointer to struct mpic will be over-written, and will cause problem when calling eoi() of the irq. Signed-off-by: Zhao Chenhui Signed-off-by: Li Yang Signed-off-by: Kumar Gala commit 8081881327d4791f26ebf56cf304992673503ad4 Author: Lan Chunhe-B25806 Date: Mon Mar 15 06:38:33 2010 +0000 powerpc/fsl_msi: Add multiple MSI bank support Freescale QorIQ P4080 has three MSI banks and the original code can not work well. This patch adds multiple MSI banks support for Freescale processor. Signed-off-by: Lan Chunhe-B25806 Signed-off-by: Roy Zang Signed-off-by: Kumar Gala commit b3df895aebe091b1657a42a8c859bd49fc96646b Author: Sebastian Andrzej Siewior Date: Sun Apr 4 22:19:03 2010 +0200 powerpc/kexec: Add support for FSL-BookE This adds support kexec on FSL-BookE where the MMU can not be simply switched off. The code borrows the initial MMU-setup code to create the identical mapping mapping. The only difference to the original boot code is the size of the mapping(s) and the executeable address. The kexec code maps the first 2 GiB of memory in 256 MiB steps. This should work also on e500v1 boxes. SMP support is still not available. (Kumar: Added minor change to build to ifdef CONFIG_PPC_STD_MMU_64 some code that was PPC64 specific) Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Kumar Gala commit 7c08ce718fd04e373d7473918ae02f1c04d5d504 Author: Sebastian Andrzej Siewior Date: Sun Apr 4 22:19:02 2010 +0200 powerpc/fsl-booke: Move the entry setup code into a seperate file This patch only moves the initial entry code which setups the mapping from what ever to KERNELBASE into a seperate file. No code change has been made here. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Kumar Gala commit 2289d2d1a8574a11e66b00c5a59090c6fc227751 Author: Sebastian Andrzej Siewior Date: Sun Apr 4 22:19:01 2010 +0200 powerpc/fsl-booke: fix the case where we are not in the first page During boot we change the mapping a few times until we have a "defined" mapping. During this procedure a small 4KiB mapping is created and after that one a 64MiB. Currently the offset of the 4KiB page in that we run is zero because the complete startup up code is in first page which starts at RPN zero. If the code is recycled and moved to another location then its execution will fail because the start address in 64 MiB mapping is computed wrongly. It does not consider the offset to the page from the begin of the memory. This patch fixes this. Usually (system boot) r25 is zero so this does not change anything unless the code is recycled. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Kumar Gala commit 0472fd0755fed200c750ba57e5ea46f941914adb Author: Andy Fleming Date: Mon Mar 29 20:39:08 2010 -0500 powerpc/85xx: Enable support for ports 3 and 4 on 8548 CDS I believe support was disabled due to issues with earlier versions of the board/processor. At worst, adding the ports back into the device tree should result in enabling ports that don't work on older systems, so the default should be to enable them. Signed-off-by: Andy Fleming Signed-off-by: Kumar Gala commit 90103f932f0d94e0a1a0e4faf20fb24a0b07264c Author: Anton Vorontsov Date: Mon May 17 22:56:52 2010 +0400 powerpc/fsl-booke: Add hibernation support for FSL BookE processors This is started as swsusp_32.S modifications, but the amount of #ifdefs made the whole file horribly unreadable, so let's put the support into its own separate file. The code should be relatively easy to modify to support 44x BookEs as well, but since I don't have any 44x to test, let's confine the code to FSL BookE. (The only FSL-specific part so far is 'flush_dcache_L1'.) Signed-off-by: Anton Vorontsov Acked-by: Scott Wood Signed-off-by: Kumar Gala commit fe04b1121511a97982a1fcdd38e44d2029304a6d Author: Scott Wood Date: Thu Apr 8 00:38:22 2010 -0500 powerpc/e500mc: Implement machine check handler. Most of the MSCR bit assigments are different in e500mc versus e500, and they are now write-one-to-clear. Some e500mc machine check conditions are made recoverable (as long as they aren't stuck on), most notably L1 instruction cache parity errors. Signed-off-by: Scott Wood Signed-off-by: Kumar Gala commit a89eda26753311d8ff2da64da621714b2f8d5dcc Author: Stefan Roese Date: Tue May 11 03:55:34 2010 +0000 powerpc/44x: Add basic ICON PPC440SPe board support ICON is based on the AppliedMicro 440SPe. It is equipped with 64MByte NOR FLASH, SODIMM, Gigabit ethernet, SM502 on PCI(X), LSI SAS1068E on PCIe0 and custom FPGA on PCIe1. Signed-off-by: Stefan Roese Cc: Josh Boyer Signed-off-by: Josh Boyer commit 58645c7f36b22d1c7b5ed966ce3f01129fa87813 Author: Benjamin Herrenschmidt Date: Tue May 11 16:22:50 2010 +0000 powerpc/44x: Fix UART clocks on 440SPe The code to fixup the serial ports on 440SPe uses the incorrect addresses for these. This fixes it. Signed-off-by: Benjamin Herrenschmidt Acked-by: Stefan Roese Signed-off-by: Josh Boyer commit 499f49026e25e74dc617bb0d96ed6e85a67f4980 Author: Stefan Roese Date: Thu May 6 21:43:43 2010 +0000 powerpc/44x: Add reset-type to katmai.dts Katmai needs "reset-type" = "chip reset" (2) to correctly reboot the board. Signed-off-by: Stefan Roese Cc: Josh Boyer Signed-off-by: Josh Boyer commit e2efc09e52680cecb0ca624e379cb4b4c56157c3 Author: Tirumala Marri Date: Mon Dec 21 22:49:41 2009 +0000 powerpc/44x: Adding PCI-E support for PowerPC 460SX based SOC. Add support for PCI-e on the AMCC 460SX boards Signed-off-by: Tirumala Marri Acked-by: Josh Boyer commit fb994ecc2b1c214951366c2ba5d8b121f0010d1f Author: Greg Thelen Date: Wed May 5 10:41:44 2010 -0700 kbuild: Fix checking of scm-identifier variable I'm looking Makefile in the -mm branch (dated 2010-04-28-16-53) and seeing what looks like a bug in the checking of scm-identifier. The "ifneq ($scm-identifier)" seems to always execute "ifeq ($(LOCALVERSION,)) ...". This patch fixes the checking of scm-identifier. Signed-off-by: Greg Thelen Acked-by: David Rientjes Signed-off-by: Michal Marek commit f35d77645808d1b890abb1a36260bf228854259e Author: Arnd Bergmann Date: Tue Apr 27 16:24:21 2010 +0200 cris: push down BKL into some device drivers A number of cris specific device drivers still use the locked ->ioctl operation. Convert them to unlocked_ioctl with explicit lock_kernel calls. Signed-off-by: Arnd Bergmann Signed-off-by: Jesper Nilsson commit 06f9a55cf72b6aa19b4206a05d6f9af6fa9648ea Author: Li Zefan Date: Wed Apr 14 11:46:24 2010 +0800 gconfig: add support to show hidden options that have prompts There's a button in gconfig to "Show all options", but I think normally we are not interested in those configs which have no prompt and thus can't be changed, so here I add a new button to show hidden options which have prompts. Signed-off-by: Li Zefan Signed-off-by: Michal Marek commit 22c7eca61e51296643bb0a379fc726fda8f3b015 Author: Li Zefan Date: Wed Apr 14 11:46:02 2010 +0800 menuconfig: add support to show hidden options which have prompts Usage: Press to show all config symbols which have prompts. Quote Tim Bird: | I've been bitten by this numerous times. I most often | use ftrace on ARM, but when I go back to x86, I almost | always go through a sequence of searching for the | function graph tracer in the menus, then realizing it's | completely missing until I disable CC_OPTIMIZE_FOR_SIZE. | | Is there any way to have the menu item appear, but be | unsettable unless the SIZE option is disabled? I'm | not a Kconfig guru... I myself found this useful too. For example, I need to test ftrace/tracing and want to be sure all the tracing features are enabled, so I enter the "Tracers" menu, and press to see if there is any config hidden. I also noticed gconfig and xconfig have a button "Show all options", but that's a bit too much, and I think normally what we are not interested in those configs which have no prompt thus can't be changed by users. Exmaple: --- Tracers -*- Kernel Function Tracer - - Kernel Function Graph Tracer [*] Interrupts-off Latency Tracer - - Preemption-off Latency Tracer [*] Sysprof Tracer Here you can see 2 tracers are not selectable, and then can find out how to make them selectable. Signed-off-by: Li Zefan Signed-off-by: Michal Marek commit 7b5d87215b38359ecadf7a69575b11e140a00484 Author: Li Zefan Date: Wed Apr 14 11:44:51 2010 +0800 gconfig: remove show_debug option This option is a no-op, so remove it. Signed-off-by: Li Zefan Signed-off-by: Michal Marek commit 2944235430c37970f82ad57b8ead343ee6065004 Author: Li Zefan Date: Wed Apr 14 11:44:34 2010 +0800 gconfig: remove dbg_print_ptype() and dbg_print_stype() Just use sym_get_type() and prop_get_type_name(). Signed-off-by: Li Zefan Signed-off-by: Michal Marek commit c6ccc30fd7870879981de03feeec61029754b0ea Author: Li Zefan Date: Wed Apr 14 11:44:20 2010 +0800 kconfig: fix zconfdump() zconfdump(), which is used for debugging, can't recognize P_SELECT, P_RANGE and P_MENU (if associated with a symbol, aka "menuconfig"), and output something like this: config X86 boolean default y unknown prop 6! unknown prop 6! unknown prop 6! ... Signed-off-by: Li Zefan Signed-off-by: Michal Marek commit 4280eae0990190d190dfa7dab9bca480215d5b19 Author: Li Zefan Date: Wed Apr 14 11:44:05 2010 +0800 kconfig: some small fixes - fix a typo in documentation - fix a typo in a printk on error - fix comments in dialog_inputbox() Signed-off-by: Li Zefan Signed-off-by: Michal Marek commit 7926c09dea682be6f3b2e42f16c50d8554c6bbdc Author: Jan III Sobieski Date: Sun Mar 28 15:38:31 2010 +0200 add random binaries to .gitignore Signed-off-by: Jan III Sobieski Signed-off-by: Michal Marek commit b83419363eff1535309df97a4bf319c42d900a9c Author: Jason Gunthorpe Date: Mon Mar 22 16:49:32 2010 -0600 kbuild: Include gen_initramfs_list.sh and the file list in the .d file Expand the dependency set used for the initrd to include the CONFIG_INITRAMFS_SOURCE file and the generator script itself. Otherwise changing the initramfs file list does not rebuild the CPIO. Signed-off-by: Jason Gunthorpe Signed-off-by: Michal Marek commit da6df879b9f88d2224174a9e4e76dc0e42e47ebc Author: Li Zefan Date: Fri Mar 19 14:57:47 2010 +0800 kconfig: recalc symbol value before showing search results A symbol's value won't be recalc-ed until we save config file or enter the menu where the symbol sits. So If I enable OPTIMIZE_FOR_SIZE, and search FUNCTION_GRAPH_TRACER: Symbol: FUNCTION_GRAPH_TRACER [=y] Prompt: Kernel Function Graph Tracer Defined at kernel/trace/Kconfig:140 Depends on: ... [=y] && (!X86_32 [=y] || !CC_OPTIMIZE_FOR_SIZE [=y]) ... From the dependency it should result in FUNCTION_GRAPH_TRACER=n, but it still shows FUNCTION_GRAPH_TRACER=y. Signed-off-by: Li Zefan Signed-off-by: Michal Marek commit 52b80025ebaa992688959b4cb2cd86c7e805b70f Author: Philipp Kohlbecher Date: Wed Mar 17 19:52:12 2010 +0100 .gitignore: ignore *.lzo files Ignore files compressed with lzop. Signed-off-by: Philipp Kohlbecher Signed-off-by: Michal Marek commit 1dcd81002453f9f22c6c4fd6c3c7d8f1c7c891fa Author: Stephen Hemminger Date: Mon Mar 8 08:24:27 2010 -0800 headerdep: perlcritic warning Minor perlcritic warning: headerdep.pl: "return" statement with explicit "undef" at line 84, column 2. See page 199 of PBP. (Severity: 5) The rationale according to PBP is that an explicit return of undef (contrary to most people's expectations) doesn't always evaluate as false. It has to with the fact that perl return value depends on context the function is called. If function is used in list context, the appropriate return value for false is an empty list; whereas in scalar context the return value for false is undefined. By just using a "return" both cases are handled. In the context of a trivial script this doesn't matter. But one script may be cut-paste into later code (most people like me only know 50% of perl), that is why perlcritic always complains Signed-off-by: Stephen Hemminger Signed-off-by: Michal Marek commit 2d74b2c62cf8867d0762f6e6b5ed8906cb6a745f Author: Wu Zhangjin Date: Thu Mar 11 17:42:14 2010 +0800 scripts/Makefile.lib: Align the output of LZO The output of LZO is not aligned with the other output: ... CC drivers/usb/mon/usbmon.mod.o LZO arch/mips/boot/compressed/vmlinux.lzo ... This patch fixes it. Signed-off-by: Wu Zhangjin Signed-off-by: Michal Marek commit 73d1393eb8507ed5fd7f8e696f6b1ecc18035ebe Author: Michal Marek Date: Wed Mar 10 12:28:58 2010 +0100 kbuild: Generate modules.builtin in make modules_install The previous approach didn't work if one did make modules && make modules_install Add modules.builtin as dependency of _modinst_, which is the target that actually needs the file. Reported-by: Andrew Morton Signed-off-by: Michal Marek commit e93bc1a0cab3e54e3c1947e01c8e73892e35630d Author: Michal Marek Date: Mon Mar 8 10:26:22 2010 +0100 Revert "kbuild: specify absolute paths for cscope" This reverts commit eb8f844c0a41c4529a7d06b7801296eca9ae67aa. Ian Campbell writes: > I keep my kernel source tree on a more powerful build box where I run my > builds etc (including "make cscope") but run my editor from my > workstation with an NFS mount to the source. This worked fine for me > using relative paths for cscope. Using absolute paths in cscope breaks > this previously working setup because the root path is not the same on > both systems. I guess this is similar to moving the source tree around. > > Without wanting to start a flamewar it really sounds to me like we are > working around a vim (or cscope) bug here, emacs with cscope bindings > works fine in this configuration. Given that absolute paths can be forced by make O=. cscope, change the default back to relative paths. Ian Campbell Cc: Daniel Vetter Signed-off-by: Michal Marek commit a6c366324cacd5f71107dd01362b995a1c67b1ad Author: Michal Marek Date: Mon Mar 8 10:07:12 2010 +0100 kbuild: Do not unnecessarily regenerate modules.builtin Only regenerate it if the configuration has changed. Also, do this after the modules build to fix errors with some weird Makefiles that are generated during build. Reported-by: Eric Miao Signed-off-by: Michal Marek commit bae4cecc09db9d472d71cb262de3c976147ad628 Author: Stephen Hemminger Date: Mon Feb 22 15:17:26 2010 -0800 headers_install: use local file handles Better practice to use 3 arg open and local file handles. Signed-off-by: Stephen Hemminger Acked-by: WANG Cong Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit dbbe33e99f41a6f07e61dbce455964112d8ac72b Author: Stephen Hemminger Date: Mon Feb 22 15:17:24 2010 -0800 headers_check: fix perl warnings According to PBP; best way practice is to use local reference for file handle and three argument open. Also perl prototypes are a mistake. Signed-off-by: Stephen Hemminger Acked-by: WANG Cong Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 91416cfdf98bdbc828fd3e5ca7208beba5979d63 Author: Stephen Hemminger Date: Mon Feb 22 15:17:22 2010 -0800 export_report: fix perl warnings Use local file handles, use three argument open. Don't modify arguments in perl grep (use sed instead) Signed-off-by: Stephen Hemminger Acked-by: WANG Cong Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 9c49fd307a6cb2d3255f9441bce5b7cb08dff79e Author: Stephen Hemminger Date: Mon Feb 22 15:17:20 2010 -0800 profile2linkerlist: fix perl warnings Turn on strict checking. Simplify code by using "unless" statement. Signed-off-by: Stephen Hemminger Acked-by: WANG Cong Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 86d08e569f63a71a2d259507e335beea32b4d2aa Author: Stephen Hemminger Date: Mon Feb 22 15:17:18 2010 -0800 namespace: perlcritic warnings Use local file handle not global. Make loop and other variables local in scope. Signed-off-by: Stephen Hemminger Cc: Hui Zhu Cc: Cong Wang Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit a208868fc0a90f62a91893b0193459de957c8d8e Author: Stephen Hemminger Date: Mon Feb 22 15:17:14 2010 -0800 checkversion: perl cleanup Turn on strict checking. Use three arguement open Standard practice in perl is to use undef not zero for false Signed-off-by: Stephen Hemminger Cc: Cong Wang Cc: Ralf Baechle Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 3da27157316cbcce326d56faa0a7a5cadc7ae507 Author: Stephen Hemminger Date: Mon Feb 22 15:17:12 2010 -0800 checkincludes: fix perlcritic warnings Turn on strict checking. Use local file handles. Use three argument open. Signed-off-by: Stephen Hemminger Cc: Cong Wang Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 1f2a144f5ab5e836b5ca8f67bd76b759fa947751 Author: Stephen Hemminger Date: Mon Feb 22 15:17:09 2010 -0800 scripts: improve checkstack Cleanup checkstack script: * Turn on strict checking * Fix resulting error message because the declaration syntax was incorrect. * Remove incorrect and misleading use of prototype - prototype not required for this type of sort function because $a and $b are being used in this contex - if prototype was being used it should be for both arguments * Use closure for sort function Signed-off-by: Stephen Hemminger Cc: Steven Rostedt Cc: Arjan van de Ven Cc: Cong Wang Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit b59a12258460b3d019918719b1bd2563cf37ad9a Author: FEJES Jozsef Date: Fri Mar 5 18:19:36 2010 +0100 kbuild: deb-pkg md5sums This patch creates the standard md5sums file for 'make deb-pkg' just like the dh_md5sums debhelper script. Signed-off-by: Jozsef Fejes Signed-off-by: Michal Marek commit e9cfaa9f4c99be6d6bfe468daa1dd3a3f326bc52 Author: Denys Vlasenko Date: Sat Feb 20 01:03:57 2010 +0100 Rename .text.start to .text..start. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit b6f4e451de78547a369a8dbb7bcb56c1919a6b79 Author: Denys Vlasenko Date: Sat Feb 20 01:03:56 2010 +0100 Rename special text sections in arch/frv from .text.XXX to .text..XXX. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit a7df554ea095da4f60ff7f7b90a94c2df91942e4 Author: Denys Vlasenko Date: Sat Feb 20 01:03:55 2010 +0100 Rename .data.lock_aligned to .data..lock_aligned. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 2c31c341a827b99eef743753aa9adb917b9ea6db Author: Denys Vlasenko Date: Sat Feb 20 01:03:54 2010 +0100 Rename .data.initvect to .data..initvect. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit c273fb3b5d0490d3058f6cce77a92860671ee7b6 Author: Denys Vlasenko Date: Sat Feb 20 01:03:53 2010 +0100 Rename .data.init to .data..init. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 07b3bb1ef211fdf20eddcae902d1098788ea2f6e Author: Denys Vlasenko Date: Sat Feb 20 01:03:52 2010 +0100 Rename .data.nosave to .data..nosave. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 9bf59424862ef5c1ba5d7ad6699a0b474916c4e3 Author: Denys Vlasenko Date: Sat Feb 20 01:03:51 2010 +0100 Rename .text.startup to .text..startup. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 819d67621edba0822352f7ae2a7ccb0387223675 Author: Denys Vlasenko Date: Sat Feb 20 01:03:49 2010 +0100 Rename .text.page_aligned to .text..page_aligned. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 75ddb0e87d0d31ad44d574e7fe2e962e4efecadb Author: Denys Vlasenko Date: Sat Feb 20 01:03:48 2010 +0100 Rename .text.lock to .text..lock. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 2b55f3672c77e76b62efd0dba6bf29addac071fd Author: Denys Vlasenko Date: Sat Feb 20 01:03:47 2010 +0100 Rename .text.ivt to .text..ivt. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 041d5f94c4d67444c40584db0d1cacf32a47a25b Author: Denys Vlasenko Date: Sat Feb 20 01:03:46 2010 +0100 Rename .rodata.compressed to .rodata..compressed. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit d56a3c1a9faa3a1703ce696e111143bfd9f071f1 Author: Denys Vlasenko Date: Sat Feb 20 01:03:45 2010 +0100 Rename .data.vmpages and .data.vm0.XXX to .data..vmpages and .data..vm0.XXX. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 54cb27a71f51d304342c79e62fd7667f2171062b Author: Denys Vlasenko Date: Sat Feb 20 01:03:44 2010 +0100 Rename .data.read_mostly to .data..read_mostly. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 3d9a854c2dac3e888393b23ba7adafcce4d6d4b9 Author: Denys Vlasenko Date: Sat Feb 20 01:03:43 2010 +0100 Rename .data[.percpu][.XXX] to .data[..percpu][..XXX]. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit dafb9320671316fbd030b1d2e0ab9b96597223cb Author: Denys Vlasenko Date: Sat Feb 20 01:03:42 2010 +0100 Rename .data..patch.XXX to .data..patch.XXX. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 9d1578a3ba7fe9d3eecf86615ee427789792c2d6 Author: Denys Vlasenko Date: Sat Feb 20 01:03:41 2010 +0100 Rename .data.init_irqstack to .data..init_irqstack. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit e1cb14b85f802c7717a46b1a38e1fba23ead86c3 Author: Denys Vlasenko Date: Sat Feb 20 01:03:40 2010 +0100 Rename .data.gate to .data..gate. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 1360e0707090c763d0d06cbc74b04f9c9588b582 Author: Denys Vlasenko Date: Sat Feb 20 01:03:39 2010 +0100 Rename .bss.stack to .bss..stack. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 7c74df07f90cabe61d700727bca04682b4e477f3 Author: Tim Abbott Date: Sat Feb 20 01:03:38 2010 +0100 Rename .bss.page_aligned to .bss..page_aligned. Signed-off-by: Tim Abbott Cc: Sam Ravnborg Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 75b134837263eb919d91678f7fcf3d54cd088c8d Author: Tim Abbott Date: Sat Feb 20 01:03:37 2010 +0100 Rename .data.page_aligned to .data..page_aligned. Signed-off-by: Tim Abbott Cc: Sam Ravnborg Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 5f547f51a2205d18a507b88756e6988639db5f25 Author: Tim Abbott Date: Sat Feb 20 01:03:36 2010 +0100 powerpc: remove unused __page_aligned definition. There is already an architecture-independent __page_aligned_data macro for this purpose, so removing the powerpc-specific macro should be harmless. Signed-off-by: Tim Abbott Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Sam Ravnborg Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 2af7687f1ad2c4571b9835f9bb2e3db9a738d258 Author: Tim Abbott Date: Sat Feb 20 01:03:35 2010 +0100 Rename .data.init_task to .data..init_task. Signed-off-by: Tim Abbott Cc: Sam Ravnborg Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 4af57b787b4be09419a2bb48aa705fa87ef41cca Author: Tim Abbott Date: Sat Feb 20 01:03:34 2010 +0100 Rename .data.cacheline_aligned to .data..cacheline_aligned. Signed-off-by: Tim Abbott Cc: Sam Ravnborg Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit bc75cc6b5636eed5f6a481cba808e906f71cfd94 Author: John Kacur Date: Tue Mar 2 16:57:52 2010 +0100 tags: Add the ability to make tags for all archs using "all" make ALLSOURCE_ARCHS=all tags - Document this in kbuild.txt Without this change you have to type each arch separately. Signed-off-by: John Kacur Signed-off-by: Michal Marek commit 4431d4ce996de2cd2c45583209ba0dbbc9bf2795 Author: John Kacur Date: Tue Mar 2 15:38:10 2010 +0100 tags: Fix spelling error in comment (is->if) Signed-off-by: John Kacur Signed-off-by: Michal Marek commit a8bac511c8c18878908eb49f33f7257610b15180 Author: Michal Marek Date: Fri Feb 19 16:18:41 2010 +0100 tags: Use $SRCARCH $ make mrproper $ make tags GEN tags find: `arch/x86_64/': No such file or directory Caused by commit f81b1be (tags: include headers before source files) Cc: Guennadi Liakhovetski Acked-by: WANG Cong Signed-off-by: Michal Marek commit e8d400a933fa44e2fba3849b084e1ae5814d7fca Author: Kirill Smelkov Date: Wed Feb 17 11:45:33 2010 +0300 kbuild: fix a couple of typos in Documentation Signed-off-by: Kirill Smelkov Signed-off-by: Michal Marek commit f81b1be40c44b33b9706d64c117edd29e627ad12 Author: Guennadi Liakhovetski Date: Mon Feb 8 00:25:59 2010 +0100 tags: include headers before source files Currently looking up a structure definition in TAGS / tags takes one to one of multiple "static struct X" definitions in arch sources, which makes it for many structs practically impossible to get to the required header. This patch changes the order of sources being tagged to first scan architecture includes, then the top-level include/ directory, and only then the rest. It also takes into account, that many architectures have more than one include directory, i.e., not only arch/$ARCH/include, but also arch/$ARCH/mach-X/include etc. Signed-off-by: Guennadi Liakhovetski Reviewed-by: WANG Cong [mmarek@suse.cz: fix 'var+=text' bashism] Signed-off-by: Michal Marek commit d0679c730395d0bde9a46939e7ba255b4ba7dd7c Author: Andi Kleen Date: Tue Feb 2 14:40:02 2010 -0800 kbuild: move -fno-dwarf2-cfi-asm to powerpc only Better dwarf2 unwind information is a good thing, it allows better debugging with kgdb and crash and helps systemtap. Commit 003086497f07f7f1e67c0c295e261740f822b377 ("Build with -fno-dwarf2-cfi-asm") disabled some CFI information globally to work around a module loader bug on powerpc. But this disables the better unwind tables for all architectures, not just powerpc. Move the workaround to powerpc and also add a suitable comment that's it really a workaround. This improves dwarf2 unwind tables on x86 at least. Signed-off-by: Andi Kleen Cc: Kyle McMartin Signed-off-by: Andrew Morton Acked-by: Benjamin Herrenschmidt Signed-off-by: Michal Marek commit 59dde3853e07aaadc2b63abd16c954d5b0606cf1 Author: Hui Zhu Date: Mon Feb 1 13:41:22 2010 +0800 markup_oops.pl: minor fixes 1. Fix a little format issue. 2. Check the return of "Getopt::Long::GetOptions". Output usage and exit if it get error. 3. Change $ARGV[$#ARGV] to $ARGV[0]. 4. Change the code which get $modulefile from modinfo. Replace the pipeline with `modinfo -F filename $module`. 4. Change usage from "Specify the module directory name" to "Specify the module filename". Signed-off-by: Hui Zhu Signed-off-by: Michal Marek commit 52e13e219d5930fb8fb774050e6ecffa244a60a9 Author: Hui Zhu Date: Tue Jan 26 17:13:07 2010 +0800 markup_oops.pl: add options to improve cross-sompilation environments The markup_oops.pl have 3 troubles to support cross-compiler environment: 1. It use objdump directly. 2. It use modinfo to get the message of module. 3. It use hex function that cannot support 64-bit number in 32-bit arch. This patch add 3 options to markup_oops.pl: 1. -c CROSS_COMPILE Specify the prefix used for toolchain. 2. -m MODULE_DIRNAME Specify the module directory name. 3. Change hex function to Math::BigInt->from_hex. After this patch, parse the x8664 oops in x86, we can: cat amd64m | perl ~/kernel/tmp/m.pl -c /home/teawater/kernel/bin/x8664- -m ./e.ko vmlinux Thanks, Hui Signed-off-by: Hui Zhu Cc: Andrew Morton Cc: Arjan van de Ven Cc: Sam Ravnborg Cc: ozan@pardus.org.tr Cc: Matthew Wilcox Acked-by: WANG Cong Signed-off-by: Michal Marek commit d224a94ab988c01f2841dccd39a518424fd26336 Merge: 70fb7ba 0db2524 Author: Michal Marek Date: Tue Feb 2 16:21:08 2010 +0100 Merge branch 'modpost' of git://git.pengutronix.de/git/ukl/linux-2.6 into kbuild/for-next Acked-by: Sam Ravnborg Signed-off-by: Michal Marek commit 70fb7ba652e8bdb05aa99ef46e3183684e0742f7 Author: Michal Marek Date: Fri Jan 29 14:22:43 2010 +0100 MAINTAINERS: add a few more patterns to kbuild Also, add a note that "unmaintained" files below scripts/ should go via the kbuild tree (best current practice). Signed-off-by: Michal Marek commit 880df92fa0bb2ebaf057ea1cc1e309b351fd73bc Author: John Saalwaechter Date: Sun Jan 31 16:18:58 2010 -0800 scripts: use %_tmppath in "make rpm-pkg" The mkspec script hardcodes "/var/tmp" into the generated rpm spec file's BuildRoot. The user, however, may have a custom setting for %_tmppath, which should be used in BuildRoot. This patch changes mkspec's BuildRoot output to appropriately use %_tmppath. Signed-off-by: John Saalwaechter Signed-off-by: Michal Marek commit 0139f1d9539395ca341e17060ae26f44f5f31434 Author: Hui Zhu Date: Thu Jan 28 06:58:02 2010 +0000 markup_oops.pl: fix for faulting instruction in the first line of a range I got a "No matching code found" when I use markup_oops.pl parse a error in a x86_64 module. cat e.c int init_module(void) { char *buf = 0; buf[0] = 3; return 0; } void cleanup_module(void) { //char *buf = 0; //buf[0] = 3; } MODULE_AUTHOR("Hui Zhu"); MODULE_LICENSE("GPL"); 0000000000000000 : init_module(): /home/teawater/study/kernel/stack2core/example/e.c:10 0: c6 04 25 00 00 00 00 movb $0x3,0x0 7: 03 /home/teawater/study/kernel/stack2core/example/e.c:13 8: 31 c0 xor %eax,%eax a: c3 retq b: 0f 1f 44 00 00 nopl 0x0(%rax,%rax,1) 0000000000000010 : cleanup_module(): /home/teawater/study/kernel/stack2core/example/e.c:20 10: f3 c3 repz retq 12: 90 nop 13: 90 nop Disassembly of section .modinfo: This is because the faulting instruction "movb $0x3,0x0" is the first line of the range. In the markup_oops.pl: main::(./scripts/markup_oops.pl:245): 245: if (InRange($1, $target)) { DB<2> p $line ffffffffa001b000: c6 04 25 00 00 00 00 movb $0x3,0x0 DB<3> p $counter 0 It just set $center in next loop. So it cannot get the $center. And even if $center is set to the right value 0. if ($center == 0) { print "No matching code found \n"; exit; } The first line $center will be 0, so I change the default value to -1. Signed-off-by: Hui Zhu Signed-off-by: Michal Marek commit 94a47083522ec4bcfc03134ebe908f1bfb393057 Author: Don Zickus Date: Tue Jan 26 22:20:41 2010 +0000 scripts: change scripts to use system python instead of env Just a small change to a couple of scripts to go from #!/usr/bin/env python to #!/usr/bin/python This shouldn't effect anyone, unless they don't install python there. In preparation for python3, Fedora is doing a big push to change the scripts to use the system python. This allows developers to put the python3 in their path without fear of breaking existing scripts. Now I am pretty sure anyone using python3 for testing purposes will probably not run any of the scripts I changed, but Fedora has this automated tool that checks for this stuff so I thought I would try to push it upstream. Signed-off-by: Don Zickus Acked-by: WANG Cong Acked-by: Jarod Wilson Signed-off-by: Michal Marek commit 71d41aed9468a1239cff1b2d928954885b09de6c Author: Himanshu Chauhan Date: Wed Jan 27 16:53:20 2010 -0800 scripts/kallsyms: suppress build warning Suppress a warn_unused_result warning. fgets is called as a part of error handling. It is called just to drop a line and return immediately. read_map is reading the file in a loop and read_symbol reads line by line. So I think there is no point in using return value for useful checking. Other checks like 3 items were returned or !EOF have already been done. Signed-off-by: Himanshu Chauhan Cc: WANG Cong Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit d4987bd7ae8401bd88896a6f76dc7af31fe55732 Author: Michal Marek Date: Wed Jan 27 09:46:23 2010 +0100 scripts/mkcompile_h: don't test for hardcoded paths Don't test for /bin/{dnsdomainname,domainname}, simply try to execute the command and check if it returned something. Reported-by: Glenn Sommer Acked-by: WANG Cong Tested-by: Glenn Sommer Signed-off-by: Michal Marek commit e66f25d7d1be19e177cf55126a40799757efae89 Author: Andi Kleen Date: Wed Jan 13 17:02:44 2010 +0100 Improve kconfig symbol hashing While looking for something else I noticed that the symbol hash function used by kconfig is quite poor. It doesn't use any of the standard hash techniques but simply adds up the string and then uses power of two masking, which is both known to perform poorly. The current x86 kconfig has over 7000 symbols. When I instrumented it showed that the minimum hash chain length was 16 and a significant number of them was over 30. It didn't help that the hash table size was only 256 buckets. This patch increases the hash table size to a larger prime and switches to a FNV32 hash. I played around with a couple of hash functions, but that one seemed to perform best with reasonable hash table sizes. Increasing the hash table size even further didn't seem like a good idea, because there are a couple of global walks which walk the complete hash table. I also moved the unnamed bucket to 0. It's still the longest of all the buckets (44 entries), but hopefully it's not often hit except for the global walk which doesn't care. The result is a much nicer distribution: (first column bucket length, second number of buckets with that length) 1: 3505 2: 1236 3: 294 4: 52 5: 3 47: 1 <--- this is the unnamed symbols bucket There are still some 5+ buckets, but increasing the hash table even more would be likely not worth it. This also cleans up the code slightly by removing hard coded magic numbers. I didn't notice a big performance difference either way on my Nehalem system, but I presume it'll help somewhat on slower systems. Signed-off-by: Andi Kleen Signed-off-by: Michal Marek commit 62718979780720e526a411dc66e810288aaa7bf6 Author: Joe Perches Date: Wed Jan 13 09:31:44 2010 -0800 Makefile: Document ability to make file.lst and file.S Signed-off-by: Joe Perches Acked-by: WANG Cong Signed-off-by: Michal Marek commit 85a256d8e0116c8f5ad276730830f5d4d473344d Author: David Rientjes Date: Wed Jan 13 13:01:05 2010 -0800 kbuild: improve version string logic The LOCALVERSION= string passed to "make" will now always be appended to the kernel version after CONFIG_LOCALVERSION, if it exists, regardless of whether CONFIG_LOCALVERSION_AUTO is set or not. This allows users to uniquely identify their kernel builds with a string. If CONFIG_LOCALVERSION_AUTO is enabled, the unique SCM tag reported by setlocalversion (or .scmversion) is appended to the kernel version, if it exists. When CONFIG_LOCALVERSION_AUTO is not enabled, a `+' is appended to the kernel version to represent that the kernel has been revised since the last release unless "make LOCALVERSION=" was used to uniquely identify the build. The end result is this: - when LOCALVERSION= is passed to "make", it is appended to the kernel version, - when CONFIG_LOCALVERSION_AUTO is enabled, a unique SCM identifier is appended if the respository has been revised beyond a tagged commit, and - when CONFIG_LOCALVERSION_AUTO is disabled, a `+' is appended if the repository has been revised beyond a tagged commit and LOCALVERSION= was not passed to "make". Examples: With CONFIG_LOCALVERSION_AUTO: "make" results in v2.6.32-rc4-00149-ga3ccf63. If there are uncommited changes to the respository, it results in v2.6.32-rc4-00149-ga3ccf63-dirty. If "make LOCALVERSION=kbuild" were used, it results in v2.6.32-rc4-kbuild-00149-ga3ccf63-dirty. Without CONFIG_LOCALVERSION_AUTO, "make" results in v2.6.32-rc4+ unless the repository is at the Linux v2.6.32-rc4 commit (in which case the version would be v2.6.32-rc4). If "make LOCALVERSION=kbuild" were used, it results in v2.6.32-rc4-kbuild. Also renames variables such as localver-auto and _localver-auto to more accurately describe what they represent: localver-extra and scm-identifier, respectively. Signed-off-by: David Rientjes Signed-off-by: Michal Marek commit 68c16edddf41044410fab59d4c179c023cb25afb Author: Nir Tzachar Date: Wed Jan 13 07:32:35 2010 +0200 nconfig: minor fix This patch fixes two problems reported by Jan Engelhardt: 1) Border is now properly placed, to always be visible 2) Long menu items are properly displayed Reported-by: Jan Engelhardt Signed-off-by: Nir Tzachar Signed-off-by: Michal Marek commit 851190c9304154b7d65596801415229c05994e91 Author: Michal Marek Date: Thu Jan 7 13:59:57 2010 +0100 nconfig: mark local functions as such scripts/kconfig/nconf.gui.c:23: warning: no previous prototype for 'set_normal_colors' scripts/kconfig/nconf.gui.c:68: warning: no previous prototype for 'normal_color_theme' scripts/kconfig/nconf.gui.c:100: warning: no previous prototype for 'no_colors_theme' scripts/kconfig/nconf.c:455: warning: no previous prototype for 'process_special_keys' scripts/kconfig/nconf.c:487: warning: no previous prototype for 'get_next_hot' scripts/kconfig/nconf.c:506: warning: no previous prototype for 'canbhot' scripts/kconfig/nconf.c:514: warning: no previous prototype for 'is_hot' scripts/kconfig/nconf.c:522: warning: no previous prototype for 'make_hot' scripts/kconfig/nconf.c:582: warning: no previous prototype for 'item_make' scripts/kconfig/nconf.c:626: warning: no previous prototype for 'item_add_str' scripts/kconfig/nconf.c:656: warning: no previous prototype for 'item_tag' scripts/kconfig/nconf.c:668: warning: no previous prototype for 'curses_item_index' scripts/kconfig/nconf.c:673: warning: no previous prototype for 'item_data' scripts/kconfig/nconf.c:684: warning: no previous prototype for 'item_is_tag' scripts/kconfig/nconf.c:691: warning: no previous prototype for 'set_config_filename' Signed-off-by: Michal Marek commit 692d97c380c6dce2c35a04c5dcbce4e831a42fa0 Author: nir.tzachar@gmail.com Date: Wed Nov 25 12:28:43 2009 +0200 kconfig: new configuration interface (nconfig) This patch was inspired by the kernel projects page, where an ncurses replacement for menuconfig was mentioned (by Sam Ravnborg). Building on menuconfig, this patch implements a more modern look interface using ncurses and ncurses' satellite libraries (menu, panel, form). The implementation does not depend on lxdialog, which is currently distributed with the kernel. Signed-off-by: Nir Tzachar Signed-off-by: Michal Marek commit c64152bfd0106807c8d3ddbe6d0928e14a64f7bb Author: Alexander Beregalov Date: Thu Jan 7 05:22:41 2010 +0300 genksyms: close ref_file after use It is the last place when the file is read, so close it. Signed-off-by: Alexander Beregalov Signed-off-by: Michal Marek commit da60fbbcb637b37b1d77a41886ae4e275422ca96 Author: Vadim Bendebury (вб) Date: Sun Dec 20 00:29:49 2009 -0800 menuconfig: wrap long help lines Help text for certain config options is very extensive (the text includes the names of all other options the option in question depends on). Long lines are not wrapped, making it impossible to see the list without scrolling horizontally. This patch adds some logic which wraps help screen lines at word boundaries to prevent truncating. Tested by running ARCH=powerpc make menuconfig O=/tmp/build which shows that the long lines are now wrapped, and ARCH=powerpc make xconfig O=/tmp/build to demonstrate that it still compiles and operates as expected. Signed-off-by: Vadim Bendebury Signed-off-by: Michal Marek commit 5358db0b0e16470337c6ec08177deb3f68ed7673 Author: Rabin Vincent Date: Tue Jan 5 20:27:58 2010 +0530 scripts: add ARM support to decodecode This patch adds support for decoding ARM oopses to scripts/decodecode. The following things are handled: - ARCH and CROSS_COMPILE environment variables are respected. - The Code: in x86 oopses is in bytes, while it is in either words (4 bytes) or halfwords for ARM. - Some versions of ARM objdump refuse to disassemble instructions generated by literal constants (".word 0x..."). The workaround is to strip the object file first. - The faulting instruction is marked (liked so) in ARM, but in x86. - ARM mnemonics may include characters such as [] which need to be escaped before being passed to sed for the "<- trapping instruction" substitution. Signed-off-by: Rabin Vincent Signed-off-by: Michal Marek commit 84336466011c589b6af554f2f2f1fcfa1a5c1437 Author: Roland McGrath Date: Mon Dec 21 16:24:06 2009 -0800 kconfig CROSS_COMPILE option This adds CROSS_COMPILE as a kconfig string so you can store it in .config. Then you can use plain "make" in the configured kernel build directory to do the right cross compilation without setting the command-line or environment variable every time. With this, you can set up different build directories for different kernel configurations, whether native or cross-builds, and then use the simple: make -C /build/dir M=module-source-dir idiom to build modules for any given target kernel, indicating which one by nothing but the build directory chosen. I tried a version that defaults the string with env="CROSS_COMPILE" so that in a "make oldconfig" with CROSS_COMPILE in the environment you can just hit return to store the way you're building it. But the kconfig prompt for strings doesn't give you any way to say you want an empty string instead of the default, so I punted that. Signed-off-by: Roland McGrath Cc: Sam Ravnborg Cc: Anibal Monsalve Salazar Cc: Steven Rostedt Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 4b024242e8a4e9679fa327ea03958b89f89096c9 Author: Jiafu He Date: Thu Dec 17 18:22:13 2009 -0700 kbuild: Fix linking error built-in.o no such file or directory This patch fixes the link error "built-in.o: no such file or directory". The problem happens if "dirx/Makefile" contains only "obj-m += diry/ dirz/" and the empty "dirx/built-in.o" is missing. Adding $(subdir-m) into check for builtin-target fixes this error. Signed-off-by: Jiafu He Signed-off-by: Michal Marek commit 0db252452378aa7a9e001a13226e1cd1dc61453d Author: Uwe Kleine-König Date: Sat Jan 30 21:14:23 2010 +0100 modpost: don't allow *driver to reference .init.* Signed-off-by: Uwe Kleine-König commit af92a82d0fec4dfd344b2ffd7a63e30f05c53938 Author: Uwe Kleine-König Date: Sat Jan 30 20:52:50 2010 +0100 modpost: make symbol white list a per mismatch type variable Signed-off-by: Uwe Kleine-König commit fc2f7efadb755b020ad8fdf195515dacaf185e2d Author: Uwe Kleine-König Date: Sat Jan 30 16:57:48 2010 +0100 modpost: remove now unused NO_MISMATCH constant Signed-off-by: Uwe Kleine-König commit 0d2a636ee6c3b8c292fbaae05976fe1537b70958 Author: Uwe Kleine-König Date: Sat Jan 30 16:56:20 2010 +0100 modpost: pass around const struct sectioncheck * instead of enum mismatch This prepares having a per-check whitelist of symbol names. Signed-off-by: Uwe Kleine-König commit bbd3f4fb84f8c4a04f22c9c6dc119b0c4856c7d9 Author: Uwe Kleine-König Date: Sat Jan 30 16:35:47 2010 +0100 modpost: give most mismatch constants a better name Signed-off-by: Uwe Kleine-König commit 4a31a229fb6cbbeabf5ca9a0dcb55d53ca052048 Author: Uwe Kleine-König Date: Fri Jan 29 12:04:26 2010 +0100 modpost: define ALL_XXX{IN,EX}IT_SECTIONS Signed-off-by: Uwe Kleine-König commit b75dcabd6c6c71d7cea64f78b06d18d9cda0ddd1 Author: Uwe Kleine-König Date: Fri Jan 29 11:40:38 2010 +0100 modpost: members of *driver structs should not point to __init functions Either the functions referred to in a driver struct should live in .devinit or the driver should be registered using platform_driver_probe (or equivalent for different driver types) with ->probe being NULL. Signed-off-by: Uwe Kleine-König