commit 99f9f3d49cbc7d944476f6fde53a77ec789ab2aa Merge: 22353f3... a4cd7ed... Author: Linus Torvalds Date: Mon Jun 11 15:46:08 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/mlx4: Make sure RQ allocation is always valid RDMA/cma: Fix initialization of next_port IB/mlx4: Fix zeroing of rnr_retry value in ib_modify_qp() mlx4_core: Don't set MTT address in dMPT entries with PA set mlx4_core: Check firmware command interface revision IB/mthca, mlx4_core: Fix typo in comment mlx4_core: Free catastrophic error MSI-X interrupt with correct dev_id mlx4_core: Initialize ctx_list and ctx_lock earlier mlx4_core: Fix CQ context layout commit 22353f35c895acb7a8ca27ebdc6397c993b4213e Merge: 3e2ce4d... ff72b7a... Author: Linus Torvalds Date: Mon Jun 11 11:41:00 2007 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix smp barriers in test_and_{change,clear,set}_bit [MIPS] Fix IP27 build [MIPS] Fix modpost warnings by making start_secondary __cpuinit [MIPS] SMTC: Fix build error caused by nonsense code. [MIPS] SMTC: The MT ASE requires to initialize c0_pagemask and c0_wired. [MIPS] SMTC: Don't continue in set_vi_srs_handler on detected bad arguments. [MIPS] SMTC: Fix warning. [MIPS] Wire up utimensat, signalfd, timerfd, eventfd [MIPS] Atlas: Fix build. [MIPS] Always install the DSP exception handler. [MIPS] SMTC: Don't set and restore irqregs ptr from self_ipi. [MIPS] Fix KMODE for the R3000 commit 3e2ce4dae98f6b246eaeb12833914d22fd83e31d Merge: 3334500... 3ce53fc... Author: Linus Torvalds Date: Mon Jun 11 11:39:25 2007 -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] CIFS should honour umask [CIFS] Missing flag on negprot needed for some servers to force packet signing [CIFS] whitespace cleanup part 2 [CIFS] whitespace cleanup [CIFS] fix mempool destroy done in wrong order in cifs error path [CIFS] typo in previous patch [CIFS] Fix oops on failed cifs mount (in kthread_stop) commit 3334500b460a5eede2e3466ca97a90fe3b91ceb5 Merge: 72f60ac... 874808c... Author: Linus Torvalds Date: Mon Jun 11 11:39:05 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] intel_agp: Add support for G33, Q33 and Q35 chipsets [AGPGART] intel_agp: add support for 945GME [AGPGART] intel_agp: add support for 965GME/GLE [AGPGART] intel_agp: use table for device probe [AGPGART] intel_agp: cleanup intel private data commit 72f60acb01fc7ef135d3181ba9235c9ef0ab68ea Merge: b44c026... e141d99... Author: Linus Torvalds Date: Mon Jun 11 11:38:14 2007 -0700 Merge branch 'linus-plus-plus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'linus-plus-plus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: limit post SRST nsect/lbal wait to ~100ms libata: force PIO on IOMEGA ZIP 250 ATAPI libata passthru: update cached device paramters libata passthru: always enforce correct DEV bit libata passthru: map UDMA protocols libata passthru: support PIO multi commands libata passthru: update protocol numbers libata: Correct abuse of language libata-core/sff: Fix multiple assumptions about DMA ahci: Add MCP73/MCP77 support to AHCI driver libata: fix hw_sata_spd_limit initialization libata: print device model and firmware revision for ATAPI devices libata: fix probe time irq printouts libata: disable NCQ for HITACHI HTS541680J9SA00/SB21C7EP remove unused variable in pata_isapnp commit b44c0267b7571b449e05f390349c4e4d080f0f4c Merge: bb3d2dd... c438509... Author: Linus Torvalds Date: Mon Jun 11 11:32:28 2007 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (5751): Ivtv: fix ia64 printk format warnings. V4L/DVB (5761): Fix broken b2c2 dependency on non x86 architectures V4L/DVB (5673): Fix audio stuttering for saa711x/ivtv when in radio mode. V4L/DVB (5736): Add V4L2_FBUF_CAP/FLAG_LOCAL/GLOBAL_INV_ALPHA V4L/DVB (5732): Add ivtv CROPCAP support and fix ivtv S_CROP for video output. V4L/DVB (5730): Remove unused V4L2_CAP_VIDEO_OUTPUT_POS V4L/DVB (5720): Usbvision: fix urb allocation and submits V4L/DVB (5716): Tda10086,tda826x: fix tuning, STR/SNR values V4L/DVB (5675): Move big PIO accesses from the interrupt handler to a workhandler V4L/DVB (5699): Cinergyt2: fix file release handler V4L/DVB (5700): Saa7111: fix picture settings cache bug V4L/DVB (5702): Fix Kconfig items to avoid linkedition errors commit bb3d2dd72302ea3eefcc6738cdd39ed5864b62f8 Merge: d5a169c... c1183a3... Author: Linus Torvalds Date: Mon Jun 11 11:31:43 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: ide: Add the MCP73/77 support to PATA driver Add the PATA controller device ID to pci_ids.h for MCP73/MCP77. hpt366: disallow Ultra133 for HPT374 ide: generic IDE PCI driver, add another device exception ide: HPA detect from resume it821x: RAID mode fixes serverworks: fix CSB6 tuning logic serverworks: remove crappy code commit d5a169c87967981d06616c3c99408bc40ec9f618 Merge: 5212c55... 3373c0a... Author: Linus Torvalds Date: Mon Jun 11 11:31:18 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: mmc: don't call switch on old cards mmc: fix broken if clause au1xmmc: Replace C code with call to ARRAY_SIZE() macro. mmc-atmel: remove linux/mmc/protocol.h dependencies commit 5212c555be332fc95982077e6cdc7bb6cb5fff5f Merge: 845a2fd... 620a324... Author: Linus Torvalds Date: Mon Jun 11 11:31:05 2007 -0700 Merge branch 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block * 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block: splice: __generic_file_splice_read: fix read/truncate race splice: __generic_file_splice_read: fix i_size_read() length checks splice: move balance_dirty_pages_ratelimited() outside of splice actor pipe: move pipe_inode_info structure decleration up before it's used splice: remove do_splice_direct() symbol export splice: move inode size check into generic_file_splice_read() commit ff72b7a6188088976bf7d77d3309a9b2f1716071 Author: Ralf Baechle Date: Thu Jun 7 13:17:30 2007 +0100 [MIPS] Fix smp barriers in test_and_{change,clear,set}_bit Signed-off-by: Ralf Baechle commit e10e0cc8852ac846d5590188b935c98742e5cc43 Author: Atsushi Nemoto Date: Fri Jun 1 23:40:59 2007 +0900 [MIPS] Fix IP27 build IP27 does no longer have ZONE_DMA. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 4ebd5233f0420f1e383c38f962ec84c4d53fbbad Author: Ralf Baechle Date: Thu May 31 16:15:01 2007 +0100 [MIPS] Fix modpost warnings by making start_secondary __cpuinit WARNING: arch/mips/kernel/built-in.o(.text+0x9a58): Section mismatch: reference to .init.text:cpu_report (between 'start_secondary' and 'smp_prepare_boot_cpu') WARNING: arch/mips/kernel/built-in.o(.text+0x9a60): Section mismatch: reference to .init.text:per_cpu_trap_init (between 'start_secondary' and 'smp_prepare_boot_cpu') WARNING: arch/mips/kernel/built-in.o(.text+0x9adc): Section mismatch: reference to .init.text:cpu_probe (between 'start_secondary' and 'smp_prepare_boot_cpu') mipsel-linux-objcopy -S -O srec --remove-section=.reginfo --remove-section=.mdebug --remove-section=.comment --remove-section=.note --remove-section=.pdr --remove-section=.options --remove-section=.MIPS.options vmlinux arch/mips/boot/vmlinux.srec Signed-off-by: Ralf Baechle commit cf7578995398e20d3ab0748e6d5f83ea6c7a0035 Author: Chris Dearman Date: Tue May 29 20:01:55 2007 +0100 [MIPS] SMTC: Fix build error caused by nonsense code. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 6a05888d713dd915d3268000a479e38646aa423f Author: Ralf Baechle Date: Thu May 31 14:03:45 2007 +0100 [MIPS] SMTC: The MT ASE requires to initialize c0_pagemask and c0_wired. Signed-off-by: Ralf Baechle commit 8e8a52ed87e5b1fa60108b525774f2a28b4016d5 Author: Ralf Baechle Date: Thu May 31 14:00:19 2007 +0100 [MIPS] SMTC: Don't continue in set_vi_srs_handler on detected bad arguments. Signed-off-by: Ralf Baechle commit ef36fc3c5b37111d41827d00536364667a923235 Author: Ralf Baechle Date: Thu May 31 13:36:57 2007 +0100 [MIPS] SMTC: Fix warning. Signed-off-by: Ralf Baechle commit 7a6d4f38744e6453ec3bd359f751c34923207735 Author: Atsushi Nemoto Date: Tue May 29 23:29:40 2007 +0900 [MIPS] Wire up utimensat, signalfd, timerfd, eventfd Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit d3a509118af28bac5b900aa4e642141853cdfd1c Author: Ralf Baechle Date: Fri May 25 15:46:38 2007 +0100 [MIPS] Atlas: Fix build. Signed-off-by: Ralf Baechle commit acaec427bc81199da41fb000ab1979041ebc3289 Author: Chris Dearman Date: Thu May 24 22:30:18 2007 +0100 [MIPS] Always install the DSP exception handler. Some non-DSP enabled cores 24K / 34K can generate a DSP exception where they are actually expected to produce a reserved instruction exception. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit da9bc7263dc7e32d52dd922fe3f46eb7107c0143 Author: Ralf Baechle Date: Thu May 24 14:56:58 2007 +0100 [MIPS] SMTC: Don't set and restore irqregs ptr from self_ipi. This did corrupt register s0 which the caller of self_ipi expects to be unchanged. This is a kernel bug which will only be triggered with the compilers which compile __smtc_ipi_replay to use s0 across the invocation of self_ipi. Gcc 4.1.2 does this, for example. Signed-off-by: Ralf Baechle commit fbf6ede2ce05592661cec04e04b88f6bab00eb09 Author: Maciej W. Rozycki Date: Mon May 21 13:47:22 2007 +0100 [MIPS] Fix KMODE for the R3000 This must be the oldest bug that we have got. Leaving interrupts "as they are" for the R3000 obviously means copying IEp to IEc. Since we have got STATMASK now, I took this opportunity to mask the status register "correctly" for the R3000 now too. Oh, and the R3000 hardly ever is 64-bit. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit e141d999b682cda9907179e3b843acb64c34a1d8 Author: Tejun Heo Date: Sun Jun 10 14:26:20 2007 +0900 libata: limit post SRST nsect/lbal wait to ~100ms After SRST, libata used to wait for nsect/lbal to be set to 1/1 for the slave device. However, some ATAPI devices don't set nsect/lbal after SRST and the wait itself isn't too useful as we're gonna wait for !BSY right after that anyway. Before reset-seq update, nsect/lbal wait failure used to be ignored and caused 30sec delay during detection. After reset-seq, all timeouts are considered error conditions making libata fail to detect such ATAPI devices. This patch limits nsect/lbal wait to around 100ms. This should give acceptable behavior to such ATAPI devices while not disturbing the heavily used code path too much. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 5acd50f641e697cb42240f278350a4f8eac9b4f5 Author: Tejun Heo Date: Sun Jun 10 14:52:36 2007 +0900 libata: force PIO on IOMEGA ZIP 250 ATAPI IOMEGA ZIP 250 ATAPI claims MWDMA0 support but fails SETXFERMODE if asked to configure itself to MWDMA0. Force PIO. This fixes bugzilla bug#8497. Signed-off-by: Tejun Heo Cc: Calvin Walton Signed-off-by: Jeff Garzik commit 2c3d2a46f1ccf591850b20f4fdde12bcf2bf3dfd Author: Albert Lee Date: Thu Jun 7 16:01:17 2007 +0800 libata passthru: update cached device paramters INIT_DEV_PARAMS and SET_MULTI_MODE change the device parameters cached by libata. Re-read IDENTIFY DEVICE info and update the cached device paramters when seeing these commands. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit fa4453c4c94a61bbefe470b16ddbb6218481c6dc Author: Albert Lee Date: Thu Jun 7 15:52:07 2007 +0800 libata passthru: always enforce correct DEV bit Always enforce correct DEV bit since we know which drive the command is targeted. SAT demands to ignore the DEV bit, too. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 23cb1d718ddbeb718ed7ca5be283dcbfb63993c3 Author: Albert Lee Date: Thu Jun 7 15:50:44 2007 +0800 libata passthru: map UDMA protocols Map the ATA passthru UDMA protocols to ATA_PROT_DMA. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 1dce589c38c36ae69614840ee230183f3a7d43c5 Author: Albert Lee Date: Thu Jun 7 15:49:22 2007 +0800 libata passthru: support PIO multi commands support the pass through of PIO multi commands. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit f93f1078d08e0f63a6a4bdaa154de3642fc03d5d Author: Albert Lee Date: Thu Jun 7 15:47:13 2007 +0800 libata passthru: update protocol numbers Update the ATA passthru protocol numbers according to the new spec. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 6070068b875f604ff3f62e6e342bbd4c1f34a895 Author: Alan Cox Date: Thu Jun 7 16:13:55 2007 +0100 libata: Correct abuse of language The controller is not reporting an unlawful type, it is reporting an invalid type. Illegal specifically means "prohibited by law" Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit d92e74d353345d19f762e9501a50b0a5f43f7ba8 Author: Alan Cox Date: Thu Jun 7 16:19:15 2007 +0100 libata-core/sff: Fix multiple assumptions about DMA The ata IRQ ack functions are only used when debugging. Unfortunately almost every controller that calls them can cause crashes in some configurations as there are missing checks for bmdma presence. In addition ata_port_start insists of installing DMA buffers and pad buffers for controllers regardless. The SFF controllers actually need to make that decision dynamically at controller setup time and all need the same helper - so we add ata_sff_port_start. Future patches will switch the SFF drivers to use this. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 0522b2869d89b095bf417c8cc6fa404842e91903 Author: Peer Chen Date: Thu Jun 7 18:05:12 2007 +0800 ahci: Add MCP73/MCP77 support to AHCI driver Add the MCP73/MCP77 support to ahci driver. Signed-off-by: Peer Chen Signed-off-by: Jeff Garzik commit afe3cc51ba4be6b25b721c40f178ea4157751161 Author: Tejun Heo Date: Wed Jun 6 16:35:55 2007 +0900 libata: fix hw_sata_spd_limit initialization hw_sata_spd_limit used to be incorrectly initialized to zero instead of UINT_MAX if SPD is zero in SControl register. This breaks PHY speed down. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ef143d577ba98c8a53aee9aa60e7d1f07c32fd7a Author: Albert Lee Date: Tue Jun 5 13:01:33 2007 +0800 libata: print device model and firmware revision for ATAPI devices For ATA/CFA devices, libata prints out the device model and firmware revision. Do the same for ATAPI devices. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 22888423b3b1b96573250671afb5b72ea4364902 Author: Olof Johansson Date: Sun Jun 3 18:35:10 2007 -0500 libata: fix probe time irq printouts Most drivers don't seem to fill out the host->irq field, resulting in the wrong (no) irq being reported at probe time. For example, sil24 on my system: ata1: SATA max UDMA/100 cmd 0xd00008009001f000 ctl 0x0000000000000000 bmdma 0x0000000000000000 irq 0 ata2: SATA max UDMA/100 cmd 0xd000080090021000 ctl 0x0000000000000000 bmdma 0x0000000000000000 irq 0 Since they're allocated and set up in ata_host_activate(), just save them away there. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit bd9c5a39e4141678bd6242e5b74bfe39d8d0be35 Author: Tejun Heo Date: Fri Jun 8 22:20:59 2007 +0900 libata: disable NCQ for HITACHI HTS541680J9SA00/SB21C7EP HITACHI HTS541680J9SA00/SB21C7EP spuriously completes NCQ commands. Blacklist it for NCQ. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c3a44a47e8f60e8e4ae58d3a024b9a7ab293e673 Author: Yoichi Yuasa Date: Tue Jun 5 22:33:29 2007 +0900 remove unused variable in pata_isapnp This patch has removed unused variable in pata_ispnp. Signed-off-by: Yoichi Yuasa Signed-off-by: Jeff Garzik commit 845a2fdcbd5bc5b9f652201ee95c825827a1d521 Merge: 81d84a9... eeb47d1... Author: Linus Torvalds Date: Fri Jun 8 19:44:16 2007 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: ocfs2: Fix invalid assertion during write on 64k pages ocfs2: Fix masklog breakage commit 81d84a94be8085475c3585596e52b06ccbedd922 Merge: 7ac7834... 50e5d35... Author: Linus Torvalds Date: Fri Jun 8 18:15:49 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [CIPSO]: Fix several unaligned kernel accesses in the CIPSO engine. [NetLabel]: consolidate the struct socket/sock handling to just struct sock [IPV4]: Do not remove idev when addresses are cleared commit 7ac7834765e1c888ab06f677d906179858627f26 Merge: 5b65c09... 8c2786c... Author: Linus Torvalds Date: Fri Jun 8 18:15:23 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Handle PCI bridges without 'ranges' property. [SPARC64]: Include instead of . commit 5b65c09e9966cae543d4727984f098b699aa1653 Merge: 837525e... 6fd75b1... Author: Linus Torvalds Date: Fri Jun 8 18:14:42 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: OHCI: Fix machine check in ohci_hub_status_data USB: Fix up bogus bInterval values in endpoint descriptors USB: cxacru: ignore error trying to start ADSL in atm_start USB: cxacru: create sysfs attributes in atm_start instead of bind USB: cxacru: add Documentation file USB: UNUSUAL_DEV: Sync up some reported devices from Ubuntu USB: usb gadgets avoid le{16,32}_to_cpup() usblp: Don't let suspend to kill ->used USB: set default y for CONFIG_USB_DEVICE_CLASS commit 837525e344298335ea56c3b8c9ca7abbc97f0285 Merge: 217397d... 87d37a4... Author: Linus Torvalds Date: Fri Jun 8 18:11:47 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: firmware: remove orphaned Email kobject: use the proper printk level for kobject error Driver core: kill unused code Driver core: keep PHYSDEV for old struct class_device update Documentation/driver-model/platform.txt commit 217397d7d267f832081169016e1ab66691a13e08 Author: Robert P. J. Day Date: Fri Jun 8 13:47:07 2007 -0700 Protect from multiple inclusion Prevent from being included more than once, otherwise you get a redefinition error if you happen to include first. Signed-off-by: Robert P. J. Day Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00df344fd06fd6ac71d0665f1ce8cc6870e4f564 Author: Andy Whitcroft Date: Fri Jun 8 13:47:06 2007 -0700 update checkpatch.pl to version 0.04 This version brings a some new tests, and a host of changes to fix false positives, of particular note: - check for and report #if 0 - extend checking of line lengths and spacing for .pl, .sh etc - extends the pointer type checks to multiple levels - updates printk handling to track newlines - adds a wrapped patch detector - drops the leading component of the filenames - extends switch indent handling to switch statmentes rooted in the context - adds foo * bar single pointer checks This version of checkpatch.pl can be found at the following URL: http://www.shadowen.org/~apw/public/checkpatch/checkpatch.pl-0.04 Full Changelog: Andy Whitcroft (16): allow checking line lengths and spacing on other source files clean up that whitespace sanitise the input line standardising the content of quotes clean up pointer type * and space checks fix up the sanitiser so it maintains the line length apply the printk facility checks only to the first printk in a set switch/case indent checks may anchor in the context add a wrapped patch detector put the #ifdef in C file checks on ice asm volatile is acceptable check for and report #if 0 drop the leading component of the filename as patches are -p1 use the original line when reporting operator errors correct spelling of Joel's name Version: 0.04 add support for struct foo * bar checks Geert Uytterhoeven (1): Fix checkpatch.pl name in usage template Randy Dunlap (1): checkpatch: produce fewer lines of output Signed-off-by: Andy Whitcroft Cc: Randy Dunlap Cc: Joel Schopp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7909234993973692414901055dfbebbca21e73f Author: Randy Dunlap Date: Fri Jun 8 13:47:04 2007 -0700 hexdump: more output formatting Add a prefix string parameter. Callers are responsible for any string length/alignment that they want to see in the output. I.e., callers should pad strings to achieve alignment if they want that. Add rowsize parameter. This is the number of raw data bytes to be printed per line. Must be 16 or 32. Add a groupsize parameter. This allows callers to dump values as 1-byte, 2-byte, 4-byte, or 8-byte numbers. Default is 1-byte numbers. If the total length is not an even multiple of groupsize, 1-byte numbers are printed. Add an "ascii" output parameter. This causes ASCII data output following the hex data output. Clean up some doc examples. Align the ASCII output on all lines that are produced by one call. Add a new interface, print_hex_dump_bytes(), that is a shortcut to print_hex_dump(), using default parameter values to print 16 bytes in byte-size chunks of hex + ASCII output, using printk level KERN_DEBUG. Signed-off-by: Randy Dunlap Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abb49202ff37bf2eca7296c62ad18c77f636ec8e Author: Alan Cox Date: Fri Jun 8 13:47:03 2007 -0700 MAINTAINERS: corrections The UFS entry was misformatted The NEC V850 links are all broken The Berkshire watchdog links are all broken Signed-off-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 389834b680c13f4727c14f70fa71c2c5678b6081 Author: Randy Dunlap Date: Fri Jun 8 13:47:03 2007 -0700 checkpatch: produce fewer lines of output Produce one less line of output per flagged incident. Change this: use tabs not spaces PATCH: /home/rddunlap/arcmsr1200014.patch4:756: FILE: b/drivers/scsi/arcmsr/arcmsr_hba.c:1843: + return PCI_ERS_RESULT_NEED_RESET;$ to this: use tabs not spaces #756: FILE: b/drivers/scsi/arcmsr/arcmsr_hba.c:1843: + return PCI_ERS_RESULT_NEED_RESET;$ Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76c4e5eafe93df0d03c9d1dc2e4e3efd344be34b Author: Jeff Mahoney Date: Fri Jun 8 13:47:02 2007 -0700 reiserfs: mailing list has moved This patch changes MAINTAINERS to reflect the new location of the reiserfs development mailing list. The old list forwards to the new one. Signed-off-by: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b39b70366c5be68affe9777de72846540d840464 Author: Andrew Morton Date: Fri Jun 8 13:47:01 2007 -0700 x86_64: oops_begin() fix We don't want to see this: > BUG: using smp_processor_id() in preemptible [00000001] code: bash/3857 > caller is oops_begin+0xb/0x6f > > Call Trace: > [] show_trace+0x34/0x4f > [] dump_stack+0x12/0x17 > [] debug_smp_processor_id+0xad/0xbc > [] oops_begin+0xb/0x6f > [] do_page_fault+0x66a/0x7c0 > [] error_exit+0x0/0x84 > coming out when the kernel is trying to oops. Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12710a56cb56e81bd8f457cc2f50c2ebfc0cb390 Author: Bob Picco Date: Fri Jun 8 13:47:00 2007 -0700 fix sysrq-m oops We aren't sampling for holes in memory. Thus we encounter a section hole with empty section map pointer for SPARSEMEM and OOPs for show_mem. This issue has been seen in 2.6.21, current git and current mm. The patch below is for mainline and mm. It was boot tested for SPARSEMEM, current VMEMMAP of Andy's in mm ml and DISCONTIGMEM. A slightly different patch will be posted to stable for 2.6.21. Previous to commit f0a5a58aa812b31fd9f197c4ba48245942364eae memory_present was called for node_start_pfn to node_end_pfn. This would cover the hole(s) with reserved pages and valid sections. Most SPARSEMEM supported arches do a pfn_valid check in show_mem before computing the page structure address. This issue was brought to my attention on IRC by Arnaldo Carvalho de Melo. Thanks to Arnaldo for testing. Signed-off-by: Bob Picco Cc: Chuck Ebbert Cc: Andi Kleen Cc: Arnaldo Carvalho de Melo Acked-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 778e9a9c3e7193ea9f434f382947155ffb59c755 Author: Alexey Kuznetsov Date: Fri Jun 8 13:47:00 2007 -0700 pi-futex: fix exit races and locking problems 1. New entries can be added to tsk->pi_state_list after task completed exit_pi_state_list(). The result is memory leakage and deadlocks. 2. handle_mm_fault() is called under spinlock. The result is obvious. 3. results in self-inflicted deadlock inside glibc. Sometimes futex_lock_pi returns -ESRCH, when it is not expected and glibc enters to for(;;) sleep() to simulate deadlock. This problem is quite obvious and I think the patch is right. Though it looks like each "if" in futex_lock_pi() got some stupid special case "else if". :-) 4. sometimes futex_lock_pi() returns -EDEADLK, when nobody has the lock. The reason is also obvious (see comment in the patch), but correct fix is far beyond my comprehension. I guess someone already saw this, the chunk: if (rt_mutex_trylock(&q.pi_state->pi_mutex)) ret = 0; is obviously from the same opera. But it does not work, because the rtmutex is really taken at this point: wake_futex_pi() of previous owner reassigned it to us. My fix works. But it looks very stupid. I would think about removal of shift of ownership in wake_futex_pi() and making all the work in context of process taking lock. From: Thomas Gleixner Fix 1) Avoid the tasklist lock variant of the exit race fix by adding an additional state transition to the exit code. This fixes also the issue, when a task with recursive segfaults is not able to release the futexes. Fix 2) Cleanup the lookup_pi_state() failure path and solve the -ESRCH problem finally. Fix 3) Solve the fixup_pi_state_owner() problem which needs to do the fixup in the lock protected section by using the in_atomic userspace access functions. This removes also the ugly lock drop / unqueue inside of fixup_pi_state() Fix 4) Fix a stale lock in the error path of futex_wake_pi() Added some error checks for verification. The -EDEADLK problem is solved by the rtmutex fixups. Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Cc: Steven Rostedt Cc: Ulrich Drepper Cc: Eric Dumazet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a539a87280b3032fd12bc93a4a82f1d8aa97ca8 Author: Thomas Gleixner Date: Fri Jun 8 13:46:58 2007 -0700 rt-mutex: fix chain walk early wakeup bug Alexey Kuznetsov found some problems in the pi-futex code. One of the root causes is: When a wakeup happens, we do not to stop the chain walk so we follow a not longer relevant locking chain. Drop out when this happens. Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Cc: Steven Rostedt Cc: Alexey Kuznetsov Cc: Ulrich Drepper Cc: Eric Dumazet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0d1d2bf5a28f78def7b68ca1eb5ba31aafd43a1 Author: Thomas Gleixner Date: Fri Jun 8 13:46:57 2007 -0700 rt-mutex: fix stale return value Alexey Kuznetsov found some problems in the pi-futex code. The major problem is a stale return value in rt_mutex_slowlock(): When the pi chain walk returns -EDEADLK, but the waiter was woken up during the phases where the locks were dropped, the rtmutex could be acquired, but due to the stale return value -EDEADLK returned to the caller. Reset the return value in the retry path. Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Cc: Steven Rostedt Cc: Alexey Kuznetsov Cc: Ulrich Drepper Cc: Eric Dumazet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51b94d2a5a90d4800e74d7348bcde098a28f4fb3 Author: Tejun Heo Date: Fri Jun 8 13:46:55 2007 -0700 sata_promise: use TF interface for polling NODATA commands sata_promise uses two different command modes - packet and TF. Packet mode is intelligent low-overhead mode while TF is the same old taskfile interface. As with other advanced interface (ahci/sil24), ATA_TFLAG_POLLING has no effect in packet mode. However, PIO commands are issued using TF interface in polling mode, so pdc_interrupt() considers interrupts spurious if ATA_TFLAG_POLLING is set. This is broken for polling NODATA commands because command is issued using packet mode but the interrupt handler ignores it due to ATA_TFLAG_POLLING. Fix pdc_qc_issue_prot() such that ATA/ATAPI NODATA commands are issued using TF interface if ATA_TFLAG_POLLING is set. This patch fixes detection failure introduced by polling SETXFERMODE. Signed-off-by: Tejun Heo Acked-by: Mikael Pettersson Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b4dc1fdb868089ab60c09531d476284b71373e3 Author: Randy Dunlap Date: Fri Jun 8 13:46:54 2007 -0700 isdn/diva: fix section mismatch __exit function is used by both init and exit routines, so it cannot be marked __init. (from allyesconfig) WARNING: drivers/built-in.o(.text+0x9b83cf): Section mismatch: reference to .exit.text: (between 'divasfunc_exit' and 'didd_callback') Signed-off-by: Randy Dunlap Cc: Karsten Keil Acked-by: Armin Schindler Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e16f5350d4cf402cffd18898b07c3b72917db192 Author: Jeff Dike Date: Fri Jun 8 13:46:54 2007 -0700 uml: get declaration of simple_strtoul Include linux/kernel.h wherever simple_strtoul is used. This kills a compile warning in stderr_console.c and potential ones in the other files. This also fixes a bunch of style violations in exitcode.c. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49277b1c68f9bd22119a5174a68254ec1b39d8c2 Author: Jiri Slaby Date: Fri Jun 8 13:46:53 2007 -0700 Char: stallion, proper fail return values do not return 0 in one case and return proper values in other 2. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e415109f5a1ec9ca7dac4fad2b852113ce303c96 Author: Jiri Slaby Date: Fri Jun 8 13:46:52 2007 -0700 Char: stallion, alloc tty before pci devices init this causes oops, because pci probe function calls tty_register_device for each device found. Thanks to Ingo. Signed-off-by: Jiri Slaby Cc: "Ingo Korb" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64834b226b237e654ab164d3af88ceaa65f10362 Author: Jiri Slaby Date: Fri Jun 8 13:46:52 2007 -0700 Char: stallion, don't fail with less than max panels Since it's not neccesary to have MAX_PANELS on the card, don't fail to let users use this card even in this case. Stop the testing for loop instead. Thanks to Ingo. Signed-off-by: Jiri Slaby Cc: "Ingo Korb" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 193faea9280a809cc30e81d7e503e01b1d7b7042 Author: Stephen Rothwell Date: Fri Jun 8 13:46:51 2007 -0700 Move three functions that are only needed for CONFIG_MEMORY_HOTPLUG into the appropriate #ifdef. Signed-off-by: Stephen Rothwell Cc: Yasunori Goto Cc: Andy Whitcroft Cc: Badari Pulavarty Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4249e08e92647b406422553bfb16276b2bf849aa Author: Ratnadeep Joshi Date: Fri Jun 8 13:46:50 2007 -0700 Documentation/atomic_ops.txt typo fix Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e80ad9b651abb7229551339081d7e53097bf8ea7 Author: Jeff Dike Date: Fri Jun 8 13:46:49 2007 -0700 uml: fix kernel stack size on x86_64 Force KERNEL_STACK_ORDER to be at least 1 on UML/x86_64, to avoid overflows. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 272c1d21d6fe42979068e14c04fb60fb6045ad74 Author: Christoph Lameter Date: Fri Jun 8 13:46:49 2007 -0700 SLUB: return ZERO_SIZE_PTR for kmalloc(0) Instead of returning the smallest available object return ZERO_SIZE_PTR. A ZERO_SIZE_PTR can be legitimately used as an object pointer as long as it is not deferenced. The dereference of ZERO_SIZE_PTR causes a distinctive fault. kfree can handle a ZERO_SIZE_PTR in the same way as NULL. This enables functions to use zero sized object. e.g. n = number of objects. objects = kmalloc(n * sizeof(object)); for (i = 0; i < n; i++) objects[i].x = y; kfree(objects); Signed-off-by: Christoph Lameter Acked-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a17627ef8833ac30622a7b39b7be390e1b174405 Author: Yoann Padioleau Date: Fri Jun 8 13:46:48 2007 -0700 potential parse error in ifdef part 3 Fix various bits of obviously-busted code which we're not happening to compile, due to ifdefs. Signed-off-by: Yoann Padioleau Cc: Andi Kleen Cc: Paul Mackerras Acked-by: Paul Mundt Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3cdc0ed0cea50ea08dd146c1bbc82b1bcc2e1b80 Author: Christoph Lameter Date: Fri Jun 8 13:46:46 2007 -0700 slab: fix alien cache handling cache_free_alien must be called regardless if we use alien caches or not. cache_free_alien() will do the right thing if there are no alien caches available. Signed-off-by: Christoph Lameter Cc: Paul Mundt Acked-by: Pekka J Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a210906c1b791af1434323f69427286039c9c8b9 Author: Hugh Dickins Date: Fri Jun 8 13:46:46 2007 -0700 mount -t tmpfs -o mpol=: check nodes online Randy Dunlap reports that a tmpfs, mounted with NUMA mpol= specifying an offline node, crashes as soon as data is allocated upon it. Now restrict it to online nodes, where before it restricted to MAX_NUMNODES. Signed-off-by: Hugh Dickins Cc: Robin Holt Cc: Christoph Lameter Cc: Andi Kleen Tested-and-acked-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9739ed1c8eafd554788d8e2ba09847b5718a34e7 Author: Andy Whitcroft Date: Fri Jun 8 13:46:45 2007 -0700 update feature-removal-schedule.txt to include deprecated functions Now that deprecated functions are detected out of Documentation/feature-removal-schedule.txt update this to include kernel_thread. Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f44cd23a5a2e26191a28ab6e91bd0c7849c8e0f Author: Andrew Morton Date: Fri Jun 8 13:46:45 2007 -0700 document Acked-by: Explain what we use Acked-by: for, and how it differs from Signed-off-by: Acked-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a47653fc2643cf61bcabba8c9ff5c45517c089ba Author: Ken Chen Date: Fri Jun 8 13:46:44 2007 -0700 loop: preallocate eight loop devices The kernel on-demand loop device instantiation breaks several user space tools as the tools are not ready to cope with the "on-demand feature". Fix it by instantiate default 8 loop devices and also reinstate max_loop module parameter. Signed-off-by: Ken Chen Acked-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c287ef1ff9296ddf707af6f9d355e1c3ffc243dd Author: Greg Ungerer Date: Fri Jun 8 13:46:43 2007 -0700 nommu: report correct errno in message Report the correct errno for out of memory debug output in binfmt_flat.c Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4342f4ace2335d4fa9fe52b4cceca979413470b2 Author: Greg Ungerer Date: Fri Jun 8 13:46:39 2007 -0700 m68knommu: fix ColdFire timer off by 1 The coldfire timer runs from 0 to TRR included, then 0 again and so on. It counts thus actually TRR + 1 steps for 1 tick, not TRR. Fix that. Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a0df2ef4569ac57cb18cd97e34c0c4733e829d9 Author: Andy Whitcroft Date: Fri Jun 8 13:46:39 2007 -0700 update checkpatch.pl to version 0.03 This version brings a host of changes to cure false positives and bugs detected on patches submitted to lkml and -mm. It also brings a number of new tests in response to reviews, of particular note: - catch use of volatile - allow deprecated functions to be listed in feature-removal-schedule.txt - warn about #ifdef's in c files - check that spinlock_t and struct mutex use is commented - report on architecture specific defines being used - report memory barriers without an associated comment Full changelog: catch use of volatile convert other quoted string checks to common routine alloc deprecated functions to be listed in feature-removal-schedule.txt split out the line length and indent for each line improve switch block handling handle GNU diff context lines with no leading space warn about #ifdef's in c files tidy up tests for signed-off-by using raw mode check that spinlock_t and struct mutex use is commented syntax checks for open brace placement may drop off the bottom of hunk report memory barriers without an associated comment when a sign off is present but ugly do not report it missing do not mistake bitfield definitions for indented labels report on architecture specific defines being used major update to the operator checks prevent switch/if/while etc matching foo_switch generify assignement in condition error message introduce an operator context marker Version: 0.03 Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fd75b19483b2f6e6619602a535b4939e46921c1 Author: Alan Stern Date: Fri May 4 11:57:00 2007 -0400 OHCI: Fix machine check in ohci_hub_status_data This patch (as901) fixes an oversight in ohci-hcd. The hub_status_data routine must not try to access the controller's memory-mapped registers if the controller is in a low-power state; such attempts will cause a crash on some architectures (such as PPC). Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 615ae11b3b4af7a5adb0819ff11b3b764eb92268 Author: Alan Stern Date: Fri Jun 8 15:23:27 2007 -0400 USB: Fix up bogus bInterval values in endpoint descriptors This patch (as904) adds code to check for endpoint descriptor bInterval values outside the legal limits. Illegal values are set to 32 ms, which seems like a reasonable default. This fixes Bugzilla #8432. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit fd209e35b74110ee1f3371838b0782b5b02eaaba Author: Simon Arlott Date: Thu May 10 23:04:13 2007 -0700 USB: cxacru: ignore error trying to start ADSL in atm_start The sysfs adsl_status attribute ignores (aside from returning -EIO to the user) any error sending a START/STOP command to the device and there is at least one firmware which never sends a response but appears to work regardless. Therefore atm_start should also continue if an error is received so that such firmware is usable. The official Conexant driver doesn't expect a reply either but this is for another device (E2 router) and a commonly used firmware does respond. Also, there is no point in changing -ECONNRESET to -ETIMEDOUT since nothing ever checks for either of these values. Signed-off-by: Simon Arlott Cc: Duncan Sands Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit da1f82b5543738d4c127a449490bc0d55e121fe8 Author: Simon Arlott Date: Thu May 10 23:04:12 2007 -0700 USB: cxacru: create sysfs attributes in atm_start instead of bind Since usbatm doesn't set the usb_interface driver data until after calling bind and heavy_init, it would be NULL when the sysfs attributes are read. Reading the MAC address from atm_dev before atm_dev exists would have been be possible too. Calling create_device_file in atm_start will avoid this problem, and the data is useless until the first status poll runs. However, it must be ready before a status poll does a printk on line status change otherwise userspace could react before the files exist. For completeness I've moved remove_device_file to atm_stop so it's not called in unbind when it's not needed. There's no point starting ADSL if atm_start could still fail either. Signed-off-by: Simon Arlott Cc: Duncan Sands Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 64b85006f5d473fefc181dece9473710b55966e0 Author: Simon Arlott Date: Thu May 10 23:04:09 2007 -0700 USB: cxacru: add Documentation file The sysfs attributes for exposing cxacru statistics/status information with possible values is now explained in Documentation/networking/cxacru.txt including information on the writable adsl_state attribute's commands and a sample of the kernel log format. Signed-off-by: Simon Arlott Cc: Duncan Sands Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 67fa10627ec0d8aa16f1cf38cf527e67d8097d3c Author: Ben Collins Date: Sat May 26 03:06:32 2007 -0700 USB: UNUSUAL_DEV: Sync up some reported devices from Ubuntu UNUSUAL_DEV: Sync up some reported devices from Ubuntu Various unusual dev entries accumulated from Ubuntu bug reports. Signed-off-by: Ben Collins Cc: Alan Stern Signed-off-by: Phil Dibowitz commit 01ee7d7032204b383b2fba73021e7acbc776184b Author: David Brownell Date: Fri May 25 20:40:14 2007 -0700 USB: usb gadgets avoid le{16,32}_to_cpup() It turns out that le16_to_cpup() and le32_to_cpup() aren't always safe to call with pointers into packed structures, since those are inlined functions and GCC may lose the "packed" attribute. So those references can become unaligned kernel accesses, which are evil on some hardware. This patch updates uses of those routines in the gadget stack. The references into packed structures can just use leXX_to_cpu(*x), which in most cases is more natural. Some other uses in RNDIS, mostly in debug code, were wrong in the first place; those use get_unaligned(). Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 97cb95d1c4b724bc3bedd16dd022fbd3c2d61283 Author: Pete Zaitcev Date: Thu May 24 21:59:19 2007 -0700 usblp: Don't let suspend to kill ->used Suspend destroys refcounting for open/release. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit dda034bcb51a0a28318046d74d664e0fc5f7d1d4 Author: Kay Sievers Date: Sun May 27 17:04:58 2007 +0200 USB: set default y for CONFIG_USB_DEVICE_CLASS Signed-off-by: Kay Sievers Cc: bert hubert Signed-off-by: Greg Kroah-Hartman commit 50e5d35ce2c4190cead13a091ea1ceab47d29cc2 Author: Paul Moore Date: Thu Jun 7 18:38:14 2007 -0700 [CIPSO]: Fix several unaligned kernel accesses in the CIPSO engine. IPv4 options are not very well aligned within the packet and the format of a CIPSO option is even worse. The result is that the CIPSO engine in the kernel does a few unaligned accesses when parsing and validating incoming packets with CIPSO options attached which generate error messages on certain alignment sensitive platforms. This patch fixes this by marking these unaligned accesses with the get_unaliagned() macro. Signed-off-by: Paul Moore Acked-by: James Morris Signed-off-by: David S. Miller commit ba6ff9f2b5c6018b293bd21083ffaa5ad710e671 Author: Paul Moore Date: Thu Jun 7 18:37:15 2007 -0700 [NetLabel]: consolidate the struct socket/sock handling to just struct sock The current NetLabel code has some redundant APIs which allow both "struct socket" and "struct sock" types to be used; this may have made sense at some point but it is wasteful now. Remove the functions that operate on sockets and convert the callers. Not only does this make the code smaller and more consistent but it pushes the locking burden up to the caller which can be more intelligent about the locks. Also, perform the same conversion (socket to sock) on the SELinux/NetLabel glue code where it make sense. Signed-off-by: Paul Moore Acked-by: James Morris Signed-off-by: David S. Miller commit 6363097cc4d182f93788131b5d8f72aa91d950a0 Author: Herbert Xu Date: Thu Jun 7 18:35:38 2007 -0700 [IPV4]: Do not remove idev when addresses are cleared Now that we create idev before addresses are added, it no longer makes sense to remove them when addresses are all deleted. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 87d37a4f470834223fc8a243af002998bdb5b886 Author: Markus Rechberger Date: Mon Jun 4 18:45:44 2007 +0200 firmware: remove orphaned Email Manuel Estrada Sainz passed away on May 9th 2004, his email account got deactivated. He was in charge of the firmware_class code, and still got CC'ed in recent discussions about it. Signed-off-by: Markus Rechberger Signed-off-by: Greg Kroah-Hartman commit 5c73a3fba6dd2b410de378f648bc9851ffa7201a Author: Greg Kroah-Hartman Date: Thu Jun 7 15:05:15 2007 -0700 kobject: use the proper printk level for kobject error Thanks to Jean Delvare for pointing it out to me. Cc: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 475c5a1518477f0301fc50dc59e690032fad1fef Author: Stephen Hemminger Date: Tue May 8 13:41:49 2007 -0700 Driver core: kill unused code CC drivers/base/dd.o drivers/base/dd.c:211: warning: =E2=80=98device_probe_drivers=E2=80=99 defi= ned but not used Looks like the following is dead. Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman commit 2c7afd125cc482dbdf6b0a169c42337e7e76cda5 Author: Kay Sievers Date: Tue May 1 13:46:26 2007 +0200 Driver core: keep PHYSDEV for old struct class_device Class-devices created by "struct class_device" are going to be replaced by "struct device". Keep the deprecated PHYSDEV* variables for the already "deprecated" struct class_device" devices. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit adfdebceaca988515ecdb557d600fd5ab9da913a Author: David Brownell Date: Thu May 10 22:36:14 2007 -0700 update Documentation/driver-model/platform.txt Make note of the legacy "probe-the-hardware" drivers, and some APIs that are mostly unused except by such drivers. We probably can't escape having legacy drivers for a while (e.g. old ISA drivers), but we can at least discourage this style code for new drivers, and unless it's unavoidable. Signed-off-by: David Brownell Cc: Andres Salomon Cc: Dmitry Torokhov Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 3ce53fc4c57603d99c330a6ee2fe96d94f2d350f Author: Steve French Date: Fri Jun 8 14:55:14 2007 +0000 [CIFS] CIFS should honour umask This patch makes CIFS honour a process' umask like other filesystems. Of course the server is still free to munge the permissions if it wants to; but the client will send the "right" permissions to begin with. A few caveats: 1) It only applies to filesystems that have CAP_UNIX (aka support unix extensions) 2) It applies the correct mode to the follow up CIFSSMBUnixSetPerms() after remote creation When mode to CIFS/NTFS ACL mapping is complete we can do the same thing for that case for servers which do not support the Unix Extensions. Signed-off-by: Matt Keenen Signed-off-by: Steve French commit c1183a3345f2e553fa0907a453cbb311c7e1698c Author: Peer Chen Date: Fri Jun 8 15:14:32 2007 +0200 ide: Add the MCP73/77 support to PATA driver Add the MCP73/MCP77 support to PATA driver. bart: Added amd74xx_chipsets[] and amd_pci_tbl[] entries. bart: Bumped driver version. Signed-off-by: Peer Chen Cc: Alan Cox , Cc: Andrew Morton Cc: Jeff Garzik Cc: Tejun Heo Signed-off-by: Bartlomiej Zolnierkiewicz commit 8da725dd94fda144802dc06b956c720eb77cfd75 Author: Peer Chen Date: Fri Jun 8 15:14:32 2007 +0200 Add the PATA controller device ID to pci_ids.h for MCP73/MCP77. Add the PATA controller device ID to pci_ids.h for MCP73/MCP77. Signed-off-by: Peer Chen Cc: Alan Cox , Cc: Andrew Morton Cc: Jeff Garzik Cc: Tejun Heo Signed-off-by: Bartlomiej Zolnierkiewicz commit 278978e953a35a2ddf27f197003b29da54e31908 Author: Sergei Shtylyov Date: Fri Jun 8 15:14:32 2007 +0200 hpt366: disallow Ultra133 for HPT374 Eliminate UltraATA/133 support for HPT374 -- the chip isn't capable of this mode according to the manual, and doesn't even seem to tolerate 66 MHz DPLL clock... Signed-off-by: Sergei Shtylyov Cc: Geller Sandor Signed-off-by: Bartlomiej Zolnierkiewicz commit ea30759643b423933ced48acdd78e5299f05295b Author: Jiri Slaby Date: Fri Jun 8 15:14:31 2007 +0200 ide: generic IDE PCI driver, add another device exception generic IDE PCI driver, add another device exception This device is char device and is grabbed by generic ide driver: 00:0b.0 Class ffff: National Semiconductor Corporation 87410 IDE (rev ff) (prog-if ff) Control: I/O+ Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- Disallow generic IDE PCI driver to grab it by adding next condition. Also consolidate exceptions to one bigger 'switch (dev->vendor)'. Signed-off-by: Jiri Slaby Cc: Ingo Korb Cc: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit 0d2157f78d17fcee17791f54959e67cc0af0da74 Author: Lee Trager Date: Fri Jun 8 15:14:30 2007 +0200 ide: HPA detect from resume Currently when system which have HPA require HPA to be detected and disabled upon resume from RAM or disk. The current IDE drivers do not do this nor does libata (obviously it since it doesn't support HPA yet). I have implemented this into the current IDE drivers and it has been tested by many others since 7/15/2006 in bug number 6840: http://bugzilla.kernel.org/show_bug.cgi?id=6840 and it has been confirmed to work fine with no problems. bart: added drv != NULL check to generic_ide_suspend() From: Lee Trager Signed-off-by: Bartlomiej Zolnierkiewicz commit 0380dad45e4f5a606025cc4df2a2cd26af08796b Author: Bartlomiej Zolnierkiewicz Date: Fri Jun 8 15:14:29 2007 +0200 it821x: RAID mode fixes The DMA support for RAID mode broke after: commit 71ef51cc1756d1c56b57c70e7cc27a3559c81ee6 Author: Jens Axboe Date:   Fri Jul 28 09:02:17 2006 +0200     [PATCH] it821x: fix ide dma setup bug     Only enable dma for a valid speed setting.     Signed-off-by: Jens Axboe commit 0a8348d08677ad77ee353f96eb8745c693a05a13 Author: Jens Axboe Date:   Fri Jul 28 08:58:26 2006 +0200     [PATCH] ide: if the id fields looks screwy, disable DMA     It's the safer choice. Originally due to a bug in itx821x, but a     generally sound thing to do.     Signed-off-by: Jens Axboe However it worked by pure luck before Jens' fixes: bogus ide_dma_enable() usage in it821x driver combined with loosy check in ide_dma_verbose() allowed the hardware to operate in DMA mode. When these problems were fixed the DMA support broke... The source root for the regression turned out to be that the it821x.c code was clearing too much of id->field_valid. The IDE core code was using the original value of id->field_valid to do the tuning but later DMA got disabled in ide_dma_verbose() because of the incorrect id->field_valid fixup. Fix it. While at it: * Do fixup() after probing the drives but before tuning them (which is also OK w.r.t. ide_undecoded_slave() fixup). This change fixes device IDENTIFY data to be consistent before/after the tuning and allows us to remove extra re-tuning of drives from it821x_fixups(). * Fake MWDMA0 enabled/supported bits in IDENTIFY data if the device has DMA capable bit set (this is just to tell the IDE core that DMA is supported since it821x firmware takes care of DMA mode programming). * Don't touch timing registers and don't program transfer modes on devices et all when in RAID mode - depend solely on firmware to do the tuning (as suggested by Alan Cox and done in libata pata_it821x driver). Thanks for testing the patch goes out to Thomas Kuther. Cc: Thomas Kuther Cc: Alan Cox Cc: Jens Axboe Signed-off-by: Bartlomiej Zolnierkiewicz commit 1abb8a8b841354e7a09ba2009376f0a6368b5cec Author: Bartlomiej Zolnierkiewicz Date: Fri Jun 8 15:14:28 2007 +0200 serverworks: fix CSB6 tuning logic Problem noticed by Joe Zbiciak, see http://kerneltrap.org/node/8252 for details. On CSB6 the driver is using BIOS settings and not programming DMA/PIO timings itself. However the logic was completely broken and resulted in wrong timings being silently allowed (instead of being corrected by the driver). This bug would explain some data corruption/timeout issues with Serverworks MegaIDE in RAID mode that Alan Cox has fixed recently with: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=2074a106f52b6371885afbd714e929d60d0e3f64 For 2.6.23 we may be better off with completely switching the driver to always programming timings (libata pata_serverworks.c driver is doing things this way and there were no problems reported so far) but for 2.6.22 lets fix the bug in the simplest and the least intrusive way. Cc: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit ed84fad5002c00dfb318f797dbf591320eebc1c0 Author: Bartlomiej Zolnierkiewicz Date: Fri Jun 8 15:14:27 2007 +0200 serverworks: remove crappy code Remove crappy code noticed by Linus, see http://lkml.org/lkml/2007/5/23/476 for details. While at it simplify logic a bit. There should be no functionality changes caused by this patch. Cc: Linus Torvalds Cc: Andrew Morton Signed-off-by: Bartlomiej Zolnierkiewicz commit c43850981b5203e13747f8a696a762eb412d9394 Author: Hans Verkuil Date: Thu Jun 7 09:04:03 2007 -0300 V4L/DVB (5751): Ivtv: fix ia64 printk format warnings. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 72fb39ea58e7e2af93895fd12642b3fff2f76462 Author: Mauro Carvalho Chehab Date: Thu Jun 7 09:42:20 2007 -0300 V4L/DVB (5761): Fix broken b2c2 dependency on non x86 architectures This patch moves flexcop-dma (currently used only by flexcop-pci) to b2c2-flexcop-pci module, that is dependent on CONFIG_PCI, fixing the bug as reported by Geert Uytterhoeven : drivers/media/dvb/b2c2/flexcop-dma.c uses the PCI DMA API, but DVB_B2C2_FLEXCOP doesn't depend on PCI, causing the following problem on PCI-less systems: | linux/drivers/media/dvb/b2c2/flexcop-dma.c:20: warning: implicit declaration of function 'pci_alloc_consistent' | linux/drivers/media/dvb/b2c2/flexcop-dma.c:20: warning: implicit declaration of function 'pci_alloc_consistent' Apparently this is the flexcop DMA core, which is used by both DVB_B2C2_FLEXCOP_PCI and DVB_B2C2_FLEXCOP_USB. Signed-off-by: Mauro Carvalho Chehab commit f2100d82b858815848b661d57d7e166341c02e20 Author: Hans Verkuil Date: Thu May 17 08:08:45 2007 -0300 V4L/DVB (5673): Fix audio stuttering for saa711x/ivtv when in radio mode. Signed-off-by: Jose Alberto Reguero Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b6cfe6af6bfb101212b217cba55012d1d35ab3a8 Author: Hans Verkuil Date: Mon Jun 4 04:55:36 2007 -0300 V4L/DVB (5736): Add V4L2_FBUF_CAP/FLAG_LOCAL/GLOBAL_INV_ALPHA Michael Schimek requested the addition of inverted alpha framebuffer caps/flags to support such hardware. 'Normal' alpha uses this formula to mix the framebuffer and video: output = fb pixel * fb alpha + video pixel * (1 - fb alpha) and the 'inverted' alpha uses this formula: output = fb pixel * (1 - fb alpha) + video pixel * fb alpha Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 987e00ba5cf667beed2b88bd1d01150334cdb6dc Author: Hans Verkuil Date: Tue May 29 13:03:27 2007 -0300 V4L/DVB (5732): Add ivtv CROPCAP support and fix ivtv S_CROP for video output. The VIDIOC_CROPCAP ioctl was missing in ivtv. The handling of output video cropping was wrong. This has now been fixed. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1f137600cacf9a2908529c7d544de82672226a98 Author: Hans Verkuil Date: Tue May 29 08:18:37 2007 -0300 V4L/DVB (5730): Remove unused V4L2_CAP_VIDEO_OUTPUT_POS V4L2_CAP_VIDEO_OUTPUT_POS was initially introduced for 2.6.22 but never actually used: remove it before the final 2.6.22 is made. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit fe818d1d9a50930aa7e1ce7169fb42e1e0c45882 Author: Thierry Merle Date: Sun May 27 17:21:17 2007 -0300 V4L/DVB (5720): Usbvision: fix urb allocation and submits - fixed the urb allocation part that was not taking into account the current alternate setting this fixes usb_submit_urb returning -90 errno in isocIrq. - fixed usb_submit_urb returning -1 errno in isocIrq (need to ignore usb urb with status==-ENOENT) Acked-by: Dwaine P. Garden Signed-off-by: Thierry Merle Signed-off-by: Mauro Carvalho Chehab commit c6604150ab04aaaf98baf1ddca2e9e4f7d3da4d3 Author: Oliver Endriss Date: Mon May 28 18:06:27 2007 -0300 V4L/DVB (5716): Tda10086,tda826x: fix tuning, STR/SNR values Several people reported unreliable reception with the current driver. Furthermore, STR and SNR values seem to be inverted. This fix is based on a patch posted by Hartmut Hackman. Thanks to Helmut Auer for testing and helping to optimize the patch. tda826x: - set baseband cut-off to 19 MHz tda10086: - change the parameters of the carrier recovery loop - toggle register 0x02 between 0x35 (tuning) and 0x00 (locked) - invert STR and SNR values Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit dc02d50a6d71cba2b2edb78377af5a5965879a49 Author: Hans Verkuil Date: Sat May 19 14:07:16 2007 -0300 V4L/DVB (5675): Move big PIO accesses from the interrupt handler to a workhandler Sliced VBI transfers use PIO instead of DMA. This was done inside the interrupt handler, but since PIO accesses are very slow this meant that a lot of time was spent inside the interrupt handler. All PIO copies are now moved to a workqueue. This should fix various issues with missing time ticks and remote key hits. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ffeb9ec72e18e16d0b0835d959cdf01650758638 Author: Andrew Morton Date: Sat May 26 07:54:21 2007 -0300 V4L/DVB (5699): Cinergyt2: fix file release handler If this mutex_lock_interruptible() does fail due to signal_pending() then the state of the driver will get trashed in interesting ways, because userspace cannot and will not retry the close(). Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 624fc7f52b48f69fd9d1fe7a594c211762c89825 Author: Russell King Date: Sat May 26 07:55:32 2007 -0300 V4L/DVB (5700): Saa7111: fix picture settings cache bug If the SAA7111 device is powered down, and requires re-initialisation when the V4L device is opened (as on the NetWinder), the SAA7111 driver gets completely confused about the current settings. The problem is centred around the way the driver keeps _two_ cached copies of the current settings - one of the struct video_picture settings, and one of the registers. When the decoder is re-initailised, the cached register settings are overwritten, as are the values in the hardware registers. However, the cached video_picture settings are not. Resolve this by removing the useless and buggy second level of caching for video_picture. Instead, provide a function which updates register values if and only if the value we are going to write to the register has changed. Signed-off-by: Russell King Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 05f85839a2ffcaa75d505526ca8e74097be18d8c Author: Mauro Carvalho Chehab Date: Sat May 26 10:45:28 2007 -0300 V4L/DVB (5702): Fix Kconfig items to avoid linkedition errors The recent changes on Kconfig broke compilation when VIDEO_DEV is compiled as module. On some cases, drivers like VIDEO_BUF are compiled with 'y' option instead of 'm': ... Thanks to: Toralf Forster for pointing this issue. Signed-off-by: Mauro Carvalho Chehab commit 620a324b744a7d66c3c45a83042f8e7fc9fc5a04 Author: Jens Axboe Date: Thu Jun 7 09:39:42 2007 +0200 splice: __generic_file_splice_read: fix read/truncate race Original patch and description from Neil Brown , merged and adapted to splice branch by me. Neils text follows: __generic_file_splice_read() currently samples the i_size at the start and doesn't do so again unless it needs to call ->readpage to load a page. After ->readpage it has to re-sample i_size as a truncate may have caused that page to be filled with zeros, and the read() call should not see these. However there are other activities that might cause ->readpage to be called on a page between the time that __generic_file_splice_read() samples i_size and when it finds that it has an uptodate page. These include at least read-ahead and possibly another thread performing a read So we must sample i_size *after* it has an uptodate page. Thus the current sampling at the start and after a read can be replaced with a sampling before page addition into spd. Signed-off-by: Jens Axboe commit 475ecade683566b19ebb84972de864039ac5fce3 Author: Hugh Dickins Date: Thu Jun 7 09:36:00 2007 +0200 splice: __generic_file_splice_read: fix i_size_read() length checks __generic_file_splice_read's partial page check, at eof after readpage, not only got its calculations wrong, but also reused the loff variable: causing data corruption when splicing from a non-0 offset in the file's last page (revealed by ext2 -b 1024 testing on a loop of a tmpfs file). Signed-off-by: Hugh Dickins Signed-off-by: Jens Axboe commit 20d698db67059a63d217030dfd02872cb5f88dfb Author: Jens Axboe Date: Tue Jun 5 11:05:11 2007 +0200 splice: move balance_dirty_pages_ratelimited() outside of splice actor I've seen inode related deadlocks, so move this call outside of the actor itself, which may hold the inode lock. Signed-off-by: Jens Axboe commit 17374ff1aa9ce2a0597416a16729474b538af443 Author: Jens Axboe Date: Mon Jun 4 15:03:12 2007 +0200 pipe: move pipe_inode_info structure decleration up before it's used There's really no reason it's below the first use of the pointer type, and it'll fail compilation for the network addition (for good reason). So move it up a bit. Signed-off-by: Jens Axboe commit 267adc3e66c3d3c2edb89dac9eddc20ac94d646b Author: Jens Axboe Date: Fri Jun 8 08:33:41 2007 +0200 splice: remove do_splice_direct() symbol export It's only supposed to be used by do_sendfile(), which is never modular. So kill the export. Signed-off-by: Jens Axboe commit d366d39885b4a56eb90c7670deb46d82501579ad Author: Jens Axboe Date: Fri Jun 1 14:54:11 2007 +0200 splice: move inode size check into generic_file_splice_read() Signed-off-by: Jens Axboe commit a4cd7ed86ff511aebcc97675937039f2321d6987 Author: Roland Dreier Date: Thu Jun 7 23:24:39 2007 -0700 IB/mlx4: Make sure RQ allocation is always valid QPs attached to an SRQ must never have their own RQ, and QPs not attached to SRQs must have an RQ with at least 1 entry. Enforce all of this in set_rq_size(). Based on a patch by Eli Cohen . Signed-off-by: Roland Dreier commit bf2944bd56c7a48cc3962a860dbc4ceee6b1ace8 Author: Sean Hefty Date: Tue Jun 5 09:57:31 2007 -0700 RDMA/cma: Fix initialization of next_port next_port should be between sysctl_local_port_range[0] and [1]. However, it is initially set to a random value with get_random_bytes(). If the value is negative when treated as a signed integer, next_port can end up outside the expected range because of the result of the % operator being negative. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 57f01b53398baebd809e7efd49fc10c10174b46d Author: Jack Morgenstein Date: Wed Jun 6 19:35:04 2007 +0300 IB/mlx4: Fix zeroing of rnr_retry value in ib_modify_qp() The code in __mlx4_ib_modify_qp() overwrites context->params1 after the RNR retry parameter is ORed in, which results in the RNR retry parameter always being set to 0. Fix this by moving where we OR in the value to later in the function, after the initial assignment of context->params1. Found by the Mellanox firmware group. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit b2d9308ae43a9cfa56cc9682dc6ed63347a8d2bf Author: Jack Morgenstein Date: Thu Jun 7 23:24:38 2007 -0700 mlx4_core: Don't set MTT address in dMPT entries with PA set If a dMPT entry has the PA flag (direct physical address) set, then the (unused) MTT base address field has to be set to 0. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit fe40900f408642e772739088d30636e2f3f7d0d8 Author: Roland Dreier Date: Thu Jun 7 23:24:36 2007 -0700 mlx4_core: Check firmware command interface revision HCA firmware with incompatible changes to the FW commmand interface is coming soon. Add a check of the interface revision during initialization and bail out if the firmware advertises a revision that the driver doesn't know about. This will avoid strange failures later if the driver goes on using the wrong interface revision. Signed-off-by: Roland Dreier commit 8c2786cfa6d15c474ec7030e8161c88e9b5c597d Author: David S. Miller Date: Thu Jun 7 21:59:44 2007 -0700 [SPARC64]: Handle PCI bridges without 'ranges' property. This fixes the IDE controller not showing up on Netra-T1 systems. Just like Simba bridges, some PCI bridges can lack the 'ranges' OBP property. So we handle this similarly to the existing Simba code: 1) In of_device register address resolving, we push the translation to the parent. 2) In PCI device scanning, we interrogate the PCI config space registers of the PCI bus device in order to resolve the resources, just like the generic Linux PCI probing code does. With much help and testing from Fabio, who also reported the initial problem. Signed-off-by: David S. Miller Signed-off-by: Fabio Massimo Di Nitto commit ea1ff19ce0146a3982a6ded4274122e6d0a91bed Author: Robert P. J. Day Date: Thu Jun 7 20:24:50 2007 -0700 [SPARC64]: Include instead of . To be consistent with other architectures, include the generic version of rwsem.h. Signed-off-by: Robert P. J. Day Signed-off-by: David S. Miller commit 85f6038f2170e3335dda09c3dfb0f83110e87019 Author: Bryan Wu Date: Tue Jun 5 11:02:01 2007 +0800 RAMFS NOMMU: missed POSIX UID/GID inode attribute checking This bug was caught by LTP testcase fchmod06 on Blackfin platform. In the manpage of fchmod, "EPERM: The effective UID does not match the owner of the file, and the process is not privileged (Linux: it does not have the CAP_FOWNER capability)." But the ramfs nommu code missed the inode_change_ok POSIX UID/GID verification. This patch fixed this. Signed-off-by: Bryan Wu Cc: David Howells Signed-off-by: Linus Torvalds commit c8d8170feb824875baf68f8aaecb181a6500ce81 Merge: 34750bb... df5e387... Author: Linus Torvalds Date: Thu Jun 7 17:10:19 2007 -0700 Merge git://git.linux-xtensa.org/kernel/xtensa-feed * git://git.linux-xtensa.org/kernel/xtensa-feed: Xtensa: use asm-generic/fcntl.h [XTENSA] Remove non-rt signal handling [XTENSA] Move common sections into bss sections [XTENSA] clean-up header files [XTENSA] Use generic 64-bit division [XTENSA] Remove multi-exported symbols from xtensa_ksyms.c [XTENSA] fix sources using deprecated assembler directive [XTENSA] Spelling fixes in arch/xtensa [XTENSA] fix bit operations in bitops.h commit 34750bb15687fa03ba95a0ccb1307b0727bc308b Merge: df3872a... ec4d18f... Author: Linus Torvalds Date: Thu Jun 7 17:09:01 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix SBUS IRQ regression caused by PCI-E driver. [SPARC64]: Fix 2 bugs in PCI Sabre bus scanning. commit df3872a9664667edae729361c9948b652de5c6f4 Merge: e5e3c84... 4aa2e62... Author: Linus Torvalds Date: Thu Jun 7 17:08:06 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (24 commits) xfrm: Add security check before flushing SAD/SPD [NET_SCHED]: Fix filter double free [NET]: Avoid duplicate netlink notification when changing link state [UDP]: Revert 2-pass hashing changes. [AF_UNIX]: Fix stream recvmsg() race. [NETFILTER]: nf_conntrack_amanda: fix textsearch_prepare() error check [NETFILTER]: ip_tables: fix compat related crash [NETFILTER]: nf_conntrack: fix helper module unload races [RTNETLINK]: ifindex 0 does not exist [NETLINK]: Mark netlink policies const [TCP] tcp_probe: Attach printf attribute properly to printl(). [TCP]: Use LIMIT_NETDEBUG in tcp_retransmit_timer(). [NET]: Merge dst_discard_in and dst_discard_out. [RFKILL]: Make rfkill->name const [IPV4]: Restore old behaviour of default config values [IPV4]: Add default config support after inetdev_init [IPV4]: Convert IPv4 devconf to an array [IPV4]: Only panic if inetdev_init fails for loopback [TCP]: Honour sk_bound_dev_if in tcp_v4_send_ack [BNX2]: Update version and reldate. ... commit e5e3c84b70e58fc605635fd340fb8dba3cc59058 Author: Steven Rostedt Date: Wed Jun 6 23:34:04 2007 -0400 enable interrupts in user path of page fault. This is a minor fix, but what is currently there is essentially wrong. In do_page_fault, if the faulting address from user code happens to be in kernel address space (int *p = (int*)-1; p = 0xbed;) then the do_page_fault handler will jump over the local_irq_enable with the goto bad_area_nosemaphore; But the first line there sees this is user code and goes through the process of sending a signal to send SIGSEGV to the user task. This whole time interrupts are disabled and the task can not be preempted by a higher priority task. This patch always enables interrupts in the user path of the bad_area_nosemaphore. Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds commit c52ecdab06ff3b4d0f8914951eb74dc8b049f51c Merge: dc31501... c0f85a8... Author: Linus Torvalds Date: Thu Jun 7 17:02:29 2007 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] pxa: fix pxa27x keyboard driver [ARM] Fix 4417/1: Serial: Fix AMBA drivers locking [ARM] 4421/1: AT91: Value of _KEY fields. [ARM] Solve buggy smp_processor_id() usage [ARM] 4422/1: Fix default value handling in gpio_direction_output (PXA) [ARM] 4419/1: AT91: SAM9 USB clocks check for suspending [ARM] 4418/1: AT91: Number of programmable clocks differs [ARM] 4392/2: Do not corrupt the SP register in compressed/head.S commit dc315011312f04433e0fdd34b6a3dde4bfde1e48 Merge: 2c750ed... 6ba07e5... Author: Linus Torvalds Date: Thu Jun 7 17:00:37 2007 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix warning by moving do_default_vi into CONFIG_CPU_MIPSR2_SRS [MIPS] Fix some minor typoes in arch/mips/Kconfig. [MIPS] Remove prototype for deleted function qemu_handle_int [MIPS] Fix some system calls with long long arguments [MIPS] Make dma_map_sg handle sg elements which are longer than one page [MIPS] Drop __ARCH_WANT_SYS_FADVISE64 [MIPS] Fix VGA corruption on RM300C [MIPS] RM300: Fix MMIO problems by marking the PCI INT ACK region busy [MIPS] EMMA2RH: remove dead KGDB code [MIPS] Remove duplicate fpu enable hazard code. [MIPS] Atlas, Malta, SEAD: Remove scroll from interrupt handler. commit 2c750edd39a45402e355459194fe8804366bedd2 Author: Peter Zijlstra Date: Wed Jun 6 11:39:40 2007 +0200 frv: build fix In file included from /usr/src/linux-2.6-2/net/ipv4/ip_input.c:118: include2/asm/system.h:245: error: parse error before "__cmpxchg_32" include2/asm/system.h:245: error: parse error before '*' token include2/asm/system.h:245: warning: type defaults to `int' in declaration of `__cmpxchg_32' include2/asm/system.h:245: warning: function declaration isn't a prototype include2/asm/system.h:245: warning: data definition has no type or storage class Signed-off-by: Peter Zijlstra Acked-by: David Howells Signed-off-by: Linus Torvalds commit ec4d18f219e71ef682fe2d7b9a6d121617fef6d5 Author: David S. Miller Date: Thu Jun 7 16:58:22 2007 -0700 [SPARC64]: Fix SBUS IRQ regression caused by PCI-E driver. We used to access the 64-bit IRQ IMAP and ICLR registers of bus controllers 4-bytes in and as a 32-bit register word, since only the low 32-bits were relevant. This seemed like a good idea at the time. But the PCI-E controller requires full 8-byte 64-bit access to these registers, so we switched over to accessing them fully. SBUS was not adjusted properly, which broke interrupts completely. Signed-off-by: David S. Miller commit 321566c2504445160b18e1508a73081579923a6b Author: David S. Miller Date: Wed Jun 6 14:03:08 2007 -0700 [SPARC64]: Fix 2 bugs in PCI Sabre bus scanning. If we are on hummingbird, bus runs at 66MHZ. pbm->pci_bus should be setup with the result of pci_scan_one_pbm() or else we deref NULL pointers in the error interrupt handlers. Signed-off-by: David S. Miller commit 4aa2e62c45b5ca08be2d0d3c0744d7585b56e860 Author: Joy Latten Date: Mon Jun 4 19:05:57 2007 -0400 xfrm: Add security check before flushing SAD/SPD Currently we check for permission before deleting entries from SAD and SPD, (see security_xfrm_policy_delete() security_xfrm_state_delete()) However we are not checking for authorization when flushing the SPD and the SAD completely. It was perhaps missed in the original security hooks patch. This patch adds a security check when flushing entries from the SAD and SPD. It runs the entire database and checks each entry for a denial. If the process attempting the flush is unable to remove all of the entries a denial is logged the the flush function returns an error without removing anything. This is particularly useful when a process may need to create or delete its own xfrm entries used for things like labeled networking but that same process should not be able to delete other entries or flush the entire database. Signed-off-by: Joy Latten Signed-off-by: Eric Paris Signed-off-by: James Morris commit b00b4bf94edb42852d55619af453588b2de2dc5e Author: Patrick McHardy Date: Tue Jun 5 16:06:59 2007 -0700 [NET_SCHED]: Fix filter double free cbq and atm destroy their filters twice when destroying inner classes during qdisc destruction. Reported-and-tested-by: Strobl Anton Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7c355f532dd43036622e1880c114773463bafd23 Author: Thomas Graf Date: Tue Jun 5 16:03:03 2007 -0700 [NET]: Avoid duplicate netlink notification when changing link state When changing the link state from userspace not affecting any other flags. Two duplicate notification are being sent, once as action in the NETDEV_UP/NETDEV_DOWN notification chain and a second time when comparing old and new device flags after the change has been completed. Although harmless, the duplicates should be avoided. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit df2bc459a3ad71f8b44c358bf7169acf9caf4acd Author: David S. Miller Date: Tue Jun 5 15:18:43 2007 -0700 [UDP]: Revert 2-pass hashing changes. This reverts changesets: 6aaf47fa48d3c44280810b1b470261d340e4ed87 b7b5f487ab39bc10ed0694af35651a03d9cb97ff de34ed91c4ffa4727964a832c46e624dd1495cf5 fc038410b4b1643766f8033f4940bcdb1dace633 There are still some correctness issues recently discovered which do not have a known fix that doesn't involve doing a full hash table scan on port bind. So revert for now. Signed-off-by: David S. Miller commit 3c0d2f3780fc94746c4842e965bd2570e2119bb6 Author: Miklos Szeredi Date: Tue Jun 5 13:10:29 2007 -0700 [AF_UNIX]: Fix stream recvmsg() race. A recv() on an AF_UNIX, SOCK_STREAM socket can race with a send()+close() on the peer, causing recv() to return zero, even though the sent data should be received. This happens if the send() and the close() is performed between skb_dequeue() and checking sk->sk_shutdown in unix_stream_recvmsg(): process A skb_dequeue() returns NULL, there's no data in the socket queue process B new data is inserted onto the queue by unix_stream_sendmsg() process B sk->sk_shutdown is set to SHUTDOWN_MASK by unix_release_sock() process A sk->sk_shutdown is checked, unix_release_sock() returns zero I'm surprised nobody noticed this, it's not hard to trigger. Maybe it's just (un)luck with the timing. It's possible to work around this bug in userspace, by retrying the recv() once in case of a zero return value. Signed-off-by: Miklos Szeredi Signed-off-by: David S. Miller commit c764c9ade6d9b710bad2b9c631ede9864333b98c Author: Akinobu Mita Date: Tue Jun 5 12:56:53 2007 -0700 [NETFILTER]: nf_conntrack_amanda: fix textsearch_prepare() error check The return value from textsearch_prepare() needs to be checked by IS_ERR(). Because it returns error code as a pointer. Cc: "Brian J. Murrell" Signed-off-by: Akinobu Mita Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 4c1b52bc7a2f5ee01ea3fc248a8748a1c6843f7c Author: Dmitry Mishin Date: Tue Jun 5 12:56:09 2007 -0700 [NETFILTER]: ip_tables: fix compat related crash check_compat_entry_size_and_hooks iterates over the matches and calls compat_check_calc_match, which loads the match and calculates the compat offsets, but unlike the non-compat version, doesn't call ->checkentry yet. On error however it calls cleanup_matches, which in turn calls ->destroy, which can result in crashes if the destroy function (validly) expects to only get called after the checkentry function. Add a compat_release_match function that only drops the module reference on error and rename compat_check_calc_match to compat_find_calc_match to reflect the fact that it doesn't call the checkentry function. Reported by Jan Engelhardt Signed-off-by: Dmitry Mishin Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3c158f7f57601bc27eab82f0dc4fd3fad314d845 Author: Patrick McHarrdy Date: Tue Jun 5 12:55:27 2007 -0700 [NETFILTER]: nf_conntrack: fix helper module unload races When a helper module is unloaded all conntracks refering to it have their helper pointer NULLed out, leading to lots of races. In most places this can be fixed by proper use of RCU (they do already check for != NULL, but in a racy way), additionally nf_conntrack_expect_related needs to bail out when no helper is present. Also remove two paranoid BUG_ONs in nf_conntrack_proto_gre that are racy and not worth fixing. Signed-off-by: Patrick McHarrdy Signed-off-by: David S. Miller commit 51055be81c3cb14d0165a7432b787098b817fd35 Author: Patrick McHardy Date: Tue Jun 5 12:40:01 2007 -0700 [RTNETLINK]: ifindex 0 does not exist ifindex == 0 does not exist and implies we should do a lookup by name if one was given. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ef7c79ed645f52bcbdd88f8d54a9702c4d3fd15d Author: Patrick McHardy Date: Tue Jun 5 12:38:30 2007 -0700 [NETLINK]: Mark netlink policies const Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 14a49e1fd2bb91ba2bf0e1f06711b6dbc21de02d Author: David S. Miller Date: Tue Jun 5 00:19:24 2007 -0700 [TCP] tcp_probe: Attach printf attribute properly to printl(). GCC doesn't like the way Stephen initially did it: net/ipv4/tcp_probe.c:83: warning: empty declaration Signed-off-by: David S. Miller commit 274707cff9810b784c548ed169298617a1bc3528 Author: Eric Dumazet Date: Tue Jun 5 00:16:12 2007 -0700 [TCP]: Use LIMIT_NETDEBUG in tcp_retransmit_timer(). LIMIT_NETDEBUG allows the admin to disable some warning messages (echo 0 >/proc/sys/net/core/warnings). The "TCP: Treason uncloaked!" message can use this facility. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit c4b1010f406d7c3f819c22a6323c46776d5b148c Author: Denis Cheng Date: Tue Jun 5 00:06:57 2007 -0700 [NET]: Merge dst_discard_in and dst_discard_out. Signed-off-by: Denis Cheng Signed-off-by: David S. Miller commit c36befb52350fa76bf3cb03d13ba2e17dbe8a508 Author: Ivo van Doorn Date: Tue Jun 5 00:04:46 2007 -0700 [RFKILL]: Make rfkill->name const The rfkill name can be made const safely, this makes the compiler happy when drivers make it point to some const string used elsewhere. Signed-off-by: Ivo van Doorn Signed-off-by: David S. Miller commit 71e27da9618b5f4d525ec821def83991da20429f Author: Herbert Xu Date: Mon Jun 4 23:36:06 2007 -0700 [IPV4]: Restore old behaviour of default config values Previously inet devices were only constructed when addresses are added (or rarely in ipmr). Therefore the default config values they get are the ones at the time of these operations. Now that we're creating inet devices earlier, this changes the behaviour of default config values in an incompatible way (see bug #8519). This patch creates a compromise by setting the default values at the same point as before but only for those that have not been explicitly set by the user since the inet device's creation. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 31be308541e990592a2d0a3e77e8e51bd0cea0e0 Author: Herbert Xu Date: Mon Jun 4 23:35:37 2007 -0700 [IPV4]: Add default config support after inetdev_init Previously once inetdev_init has been called on a device any changes made to ipv4_devconf_dflt would have no effect on that device's configuration. This creates a problem since we have moved the point where inetdev_init is called from when an address is added to where the device is registered. This patch is the first half of a set that tries to mimic the old behaviour while still calling inetdev_init. It propagates any changes to ipv4_devconf_dflt to those devices that have not had the corresponding attribute set. The next patch will forcibly set all values at the point where inetdev_init was previously called. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 42f811b8bcdf6695bf74de580b1daf53445e8949 Author: Herbert Xu Date: Mon Jun 4 23:34:44 2007 -0700 [IPV4]: Convert IPv4 devconf to an array This patch converts the ipv4_devconf config members (everything except sysctl) to an array. This allows easier manipulation which will be needed later on to provide better management of default config values. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 8d76527e728d00d1cf9d5dd663caffb2dcf05ae6 Author: Herbert Xu Date: Mon Jun 4 23:34:08 2007 -0700 [IPV4]: Only panic if inetdev_init fails for loopback When I made the inetdev_init call work on all devices I incorrectly left in the panic call as well. It is obviously undesirable to panic on an allocation failure for a normal network device. This patch moves the panic call under the loopback if clause. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit f0e48dbfc5c74e967fea4c0fd0c5ad07557ae0c8 Author: Patrick McHardy Date: Mon Jun 4 21:32:46 2007 -0700 [TCP]: Honour sk_bound_dev_if in tcp_v4_send_ack A time_wait socket inherits sk_bound_dev_if from the original socket, but it is not used when sending ACK packets using ip_send_reply. Fix by passing the oif to ip_send_reply in struct ip_reply_arg and use it for output routing. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit b91b9fd11210a7023f37eaee1e977ad9ce532095 Author: Michael Chan Date: Mon Jun 4 21:24:42 2007 -0700 [BNX2]: Update version and reldate. Update to version 1.5.11. Signed-off-by: Michael Chan Acked-by: Jeff Garzik Signed-off-by: David S. Miller commit 02537b0676930b1bd9aff2139e0e645c79986931 Author: Michael Chan Date: Mon Jun 4 21:24:07 2007 -0700 [BNX2]: Fix occasional counter corruption on 5708. The statistics block DMA on 5708 can be messed up occasionally on the average of about once per hour. If the user is reading the counters within one second after the corruption, the counters will be all messed up. One second later, the counters will be ok again until the next corruption occurs. The workaround is to disable the periodic statistics DMA. Instead, we manually trigger the DMA once a second in bnx2_timer(). This manual trigger of the DMA avoids the problem. As a consequence, we can only allow 0 or 1 second settings for ethtool -C statistics block. Thanks to Jean-Daniel Pauget and CaT for reporting this rare problem. Signed-off-by: Michael Chan Acked-by: Jeff Garzik Signed-off-by: David S. Miller commit 0aa38df7cd5b6c5b89f5146f4a2286434bc4a8f3 Author: Michael Chan Date: Mon Jun 4 21:23:06 2007 -0700 [BNX2]: Enable DMA on 5709. Add missing code to enable DMA on 5709 A1. The bit is a no-op on A0 and therefore can be set on all 5709 chips. Signed-off-by: Michael Chan Acked-by: Jeff Garzik Signed-off-by: David S. Miller commit 641bdcd56c8bb2110a31da846b2752b11a644050 Author: Michael Chan Date: Mon Jun 4 21:22:24 2007 -0700 [BNX2]: Add missing wait in bnx2_init_5709_context(). For correctness, we need to wait for the MEM_INIT bit to be cleared in the BNX2_CTX_COMMAND register before proceeding. [Added return -EBUSY when the MEM_INIT bit doesn't clear, suggested by Jeff Garzik.] Signed-off-by: Michael Chan Acked-by: Jeff Garzik Signed-off-by: David S. Miller commit 7947b20ebae785ba25154aa1a9a00a98a22de75a Author: Michael Chan Date: Mon Jun 4 21:17:10 2007 -0700 [BNX2]: Fix netdev watchdog on 5708. There's a bug in the driver that only initializes half of the context memory on the 5708. Surprisingly, this works most of the time except for some occasional netdev watchdogs when sending a lot of 64-byte packets. The fix is to add the missing code to initialize the 2nd halves of all context memory. Signed-off-by: Michael Chan Acked-by: Jeff Garzik Signed-off-by: David S. Miller commit 3e1db334dca97df9034ebeec4657329a2b37a811 Author: Roland Dreier Date: Sun Jun 3 19:47:10 2007 -0700 IB/mthca, mlx4_core: Fix typo in comment s/signifant/significant/ Signed-off-by: Roland Dreier commit 2c5cb2355843f9958e19a4b243456be92f97c73b Author: Roland Dreier Date: Sat Jun 2 07:16:02 2007 -0700 mlx4_core: Free catastrophic error MSI-X interrupt with correct dev_id We need to pass the same dev_id to free_irq() and request_irq(). When using MSI-X, the MLX4_EQ_CATAS interrupt uses a different dev_id from the other interrupts. Signed-off-by: Roland Dreier commit b581401ed0cc83a4483ed39c00a14a60bacecc3a Author: Roland Dreier Date: Thu Jun 7 11:51:58 2007 -0700 mlx4_core: Initialize ctx_list and ctx_lock earlier We may call mlx4_dispatch_event() before mlx4_register_device() is called for a device, because for example a catastrophic error happens immediately after we enable interrupts. Therefore priv->ctx_list and priv->ctx_lock need to be initialized earlier. This bug was actually exposed by the MSI-X bug that returned IRQ numbers to drivers in reverse order, so that the first FW command interrupt looked to mlx4 like a catastrophic error. Signed-off-by: Roland Dreier commit 09360d5408cb641abff0f32a172a3332f02e8e88 Author: Eli Cohen Date: Wed May 30 13:14:31 2007 +0300 mlx4_core: Fix CQ context layout The reserved6 field should be 64 bits, not just 16 bits. Without this, the structure does not match the hardware layout on 32-bit architectures: the db_rec_addr field ends up at offset 52 instead of offset 56. The bug slipped by because the alignment of __be64 members ends up putting it in the right place on x86-64. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit 8a2e21038df74c4401f422346b9371a959c21438 Merge: 7244d54... 9a41284... Author: Linus Torvalds Date: Thu Jun 7 09:36:55 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Fix se73180 platform device registration. sh: ioremap() through PMB needs asm/mmu.h. sh: voyagergx: Fix build warnings. sh: Fix SH4-202 clock fwk set_rate() mismatch. sh: microdev: Fix compile warnings. sh: Fix in_nmi symbol build error. commit 7244d545c123ff33a3a5bff7fcb96a07778c32d1 Merge: 143a275... e7e8cc5... Author: Linus Torvalds Date: Thu Jun 7 09:35:54 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [VIDEO] sunxvr500fb: Fix pseudo_palette array size [VIDEO] sunxvr2500fb: Fix pseudo_palette array size [VIDEO] ffb: The pseudo_palette is only 16 elements long [VIDEO]: Fix section mismatch warning in promcon. [ATA]: Back out bogus (SPARC64 && !PCI) Kconfig depends. [SPARC64]: Fill in gaps in non-PCI dma_*() NOP implementation. [SPARC64]: Fix {mc,smt}_capable(). [SPARC64]: Make core and sibling groups equal on UltraSPARC-IV. [SPARC64]: Proper multi-core scheduling support. [SPARC64]: Provide mmu statistics via sysfs. [SPARC64]: Fix service channel hypervisor function names. [SPARC64]: Export basic cpu properties via sysfs. [SPARC64]: Move topology init code into new file, sysfs.c commit 143a275984b37058d2d3ab1ec0e5be9026fda24d Merge: b74d0de... f40e524... Author: Linus Torvalds Date: Thu Jun 7 08:54:55 2007 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix building of COFF zImages [POWERPC] spufs: Fix error handling in spufs_fill_dir() [POWERPC] Add table of contents to booting-without-of.txt [POWERPC] spufs: Don't yield nosched context [POWERPC] Fix typo in booting-without-of-txt section numbering [POWERPC] scc_sio: Fix link failure [POWERPC] cbe_cpufreq: Limit frequency via cpufreq notifier chain [POWERPC] Fix pci_setup_phb_io_dynamic for pci_iomap [POWERPC] spufs scheduler: Fix wakeup races [POWERPC] spufs: Synchronize pte invalidation vs ps close [POWERPC] spufs: Free mm if spufs_fill_dir() failed [POWERPC] spufs: Fix gang destroy leaks [POWERPC] spufs: Hook up spufs_release_mem [POWERPC] spufs: Refuse to load the module when not running on cell [POWERPC] pasemi: Fix iommu + 64K PAGE_SIZE bug commit b74d0deb968e1f85942f17080eace015ce3c332c Author: Roland McGrath Date: Wed Jun 6 03:59:00 2007 -0700 Restrict clearing TIF_SIGPENDING This patch should get a few birds. It prevents sigaction calls from clearing TIF_SIGPENDING in other threads, which could leak -ERESTART*. And It fixes ptrace_stop not to clear it, which done at the syscall exit stop could leak -ERESTART*. It probably removes the harm from signalfd, at least assuming it never calls dequeue_signal on kernel threads that might have used block_all_signals. Signed-off-by: Roland McGrath Cc: Andrew Morton Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Satoru Takeuchi Signed-off-by: Linus Torvalds commit 8381e04b90ce9e7669a2d20aa7aaff3be910e447 Author: Andy Whitcroft Date: Thu Jun 7 16:16:40 2007 +0100 checkpatch.pl: should be executable scripts/checkpatch.pl should be executable, make it so. Signed-off-by: Andy Whitcroft Acked-by: Andrew Morton Acked-by: Joel Schopp Signed-off-by: Linus Torvalds commit f40e524eaec9697d1515564fd5b961d839d2dc4f Author: Paul Mackerras Date: Thu Jun 7 22:21:31 2007 +1000 [POWERPC] Fix building of COFF zImages The COFF zImage (for booting oldworld powermacs) wasn't being built correctly because the procedure descriptor in crt0.S for the zImage entry point wasn't declared as .globl, and therefore wasn't getting pulled in from wrapper.a by the linker. This adds the necessary .globl statement. Signed-off-by: Paul Mackerras commit 3373c0ae6a51085b10a95fd9d2214a9995ef7563 Author: Pierre Ossman Date: Thu May 31 22:25:11 2007 +0200 mmc: don't call switch on old cards Make sure we don't call the switch function on cards too old to support it. They should just ignore it, but some have been reported to lock up instead. Signed-off-by: Pierre Ossman commit 71651297a448289353b2493c6c3c183f9be7be7c Author: Pierre Ossman Date: Wed Jun 6 20:23:25 2007 +0200 mmc: fix broken if clause Fix a broken if clause which was causing SD cards to go into 4-bit mode even if the host did not support it. (Reported by David Brownell and Marc Pignat) Signed-off-by: Pierre Ossman commit 60da8de671cc314c75118768052d04ea92eaed4d Author: Robert P. J. Day Date: Wed Jun 6 20:19:34 2007 +0200 au1xmmc: Replace C code with call to ARRAY_SIZE() macro. Signed-off-by: Robert P. J. Day Signed-off-by: Pierre Ossman commit b6cedb38613d41367839df9d2181df3c81fb25c4 Author: Marc Pignat Date: Wed Jun 6 20:27:59 2007 +0200 mmc-atmel: remove linux/mmc/protocol.h dependencies Fix compilation error by removing command decoding from at91_mci.c driver. Decoding commands in the host driver is the wrong way. Signed-off-by: Marc Pignat Signed-off-by: Pierre Ossman commit 87873c86802ba7ff9d9550d06459a6e99d72c5eb Author: Sebastian Siewior Date: Wed Jun 6 14:03:58 2007 +1000 [POWERPC] spufs: Fix error handling in spufs_fill_dir() The error path in spufs_fill_dir() is broken. If d_alloc_name() or spufs_new_file() fails, spufs_prune_dir() is getting called. At this time dir->inode is not set and a NULL pointer is dereferenced by mutex_lock(). This bugfix replaces spufs_prune_dir() with a shorter version that does not touch dir->inode but simply removes all children. Signed-off-by: Sebastian Siewior Signed-off-by: Jeremy Kerr Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 5e1e9ba690a2e2135a8f997242f9c46d2b8ac033 Author: Stuart Yoder Date: Wed Jun 6 04:29:14 2007 +1000 [POWERPC] Add table of contents to booting-without-of.txt Add table of contents. Signed-off-by: Stuart Yoder Signed-off-by: Paul Mackerras commit e5c0b9ec538a86433ddd725f675e0a5a2117b9ed Author: Christoph Hellwig Date: Tue Jun 5 11:25:59 2007 +1000 [POWERPC] spufs: Don't yield nosched context Nosched context sould never be scheduled out, thus we must not deactivate them in spu_yield ever. Signed-off-by: Christoph Hellwig Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit d30ac1242bf842fe28501a78a460a43910ef2dba Author: Stuart Yoder Date: Tue Jun 5 07:16:15 2007 +1000 [POWERPC] Fix typo in booting-without-of-txt section numbering Fix typo in section numbering. Signed-off-by: Stuart Yoder Acked-by: David Gibson Signed-off-by: Paul Mackerras commit 6dcbf164dcf4042bcbe9f56d94f65acd10b0e1f6 Author: Christoph Hellwig Date: Tue Jun 5 04:14:41 2007 +1000 [POWERPC] scc_sio: Fix link failure scc_sio.o should only be built if the txx9 serial driver is actually built into the kernel. Signed-off-by: Christoph Hellwig Signed-off-by: Arnd Bergmann -- Signed-off-by: Paul Mackerras commit 1552cb923efcd0f5499104256010d2ace437581d Author: Thomas Renninger Date: Tue Jun 5 04:14:40 2007 +1000 [POWERPC] cbe_cpufreq: Limit frequency via cpufreq notifier chain ... and get rid of cpufreq_set_policy call that caused a build failure due interfering commits. Signed-off-by: Thomas Renninger Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit e7c40012b84f670ba57fe4a3f453ddecc8813e9b Author: Arnd Bergmann Date: Tue Jun 5 04:14:39 2007 +1000 [POWERPC] Fix pci_setup_phb_io_dynamic for pci_iomap We had a problem on a system with only dynamically allocated PCI buses (using of_pci_phb_driver) in combination with libata. This setup ended up having no "primary" phb, which means that pci_io_base never got initialized and all IO port numbers are 64 bit numbers, which is larger than the PIO_MASK limit. Signed-off-by: Arnd Bergmann Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit bb5db29aa0379f0f3ef857a3a3715f17261c611b Author: Christoph Hellwig Date: Mon Jun 4 23:26:51 2007 +1000 [POWERPC] spufs scheduler: Fix wakeup races Fix the race between checking for contexts on the runqueue and actually waking them in spu_deactive and spu_yield. The guts of spu_reschedule are split into a new helper called grab_runnable_context which shows if there is a runnable thread below a specified priority and if yes removes if from the runqueue and uses it. This function is used by the new __spu_deactivate hepler shared by preemption and spu_yield to grab a new context before deactivating a specified priority and if yes removes if from the runqueue and uses it. This function is used by the new __spu_deactivate hepler shared by preemption and spu_yield to grab a new context before deactivating the old one. Signed-off-by: Christoph Hellwig Signed-off-by: Arnd Bergmann Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit 47d3a5faa3f72186f769ed9579c630afb8433f2b Author: Christoph Hellwig Date: Mon Jun 4 23:26:51 2007 +1000 [POWERPC] spufs: Synchronize pte invalidation vs ps close Make sure the mapping_lock also protects access to the various address_space pointers used for tearing down the ptes on a spu context switch. Because unmap_mapping_range can sleep we need to turn mapping_lock from a spinlock into a sleeping mutex. Signed-off-by: Christoph Hellwig Signed-off-by: Arnd Bergmann Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit 89df00855beabfa700f9a9ed52f0983bdc4b021d Author: Sebastian Siewior Date: Mon Jun 4 23:26:51 2007 +1000 [POWERPC] spufs: Free mm if spufs_fill_dir() failed In case spufs_fill_dir() fails only put_spu_context() gets called for cleanup and the acquired mm_struct never gets freed. Signed-off-by: Sebastian Siewior Signed-off-by: Arnd Bergmann Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit 877907d37da9694a34adc9dc3e2ce09400148cb5 Author: Jeremy Kerr Date: Mon Jun 4 23:26:51 2007 +1000 [POWERPC] spufs: Fix gang destroy leaks Previously, closing a SPE gang that still has contexts would trigger a WARN_ON, and leak the allocated gang. This change fixes the problem by using the gang's reference counts to destroy the gang instead. The gangs will persist until their last reference (be it context or open file handle) is gone. Also, avoid using statements with side-effects in a WARN_ON(). Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit ce92987baba60bc082b9eedddfaf4ae3f8435dac Author: Christoph Hellwig Date: Mon Jun 4 23:26:51 2007 +1000 [POWERPC] spufs: Hook up spufs_release_mem Currently spufs_mem_release and the mem file doesn't have any release method hooked up, leading to leaks everytime is used. Signed-off-by: Christoph Hellwig Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit 8f18a158192ef6dc63a572bdbbdf5613cfbbe2e4 Author: Arnd Bergmann Date: Mon Jun 4 23:26:51 2007 +1000 [POWERPC] spufs: Refuse to load the module when not running on cell As noticed by David Woodhouse, it's currently possible to mount spufs on any machine, which means that it actually will get mounted by fedora. This refuses to load the module on platforms that have no support for SPUs. Cc: David Woodhouse Signed-off-by: Arnd Bergmann Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit 6291ed3c04d5c83c26e77d4fa47e06d0416be81d Author: Olof Johansson Date: Mon Jun 4 10:49:05 2007 +1000 [POWERPC] pasemi: Fix iommu + 64K PAGE_SIZE bug The powerpc iommu code was refactored by Linas back in the 2.6.20 time frame to map 4K pages from the generic code, but I had forgotten to go back and fix my platform driver before submitting it. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit eeb47d1234af1a9267836f680a8e114b2e88d0dc Author: Mark Fasheh Date: Wed Jun 6 16:15:24 2007 -0700 ocfs2: Fix invalid assertion during write on 64k pages The write path code intends to bug if a math error (or unhandled case) results in a write outside of the current cluster boundaries. The actual BUG_ON() statements however are incorrect, leading to a crash on kernels with 64k page size. Fix those by checking against the right variables. Also, move the assertions higher up within the functions so that they trip *before* the code starts to mark buffers. Signed-off-by: Mark Fasheh commit 59be7dc97bacc0fd8e22f0be6e2aebb5c9b4ff47 Author: Tiger Yang Date: Mon Jun 4 10:31:08 2007 +0800 ocfs2: Fix masklog breakage Some of the sysfs changes inadvertantly broke the simple runtime debug log filtering employed in ocfs2. Fix this by properly exporting the masklog category filter names. Signed-off-by: Tiger Yang Signed-off-by: Mark Fasheh commit 874808c6dd429f7431b906a32c7f78a68e7636af Author: Wang Zhenyu Date: Wed Jun 6 11:16:25 2007 +0800 [AGPGART] intel_agp: Add support for G33, Q33 and Q35 chipsets This patch adds pci ids for G33, Q33 and Q35 chips, and update with new GTT size and stolen mem size detect method on these chips. Signed-off-by: Wang Zhenyu Signed-off-by: Dave Jones commit df80b148869291621ddf51eb8716658d5bfba811 Author: Wang Zhenyu Date: Thu May 31 11:51:12 2007 +0800 [AGPGART] intel_agp: add support for 945GME Add pci id info for 945GME. Signed-off-by: Wang Zhenyu Signed-off-by: Dave Jones commit c8eebfd6807f37b9a8a7ce3a64b60429788dfb54 Author: Wang Zhenyu Date: Thu May 31 11:34:06 2007 +0800 [AGPGART] intel_agp: add support for 965GME/GLE Add pci id info for 965GME/GLE support. Signed-off-by: Wang Zhenyu Signed-off-by: Dave Jones commit 9614ece14f23f2ce54a076c471aec9c91e51e79c Author: Wang Zhenyu Date: Wed May 30 09:45:58 2007 +0800 [AGPGART] intel_agp: use table for device probe Fixed issues noted by Christoph Hellwig, and I changed device table scan a bit to allow the case that some models of graphics chips may have same host bridge type. This type of chip will be added in the future. This patch cleans up device probe function. Eric Anholt was the original author. Signed-off-by: Eric Anholt Signed-off-by: Wang Zhenyu Signed-off-by: Dave Jones commit c4ca881796b7e14120851ddf6e04845ef94a314a Author: Wang Zhenyu Date: Wed May 30 09:40:46 2007 +0800 [AGPGART] intel_agp: cleanup intel private data Remove volatile type declare for IO mem variables. A single private gart data is used by all drivers, this makes it clean. Eric Anholt wrote the original patch. Signed-off-by: Wang Zhenyu Signed-off-by: Dave Jones commit 6ba07e590d1f841a5d0539978399b852a015ab53 Author: Atsushi Nemoto Date: Mon May 21 23:45:38 2007 +0900 [MIPS] Fix warning by moving do_default_vi into CONFIG_CPU_MIPSR2_SRS This fixes the warning: arch/mips/kernel/traps.c:931: warning: 'do_default_vi' defined but not used Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 490dcc4d309141b622107ad5ad82674a01e089bc Author: Robert P. J. Day Date: Sun May 20 12:11:07 2007 -0400 [MIPS] Fix some minor typoes in arch/mips/Kconfig. Signed-off-by: Robert P. J. Day Signed-off-by: Ralf Baechle commit cc8f0b827fdd616a3358fc939a2811bc0d6c3f79 Author: Ralf Baechle Date: Sun May 20 22:29:01 2007 +0200 [MIPS] Remove prototype for deleted function qemu_handle_int Signed-off-by: Ralf Baechle commit 8676d2e0244cbef294c7d9ad6e50048f9dfba9e0 Author: Atsushi Nemoto Date: Fri May 18 00:46:13 2007 +0900 [MIPS] Fix some system calls with long long arguments * O32 fadvise64() pass long long arguments by register pairs. Add sys32 version for 64 bit kernel. * N32 readahead() can pass a long long argument by one register. No need to use sys32_readahead. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit fbd5604d56c4543457aeae6dda69c9b8a1405474 Author: Thomas Bogendoerfer Date: Fri May 18 14:32:36 2007 +0200 [MIPS] Make dma_map_sg handle sg elements which are longer than one page Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 1fe5f2c4503cf45806a47c608706fc7892649d4b Author: Atsushi Nemoto Date: Fri May 18 00:53:47 2007 +0900 [MIPS] Drop __ARCH_WANT_SYS_FADVISE64 sys_fadvise64() is not used on MIPS. The libc can implement both posix_fadvise() and posix_fadvise64() using sys_fadvise64_64(). Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 22df5bc591ea2d0dbe8240fe8af0816b8a6533b9 Author: Thomas Bogendoerfer Date: Thu May 17 14:53:12 2007 +0200 [MIPS] Fix VGA corruption on RM300C ... by setting DRAM config to 2MB (SNI always used that size). This also fixes video dram size detection in cirrusfb. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 0c2bf745f9bdef7243ef5f04e6b05f592abead06 Author: Thomas Bogendoerfer Date: Thu May 17 14:51:47 2007 +0200 [MIPS] RM300: Fix MMIO problems by marking the PCI INT ACK region busy Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit d73d420708f456a63d7db2c504c62cd713381d7d Author: Sergei Shtylyov Date: Wed May 16 20:35:13 2007 +0400 [MIPS] EMMA2RH: remove dead KGDB code Get rid of the cross-arch KGDB specific code which shouldn't have been there in the first place... Signed-off-by: Sergey Shtylyov Signed-off-by: Ralf Baechle commit f9509c84d8d9451ecd1731e922e7094b38ee336a Author: Chris Dearman Date: Thu May 17 21:36:55 2007 +0100 [MIPS] Remove duplicate fpu enable hazard code. Use common code from hazards.h instead. Signed-off-by: Chris Dearman Signed-off-by: Ralf Baechle commit 79894c7b47f78decaa3511f1d6646aa06e2c6bed Author: Ralf Baechle Date: Wed May 16 17:54:08 2007 +0200 [MIPS] Atlas, Malta, SEAD: Remove scroll from interrupt handler. Aside of being handy for debugging this has never been a particularly good idea but is now getting in the way of dyntick / tickless kernels and general cleanups. Signed-off-by: Ralf Baechle commit 100c1ddc98e070c1b595d6bad329fb57bc57313c Author: Yehuda Sadeh Weinraub Date: Tue Jun 5 21:31:16 2007 +0000 [CIFS] Missing flag on negprot needed for some servers to force packet signing A related signature issue that I came across. There's a bug in win2k that when NT error codes are not negotiated, the server doesn't response that signatures are mandatory. Since there's (currently) no way turn on signatures in such case, I had to force NT error codes, so that this bug will not occur Signed-off-by: Yehuda Sadeh Weinraub Signed-off-by: Steve French commit 221601c3d1df8148525daf3143a7a22fba772566 Author: Steve French Date: Tue Jun 5 20:35:06 2007 +0000 [CIFS] whitespace cleanup part 2 Various coding style problems found by running the new checkpatch.pl script against fs/cifs. 3 more files fixed up. Signed-off-by: Steve French commit e7e8cc5ae63c39dbbbb5f14c5120bdf2d931fac9 Author: Antonino Daplas Date: Tue Jun 5 13:15:26 2007 -0700 [VIDEO] sunxvr500fb: Fix pseudo_palette array size - the pseudo_palette is only 16 elements long. - the pseudo_palette has only 16 elements. Do not write if regno (the array index) is more than 15. Signed-off-by: Antonino Daplas Signed-off-by: David S. Miller commit f2c138638687a7ffbf0d2a0e7addfec7bab9a765 Author: Antonino Daplas Date: Tue Jun 5 13:15:01 2007 -0700 [VIDEO] sunxvr2500fb: Fix pseudo_palette array size - the pseudo_palette is only 16 elements long. - the pseudo_palette has only 16 elements. Do not write if regno (the array index) is more than 15. Signed-off-by: Antonino Daplas Signed-off-by: David S. Miller commit c0f85a82484c25d23b44a87a35daddb2b276b4aa Author: Russell King Date: Tue Jun 5 21:14:40 2007 +0100 [ARM] pxa: fix pxa27x keyboard driver CKEN macro definitions no longer contains the bit number; remove it from usages in the pxa27x keyboard driver. Signed-off-by: Russell King commit d2fa9e05e3876198d8ab31624fe84512a0a44b45 Author: Antonino Daplas Date: Tue Jun 5 13:14:33 2007 -0700 [VIDEO] ffb: The pseudo_palette is only 16 elements long The pseudo_palette is only 16 elements long. Signed-off-by: Antonino Daplas Signed-off-by: David S. Miller commit db002b8597df84643e949cce793d0f696f100c9e Author: Russell King Date: Tue Jun 5 19:39:49 2007 +0100 [ARM] Fix 4417/1: Serial: Fix AMBA drivers locking 2389b272168ceec056ca1d8a870a97fa9c26e11a contains a merge bug; fix it. Signed-off-by: Russell King commit 5fdae1f681426d23eadcb99566030781ba8c65c9 Author: Steve French Date: Tue Jun 5 18:30:44 2007 +0000 [CIFS] whitespace cleanup Various coding style problems found by running fs/cifs against the new checkpatch.pl script. Since there were too many to fit in one patch. Updated the first four files. Signed-off-by: Steve French commit 353076fee81318d056c7a853b1bf6ad1f81d050d Author: Sam Ravnborg Date: Mon Jun 4 23:52:45 2007 -0700 [VIDEO]: Fix section mismatch warning in promcon. Fix the following warnings in promcon: WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x480): Section mismatch: reference to .init.data:promfont_unitable (between 'promcon_init_unimap' and 'promcon_init') WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x488): Section mismatch: reference to .init.data:promfont_unitable (between 'promcon_init_unimap' and 'promcon_init') WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x48c): Section mismatch: reference to .init.data:promfont_unicount (between 'promcon_init_unimap' and 'promcon_init') WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x490): Section mismatch: reference to .init.data:promfont_unicount (between 'promcon_init_unimap' and 'promcon_init') The warnings happens because the function: promcon_init_unimap() references promfont_unitable and promfont_unicount which are marked __initdata by the conmakehash command in the drivers/video/console/Makefile Fix the warning by removing the __initdata marker on the two variables. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 65d8bac3df9516adb17ce9df94a955d3c2c85a51 Author: David S. Miller Date: Mon Jun 4 23:33:04 2007 -0700 [ATA]: Back out bogus (SPARC64 && !PCI) Kconfig depends. Signed-off-by: David S. Miller commit f04dbac2623439e8e15abf55742769af0280c919 Author: David S. Miller Date: Mon Jun 4 23:32:23 2007 -0700 [SPARC64]: Fill in gaps in non-PCI dma_*() NOP implementation. Signed-off-by: David S. Miller commit a2f9f6bbb30e60ee9f9f83cede960123a65876a2 Author: David S. Miller Date: Mon Jun 4 21:48:33 2007 -0700 [SPARC64]: Fix {mc,smt}_capable(). It's not just sun4v hypervisor platforms that should return true for this, sun4u with UltraSPARC-IV should return true too. Signed-off-by: David S. Miller commit 5cd342df96e911fb8135fb3d58f33c2c5af9ffab Author: David S. Miller Date: Mon Jun 4 21:35:18 2007 -0700 [SPARC64]: Make core and sibling groups equal on UltraSPARC-IV. Signed-off-by: David S. Miller commit f78eae2e6f5d1eb05f76a45486286445b916bd92 Author: David S. Miller Date: Mon Jun 4 17:01:39 2007 -0700 [SPARC64]: Proper multi-core scheduling support. The scheduling domain hierarchy is: all cpus --> cpus that share an instruction cache --> cpus that share an integer execution unit Signed-off-by: David S. Miller commit d887ab3a9b1899f88b8cfba531e726b5fb2ebd14 Author: David Miller Date: Sun Jun 3 23:38:09 2007 -0700 [SPARC64]: Provide mmu statistics via sysfs. If the system supports hypervisor based statistics, allow them to be fetched, enabled, and disabled via sysfs. Enable and disable via the boolean: /sys/devices/systems/cpu/cpuN/mmustat_enable Statistic values are provided under: /sys/devices/systems/cpu/cpuN/mmu_status/ Signed-off-by: David S. Miller commit 48b67356400dd7866c035024aeaa2f804de7cead Author: David Miller Date: Sun Jun 3 19:07:32 2007 -0700 [SPARC64]: Fix service channel hypervisor function names. sed 's/scv/svc/' Signed-off-by: David S. Miller commit d1f253e60aefe4d3a3e708b3c2a082f3ec1be6f4 Author: David S. Miller Date: Sat Jun 2 20:46:36 2007 -0700 [SPARC64]: Export basic cpu properties via sysfs. Cache sizes, udelay_val, and clock_tick. Signed-off-by: David S. Miller commit eff3414b7277c4792debfa227f5408238d925f16 Author: David S. Miller Date: Sat Jun 2 14:41:44 2007 -0700 [SPARC64]: Move topology init code into new file, sysfs.c Also, use per-cpu data for struct cpu. Calling kmalloc for each cpu in topology_init() is just plain clumsy. Signed-off-by: David S. Miller commit e6985c7f6842fa040d058640e363140ad1730dc5 Author: Akinobu Mita Date: Mon Jun 4 16:14:59 2007 +0000 [CIFS] fix mempool destroy done in wrong order in cifs error path Slab cache used as memory pool can not be destroyed before the memory pool destruction. Because the memory pool still holds some objects and kmem_cache_destroy() says "Can't free all objects". Signed-off-by: Akinobu Mita Signed-off-by: Steve French commit 9a412847fbe396563acf2a78d5830c9c6c5a5d43 Author: Paul Mundt Date: Mon Jun 4 11:07:23 2007 +0900 sh: Fix se73180 platform device registration. Copy and paste error from se7343, fix it up. Signed-off-by: Paul Mundt commit 0fd14754141e3604529579232d34fcffd89c24b9 Author: Paul Mundt Date: Mon Jun 4 10:58:23 2007 +0900 sh: ioremap() through PMB needs asm/mmu.h. Signed-off-by: Paul Mundt commit 63dfc3c77b6a99cc618e0a11b7532a56e2699320 Author: Paul Mundt Date: Mon Jun 4 10:53:00 2007 +0900 sh: voyagergx: Fix build warnings. pr_debug() was using a %x on an unsigned long, which was making the build a bit noisy. Signed-off-by: Paul Mundt commit 907c9d70042e38efc6a981d425a3d8d98b089cba Author: Paul Mundt Date: Mon Jun 4 10:51:59 2007 +0900 sh: Fix SH4-202 clock fwk set_rate() mismatch. With the SH7722 changes, ->set_rate() also takes an algo_id, SH4-202 was overlooked when this change went in. Signed-off-by: Paul Mundt commit 8b19a7ce566007a8c45f9ba9d2b4a31bba20d62d Author: Paul Mundt Date: Mon Jun 4 10:50:42 2007 +0900 sh: microdev: Fix compile warnings. irq.c needs linux/interrupt.h. Signed-off-by: Paul Mundt commit c596b1a38085a041464b9b2c0c200e81ff695634 Author: Paul Mundt Date: Mon Jun 4 10:39:50 2007 +0900 sh: Fix in_nmi symbol build error. If CONFIG_KGDB_NMI is disabled, we're left with a stray in_nmi reference that can't be resolved. Move the symbol under the ifdef, too. Signed-off-by: Paul Mundt commit 0e5f82dda5e60a21cf8ba4f77334d60290277d2c Author: Andrew Victor Date: Thu May 31 10:16:00 2007 +0100 [ARM] 4421/1: AT91: Value of _KEY fields. Use the actual value (0xA5) for the AT91_SHDW_KEY and AT91_WDT_KEY register fields instead of a bitmask. This is consistent with how AT91_RSTC_KEY is defined, and is easier to use in code. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit f72267c30f5a08f9a77c97417ec120e6943195f8 Author: Russell King Date: Sat Jun 2 15:36:37 2007 +0100 [ARM] Solve buggy smp_processor_id() usage BUG: using smp_processor_id() in preemptible [00000001] code: opcontrol/427 Resolve this bug by ensuring that we're not using smp_processor_id() in a preemptable context (by disabling preemption.) Signed-off-by: Russell King commit 29c349d22ccda5678a7dfb732093dbd3befcefa3 Author: Bill Gatliff Date: Thu May 31 16:17:16 2007 +0100 [ARM] 4422/1: Fix default value handling in gpio_direction_output (PXA) The default value passed through to pxa_gpio_mode() is lost due to a missing GPIO_DFLT_HIGH mask for nonzero values. The enclosed patch fixes this programming error. Signed-off-by: Bill Gatliff Signed-off-by: Russell King commit b6b27ae5e85fb193c08448157943b187958b8ca2 Author: Andrew Victor Date: Thu May 31 09:34:53 2007 +0100 [ARM] 4419/1: AT91: SAM9 USB clocks check for suspending When suspending to slow-clock mode, at91_pm_verify_clocks() is called to ensure that all the clocks are disabled or in the correct state. This patch replaces the "#warning TODO" messages for the SAM9 processors with the correct code. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 1f4b49a4293ea7b0adeaeae37207b9c9fd2dd7c2 Author: Andrew Victor Date: Thu May 31 09:29:33 2007 +0100 [ARM] 4418/1: AT91: Number of programmable clocks differs The number of programmable clocks available on the AT91 processors can differ, therefore do not always display the contents of the PMC_PCKR(0) .. PMC_PCKR(3) registers (ie, assume there are 4 clocks). If CONFIG_AT91_PROGRAMMABLE_CLOCKS is enabled, the programmable clocks will be registered like the other system/peripheral clocks, and the state of the programmable clocks will be displayed like with the other clocks. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit c7341d436a7a89dc26706386de0a301fc9dbe49a Author: Catalin Marinas Date: Fri Jun 1 17:13:59 2007 +0100 [ARM] 4392/2: Do not corrupt the SP register in compressed/head.S ARMv7 support code requires a valid stack for saving/restoring registers as the whole D-cache flushing function is more complex. This patch ensures that the SP register is not corrupted. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit df5e38703d647b160d7ba300b3d2fcb64a48549a Author: Stephen Rothwell Date: Thu May 31 20:18:25 2007 -0700 Xtensa: use asm-generic/fcntl.h Commit fc4fb2adf944d45a7f3d4d38df991c79ffdb6a43 "fixed" the Xtensa asm/fcntl.h and in doing so ignored asm-generic/fcntl.h completely. It turns out that it is now exactly the same as asm-generic/fcntl.h. Signed-off-by: Stephen Rothwell Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton commit 29c4dfd92edc26c2cd2c0c64c9201d5b91d6418e Author: Chris Zankel Date: Thu May 31 17:49:32 2007 -0700 [XTENSA] Remove non-rt signal handling The non-rt signal handling was never really used, so we don't break anything. This patch also cleans up the signal stack-frame to make it independent from the processor configuration. It also improves the method used for controlling single-stepping. We now save and restore the 'icountlevel' register that controls single stepping and set or clear the saved state to enable or disable it. Signed-off-by: Chris Zankel commit adba09f01577ea441a761a85aacb1e43b58d35c4 Author: Chris Zankel Date: Thu May 31 17:48:07 2007 -0700 [XTENSA] Move common sections into bss sections Move the fields of the COMMON sections 'swapper_pg_dir' and 'empty_zero_page' to the BSS section. Remove the unused COMMON sections 'emtpy_bad_page_table' and 'empty_bad_page'. Signed-off-by: Chris Zankel commit de4f6e5b41bef50fc981410ae8380f27f4e93bf8 Author: Chris Zankel Date: Thu May 31 17:47:01 2007 -0700 [XTENSA] clean-up header files The header files in the asm-xtensa directory are not clean and 'make headers_check' fails. This is a first patch to fix most of the header files. It removes unnecessary include statements and adds some that are required for building the kernel. The linker script required some updates or the linking stage would fail. Signed-off-by: Chris Zankel commit 176fd6c96dcbc263eb1c61eae9fe2a33f23a876d Author: Chris Zankel Date: Thu May 31 17:46:09 2007 -0700 [XTENSA] Use generic 64-bit division Use generic 64-bit division algorithm from the asm-generic directory.\ Signed-off-by: Chris Zankel commit 54213baf643dd14d3bc06ca7575a817d79a350c2 Author: Chris Zankel Date: Thu May 31 17:45:23 2007 -0700 [XTENSA] Remove multi-exported symbols from xtensa_ksyms.c This patch removes the following symbols from arch/xtensa/kernel/xtensa_ksyms.c that were already exported: memcmp, memchr, strcat, strchr, strlen, stncat, strnlen, strrchr, strstr, enable_irq, and disable_irq Signed-off-by: Chris Zankel commit a0bb46ba074d2442e96f55c997293767340f4ce9 Author: Chris Zankel Date: Thu May 31 17:44:31 2007 -0700 [XTENSA] fix sources using deprecated assembler directive The assembler directive '.begin literal' is deprecated in the newer versions of the binutils (strncopy_user.S and strnlen_user.S). Signed-off-by: Chris Zankel commit 4af410a868ddddfc6aa9b19379599feac7e79d95 Author: Chris Zankel Date: Thu May 31 17:43:40 2007 -0700 [XTENSA] Spelling fixes in arch/xtensa Spelling fixes in arch/xtensa/. Signed-off-by: Simon Arlott Signed-off-by: Chris Zankel commit ef6051a90e2ad1af636e99d1d4603fdcf2adfcbe Author: Chris Zankel Date: Thu May 31 17:41:14 2007 -0700 [XTENSA] fix bit operations in bitops.h A macro used internally in the bitops.h file to identify the number of leading zeros (__cntlz) was implemented incorrectly for Xtensa processors that don't provide the 'nsa/nsau' instructions. As a result, the dependent functions and macros (ffs, ffz, fls) were broken. Signed-off-by: Chris Zankel commit f7f7c31c98830e5f4aa5486b8aabb7f3bf4a2512 Author: Steve French Date: Thu May 24 02:29:51 2007 +0000 [CIFS] typo in previous patch (also fixed missing space after if) Signed-off-by: Steve French commit 28356a1679006b110215596e057f304ef3083922 Author: Steve French Date: Wed May 23 14:45:36 2007 +0000 [CIFS] Fix oops on failed cifs mount (in kthread_stop) If the cifs demultiplex thread wakes up and exits (zeroing server->tsk) before kthread_stop is called, the cifs_mount code could pass a null pointer to kthread_stop Thanks to akpm, Dave Young and Shaggy for suggesting earlier versions of this patch. CC: akpm@linux-foundatior.org Signed-off-by: Dave Young Signed-off-by: Dave Kleikamp Signed-off-by: Steve French