commit 291b58d663862c3d42d2e8092f8b0dd3f15a94f8 Author: Haavard Skinnemoen Date: Tue Oct 24 10:12:46 2006 +0200 [PATCH] AVR32: Update defconfig Sync atstk1002_defconfig with latest git, turn off non-existent drivers and enable a few more userspace-visible options like SysV IPC and inotify support. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit 452976b29864f9adcdd6d4ea81001aa5483592c2 Author: Haavard Skinnemoen Date: Tue Oct 24 10:12:45 2006 +0200 [PATCH] AVR32: Use __raw MMIO access for internal peripherals The read[bwl] and write[bwl] functions are meant for accessing PCI devices. How this is achieved on AVR32 is unknown, as there are no systems with a PCI bridge available yet. On-chip peripheral access, however, should not depend on how we end up implementing PCI access, so using __raw_read[bwl]/__raw_write[bwl] is the right thing to do for on-chip peripherals. This patch converts the drivers for the static memory controller, interrupt controller, PIO controller and system manager to use __raw MMIO access. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit d68041cc9fde550fe6b6a6de1d7a110daff3cb60 Author: Haavard Skinnemoen Date: Tue Oct 24 10:12:44 2006 +0200 [PATCH] AVR32: Implement and export __raw_{read,write}s[bwl] Implement __raw_readsb and __raw_writesb. Export __raw_reads[bwl] and __raw_writes[bwl] for use by modules. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit 065834ab3988fece5608088e83724891c8190a2f Author: Ben Nizette Date: Tue Oct 24 10:12:43 2006 +0200 [PATCH] AVR32: add io{read,write}{8,16,32}{be,} support A number of new drivers require io{read,write}{8,16,32}{be,} family of io operations. These are provided for the AVR32 by this patch in the form of a series of macros. Access to the (memory mapped) io space through these macros is defined to be little endian only as little endian devices (such as PCI) are the main consumer of IO access. If high speed access is required, io{read,write}{16,32}be macros are supplied to perform native big endian access to this io space. Signed-off-by: Ben Nizette Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit fa3522407f01ead1ec14bdd6b785ea08d17d500d Author: Haavard Skinnemoen Date: Tue Oct 24 10:12:42 2006 +0200 [PATCH] AVR32: Fix oversize immediates in atomic.h When calling e.g. atomic_sub_return with a large constant, the compiler may output an immediate that is too large for the sub instruction in the middle of the loop. Fix this by explicitly specifying the number of bits allowed in the constraint. Also stop atomic_add_return() and friends from falling back to their respective "sub" variants if the constant is too large to fit in an immediate. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit bee8ce809fb1c877388be032b468574a1cfff9ef Author: Haavard Skinnemoen Date: Tue Oct 24 10:12:41 2006 +0200 [PATCH] AVR32: Don't try to iounmap P2 segment addresses While ioremap() will happily map a physical address through the P2 (uncached) segment when appropriate, iounmap() doesn't know how to handle those mappings. This patch makes iounmap() do the right thing, i.e. nothing, for such mappings. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit 6ea850b5eb17f6d21ac1b3d99406d213a10c64e9 Author: Haavard Skinnemoen Date: Tue Oct 24 10:12:40 2006 +0200 [PATCH] AVR32: Silence some compile warnings Silence a few compile warnings which are basically harmless, but easy to fix. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit 0430fb20a2a9f06262cb5ccc98869d54cdaa3963 Author: Haavard Skinnemoen Date: Tue Oct 24 10:12:39 2006 +0200 [PATCH] AVR32: Minor Makefile cleanup Don't generate listing by default, remove unused LIBGCC variable and rename generated disassembly and listing files to vmlinux.{s,lst}. Also make sure that files generated during the build are actually removed with make clean. Signed-off-by: Haavard Skinnemoen Signed-off-by: Linus Torvalds commit 71fa0a849b384f066dea6a2351c722c19846f4ac Merge: 9d81a78... d6b9ccb... Author: Linus Torvalds Date: Wed Oct 25 20:22:55 2006 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (40 commits) [SCSI] aic79xx: Print out signalling [SCSI] aic7xxx: Remove slave_destroy [SCSI] aic79xx: set precompensation [SCSI] aic79xx: Fixup external device reset [SCSI] replace u8 and u32 with __u8 and __u32 in scsi.h for user space [SCSI] lpfc: fix printk format warning [SCSI] aic79xx: make ahd_set_tags() static [SCSI] aic7xxx: cleanups [SCSI] drivers/scsi: Handcrafted MIN/MAX macro removal [SCSI] scsi_debug: support REPORT TARGET PORT GROUPS [SCSI] qla1280 bus reset typo [SCSI] libiscsi: fix logout pdu processing [SCSI] libiscsi: fix aen support [SCSI] libiscsi: fix missed iscsi_task_put in xmit error path [SCSI] libiscsi: fix oops in connection create failure path [SCSI] iscsi class: fix slab corruption during restart [SCSI] Switch fdomain to the pci_get API [SCSI] add can_queue to host parameters [SCSI] megaraid_{mm,mbox}: 64-bit DMA capability fix [SCSI] aic94xx: Supermicro motherboards support ... commit 9d81a782d55bdeec3bfa3106e514bf46ac12e172 Merge: 82b6c3a... f84fcb0... Author: Linus Torvalds Date: Wed Oct 25 20:22:04 2006 -0700 Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6 * 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6: Remove unnecessary check in drivers/video/intelfb/intelfbhw.c intel fb: switch to pci_get API commit 82b6c3af0482c167fb3bb51375589e6d9c5c67a4 Merge: 9f4c7ac... 85abb3f... Author: Linus Torvalds Date: Wed Oct 25 20:21:43 2006 -0700 Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: ioremap balanced with iounmap for drivers/char/drm drm: fix error returns, sysfs error handling fix return code in error case. drm: mga: set dev_priv_size drm: savage: dev->agp_buffer_map is not initialized for AGP DMA on savages drm: radeon: only allow specific type-3 packetss through verifier commit 9f4c7ac227423eb4a514ce0bbd3a884a26541e63 Merge: 8c8a0ea... 70a0a53... Author: Linus Torvalds Date: Wed Oct 25 20:21:16 2006 -0700 Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 * 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: [PATCH] x86-64: Only look at per_cpu data for online cpus. [PATCH] x86-64: Simplify the vector allocator. commit 8c8a0eab988c94294adbbb4fe955bba7d8ebddcf Merge: 8483ca3... bcbaecb... Author: Linus Torvalds Date: Wed Oct 25 20:20:41 2006 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] users: Select ECB/CBC where needed commit 8483ca3c99559027a3741af7f56f6b36887f7fd5 Merge: ede847c... 190a24f... Author: Linus Torvalds Date: Wed Oct 25 20:20:03 2006 -0700 Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Make sure __cpu_preinit_ppc970 gets called on 970GX processors [POWERPC] Fix CHRP platforms with only 8259 [POWERPC] IPIC: Fix spinlock recursion in set_irq_handler [POWERPC] Fix the UCC rx/tx clock of QE [POWERPC] cell: update defconfig [POWERPC] spufs: fix another off-by-one bug in spufs_mbox_read [POWERPC] spufs: fix signal2 file to report signal2 [POWERPC] Fix device_is_compatible() const warning [POWERPC] Cell timebase bug workaround [POWERPC] Support feature fixups in modules [POWERPC] Support feature fixups in vdso's [POWERPC] Support nested cpu feature sections [POWERPC] Consolidate feature fixup code [POWERPC] Fix hang in start_ldr if _end or _edata is unaligned [POWERPC] Fix spelling errors in ucc_fast.c and ucc_slow.c [POWERPC] Don't require execute perms on wrapper when building zImage.initrd [POWERPC] Add 970GX cputable entry [POWERPC] Fix build breakage with CONFIG_PPC32 [POWERPC] Fix compiler warning message on get_property call [POWERPC] Simplify stolen time calculation commit ede847c406054ba2a1ef2d165d3fd9f8e2b8d1bc Merge: 9eed286... 64271c4... Author: Linus Torvalds Date: Wed Oct 25 20:19:23 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3902/1: Enable GPIO81-84 on PXA255 [ARM] Comment out missing configuration symbols [ARM] 3898/1: corgi_bl fix module loading [ARM] 3897/1: corgi_bl fix module compiling [ARM] Fix breakage in 7281c248f797723f66244b7ecef204620f664648 commit 190a24f5605d95b786c92280bf7a51ebef43f29f Author: Olof Johansson Date: Wed Oct 25 17:32:40 2006 -0500 [POWERPC] Make sure __cpu_preinit_ppc970 gets called on 970GX processors Add check for 970GX for __cpu_preinit_ppc970. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit d6b9ccbbeb625674891f797119f06512d27fc905 Author: Hannes Reinecke Date: Mon Oct 23 15:26:37 2006 +0200 [SCSI] aic79xx: Print out signalling This is a cross-port of a similar patch for aic7xxx; only it's a bit simpler here as we don't support HVD and all controller actually implement this register. I hope. Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley commit 9080063f523b09af63234a21816c825133d48c44 Author: Hannes Reinecke Date: Mon Oct 23 15:25:36 2006 +0200 [SCSI] aic7xxx: Remove slave_destroy This is a cross-port from aic79xx; we still hit the occasional BUG_ON in slave_destroy. And again we don't really need the slave_destroy callback nor the ahc_linux_target structure at all. Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley commit 843822ad631889596d67716e6edbcde608aeba81 Author: Hannes Reinecke Date: Mon Oct 23 15:24:23 2006 +0200 [SCSI] aic79xx: set precompensation aic79xx has a special 'iocell' chip which handles the precompensation. If it's set via DV we should make sure to set the chip correctly, too. Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley commit 8883c1f182fa88d2b8e0adb6ae90a42f67e5353e Author: Hannes Reinecke Date: Mon Oct 23 15:22:37 2006 +0200 [SCSI] aic79xx: Fixup external device reset Whenever an external device is resetted we really have to take care to keep the channel in sync. Just notifying SCSI-ML and retry is not enough as we have to make sure the SCSI bus is not getting confused, either. So whenever we detect an external reset we rewrite the command to TUR, disable packetized command and notify the internal engine that an abort has happened. This way we trigger a proper bus reset sequence and all devices will be renegotiated properly. Kudos to Justin Gibbs and Luben Tuikov for this idea. Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley commit 4a531e8c79fe459e922347461ccc0f0c13de20d5 Author: FUJITA Tomonori Date: Fri Oct 20 09:08:18 2006 +0900 [SCSI] replace u8 and u32 with __u8 and __u32 in scsi.h for user space Signed-off-by: FUJITA Tomonori Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit afc071e6281e4f2af4748b5ddc594334726a37cf Author: Randy Dunlap Date: Mon Oct 23 21:47:13 2006 -0700 [SCSI] lpfc: fix printk format warning Fix printk format warning: drivers/scsi/lpfc/lpfc_attr.c:597: warning: long long unsigned int format, uint64_t arg (arg 4) Signed-off-by: Randy Dunlap Acked-by: James Smart Signed-off-by: James Bottomley commit ca3c3323931ef925497a9ffcb61c5eebe55f8e2b Author: Adrian Bunk Date: Fri Oct 20 14:48:07 2006 -0700 [SCSI] aic79xx: make ahd_set_tags() static Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Acked-by: Hannes Reinecke Signed-off-by: James Bottomley commit 289fe5b1f99c5e61ed32796cbed0a1ecc3589041 Author: Adrian Bunk Date: Fri Oct 20 14:47:57 2006 -0700 [SCSI] aic7xxx: cleanups - make needlessly global code static - #if 0 the following unused global functions: - aic79xx_core.c: ahd_print_scb - aic79xx_core.c: ahd_suspend - aic79xx_core.c: ahd_resume - aic79xx_core.c: ahd_dump_scbs - aic79xx_osm.c: ahd_softc_comp Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Acked-by: Hannes Reinecke Signed-off-by: James Bottomley commit 6d07cb71fdacc710fd9816cddb5c2df0f7bd96b4 Author: Amol Lad Date: Fri Oct 20 14:48:40 2006 -0700 [SCSI] drivers/scsi: Handcrafted MIN/MAX macro removal Cleanups done to use min/max macros from kernel.h. Handcrafted MIN/MAX macros are changed to use macros in kernel.h [akpm@osdl.org: fix warning] Signed-off-by: Amol Lad Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 5a09e39810ae0465016c380962e12dd115779b87 Author: Hannes Reinecke Date: Fri Oct 20 09:58:47 2006 +0200 [SCSI] scsi_debug: support REPORT TARGET PORT GROUPS This patch adds support for REPORT TARGET PORT GROUPS. This is used eg for the multipathing priority callout to determine the path priority. With this patch multipath-tools can use the existing mpath_prio_alua callout to exercise the path priority grouping. Signed-off-by: Hannes Reinecke Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit cd00b7f5d814ba87b36371f122ce36ba4a88ba69 Author: Jes Sorensen Date: Tue Oct 17 09:32:06 2006 -0400 [SCSI] qla1280 bus reset typo Fix typo in check of return value of qla1280_bus_reset() which would result in an adapter reset in addition to the bus reset. Signed-off-by: Jes Sorensen Signed-off-by: James Bottomley commit b5072ea0910e5c8c79b8313e0ef70ca763983dbf Author: Mike Christie Date: Mon Oct 16 18:09:42 2006 -0400 [SCSI] libiscsi: fix logout pdu processing According to the iscsi RFC, we cannot send other requests if we have sent a logout pdu. This patch enforces this requirement by blocking the session and suspending the send thread. Userspace decides if we restart the connection or if we just free everything. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 5831c737f724aa6a655a908d202221f079f30036 Author: Mike Christie Date: Mon Oct 16 18:09:41 2006 -0400 [SCSI] libiscsi: fix aen support We have been dropping the pdu. We should just send it to userspace and let it handle it. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit cd529a46e17b43976d05c1e2ece2676ec7941cc8 Author: Mike Christie Date: Mon Oct 16 18:09:40 2006 -0400 [SCSI] libiscsi: fix missed iscsi_task_put in xmit error path from bhalevy@gmail.com: It looks like change 652 to libiscsi.c added some dead code around line 670 if (rc) { spin_unlock_bh(&conn->session->lock); goto again; } since 5 lines above we goto again if (rc). It looks like the previous if (rc) should go away if we want to put the ctask before breaking out of the while loop with "goto again" (see following patch). Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 98644047916c24258fb47c3dab2bed8a44f53b83 Author: Mike Christie Date: Mon Oct 16 18:09:39 2006 -0400 [SCSI] libiscsi: fix oops in connection create failure path If connection creation fails we end up calling list_del on a invalid struct. This then causes an oops. We are not acutally using the lists (old MCS code we thought might be useful elsewhere) so this patch just removes that code. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 43a145a3440c5c5f24ff2888801e40e2242187e6 Author: Mike Christie Date: Mon Oct 16 18:09:38 2006 -0400 [SCSI] iscsi class: fix slab corruption during restart The transport class recv mempools are causing slab corruption. We could hack around netlink's lack of mempool support like dm, but it is just too ulgy (dm's hack is ugly enough :) when you need to support broadcast. This patch removes the recv pools. We have not used them even when we were allocting 20 MB per session and the system only had 64 MBs. And we have no pools on the send side and have been ok there. When Peter's work gets merged we can use that since the network guys are in favor of that approach and are not going to add mempools everywhere. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 47bcd3546d5141e54f15e40a20dc01d7c5f5a473 Author: Alan Cox Date: Mon Oct 16 16:55:46 2006 +0100 [SCSI] Switch fdomain to the pci_get API Doesn't make the hardware hot pluggable but does ensure the driver won't crash when another device is hot-unplugged at the wrong moment. Soon I propose to deprecate pci_find_device() and some of its friends. Signed-off-by: Alan Cox Signed-off-by: James Bottomley commit ed632da84c51a39fd9c982991e0f26120a035761 Author: James Bottomley Date: Mon Oct 16 10:06:27 2006 -0500 [SCSI] add can_queue to host parameters Debugging TCQ issues has shown me this is a very useful parameter to be able to view. Add it to he host class parameters. Signed-off-by: James Bottomley commit 031280f6e73d9177c93333c96e37eb05f2522faa Author: Andrey Mirkin <(amirkin@sw.ru)> Date: Mon Oct 16 12:08:43 2006 +0400 [SCSI] megaraid_{mm,mbox}: 64-bit DMA capability fix It is known that 2 LSI Logic MegaRAID SATA RAID Controllers (150-4 and 150-6) don't support 64-bit DMA. Unfortunately currently this check is wrong and driver sets 64-bit DMA mode for these devices. Signed-off-by: Andrey Mirkin Acked-by: "Ju, Seokmann" Signed-off-by: James Bottomley commit 3fc2aef5227dda464560a3fdafc9f4c7ce10210f Author: Sergey Kononenko Date: Sun Oct 15 03:12:08 2006 +0300 [SCSI] aic94xx: Supermicro motherboards support Add PCI id. Plus correct for possibly missing resistor that can cause FLASHEX to have the wrong value. Signed-off-by: Sergey Kononenko Signed-off-by: James Bottomley commit 9c3121feef7e1fba86f74b2677e6f54e7153d149 Author: Santiago Leon Date: Fri Oct 13 10:22:50 2006 -0500 [SCSI] ibmvscsi: correctly reenable CRQ The "ibmvscsi: treat busy and error conditions separately" patch submitted by Dave Boutcher back in June incorrectly reenables the CRQ. The broken logic causes the adapter to get disabled if the CRQ connection happens to close temporarily. This patch "fixes that obviously wrong logic check" (Dave's words). Signed-off-by: Santiago Leon Signed-off-by: David Boutcher Signed-off-by: James Bottomley commit 7c83a3ceb6d06e7cb908f5102687c9661e7d4d0a Author: Andrew Vasquez Date: Fri Oct 13 09:33:40 2006 -0700 [SCSI] qla2xxx: Update version number to 8.01.07-k3. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit df7baa506c2db1c2d12abd6f05c43f911da55a2e Author: Andrew Vasquez Date: Fri Oct 13 09:33:39 2006 -0700 [SCSI] qla2xxx: Correct QUEUE_FULL handling. - Drop queue-depths across all luns for a given fcport during TASK_SET_FULL statuses. - Ramp-up I/Os after throttling. - Consolidate completion-status handling of CS_QUEUE_FULL with CS_COMPLETE as ISP24xx firmware no longer reports CS_QUEUE_FULL. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 18c6c12759813c988bb05796d1b3352e98ae77de Author: Andrew Vasquez Date: Fri Oct 13 09:33:38 2006 -0700 [SCSI] qla2xxx: Workaround D3 power-management issues. Early ISP2432 parts have a known hardware issue when coming out of a D3 hot state. This issue can result in a hung PCIe link. Recent firmwares contain a workaround whereby the stop-firmware mailbox command prevents the ISP from entering the D3 hot state. In order to ensure that the workaround succeeded the driver must verify that the stop-firmware mailbox command completes successfully. In the event of a failure, the driver attempts a shutdown-retry after resetting the ISP and re-executing firmware. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit f1663ad5dbb801e03c4c99c24d698ad5dba9aaff Author: Andrew Vasquez Date: Fri Oct 13 09:33:37 2006 -0700 [SCSI] qla2xxx: Check return value of sysfs_create_bin_file() usage. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 8d1a006049ff1c084d57fbea1106ecad3455bd27 Author: Swen Schillig Date: Thu Oct 12 11:43:44 2006 +0200 [SCSI] zfcp: initialize scsi_host_template.max_sectors with appropriate value Define ZFCP_MAX_SECTORS and initialize scsi_host_template.max_sectors with appropriate value. Signed-off-by: Swen Schillig Signed-off-by: James Bottomley commit 9531c330f14c02d9f4eff7345071f485dc62dab1 Author: Henrik Kretzschmar Date: Tue Oct 10 14:41:42 2006 -0700 [SCSI] fc4: Conversion to struct scsi_cmnd in fc4 Changes the obsolete Scsi_Cmnd to struct scsi_cmnd in the Fibre Channel driver (fc4). Signed-off-by: Henrik Kretzschmar Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 0fc82d5e84825ab43006f40935633120d23c2e15 Author: Henrik Kretzschmar Date: Tue Oct 10 14:41:41 2006 -0700 [SCSI] convert ninja driver to struct scsi_cmnd Changes the obsolete typedefd Scsi_Cmnd to struct scsi_cmnd in the ninja scsi pcmcia driver. Signed-off-by: Henrik Kretzschmar Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit c543a3739c2a3034c80d77a189bd187c43a00feb Author: Henrik Kretzschmar Date: Tue Oct 10 14:41:45 2006 -0700 [SCSI] Scsi_Cmnd conversion in psi240i driver Changes the obsolete Scsi_Cmnd to struct scsi_cmnd in psi240i-driver. Signed-off-by: Henrik Kretzschmar Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 0b3a82d391563da15df2b3a0d245d41748822489 Author: Eric Sesterhenn Date: Tue Oct 10 14:41:43 2006 -0700 [SCSI] lpfc: check before dereference in lpfc_ct.c If we fail to allocate mp->virt during the first while loop iteration, mlist is still uninitialized, therefore we should check if before dereferencing. Signed-off-by: Eric Sesterhenn Acked-by: James Smart Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 46c43db1eabcdc46ad9a3d711edff1d698ecd21f Author: Alexey Dobriyan Date: Sun Oct 8 15:55:55 2006 +0400 [SCSI] scsi_lib.c: use BUILD_BUG_ON Signed-off-by: Alexey Dobriyan Signed-off-by: James Bottomley commit 8e394aec14f24e3b41a315a2dc53537024190c8a Author: Henne Date: Mon Oct 9 15:38:34 2006 +0200 [SCSI] fix typo in previous Scsi_Cmnd convertion in aic7xxx_old.c Fixes a typo in the aic7xxx_old.c. Signed-off-by: Olaf Hering Signed-off-by: Henrik Kretzschmar Signed-off-by: James Bottomley commit 35508e46aae4b57bd07d095eb11533e296b254dc Author: Michael Reed Date: Fri Oct 6 15:39:25 2006 -0500 [SCSI] mptfc: stall eh handlers if resetting while rport blocked Thanks to James Smart for the inspiration. Stall error handler if attempting recovery while an rport is blocked. This avoids device offline scenarios due to errors in the error handler. Also verify that VirtDevice is available before issuing scsi command. VirtDevice is removed when fc transport removes a target. See James Smart's patch of 08/17/2006 for greater detail. http://marc.theaimsgroup.com/?l=linux-scsi&m=115583213624803&w=2 Also bump version number per Eric's request. Signed-off-by: Michael Reed Acked-by: Eric Moore Signed-off-by: James Bottomley commit 11010fecd2a1fdae684237b61709367ae6a93289 Author: Andrew Vasquez Date: Fri Oct 6 09:54:59 2006 -0700 [SCSI] Maintain module-parameter name consistency with qla2xxx/qla4xxx. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 80f1443c66de3ec42e28d151bd43a80de398877e Author: Hannes Reinecke Date: Fri Oct 6 09:22:41 2006 +0200 [SCSI] aic7xxx: Adjust .max_sectors According to the adaptec sources aic7xxx / aic79xx really can do 4MB transfers. So we should adjust .max_sectors. Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley commit 5ae16db36988e811410494fb5d07c81e14453e7b Author: Doug Maxey Date: Thu Oct 5 23:50:07 2006 -0500 [SCSI] qla4xxx: fix double printk on load There is a dup printk at the tail of qla4xxx_module_init(). Remove the first instance as it's before the complete success of the function. Signed-off-by: James Bottomley commit 75c28851c9eee889ef4347ff6f55b2dd1e1ceb81 Author: Guennadi Liakhovetski Date: Fri Oct 6 00:11:17 2006 +0200 [SCSI] tmscsim: set max_sectors AM53C974A's Start Transfer Counter register has 24 bits, thus maximum transfer length is 16MiB. But the maximum I can test is 8MiB, so use that until somebody tests 16MiB. Signed-off-by: Guennadi Liakhovetski Signed-off-by: James Bottomley commit 413f73272090a69e35a03c938272ec661b1d3d4c Author: Kai Makisara Date: Thu Oct 5 22:59:46 2006 +0300 [SCSI] st: Fixup -ENOMEDIUM Based on the original patch from Hannes Reinecke Fix st_open() to return -ENOMEDIUM instead of -EIO if no medium is found. Signed-off-by: Kai Makisara Signed-off-by: James Bottomley commit a24342b90c9c829fc5fea9ee01b127f81bca18ef Author: Henne Date: Tue Oct 3 21:31:14 2006 +0200 [SCSI] Scsi_Cmnd conversion in qlogicfas408 driver Change obsolete Scsi_Cmnd to struct scsi_cmnd in the Qlocic FAS408 driver. Signed-off-by: Henrik Kretzschmar rejections fixed and Signed-off-by: James Bottomley commit 811c93666c3f4a0e99382c24a84480b03c7262f6 Author: Henne Date: Tue Oct 3 19:51:59 2006 +0200 [SCSI] Scsi_Cmnd convertion in sun3-driver Change the obsolete Scsi_Cmnd to struct scsi_cmnd in the sun3-driver. Signed-off-by: Henrik Kretzschmar Signed-off-by: James Bottomley commit f84fcb06a1f7ab4ac0444ece82b25b0701369641 Author: Eric Sesterhenn Date: Fri Oct 20 14:35:59 2006 -0700 Remove unnecessary check in drivers/video/intelfb/intelfbhw.c All callers and the function itself dereference dinfo, so we can remove the check. (coverity id #1371) Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit a77b8950019289611f836c8fc19f91592822efcd Author: Alan Cox Date: Fri Oct 20 14:36:00 2006 -0700 intel fb: switch to pci_get API Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 85abb3f95010b277a6efbc9b8031a7854af87e10 Author: Amol Lad Date: Wed Oct 25 09:55:34 2006 -0700 drm: ioremap balanced with iounmap for drivers/char/drm ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Tested (compilation only) to make sure the files are compiling without any warning/error due to new changes Signed-off-by: Amol Lad Signed-off-by: Dave Airlie commit 24f73c92a990ecd3d1bb846267780a264d830065 Author: Jeff Garzik Date: Tue Oct 10 14:23:37 2006 -0700 drm: fix error returns, sysfs error handling - callers of drm_sysfs_create() and drm_sysfs_device_add() looked for errors using IS_ERR(), but the functions themselves only ever returned NULL on error. Fixed. - unwind from, and propagate sysfs errors Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 0d960d26c42888cf327df7faa1a8aa62bab53fa4 Author: Dave Jones Date: Wed Oct 18 00:26:39 2006 -0400 fix return code in error case. The other failure returns in this function are negative, so make this one do the same. Signed-off-by: Dave Jones Signed-off-by: Dave Airlie commit bcbaecbb9968750d4bfb2686a97e396f681f88ef Author: Patrick McHardy Date: Wed Oct 25 16:49:36 2006 +1000 [CRYPTO] users: Select ECB/CBC where needed CRYPTO_MANAGER is selected automatically by CONFIG_ECB and CONFIG_CBC. config CRYPTO_ECB tristate "ECB support" select CRYPTO_BLKCIPHER select CRYPTO_MANAGER I've added CONFIG_ECB to the ones you mentioned and CONFIG_CBC to gssapi. Signed-off-by: Patrick McHardy Signed-off-by: Herbert Xu commit 9eed28679282238210ad5e80bb91df30fec6d7db Merge: 2099c99... 0e64e94... Author: Linus Torvalds Date: Tue Oct 24 22:01:33 2006 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [DCCP]: Update documentation references. [ATM] horizon: read_bia() needs to be __devinit [NETFILTER]: Fix ip6_tables extension header bypass bug [NETFILTER]: Fix ip6_tables protocol bypass bug [XFRM]: Fix xfrm_state accounting [IPV4] ipconfig: fix RARP ic_servaddr breakage commit 2099c99e3b24f86b131566aa9854249189ae9ea2 Author: Al Viro Date: Tue Oct 24 11:17:06 2006 +0100 [PATCH] missing includes of io.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 016002312d50004908a79df37174b336e3682e18 Author: Al Viro Date: Tue Oct 24 11:17:37 2006 +0100 [PATCH] missing include of dma-mapping.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit aa6c2e62bbe7a20ccc85906f75bc63465d899227 Author: Al Viro Date: Tue Oct 24 11:16:29 2006 +0100 [PATCH] IOC4 should depend on PCI Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3a51237dc11efe283b40ea0248f4e26ab935dbd1 Author: Al Viro Date: Tue Oct 24 11:15:29 2006 +0100 [PATCH] uml: mconsole fixes * when we have stop/sysrq/go, we get pt_regs of whatever executes mc_work_proc(). Would be better to see what we had at the time of interrupt that got us stop. * stop/stop/stop..... will give stack overflow. Shouldn't allow stop from mconsole_stop(). * stop/stop/go leaves us inside mconsole_stop() with os_set_fd_block(req->originating_fd, 0); reactivate_fd(req->originating_fd, MCONSOLE_IRQ); just done by nested mconsole_stop(). Ditto. * once we'd seen stop, there's a period when INTR commands are executed out of order (as they should; we might have the things stuck badly enough to never reach mconsole_stop(), but still not badly enough to block mconsole_interrupt(); in that situation we _want_ things like "cad" to be executed immediately). Once we enter monsole_stop(), all INTR commands will be executed in order, mixed with PROC ones. We'd better let user see that such change of behaviour has happened. (Suggested by lennert). * stack footprint of monsole_interrupt() is an atrocity; AFAICS we can safely make struct mc_request req; static in function there. Signed-off-by: Al Viro Acked-by: Jeff Dike Signed-off-by: Linus Torvalds commit 6c50444723f2e6487b3377450f90d813a88e6c31 Author: Keith Packard Date: Tue Oct 24 13:34:11 2006 -0700 [PATCH] Merge headphone and speaker volume controls for Panasonic R4 laptop Signed-off-by: Keith Packard Signed-off-by: Linus Torvalds commit f4d4c354bca18210296cc0a8f592c0cdb720bf20 Author: Benjamin Herrenschmidt Date: Wed Oct 25 13:22:27 2006 +1000 [POWERPC] Fix CHRP platforms with only 8259 On CHRP platforms with only a 8259 controller, we should set the default IRQ host to the 8259 driver's one for the IRQ probing fallbacks to work in case the IRQ tree is incorrect (like on Pegasos for example). Without this fix, we get a bunch of WARN_ON's during boot. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit f49196a5f53aa62a964b08ffa2c59699a0c8eb53 Author: Scott Wood Date: Mon Oct 23 11:35:22 2006 -0500 [POWERPC] IPIC: Fix spinlock recursion in set_irq_handler This causes ipic_set_irq_type to set the handler directly rather than call set_irq_handler, which causes spinlock recursion because the lock is already held when ipic_set_irq_type is called. I'm also not convinced that ipic_set_irq_type should be changing the handler at all. There seem to be several controllers that don't and several that do. Those that do would break what appears to be a common usage of calling set_irq_chip_and_handler followed by set_irq_type, if a non-standard handler were to be used. OTOH, irq_create_of_mapping() doesn't set the handler, but only calls set_irq_type(). This patch gets things working in the spinlock-debugging-enabled case, but I'm curious as to where the handler setting is ideally supposed to be done. I don't see any documentation on set_irq_type() that clarifies what the semantics are supposed to be. Signed-off-by: Scott Wood Signed-off-by: Paul Mackerras commit f84c39da766b4c8f13872282f58286a57ad05b3e Author: Liu Dave-r63238 Date: Wed Oct 18 16:36:56 2006 +0800 [POWERPC] Fix the UCC rx/tx clock of QE MPC8323EMDS board ethernet interface with RMII uses the CLK16 divisor for the rx and tx clock, but the ucc_set_qe_mux_rxtx() function doesn't handle the CLK16 setting of the CMXUCR3 and CMXUCR4 registers. This fixes it. Signed-off-by: Dave Liu Signed-off-by: Paul Mackerras commit b910ecf6bf221bb06f37e44765307c42b20db205 Author: Arnd Bergmann Date: Tue Oct 24 18:01:43 2006 +0200 [POWERPC] cell: update defconfig =================================================================== Signed-off-by: Paul Mackerras commit 274cef5e9d0e494ad84dbc28513b0bb6e3d847ae Author: Arnd Bergmann Date: Tue Oct 24 18:01:42 2006 +0200 [POWERPC] spufs: fix another off-by-one bug in spufs_mbox_read Currently, spufs_mbox_read transfers more bytes than requested on a read. If you ask for four bytes, you get eight. This fixes it to transfer the largest multiple of four bytes that is less than or equal to the number you asked for. Note: one nasty property of this file in spufs is that you can only read multiples of four bytes in the first place, since there is no way to atomically put back a few bytes into the hardware register. Thus, reading less than four bytes returns -EINVAL. Asking for more than four returns the largest possible multiple of four. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit f6b301b89b7bf0bb872da4f37dc28240413cbae7 Author: Dwayne Grant Mcconnell Date: Tue Oct 24 18:27:30 2006 +0200 [POWERPC] spufs: fix signal2 file to report signal2 This fixes the /signal2 file to actually give signal2 data. Signed-off-by: Dwayne Grant Mcconnell Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit e2100efb266c9335925191afe79f81f8d0a5807e Author: Benjamin Herrenschmidt Date: Fri Oct 20 11:49:54 2006 +1000 [POWERPC] Fix device_is_compatible() const warning Fix a const'ification related warning with device_is_compatible() and friends related to get_property() not properly having const on it's input device node argument. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 859deea949c382d9ccb6397fe33df3703ecef45d Author: Benjamin Herrenschmidt Date: Fri Oct 20 14:37:05 2006 +1000 [POWERPC] Cell timebase bug workaround The Cell CPU timebase has an erratum. When reading the entire 64 bits of the timebase with one mftb instruction, there is a handful of cycles window during which one might read a value with the low order 32 bits already reset to 0x00000000 but the high order bits not yet incremeted by one. This fixes it by reading the timebase again until the low order 32 bits is no longer 0. That might introduce occasional latencies if hitting mftb just at the wrong time, but no more than 70ns on a cell blade, and that was considered acceptable. Signed-off-by: Benjamin Herrenschmidt Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 21c4ff80cba5e24932f3ef79c8482c0491630b2b Author: Benjamin Herrenschmidt Date: Fri Oct 20 11:47:19 2006 +1000 [POWERPC] Support feature fixups in modules This patch adds support for feature fixups in modules. This involves adding support for R_PPC64_REL64 relocs to the 64 bits module loader. It also modifies modpost.c to ignore the powerpc fixup sections (or it would warn when used in .init.text). Signed-off-by: Benjamin Herrenschmidt Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 0909c8c2d547e45ca50e2492b08ec93a37b35237 Author: Benjamin Herrenschmidt Date: Fri Oct 20 11:47:18 2006 +1000 [POWERPC] Support feature fixups in vdso's This patch reworks the feature fixup mecanism so vdso's can be fixed up. The main issue was that the construct: .long label (or .llong on 64 bits) will not work in the case of a shared library like the vdso. It will generate an empty placeholder in the fixup table along with a reloc, which is not something we can deal with in the vdso. The idea here (thanks Alan Modra !) is to instead use something like: 1: .long label - 1b That is, the feature fixup tables no longer contain addresses of bits of code to patch, but offsets of such code from the fixup table entry itself. That is properly resolved by ld when building the .so's. I've modified the fixup mecanism generically to use that method for the rest of the kernel as well. Another trick is that the 32 bits vDSO included in the 64 bits kernel need to have a table in the 64 bits format. However, gas does not support 32 bits code with a statement of the form: .llong label - 1b (Or even just .llong label) That is, it cannot emit the right fixup/relocation for the linker to use to assign a 32 bits address to an .llong field. Thus, in the specific case of the 32 bits vdso built as part of the 64 bits kernel, we are using a modified macro that generates: .long 0xffffffff .llong label - 1b Note that is assumes that the value is negative which is enforced by the .lds (those offsets are always negative as the .text is always before the fixup table and gas doesn't support emiting the reloc the other way around). Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 7aeb732428fc8e2ecae6d432873770c12f04a979 Author: Benjamin Herrenschmidt Date: Fri Oct 20 11:47:16 2006 +1000 [POWERPC] Support nested cpu feature sections This patch adds some macros that can be used with an explicit label in order to nest cpu features. This should be used very careful but is necessary for the upcoming cell TB fixup. Signed-off-by: Benjamin Herrenschmidt Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 42c4aaadb737e0e672b3fb86b2c41ff59f0fb8bc Author: Benjamin Herrenschmidt Date: Tue Oct 24 16:42:40 2006 +1000 [POWERPC] Consolidate feature fixup code There are currently two versions of the functions for applying the feature fixups, one for CPU features and one for firmware features. In addition, they are both in assembly and with separate implementations for 32 and 64 bits. identify_cpu() is also implemented in assembly and separately for 32 and 64 bits. This patch replaces them with a pair of C functions. The call sites are slightly moved on ppc64 as well to be called from C instead of from assembly, though it's a very small change, and thus shouldn't cause any problem. Signed-off-by: Benjamin Herrenschmidt Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit fb20f65a01a97bdf4bb746eecfc24a08561e2648 Author: Olaf Hering Date: Fri Oct 20 15:57:15 2006 +0200 [POWERPC] Fix hang in start_ldr if _end or _edata is unaligned Quick fix for lack of memset(__bss_start, 0, _end-__bss_start) in load_kernel(). If edata is unaligned, the loop will overwrite all memory because r3 and r4 will never be equal. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 0e64e94e477f8ed04e9295b11a5898d443c28a47 Author: Gerrit Renker Date: Tue Oct 24 16:17:51 2006 -0700 [DCCP]: Update documentation references. Updates the references to spec documents throughout the code, taking into account that * the DCCP, CCID 2, and CCID 3 drafts all became RFCs in March this year * RFC 1063 was obsoleted by RFC 1191 * draft-ietf-tcpimpl-pmtud-0x.txt was published as an Informational RFC, RFC 2923 on 2000-09-22. All references verified. Signed-off-by: Gerrit Renker Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 977a415f2b70b5693aaa23b1a16ad57ea20a1dce Author: David S. Miller Date: Tue Oct 24 16:16:39 2006 -0700 [ATM] horizon: read_bia() needs to be __devinit Thanks to Randy Dunlap. Signed-off-by: David S. Miller commit 6d381634d213580d40d431e7664dfb45f641b884 Author: Patrick McHardy Date: Tue Oct 24 16:15:10 2006 -0700 [NETFILTER]: Fix ip6_tables extension header bypass bug As reported by Mark Dowd , ip6_tables is susceptible to a fragmentation attack causing false negatives on extension header matches. When extension headers occur in the non-first fragment after the fragment header (possibly with an incorrect nexthdr value in the fragment header) a rule looking for this extension header will never match. Drop fragments that are at offset 0 and don't contain the final protocol header regardless of the ruleset, since this should not happen normally. Since all extension headers are before the protocol header this makes sure an extension header is either not present or in the first fragment, where we can properly parse it. With help from Yasuyuki KOZAKAI . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 51d8b1a65291a6956b79374b6adbbadc2263bcf6 Author: Patrick McHardy Date: Tue Oct 24 16:14:04 2006 -0700 [NETFILTER]: Fix ip6_tables protocol bypass bug As reported by Mark Dowd , ip6_tables is susceptible to a fragmentation attack causing false negatives on protocol matches. When the protocol header doesn't follow the fragment header immediately, the fragment header contains the protocol number of the next extension header. When the extension header and the protocol header are sent in a second fragment a rule like "ip6tables .. -p udp -j DROP" will never match. Drop fragments that are at offset 0 and don't contain the final protocol header regardless of the ruleset, since this should not happen normally. With help from Yasuyuki KOZAKAI . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 70a0a5357db20c291d46c04011d646d5d84c868c Author: Eric W. Biederman Date: Wed Oct 25 01:00:23 2006 +0200 [PATCH] x86-64: Only look at per_cpu data for online cpus. When I generalized __assign_irq_vector I failed to pay attention to what happens when you access a per cpu data structure for a cpu that is not online. It is an undefined case making any code that does it have undefined behavior as well. The code still needs to be able to allocate a vector across cpus that are not online to properly handle combinations like lowest priority interrupt delivery and cpu_hotplug. Not that we can do that today but the infrastructure shouldn't prevent it. So this patch updates the places where we touch per cpu data to only touch online cpus, it makes cpu vector allocation an atomic operation with respect to cpu hotplug, and it updates the cpu start code to properly initialize vector_irq so we don't have inconsistencies. Signed-off-by: Eric W. Biederman Signed-off-by: Andi Kleen commit d1752aa884ec0ac3027c1a3d456bf69bf765c8b8 Author: Eric W. Biederman Date: Wed Oct 25 01:00:22 2006 +0200 [PATCH] x86-64: Simplify the vector allocator. There is no reason to remember a per cpu position of which vector to try. Keeping a global position is simpler and more likely to result in a global vector allocation even if I don't need or require it. For level triggered interrupts this means we are less likely to acknowledge another cpus irq, and cause the level triggered irq to harmlessly refire. This simplification makes it easier to only access data structures of online cpus, by having fewer special cases to deal with. Signed-off-by: Eric W. Biederman Signed-off-by: Andi Kleen commit 2fab22f2d3290ff7c602fe62f22e825c48e97a06 Author: Patrick McHardy Date: Tue Oct 24 15:34:00 2006 -0700 [XFRM]: Fix xfrm_state accounting xfrm_state_num needs to be increased for XFRM_STATE_ACQ states created by xfrm_state_find() to prevent the counter from going negative when the state is destroyed. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 82571026b9771c4035b0c62abbbe588fe73373ea Author: Al Viro Date: Tue Oct 24 15:18:36 2006 -0700 [IPV4] ipconfig: fix RARP ic_servaddr breakage memcpy 4 bytes to address of auto unsigned long variable followed by comparison with u32 is a bloody bad idea. Signed-off-by: Al Viro Signed-off-by: David S. Miller commit 64271c4d909a15bc588f053a739db2e6df336d7d Author: Craig Hughes Date: Tue Oct 24 00:47:35 2006 +0100 [ARM] 3902/1: Enable GPIO81-84 on PXA255 The PXA255 has 84 GPIO lines available. This patch allows access to 81-84 Signed-off-by: Craig Hughes Signed-off-by: Russell King commit 52f0c67340ca306d5802b52140a186fcfa4b340e Author: Russell King Date: Sun Oct 22 16:04:29 2006 +0100 [ARM] Comment out missing configuration symbols HAS_TOUCHSCREEN_ADS7843_LH7 and HAS_TOUCHSCREEN_ADC_LH7 are referenced but not defined in the LH7A40x configuration. Comment them out to prevent them causing warnings. Marc Singer said: Feel free to remove the Kconfig lines. I'll add it back with the rest of the config entries. Signed-off-by: Russell King commit 62c877b9b7c463aa16ffbc9a322cb094fdb5827a Author: Anton Vorontsov Date: Fri Oct 20 00:58:49 2006 +0100 [ARM] 3898/1: corgi_bl fix module loading Fix module loading: corgi_bl: module license 'GPLv2' taints kernel. corgi_bl: Unknown symbol platform_driver_unregister corgi_bl: Unknown symbol __symbol_get corgi_bl: Unknown symbol platform_driver_register Cc: Richard Purdie Signed-off-by: pHilipp Zabel Signed-off-by: Anton Vorontsov Signed-off-by: Russell King commit f586fbd0ef273a80d88a07f911d9f2f2a8ac1679 Author: Anton Vorontsov Date: Fri Oct 20 00:56:28 2006 +0100 [ARM] 3897/1: corgi_bl fix module compiling Fix module compiling: WARNING: drivers/video/backlight/corgi_bl.o - Section mismatch: reference to .init.text: from .data between '$d' (at offset 0x0) and 'bl_mutex' Cc: Richard Purdie Signed-off-by: Anton Vorontsov Signed-off-by: Russell King commit cf610ca226a484f3182a59f168402cb27dcc1c53 Author: Russell King Date: Fri Oct 20 20:16:24 2006 +0100 [ARM] Fix breakage in 7281c248f797723f66244b7ecef204620f664648 A couple of missing semicolons. Signed-off-by: Russell King commit 958de71b1ab01c20c1b385035235746c9227b24f Author: Tilman Sauerbeck Date: Tue Oct 24 21:52:23 2006 +1000 drm: mga: set dev_priv_size fd.o bug 1746 Signed-off-by: Dave Airlie commit 10eee0fe9114694401c7ae154e8cfb2ab2f59c10 Author: Michael Karcher Date: Tue Oct 24 21:46:55 2006 +1000 drm: savage: dev->agp_buffer_map is not initialized for AGP DMA on savages fd.o bug 8662 Signed-off-by: Dave Airlie commit a1aa28970316d7fb606321d5ab7fb3873641ab54 Author: Roland Scheidegger Date: Tue Oct 24 21:45:00 2006 +1000 drm: radeon: only allow specific type-3 packetss through verifier only allow specific type-3 packets to pass the verifier instead of all for r100/r200 as others might be unsafe (r300 already does this), and add checking for these we need but aren't safe. Check the RADEON_CP_INDX_BUFFER packet on both r200 and r300 as it isn't safe neither. Signed-off-by: Dave Airlie commit aa7a32cbdac50bb46a75722faa359993dab07c61 Author: Timur Tabi Date: Wed Oct 18 17:27:32 2006 -0500 [POWERPC] Fix spelling errors in ucc_fast.c and ucc_slow.c In ucc_fast.c and ucc_slow.c, "illegal" is twice spelled "illagal". Signed-off-by: Timur Tabi Signed-off-by: Paul Mackerras commit 3688a0f484e980771c078ab90f74a2656c339106 Author: Mark A. Greer Date: Wed Oct 18 14:38:09 2006 -0700 [POWERPC] Don't require execute perms on wrapper when building zImage.initrd Don't require that the wrapper script be executable when building zImage.initrds. This has already been fixed for zImages. Signed-off-by: Mark A. Greer Signed-off-by: Paul Mackerras commit 362ff7b2ac0234152b4a334dd006b77f4fa2ab23 Author: Jake Moilanen Date: Wed Oct 18 10:47:22 2006 -0500 [POWERPC] Add 970GX cputable entry 970GX cputable entry from Steve Winiecki. Signed-off-by: Jake Moilanen arch/powerpc/kernel/cputable.c | 15 +++++++++++++++ arch/powerpc/oprofile/op_model_power4.c | 2 +- include/asm-powerpc/reg.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) Signed-off-by: Paul Mackerras commit 7f8c4c50bda13d27afc03679d25aa1fcac8df551 Author: Srinivasa Ds Date: Wed Oct 18 17:34:49 2006 +0530 [POWERPC] Fix build breakage with CONFIG_PPC32 low_cpu_die is called from the CPU hotplug code on 32-bit powermacs, but it is only defined if CONFIG_PM || CONFIG_CPU_FREQ_PMAC. This changes the ifdef so it is defined for CONFIG_HOTPLUG_CPU on 32-bit machines. Signed-off-by: Srinivasa DS Signed-off-by: Paul Mackerras commit c3386e40142e9d0c077460c2a548c4653fecaf15 Author: Zang Roy-r61911 Date: Wed Oct 18 11:18:58 2006 +0800 [POWERPC] Fix compiler warning message on get_property call This fixes the warning message from the return value of function get_property(), by making sure that the variable that receives the value is marked as const. Signed-off-by: Roy Zang -- Signed-off-by: Paul Mackerras commit cbcdb93d4443568f17e93610d240043ec5ac067b Author: Stephen Rothwell Date: Tue Oct 17 23:08:35 2006 +1000 [POWERPC] Simplify stolen time calculation In calculating stolen time, we were trying to actually account for time spent in the hypervisor. We don't really have enough information to do that accurately, so don't try. Instead, we now calculate stolen time as time that the current cpu thread is not actually dispatching instructions. On chips without a PURR, we cannot do this, so stolen time will always be zero. On chips with a PURR, this is merely the difference between the elapsed PURR values and the elapsed TB values. This gives us much more sane vaules from tools such as mpstat, even if they are still a bit strange e.g. 2 busy threads on one cpu will both appear to have 50% user time and 50% stolen time while 1 busy thread on a cpu will look like 100% user on one of them and 100% idle on the other. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras