commit 8eb891fc809b2300137bcd247025628c06c95a63 Author: Linus Torvalds Date: Mon Aug 20 23:38:44 2007 -0700 Revert "USB: EHCI cpufreq fix" This reverts commit 196705c9bbc03540429b0f7cf9ee35c2f928a534. It was reported to cause a regression by Daniel Exner, and Arjan van de Ven points out that we actually already have infrastructure in place for setting limits on acceptable DMA latency that would be the much more correct fix for the problem with some Broadcom EHCI controllers. Fixed up trivial conflicts due to the changes to support big-endian host controller descriptors in drivers/usb/host/{ehci-sched.c,ehci.h}. Signed-off-by: Linus Torvalds commit 848c4dd5153c7a0de55470ce99a8e13a63b4703f Author: Zach Brown Date: Mon Aug 20 17:12:01 2007 -0700 dio: zero struct dio with kzalloc instead of manually This patch uses kzalloc to zero all of struct dio rather than manually trying to track which fields we rely on being zero. It passed aio+dio stress testing and some bug regression testing on ext3. This patch was introduced by Linus in the conversation that lead up to Badari's minimal fix to manually zero .map_bh.b_state in commit: 6a648fa72161d1f6468dabd96c5d3c0db04f598a It makes the code a bit smaller. Maybe a couple fewer cachelines to load, if we're lucky: text data bss dec hex filename 3285925 568506 1304616 5159047 4eb887 vmlinux 3285797 568506 1304616 5158919 4eb807 vmlinux.patched I was unable to measure a stable difference in the number of cpu cycles spent in blockdev_direct_IO() when pushing aio+dio 256K reads at ~340MB/s. So the resulting intent of the patch isn't a performance gain but to avoid exposing ourselves to the risk of finding another field like .map_bh.b_state where we rely on zeroing but don't enforce it in the code. Signed-off-by: Zach Brown Signed-off-by: Linus Torvalds commit 38f061c5714265fa8481cc0b7795aa8fe81b45be Merge: 09d4b9a... b0244a0... Author: Linus Torvalds Date: Mon Aug 20 22:48:42 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide-disk: workaround for buggy HPA support on ST340823A (take 3) hpt34x: fix CONFIG_HPT34X_AUTODMA=n handling triflex: add missing ->dma_base check pdc202xx_old: add missing ->dma_base check pdc202xx_new: add missing ->dma_base check cs5530: add missing ->dma_base check ide: ide_config_drive_speed() bugfixes ide: add cable detection for early UDMA66 devices (take 3) ide-pmac: fix drive->init_speed reporting ide: config_drive_for_dma() fixes ide-cris: fix ->set_pio_mode method to set transfer mode on the device ide: fix hidden dependencies on CONFIG_IDE_GENERIC ide: make CONFIG_IDE_GENERIC default to N commit 09d4b9aa90ab7a0ce7c266d2ea18153bf79bba33 Merge: b574864... 70cd685... Author: Linus Torvalds Date: Mon Aug 20 22:48:24 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 (6028): Turn an unnecessary mdelay() into msleep(). V4L/DVB (6027): Get rid of an ill-behaved msleep in i2c write V4L/DVB (6026): Avoid powering up the camera on resume V4L/DVB (6016): get_dvb_firmware: update script for new location of tda10046 firmware V4L/DVB (5991): dvb-pll: Set minimum and maximum frequency properly V4L/DVB (5969): ivtv: report ivtv version in status log V4L/DVB (5967): ivtv: fix VIDIOC_S_FBUF:new OSD values where never set V4L/DVB (5968): videodev2.h: remove superfluous FBUF GLOBAL_INV_ALPHA support commit b5748643332bf75274e0b639926d57e86fb133cf Author: David Woodhouse Date: Mon Aug 20 11:05:29 2007 +0100 JFFS2 locking regression fix. Commit a491486a2087ac3dfc00efb4f838c8d684afaf54 introduced a locking problem in JFFS2 -- we up() the alloc_sem when we weren't previously holding it. This leads to all kinds of fun behaviour later. There was a _reason_ for the if (1 /* alternative path needs testing */ || which the above-mentioned commit removed :) Discovered and debugged by Giulio Fedel Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit 2046219364a40bcb13482ff68eb6ccec13405633 Merge: 0c5564b... 0af666f... Author: Linus Torvalds Date: Mon Aug 20 22:43:18 2007 -0700 Merge branch 'fixes-2.6.23' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc * 'fixes-2.6.23' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc: [POWERPC] Fix 8xx compile failure [POWERPC] Fix FSL BookE machine check reporting [POWERPC] Fix interrupt routing and setup of ULI M1575 on FSL boards [POWERPC] Add interrupt resource for RTC CMOS driver commit 0c5564bd91ad237212871d52deaf79ffe06bcc64 Author: Robin Getz Date: Mon Aug 20 15:22:47 2007 -0400 ensure we don't use bootconsoles after init has been released This is a followup to the cleanups for earlyprintk patch from Gerd Hoffmann http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=69331af79cf29e26d1231152a172a1a10c2df511 This ensures that a bootconsole is unregistered if it is not replaced. The current implementation spews garbage out the bootconsole in this case, since the bootconsole structure is normally in the init section, and is freed, but still used. Signed-off-by: Robin Getz Acked-by: Gerd Hoffmann Acked-by: Paul Mundt Cc: Mike Frysinger Signed-off-by: Linus Torvalds commit b0244a00451c1ad64bf0a51f50679f7146786780 Author: Bartlomiej Zolnierkiewicz Date: Mon Aug 20 22:42:57 2007 +0200 ide-disk: workaround for buggy HPA support on ST340823A (take 3) This disk reports total number of sectors instead of maximum sector address in response to READ_NATIVE_MAX_ADDRESS command and also happily accepts SET_MAX_ADDRESS command with the bogus value. This results in +1 sector capacity being used and errors on attempts to use the last sector. ... hdd: Host Protected Area detected.         current capacity is 78165360 sectors (40020 MB)         native  capacity is 78165361 sectors (40020 MB) hdd: Host Protected Area disabled. ... hdd: reading: block=78165360, sectors=1, buffer=0xc1e63000 hdd: dma_intr: status=0x51 { DriveReady SeekComplete Error } hdd: dma_intr: error=0x10 { SectorIdNotFound }, LBAsect=78165360, sector=78165360 ... Add hpa_list[] table and workaround the issue in idedisk_check_hpa(). v2: * Add missing export and improve patch description a bit. v3: * Add list termination. (From Mikko) Fixes kernel bugzilla bug #8816. Thanks to Mikko for investigating the issue and helping with this patch. Cc: Mikko Rapeli Cc: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz commit 76e1faa7cfd464fa06a9c2cafd633d643daafeae Author: Bartlomiej Zolnierkiewicz Date: Mon Aug 20 22:42:57 2007 +0200 hpt34x: fix CONFIG_HPT34X_AUTODMA=n handling Programming DMA mode may destroy current PIO mode setting so if CONFIG_HPT34X_AUTODMA=n (the default case) make ide_tune_dma() fail early by disabling all host DMA masks and re-tune PIO mode. This fix doesn't help with the driver being broken but is needed for some other changes. Signed-off-by: Bartlomiej Zolnierkiewicz commit 88b47040f8365ad56ecfd4103e964ba9b695987e Author: Bartlomiej Zolnierkiewicz Date: Mon Aug 20 22:42:56 2007 +0200 triflex: add missing ->dma_base check If ->dma_base is not set (== PCI BAR4 cannot be reserved) then DMA hooks shouldn't be initialized or bad things will happen. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit e98d6e50be87c1ad2df81f73c7442cf631d6f931 Author: Bartlomiej Zolnierkiewicz Date: Mon Aug 20 22:42:56 2007 +0200 pdc202xx_old: add missing ->dma_base check If ->dma_base is not set (== PCI BAR4 cannot be reserved) then DMA hooks shouldn't be initialized or bad things will happen. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 01cc643ae3c7de35b63989b7b65e3ef3132e48e4 Author: Bartlomiej Zolnierkiewicz Date: Mon Aug 20 22:42:56 2007 +0200 pdc202xx_new: add missing ->dma_base check If ->dma_base is not set (== PCI BAR4 cannot be reserved) then DMA hooks shouldn't be initialized or bad things will happen. Also this host driver requires valid PCI BAR4 for normal operation so check it in ->init_chipset and fail initialization if not set. Signed-off-by: Bartlomiej Zolnierkiewicz commit f7b0d2df2f6fd9abdf47b4a1965dcaa2870e35df Author: Bartlomiej Zolnierkiewicz Date: Mon Aug 20 22:42:56 2007 +0200 cs5530: add missing ->dma_base check If ->dma_base is not set (== PCI BAR4 cannot be reserved) then DMA hooks shouldn't be initialized or bad things will happen. Also this host driver requires valid PCI BAR4 for normal operation so check it in ->init_chipset and fail initialization if not set. Signed-off-by: Bartlomiej Zolnierkiewicz commit adcd33d41bfea8fb6870cf1f7e7ed2e5f7323fc1 Author: Bartlomiej Zolnierkiewicz Date: Mon Aug 20 22:42:56 2007 +0200 ide: ide_config_drive_speed() bugfixes * Use ->OUTBSYNC instead of ->OUTB when writing command register (needed for scc_pata and pmac host drivers). * Don't check DRDY bit of the status register on ATAPI devices (ATAPI devices are free to ignore DRDY bit). Cc: Benjamin Herrenschmidt Cc: Kou Ishizaki Cc: Akira Iguchi Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit a5b7e70d787f528386eda025d3e38f545017f241 Author: Bartlomiej Zolnierkiewicz Date: Mon Aug 20 22:42:56 2007 +0200 ide: add cable detection for early UDMA66 devices (take 3) * Move ide_in_drive_list() from ide-dma.c to ide-iops.c. * Add ivb_list[] table for listening early UDMA66 devices which don't conform to ATA4 standard wrt cable detection (bit14 is zero, only bit13 is valid) and use only device side cable detection for them since host side cable detection may be unreliable. * Add model "QUANTUM FIREBALLlct10 05" with firwmare "A03.0900" to the list (from Craig's bugreport). v2: * Improve kernel message basing on suggestion from Sergei. v3: * Don't print kernel message when no device side cable detection is done, plus some minor fixes. (Noticed by Sergei) Thanks to Craig for testing this patch. Cc: Craig Block Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 59785c8fe23ca2f432bc41ef473a8933ab435812 Author: Bartlomiej Zolnierkiewicz Date: Mon Aug 20 22:42:55 2007 +0200 ide-pmac: fix drive->init_speed reporting pmac_ide_tune_chipset() don't set drive->init_speed. Fix it by setting drive->{current,init}_speed in pmac_ide_do_setfeature() and clean up pmac_ide_{tune_chipset,mdma_enable,udma_enable}(). Acked-by: Benjamin Herrenschmidt Signed-off-by: Bartlomiej Zolnierkiewicz commit 1116fae5fdfa80c6744a9b5d75fb3ef687a69b19 Author: Bartlomiej Zolnierkiewicz Date: Mon Aug 20 22:42:55 2007 +0200 ide: config_drive_for_dma() fixes * Add DMA blacklist checking (->ide_dma_on check probably can go now). * Add ->atapi_dma flag checking and remove no longer needed ns87415_ide_dma_check() from ns87415 host driver. * Remove now needless __ide_dma_check() wrapper and symbol export. * Check drive->autodma instead of hwif->autodma (there should be no changes in behavior as all users of config_drive_for_dma() set both ->autodma flags). Signed-off-by: Bartlomiej Zolnierkiewicz commit 8292e8c7e4c2b99f22120f677858487de43c484b Author: Bartlomiej Zolnierkiewicz Date: Mon Aug 20 22:42:54 2007 +0200 ide-cris: fix ->set_pio_mode method to set transfer mode on the device Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 2195dadf853bb32262bd2e5a64f517ae45698c55 Author: Bartlomiej Zolnierkiewicz Date: Mon Aug 20 22:42:54 2007 +0200 ide: fix hidden dependencies on CONFIG_IDE_GENERIC Some host drivers depend on CONFIG_IDE_GENERIC to do the probing but their config options lack explicit dependencies on IDE_GENERIC. In the long-term these host drivers should be fixed to do the probing themselves but for now fix them by making their config options select CONFIG_IDE_GENERIC. Signed-off-by: Bartlomiej Zolnierkiewicz commit 82a0e70e795ee605e1a34a874dd3a3a43b745fb9 Author: Tejun Heo Date: Mon Aug 20 22:42:53 2007 +0200 ide: make CONFIG_IDE_GENERIC default to N These days, CONFIG_IDE_GENERIC causes more confusion and misconfiguration than it helps. Especially so because libata is linked after the generic driver. Default to N. Signed-off-by: Tejun Heo Acked-by: Jeff Garzik Cc: "P.C.Chan" Signed-off-by: Bartlomiej Zolnierkiewicz commit 70cd685d4b161c9137020ba7ec551cb343cd6fbf Author: Marcelo Tosatti Date: Fri Aug 17 01:03:22 2007 -0300 V4L/DVB (6028): Turn an unnecessary mdelay() into msleep(). Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 6d77444aca298b43a88086be446f943cd0442ef7 Author: Jonathan Corbet Date: Fri Aug 17 01:02:33 2007 -0300 V4L/DVB (6027): Get rid of an ill-behaved msleep in i2c write Configuring the OLPC camera requires something over 150 register writes. Unfortunately, querying the CAFE i2c controller too soon after a write causes the hardware to flake. The problem had been "solved" with an msleep() call, but, between the number of registers and how msleep() behaves, that resulted in a 3-second delay on camera initialization. Instead, we hand-code a wait for the completion interrupt which avoids reading the status registers. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 01659f2a0067d855089811529fa596cbc40f1e75 Author: Chris Ball Date: Fri Aug 17 01:01:33 2007 -0300 V4L/DVB (6026): Avoid powering up the camera on resume Signed-off-by: Chris Ball Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit c545d6adbcacd296f7457bd992556feb055379de Author: Andreas Arens Date: Wed Aug 15 17:37:16 2007 -0300 V4L/DVB (6016): get_dvb_firmware: update script for new location of tda10046 firmware Update get_dvb_firmware script for the new location of the tda10046 firmware. The old location doesn't work anymore. Signed-off-by: Andreas Arens Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0d84a62b38bab2e15ddc44ea6dcd8ce49199b299 Author: Trent Piepho Date: Fri Aug 17 18:36:44 2007 -0300 V4L/DVB (5991): dvb-pll: Set minimum and maximum frequency properly The tuner maximum frequency wasn't being set, while the minimum frequency was set to what the maximum should have been. If a future patch were to enforce these limits, dvb-pll would be effectively broken. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit de23084a85f6f5030e6760f6e494a9f2a19013d4 Author: Hans Verkuil Date: Fri Aug 3 09:33:38 2007 -0300 V4L/DVB (5969): ivtv: report ivtv version in status log Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c3624f99a8c06cfe75e0b06f23a7f7cea9d2d5ff Author: Hans Verkuil Date: Tue Jul 31 07:15:56 2007 -0300 V4L/DVB (5967): ivtv: fix VIDIOC_S_FBUF:new OSD values where never set ivtv: fix VIDIOC_S_FBUF support: new OSD values where never actually set. The values set with VIDIOC_S_FBUF were not actually used until the next VIDIOC_S_FMT. Fixed. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c9b0ee2c2af33c2ca722aa05bbcb604487134e4c Author: Hans Verkuil Date: Tue Jul 31 12:42:22 2007 -0300 V4L/DVB (5968): videodev2.h: remove superfluous FBUF GLOBAL_INV_ALPHA support There is no need for a global inverted alpha capability since all the application has to do is to pass '255-alpha' as the global alpha value. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 35b426c329e12e33bd0f0912f3d2e3f5f7b2c486 Author: Al Viro Date: Sun Aug 19 04:51:26 2007 +0100 missing return in bridge sysfs code Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 6ec8a856e4097d42ece9b0b9459bbca1586f13d7 Author: Avi Kivity Date: Sun Aug 19 15:57:26 2007 +0300 KVM: Avoid calling smp_call_function_single() with interrupts disabled When taking a cpu down, we need to hardware_disable() it. Unfortunately, the CPU_DYING notifier is called with interrupts disabled, which means we can't use smp_call_function_single(). Fortunately, the CPU_DYING notifier is always called on the dying cpu, so we don't need to use the function at all and can simply call hardware_disable() directly. Tested-by: Paolo Ornati Signed-off-by: Avi Kivity Signed-off-by: Linus Torvalds commit e598fbaabdb6608915cbc5e80409d70f4f857e5c Author: Christian Heim Date: Sun Aug 19 13:07:59 2007 +0200 Remove double inclusion of linux/capability.h Remove the second inclusion of linux/capability.h, which has been introduced with "[PATCH] move capable() to capability.h" (commit c59ede7b78db329949d9cdcd7064e22d357560ef) Signed-off-by: Christian Heim Signed-off-by: Linus Torvalds commit 2a67789618abb74f0f97d4836a2b937bff2f1b2d Author: Al Viro Date: Sun Aug 19 01:03:07 2007 +0100 Fix tpyo Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit d34fda4a84c18402640a1a2342d6e6d9829e6db7 Author: Chris Wright Date: Sat Aug 18 14:31:41 2007 -0700 x86: properly initialize temp insn buffer for paravirt patching With commit ab144f5ec64c42218a555ec1dbde6b60cf2982d6 the patching code now collects the complete new instruction stream into a temp buffer before finally patching in the new insns. In some cases the paravirt patchers will choose to leave the patch site unpatched (length mismatch, clobbers mismatch, etc). This causes the new patching code to copy an uninitialized temp buffer, i.e. garbage, to the callsite. Simply make sure to always initialize the buffer with the original instruction stream. A better fix is to audit all the patchers and return proper length so that apply_paravirt() can skip copies when we leave the patch site untouched. Signed-off-by: Chris Wright Signed-off-by: Linus Torvalds commit 18115f45374d19ada218fc013aa5308baf5d283e Merge: f0f12d8... daa7162... Author: Linus Torvalds Date: Sat Aug 18 10:28:21 2007 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4549/1: KS8695: Fix build errors [ARM] 4546/1: s3c2410: fix architecture typo for s3c2442 [ARM] 4544/1: arm: fix section mismatch in pxa fb commit f0f12d85af8593e45fdf4a4d4c7cad240a6787a2 Author: Andi Kleen Date: Wed Aug 15 02:40:37 2007 +0200 x86_64: Check for .cfi_rel_offset in CFI probe Very old 64bit binutils have .cfi_startproc/endproc, but no .cfi_rel_offset. Check for .cfi_rel_offset too. Cc: Jan Beulich Cc: Sam Ravnborg Signed-off-by: Linus Torvalds commit 6e3515352bdd1c42d78bd16dae06dd429d6b1861 Author: Andi Kleen Date: Wed Aug 15 02:40:36 2007 +0200 x86_64: Change PMDS invocation to single macro Very old binutils (2.12.90...) seem to have trouble with newlines in assembler macro invocation. They put them into the resulting argument expansion. In this case this lead to a parse error because a .rept expression ended up spread over multiple lines. Change the PMDS() invocation to a single line. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0328ecef9041fe477efc2404fd3aaa29e7ee0430 Author: Daniel Gollub Date: Wed Aug 15 02:40:35 2007 +0200 x86_64: Fix to keep watchdog disabled by default for i386/x86_64 Fixed wrong expression which enabled watchdogs even if nmi_watchdog kernel parameter wasn't set. This regression got slightly introduced with commit b7471c6da94d30d3deadc55986cc38d1ff57f9ca. Introduced NMI_DISABLED (-1) which allows to switch the value of NMI_DEFAULT without breaking the APIC NMI watchdog code (again). Fixes: https://bugzilla.novell.com/show_bug.cgi?id=298084 http://bugzilla.kernel.org/show_bug.cgi?id=7839 And likely some more nmi_watchdog=0 related issues. Signed-off-by: Daniel Gollub Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8154549cb8ca795cbefda404cd6120398e5b145f Author: Andi Kleen Date: Wed Aug 15 02:40:34 2007 +0200 x86_64: Fail dma_alloc_coherent on dma less devices This should fix an oops with PCMCIA PATA devices http://bugzilla.kernel.org/show_bug.cgi?id=8424 This is not a full fix for the problem, but probably still the right thing to do. [ I'm almost certain it's *not* the right thing to do, but it avoids an oops, and I want comments from others on what the right thing would actually be.. I suspect we should just remove the use of dma_mask entirely in this function, and just use coherent_dma_mask. - Linus ] Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1a2b73302aacddf2543f9d7a25936e4323fa1486 Author: Timo Jantunen Date: Tue Aug 14 21:56:57 2007 +0300 fix random hang in forcedeth driver when using netconsole If the forcedeth driver receives too much work in an interrupt, it assumes it has a broken hardware with stuck IRQ. It works around the problem by disabling interrupts on the nic but makes a printk while holding device spinlog - which isn't smart thing to do if you have netconsole on the same nic. This patch moves the printk's out of the spinlock protected area. Without this patch the machine hangs hard. With this patch everything still works even when there is significant increase on CPU usage while using the nic. Signed-off-by: Timo Jantunen Signed-off-by: Linus Torvalds commit 62be90012c507b2bf1047eb2eaa1e9151f7172fe Author: Satyam Sharma Date: Thu Aug 16 06:09:25 2007 +0530 i386: Fix a couple busy loops in mach_wakecpu.h:wait_for_init_deassert() Use cpu_relax() in the busy loops, as atomic_read() doesn't automatically imply volatility for i386 and x86_64. x86_64 doesn't have this issue because it open-codes the while loop in smpboot.c:smp_callin() itself that already uses cpu_relax(). For i386, however, smpboot.c:smp_callin() calls wait_for_init_deassert() which is buggy for mach-default and mach-es7000 cases. [ I test-built a kernel -- smp_callin() itself got inlined in its only callsite, smpboot.c:start_secondary() -- and the relevant piece of code disassembles to the following: 0xc1019704 : mov 0xc144c4c8,%eax 0xc1019709 : test %eax,%eax 0xc101970b : je 0xc1019709 init_deasserted (at 0xc144c4c8) gets fetched into %eax only once and then we loop over the test of the stale value in the register only, so these look like real bugs to me. With the fix below, this becomes: 0xc1019706 : pause 0xc1019708 : cmpl $0x0,0xc144c4c8 0xc101970f : je 0xc1019706 which looks nice and healthy. ] Thanks to Heiko Carstens for noticing this. Signed-off-by: Satyam Sharma Cc: Heiko Carstens Signed-off-by: Linus Torvalds commit 06bfb7eb1535822a3338ffea9918e22215abed90 Author: Jan Engelhardt Date: Sat Aug 18 12:56:21 2007 +0200 Add some help texts to recently-introduced kconfig items Signed-off-by: Jan Engelhardt Signed-off-by: Stefan Richter (edited MACINTOSH_DRIVERS per Geert Uytterhoeven's remark) Signed-off-by: Linus Torvalds commit 9ef7ad22965fcd817b20c1332286f02362266534 Author: Rusty Russell Date: Fri Aug 17 14:05:27 2007 +1000 Enable partitions for lguest block device The lguest block device only requests one minor, which means partitions don't work (eg "root=/dev/lgba1"). Let's follow the crowd and ask for 16. Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds commit 56616ebd0e49b7e5c67a19ca1d96e8ec382bcacf Merge: 203f339... 5ba056c... Author: Linus Torvalds Date: Sat Aug 18 09:43:40 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6: sh64: arch/sh64/kernel/setup.c: duplicate include removal. sh64: arch/sh64/kernel/signal.c: duplicate include removal sh64: Add missing dma_sync_single_for_*(). commit 203f3394397642f2f9d9ee760f03420459b7a8ef Merge: ef1c533... 96989d9... Author: Linus Torvalds Date: Sat Aug 18 09:42:43 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23: sh: remove extraneous ; on scif_sercon_putc wait loop sh: Add missing dma_sync_single_range_for_*(). sh: panic on machvec section misalignment. sh: Fix PTRACE_PEEKTEXT/PEEKDATA fallout from generic_ptrace_peekdata(). commit ef1c5339d9413ab57c9b2aa768f3c67485d11acb Merge: ed72df4... 68a50b5... Author: Linus Torvalds Date: Sat Aug 18 09:41:19 2007 -0700 Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 * 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: hwmon: (smsc47m1) restore missing name attribute hwmon: (w83627ehf) don't assume bank 0 hwmon: (w83627ehf) read fan_div values during probe hwmon: fix w83781d temp sensor type setting commit ed72df448250a6da72b65e7881eb63c5ded3475f Merge: 5056836... 1181420... Author: Linus Torvalds Date: Sat Aug 18 09:38:56 2007 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: Cross-compilation between e.g. i386 -> 64bit could break -> work around it [IA64] Enable early console for Ski simulator [IA64] forbid ptrace changes psr.ri to 3 [IA64] Failure to grow RBS [IA64] Fix processor_get_freq [IA64] SGI Altix : fix a force_interrupt bug on altix [IA64] Update arch/ia64/configs/* s/SLAB/SLUB/ [IA64] get back PT_IA_64_UNWIND program header [IA64] need NOTES in vmlinux.lds.S [IA64] make unwinder stop at last frame of the bootloader [IA64] Clean up CPE handler registration [IA64] Include Kconfig.preempt [IA64] SN2 needs platform specific irq_to_vector() function. [IA64] Use atomic64_read to read an atomic64_t. [IA64] disable irq's and check need_resched before safe_halt commit 505683675cf0ed903765f160ad633f77ab90a9d4 Merge: e4f3b1e... 3ad40d6... Author: Linus Torvalds Date: Sat Aug 18 09:38:30 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: SELinux: correct error code in selinux_audit_rule_init commit e4f3b1e74b67fdcdd3034b84997fad7912f182f6 Merge: 5bc705e... fe11cb6... Author: Linus Torvalds Date: Sat Aug 18 09:38:09 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: Incorrect semicolon after if statement mlx4_core: Wait 1 second after reset before accessing device IPoIB: Fix leak in ipoib_transport_dev_init() error path IB/mlx4: Fix opcode returned in RDMA read completion IB/srp: Add OUI for new Cisco targets IB/srp: Wrap OUI checking for workarounds in helper functions RDMA/cxgb3: Always call low level send function via cxgb3_ofld_send() IB: Move the macro IB_UMEM_MAX_PAGE_CHUNK() to umem.c IB: Include and from IB: Include from IB/mad: Fix address handle leak in mad_rmpp IB/mad: agent_send_response() should be void IB/mad: Fix memory leak in switch handling in ib_mad_recv_done_handler() IB/mad: Fix error path if response alloc fails in ib_mad_recv_done_handler() IB/sa: Don't need to check for default P_Key twice IB/core: Ignore membership bit in ib_find_pkey() commit 5bc705e9fe774be9bb87584644c1f6752ee5ea7e Merge: 605a494... 4058496... Author: Linus Torvalds Date: Sat Aug 18 09:34:28 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: [MATH-EMU]: Fix underflow exception reporting. [SPARC64]: Create a HWCAP_SPARC_N2 and report it to userspace on Niagara-2. [SPARC64]: SMP trampoline needs to avoid %tick_cmpr on sun4v too. [SPARC64]: Do not touch %tick_cmpr on sun4v cpus. [SPARC64]: Niagara-2 optimized copies. [SPARC64]: Allow userspace to get at the machine description. [SPARC32]: Remove superfluous 'kernel_end' alignment on sun4c. [SPARC32]: Fix bogus ramdisk image location check. [SPARC32]: Remove iommu from struct sbus_bus and use archdata like sparc64. commit 605a494e4df0b2dabdebcdfee99536b0f6a22adc Merge: 585eb6d... 660adc6... Author: Linus Torvalds Date: Sat Aug 18 09:34:09 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: [IPv6]: Invalid semicolon after if statement [NET]: Fix unbalanced rcu_read_unlock in __sock_create [VLAN] net/8021q/vlanproc.c: fix check-after-use [NET]: Unexport dev_ethtool [IOAT]: Remove redundant struct member to avoid descriptor cache miss [ECONET]: remove econet_packet_type on unload [AX25]: don't free pointers to statically allocated data [PATCH] mac80211: probe for hidden SSIDs in pre-auth scan [PATCH] mac80211: fix tx status frame code [BRIDGE]: Fix typo in net/bridge/br_stp_if.c [BRIDGE]: sysfs locking fix. [NETFILTER]: nf_nat_sip: don't drop short packets [NETFILTER]: nf_conntrack_sip: fix SIP-URI parsing [NETFILTER]: nf_conntrack_sip: check sname != NULL before calling strncmp [NETFILTER]: netfilter: xt_u32 bug correction commit 585eb6daa4b6886ab92ff914f55e8e87f7c2670b Merge: 844d6c4... cca6716... Author: Linus Torvalds Date: Sat Aug 18 09:33:43 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: [AVR32] Define mmiowb() [AVR32] Fix bogus pte_page() definition [AVR32] Simplify pte_alloc_one{,_kernel} include/asm-avr32/pgalloc.h: kmalloc + memset conversion to kcalloc [AVR32] Wire up i2c-gpio on the ATNGW100 board [AVR32] leds-gpio for stk1000 commit 844d6c48be7f11592d287a9fe2183007c4ebfbbb Merge: 0894910... 2b02d13... Author: Linus Torvalds Date: Sat Aug 18 09:33:25 2007 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix invalid semicolon after if statement [POWERPC] ps3: Fix no storage devices found [POWERPC] Fix for assembler -g [POWERPC] Fix small race in 44x tlbie function [POWERPC] Remove unused code causing a compile warning [POWERPC] cell: Fix errno for modular spufs_create with invalid neighbour commit 0894910cce8d9105e5d8457fd8686fe96dc958eb Merge: b2d597c... fb0582f... Author: Linus Torvalds Date: Sat Aug 18 09:32:36 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: adjust libata to ignore errors after spinup ata_piix: add TECRA M7 to broken suspend list pata_hpt{37x|3x2n}: fix clock reporting (take 2) pata_hpt37x: actually clock HPT374 with 50 MHz DPLL (take 2) pata_artop: fix UDMA5 for AEC6280[R] and UDMA6 for AEC6880[R] ata_piix: update map 10b for ich8m sata_mv: PCI IDs for Hightpoint RocketRaid 1740/1742 [libata] pata_isapnp: replace missing module device table commit b2d597cb6d64d5e30236273249e3790434387743 Merge: edd5f25... 9a5f35d... Author: Linus Torvalds Date: Sat Aug 18 09:31:05 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup: [x86 setup] edd.c: make sure MBR signatures actually get reported [x86 setup] Don't use EDD to get the MBR signature [x86 setup] The current display page is returned in %bh, not %bl commit edd5f25f7475013b44f7942bb3b25022792a9c9d Merge: d2d56c5... 5e6e623... Author: Linus Torvalds Date: Sat Aug 18 09:30:07 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] Check return code on failed alloc [CIFS] Update CIFS project web site [CIFS] Fix hang in find_writable_file commit d2d56c5f51028cb9f3d800882eb6f4cbd3f9099f Author: Marcel Holtmann Date: Fri Aug 17 21:47:58 2007 +0200 Reset current->pdeath_signal on SUID binary execution This fixes a vulnerability in the "parent process death signal" implementation discoverd by Wojciech Purczynski of COSEINC PTE Ltd. and iSEC Security Research. http://marc.info/?l=bugtraq&m=118711306802632&w=2 Signed-off-by: Marcel Holtmann Signed-off-by: Linus Torvalds commit 5e6e6232753482dc0024a319b9d8f611d7a80c19 Author: Cyrill Gorcunov Date: Sat Aug 18 00:15:20 2007 +0000 [CIFS] Check return code on failed alloc Signed-off-by: Cyrill Gorcunov Signed-off-by: Steve French commit 118142080a75fc1ce599c73b7894a71b4813828e Author: Thomas Renninger Date: Thu Aug 16 16:27:15 2007 +0200 Cross-compilation between e.g. i386 -> 64bit could break -> work around it Adrian Bunk: scripts/mod/file2alias.c is compiled with HOSTCC and ensures that kernel_ulong_t is correct, but it can't cope with different padding on different architectures. Signed-off-by: Thomas Renninger Signed-off-by: Tony Luck commit 471e7a44848f467c9b83adc3463d019d2fa8817f Author: Peter Chubb Date: Thu Aug 16 15:03:07 2007 +1000 [IA64] Enable early console for Ski simulator When using Ski to debug early startup, it's a bit of a pain not to have printk. This patch enables the simulated console very early. It may be worth conditionalising on the command line... but this is enough for now. Signed-off-by: Peter Chubb Signed-off-by: Tony Luck commit b09e789c438c406bd9bcaac6f1c940a75007e59f Author: Shaohua Li Date: Fri Aug 17 13:43:50 2007 -0700 [IA64] forbid ptrace changes psr.ri to 3 The "ri" field in the processor status register only has defined values of 0, 1, 2. Do not let ptrace set this to 3. As with other reserved fields in registers we silently discard the value. Signed-off-by: Shaohua Li Signed-off-by: Tony Luck commit 0af666fa6cf4bc639fb6170600b5fb0d8b6504b9 Author: Kumar Gala Date: Fri Aug 17 08:23:06 2007 -0500 [POWERPC] Fix 8xx compile failure CC arch/powerpc/sysdev/commproc.o arch/powerpc/sysdev/fsl_soc.c: In function fsl_pcmcia_of_init: arch/powerpc/sysdev/fsl_soc.c:1109: error: implicit declaration of function of_platform_device_create Signed-off-by: Kumar Gala commit 86d7a9a9c4775f864e6bc5f5da66ef9ea3715734 Author: Becky Bruce Date: Thu Aug 2 15:37:15 2007 -0500 [POWERPC] Fix FSL BookE machine check reporting Reserved MCSR bits on FSL BookE parts may have spurious values when mcheck occurs. Mask these off when printing the MCSR to avoid confusion. Also, get rid of the MCSR_GL_CI bit defined for e500 - this bit doesn't actually have any meaning. Signed-off-by: Becky Bruce Signed-off-by: Kumar Gala commit b66510cb9992d204f216049e9c01d432c7635f6c Author: Kumar Gala Date: Thu Aug 16 23:55:55 2007 -0500 [POWERPC] Fix interrupt routing and setup of ULI M1575 on FSL boards The interrupt routing in the device trees for the ULI M1575 was inproperly using the interrupt line field as pci function. Fixed up the device tree's to actual conform for to specification and changed the interrupt mapping code so it just uses a static mapping setup as follows: PIRQA - IRQ9 PIRQB - IRQ10 PIRQC - IRQ11 PIRQD - IRQ12 USB 1.1 OCHI (1c.0) - IRQ12 USB 1.1 OCHI (1c.1) - IRQ9 USB 1.1 OCHI (1c.2) - IRQ10 USB 1.1 ECHI (1c.3) - IRQ11 LAN (1b.0) - IRQ6 AC97 (1d.0) - IRQ6 Modem (1d.1) - IRQ6 HD Audio (1d.2) - IRQ6 SATA (1f.1) - IRQ5 SMB (1e.1) - IRQ7 PMU (1e.2) - IRQ7 PATA (1f.0) - IRQ14/15 Took the oppurtunity to refactor the code into a single file so we don't have to duplicate these fixes on the two current boards in the tree and several forth coming boards that will also need the code. Fixed RTC support that requires a dummy memory read on the P2P bridge to unlock the RTC and setup the default of the RTC alarm registers to match with a basic x86 style CMOS RTC. Moved code that poked ISA registers to a FIXUP_FINAL quirk to ensure the PCI IO space has been setup properly before we start poking ISA registers at random locations. Signed-off-by: Kumar Gala commit ada3ea6fcde45abc55e2af0e564455fd7f943a79 Author: Kumar Gala Date: Thu Aug 16 23:44:00 2007 -0500 [POWERPC] Add interrupt resource for RTC CMOS driver The RTC CMOS driver expects the interrupt to be a resource of the platform device. Use a fixed interrupt value of 8 since on PPC if we are using this its off an i8259 which we ensure has interrupt numbers 0..15. Signed-off-by: Kumar Gala commit 405849610fd96b4f34cd1875c4c033228fea6c0f Author: David S. Miller Date: Thu Aug 16 22:59:49 2007 -0700 [MATH-EMU]: Fix underflow exception reporting. The underflow exception cases were wrong. This is one weird area of ieee1754 handling in that the underflow behavior changes based upon whether underflow is enabled in the trap enable mask of the FPU control register. As a specific case the Sparc V9 manual gives us the following description: -------------------- If UFM = 0: Underflow occurs if a nonzero result is tiny and a loss of accuracy occurs. Tininess may be detected before or after rounding. Loss of accuracy may be either a denormalization loss or an inexact result. If UFM = 1: Underflow occurs if a nonzero result is tiny. Tininess may be detected before or after rounding. -------------------- What this amounts to in the packing case is if we go subnormal, we set underflow if any of the following are true: 1) rounding sets inexact 2) we ended up rounding back up to normal (this is the case where we set the exponent to 1 and set the fraction to zero), this should set inexact too 3) underflow is set in FPU control register trap-enable mask The initially discovered example was "DBL_MIN / 16.0" which incorrectly generated an underflow. It should not, unless underflow is set in the trap-enable mask of the FPU csr. Another example, "0x0.0000000000001p-1022 / 16.0", should signal both inexact and underflow. The cpu implementations and ieee1754 literature is very clear about this. This is case #2 above. However, if underflow is set in the trap enable mask, only underflow should be set and reported as a trap. That is handled properly by the prioritization logic in arch/sparc{,64}/math-emu/math.c:record_exception(). Based upon a report and test case from Jakub Jelinek. Signed-off-by: David S. Miller commit 2b02d13996fe28478e45605de9bd8bdca25718de Author: Ilpo Järvinen Date: Thu Aug 16 08:03:35 2007 +1000 [POWERPC] Fix invalid semicolon after if statement A similar fix to netfilter from Eric Dumazet inspired me to look around a bit by using some grep/sed stuff as looking for this kind of bugs seemed easy to automate. This is one of them I found where it looks like this semicolon is not valid. Signed-off-by: Ilpo Järvinen Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 8b224b813aad0231af62dc75d056aae83c9d4d12 Author: David S. Miller Date: Thu Aug 16 13:56:39 2007 -0700 [SPARC64]: Create a HWCAP_SPARC_N2 and report it to userspace on Niagara-2. Signed-off-by: David S. Miller commit e8c59c0cf9c91dccfb6367c306d753500d5a0150 Author: Andrew Burgess Date: Thu Aug 16 10:30:46 2007 -0700 [IA64] Failure to grow RBS There is a bug in the ia64_do_page_fault code that can cause a failure to grow the register backing store, or any mapping that is marked as VM_GROWSUP if the mapping is the highest mapped area of memory. When the address accessed is below the first mapping the previous mapping is returned as NULL, and this case is handled. However, when the address accessed is above the highest mapping the vma returned is NULL, this case is not handled correctly, and it fails to spot that this access might require an existing mapping to grow upwards. Signed-off-by: Andrew Burgess Signed-off-by: Tony Luck commit 96989d9d754ef1fa55e71beff6a076f79cc1717e Author: Andy Whitcroft Date: Fri Aug 17 01:25:34 2007 +0900 sh: remove extraneous ; on scif_sercon_putc wait loop It seems we have gained an extraneous trailing ';' on one of the wait loops in scif_sercon_putc(). Although this is completely benign as the apparent payload is also the empty statement, it invites error in the future. Clean it up now. Signed-off-by: Andy Whitcroft Signed-off-by: Paul Mundt commit 3ad40d647d5e7c320385649e5eb422a5e89e035d Author: Steve G Date: Tue Aug 14 12:50:46 2007 -0700 SELinux: correct error code in selinux_audit_rule_init Corrects an error code so that it is valid to pass to userspace. Signed-off-by: Steve Grubb Signed-off-by: James Morris commit 7dc408808ad40b9a5d031966035713ed5d5153b8 Author: David S. Miller Date: Thu Aug 16 01:56:00 2007 -0700 [SPARC64]: SMP trampoline needs to avoid %tick_cmpr on sun4v too. Signed-off-by: David S. Miller commit 53140b71c5e7b5370e4ac6ffc13fddbdfae71473 Author: David S. Miller Date: Thu Aug 16 01:52:44 2007 -0700 [SPARC64]: Do not touch %tick_cmpr on sun4v cpus. This register is not a part of the sun4v architecture. Niagara 1 and 2 happened to leave it around. Signed-off-by: David S. Miller commit cf5adce11743e98739fcb97e76d688f0b0bc2199 Author: David S. Miller Date: Thu Aug 16 01:47:25 2007 -0700 [SPARC64]: Niagara-2 optimized copies. The bzero/memset implementation stays the same as Niagara-1. Signed-off-by: David S. Miller commit 0fdb7f96d8c27e37ed2ca1ae5a763baf14b8fe0c Author: David S. Miller Date: Wed Aug 15 21:02:23 2007 -0700 [SPARC64]: Allow userspace to get at the machine description. Like the OF device tree, it's useful to let userland get at the machine description so it can pretty print the graph etc. The implementation is a simple MISC device with a read method. Signed-off-by: David S. Miller commit fe11cb6ba40afff15efb053fd0bcba45274636e0 Author: Ilpo Järvinen Date: Thu Aug 16 01:02:07 2007 +0300 IB/mlx4: Incorrect semicolon after if statement A stray semicolon makes us inadvertently ignore the value of err. Signed-off-by: Ilpo Järvinen Signed-off-by: Roland Dreier commit 660adc6e60bc8882b16e466c09401cff017dcd94 Author: Ilpo Järvinen Date: Wed Aug 15 15:07:30 2007 -0700 [IPv6]: Invalid semicolon after if statement A similar fix to netfilter from Eric Dumazet inspired me to look around a bit by using some grep/sed stuff as looking for this kind of bugs seemed easy to automate. This is one of them I found where it looks like this semicolon is not valid. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 3b1855255098e1f78fa74c0f3378c0391e9a7a2b Author: Herbert Xu Date: Wed Aug 15 14:46:02 2007 -0700 [NET]: Fix unbalanced rcu_read_unlock in __sock_create The recent RCU work created an unbalanced rcu_read_unlock in __sock_create. This patch fixes that. Reported by oleg 123. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 182fdd225de8fc3b1b721ae944fc41146a0bd812 Author: Alex Williamson Date: Mon Aug 13 15:49:46 2007 -0600 [IA64] Fix processor_get_freq The core cpufreq code doesn't appear to understand returning -EAGAIN for the get() function of the cpufreq_driver. If PAL_GET_PSTATE returns -1, such as when running on Xen, scaling_cur_freq is happy to return 4294967285 kHz (ie. (unsigned)-11). The other drivers appear to return 0 for a failure, and doing so gives me the max frequency from scaling_cur_frequency and "" from cpuinfo_cur_frequency. I believe that's the desired behavior. Signed-off-by: Alex Williamson Acked-by: Venkatesh Pallipadi Signed-off-by: Tony Luck commit cca67164bbdb083df9adb6480822518b0f4b358f Author: Haavard Skinnemoen Date: Mon Aug 13 16:24:01 2007 +0200 [AVR32] Define mmiowb() Add empty definition of mmiowb() since some drivers need it. Uncached writes are strongly ordered on AVR32. They may be delayed if the dcache is busy doing a writeback, but AFAICT that's not what this macro is supposed to deal with, at least on UP systems. We might have to revisit this definition when a SMP-capable AVR32 CPU comes along, depending on how the busses and cache coherency stuff end up being implemented. Signed-off-by: Haavard Skinnemoen commit 6f834197a79d34d65ca44e9c77f2571edbcfb64b Author: Haavard Skinnemoen Date: Wed Aug 15 16:12:18 2007 +0200 [AVR32] Fix bogus pte_page() definition The current definition of pte_page() masks out valid bits from the physical address, causing vmalloc_to_page() to misbehave. This may lead to everything from mmap() silently accessing the wrong data to "invalid pte" errors dumped by the kernel. Also remove the now-unused definition of PTE_PHYS_MASK. Thanks to Matteo Vit for discovering this bug. Signed-off-by: Haavard Skinnemoen commit e7f3bac95e0bdfd520e065c4a29aad46190fcc99 Author: Haavard Skinnemoen Date: Fri Aug 3 13:29:01 2007 +0200 [AVR32] Simplify pte_alloc_one{,_kernel} There's really no need to retry an allocation with __GFP_REPEAT set. Also, use get_zeroed_page() and __GFP_ZERO to eliminate the extra call to clear_page() afterwards. Signed-off-by: Haavard Skinnemoen commit 5221b34edfd05ac35c077e071095cf853325320f Author: Mariusz Kozlowski Date: Tue Jul 31 23:41:00 2007 +0200 include/asm-avr32/pgalloc.h: kmalloc + memset conversion to kcalloc Signed-off-by: Mariusz Kozlowski Signed-off-by: Haavard Skinnemoen commit 54bb69e25016a7b11d83f03feafafdfe2b4d0859 Author: Haavard Skinnemoen Date: Thu Jul 12 16:36:34 2007 +0200 [AVR32] Wire up i2c-gpio on the ATNGW100 board The NGW100 has a board controller which is hooked up to the TWI lines on AP7000. Since the TWI driver isn't in mainline, use the i2c-gpio driver in the mean time. Signed-off-by: Haavard Skinnemoen commit ad93ab0a6ee20130fb8f719fc1860c20daa99a7b Author: David Brownell Date: Mon Jul 9 10:29:44 2007 +0200 [AVR32] leds-gpio for stk1000 Add GPIO led support: J2 to either block of LEDs on the STK1000. This uses the new LEDS_GPIO driver, and sets up a heartbeat trigger by default ... either bright (!!) amber, or a more interesting purple. Signed-off-by: David Brownell Signed-off-by: Haavard Skinnemoen commit fb0582f91fdd62b67bf54a440d7c79b19ed84da8 Author: Ryan Power Date: Fri Aug 10 13:59:35 2007 -0700 libata: adjust libata to ignore errors after spinup Adjust libata to ignore errors after spinup This patch is to ignore errors from the spinup attempt if the drive is in the "standby id" state. Signed-off-by: Ryan Power Acked-by: Mark Lord Cc: Jeff Garzik Cc: Tejun Heo Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 5c08ea019198230a62c601ddf97d0319ae246ad8 Author: Tejun Heo Date: Tue Aug 14 19:56:04 2007 +0900 ata_piix: add TECRA M7 to broken suspend list Add TECRA M7 to broken suspend list. Reported by Marie Koreen. Signed-off-by: Tejun Heo Cc: Marie Koreen Signed-off-by: Jeff Garzik commit 80b8987c8feaf07a070f7cdcd55db024e9e200ec Author: Sergei Shtylyov Date: Fri Aug 10 21:02:15 2007 +0400 pata_hpt{37x|3x2n}: fix clock reporting (take 2) Fix several inconsistencies in these drivers WRT reporting the clocks: - when using DPLL mode, 'pata_hpt37x' driver reported the DPLL frequency as the PCI clock -- make it properly report both clocks and add the same ability to the 'pata_hpt3x2n' driver; - both drivers sometimes use "pata_hpt3*:" and sometimes "hpt3*:" in the messages -- make them use only the former one; - the message about failed DPLL stablizatios deserves KERN_ERR and a bang. :-) Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit d44a65f7bb0dae0bcc78de336b55a75b30ec2d2a Author: Sergei Shtylyov Date: Fri Aug 10 20:58:46 2007 +0400 pata_hpt37x: actually clock HPT374 with 50 MHz DPLL (take 2) The DPLL tuning code always set up it for 66 MHz due to wrong UltraDMA mask including mode 5 used to check for the necessity of 66 MHz clocking -- this caused 66 MHz clock to be used for HPT374 chip that does not tolerate it. While fixing this, also remove PLL mode from the TODO list -- I don't think it's still a relevant item. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit be456b77ffbd3983b5da8eff49a70a701333f68b Author: Bartlomiej Zolnierkiewicz Date: Thu Aug 9 23:19:34 2007 +0200 pata_artop: fix UDMA5 for AEC6280[R] and UDMA6 for AEC6880[R] Maximum supported UDMA mode for AEC6280[R] is UDMA5 (not UDMA4) and for AEC6880[R] it is UDMA6 (not UDMA5): * Fix the problem by adding missing struct ata_port_info to artop_init_one(). * Use the right naming (s/626/628/). * Bump driver version. Fixes IDE->libata regression, problem was never present in IDE aec62xx driver. Cc: Alan Cox Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit ac2b04371fffd964b0d1c3369a9972bed7a5c5d9 Author: Tejun Heo Date: Tue Aug 7 02:43:27 2007 +0900 ata_piix: update map 10b for ich8m Fix map entry 10b for ich8. It's [P0 P2 IDE IDE] like ich6 / ich6m. Signed-off-by: Tejun Heo Cc: kristen.c.accardi@intel.com Signed-off-by: Jeff Garzik commit cfbf723eb7928879292ee71fa0d118fc4e37b8c9 Author: Alan Cox Date: Mon Jul 9 14:38:41 2007 +0100 sata_mv: PCI IDs for Hightpoint RocketRaid 1740/1742 Underneath all the HPT packaging, PCI identifiers, binary driver modules and stuff you find that ... Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 6a286a6d85bb0da687011b15f268c0e52e8eaba4 Author: Jeff Garzik Date: Fri Aug 3 11:25:50 2007 -0400 [libata] pata_isapnp: replace missing module device table Signed-off-by: Jeff Garzik commit 2de69124e86682c3427adb4136e097854841e467 Author: Geert Uytterhoeven Date: Wed Aug 15 02:30:13 2007 +1000 [POWERPC] ps3: Fix no storage devices found Fix probing of PS3 storage devices: in the success case, we should set `error' to zero, not `result'. Without this patch no storage devices are found. Signed-off-by: Geert Uytterhoeven Signed-off-by: Paul Mackerras commit 55a910a81d0c3014abc20b9efa73c595b3e68339 Author: Roland McGrath Date: Sat Aug 11 09:03:11 2007 +1000 [POWERPC] Fix for assembler -g ppc64 does the unusual thing of using #include on a compiler-generated assembly file (lparmap.s) from an assembly source file (head_64.S). This runs afoul of my recent patch to pass -gdwarf2 to the assembler under CONFIG_DEBUG_INFO. This patch avoids the problem by disabling DWARF generation (-g0) when producing lparmap.s. Signed-off-by: Roland McGrath Signed-off-by: Paul Mackerras commit aa1cf632bd6f998cb4567ccf1a9d2e5daaa9fb44 Author: David Gibson Date: Tue Aug 7 14:20:50 2007 +1000 [POWERPC] Fix small race in 44x tlbie function The 440 family of processors don't have a tlbie instruction. So, we implement TLB invalidates by explicitly searching the TLB with tlbsx., then clobbering the relevant entry, if any. Unfortunately the PID for the search needs to be stored in the MMUCR register, which is also used by the TLB miss handler. Interrupts were enabled in _tlbie(), so an interrupt between loading the MMUCR and the tlbsx could cause incorrect search results, and thus a failure to invalide TLB entries which needed to be invalidated. This fixes the problem in both arch/ppc and arch/powerpc by inhibiting interrupts (even critical and debug interrupts) across the relevant instructions. Signed-off-by: David Gibson Acked-by: Josh Boyer Signed-off-by: Paul Mackerras commit fa6b769a8e981afea869285982640168f76774df Author: Becky Bruce Date: Sat May 12 03:49:39 2007 +1000 [POWERPC] Remove unused code causing a compile warning AFAICT, nobody is using ft_ordered(), and it causes a build warning to be generated. This patch cleans that up by removing the function and the commented-out code that calls it. Signed-off-by: Becky Bruce Acked-by: David Gibson Signed-off-by: Paul Mackerras commit ad941fe4b6b83999863f49dfba7b3d2cebc4ced5 Author: Jeremy Kerr Date: Mon Aug 13 13:22:44 2007 +1000 [POWERPC] cell: Fix errno for modular spufs_create with invalid neighbour At present, spu_create with an invalid neighbo(u)r will return -ENOSYS, not -EBADF, but only when spufs.o is built as a module. This change adds the appropriate errno, making the behaviour the same as the built-in case. Signed-off-by: Jeremy Kerr Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit cd8d60f28f519786f00d64d68bb3b7669bdfbcb8 Merge: 16f3051... b9bf1e6... Author: David S. Miller Date: Tue Aug 14 18:32:20 2007 -0700 Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 70b0e7a919b7961285c685a87928ed78c9fb07f0 Author: Mark Fortescue Date: Tue Aug 14 18:24:10 2007 -0700 [SPARC32]: Remove superfluous 'kernel_end' alignment on sun4c. In sun4c_init_clean_mmu(), aligning 'kernel_end' using SUN4C_REAL_PGDIR_ALIGN() is unnecessary since the caller does this already. In sun4c_paging_init(), 4 page sizes of "fluff" were added to the address of &end. This was necessary a long time ago when sparc32 would allocate some early data structures by carving out memory chunks after &end but that no longer occurs. Signed-off-by: Mark Fortescue Signed-off-by: David S. Miller commit f642b263800e6e57c377d630be6d2a999683b579 Author: Mark Fortescue Date: Tue Aug 14 18:22:03 2007 -0700 [SPARC32]: Fix bogus ramdisk image location check. This mirrors sparc64 commit 715a0ecc29c850d2b2f76e1803d3f22cd5a0ac0d sparc_ramdisk_image should always be decremented by KERNBASE. Signed-off-by: Mark Fortescue Signed-off-by: David S. Miller commit 9a5f35d4ede43fee791a486e0850e9e3afdde0a7 Author: H. Peter Anvin Date: Tue Aug 14 17:36:00 2007 -0700 [x86 setup] edd.c: make sure MBR signatures actually get reported When filling in the MBR signature array, the setup code failed to advance boot_params.edd_mbr_sig_buf_entries, which resulted in the valid data being ignored. Signed-off-by: H. Peter Anvin commit c1a6e2b082a7cefe58315af7a461bbf2f33221a3 Author: H. Peter Anvin Date: Mon Aug 13 16:27:42 2007 -0700 [x86 setup] Don't use EDD to get the MBR signature At least one machine has been identified in the field which advertises EDD for all drives but locks up if one attempts an extended read from a non-primary drive. The MBR is always at CHS 0-0-1, so there is no reason to use an extended read, other than the possibility that the BIOS cannot handle it. Although this might break as many machines as it fixes (a small number either way), the current state is a regression but the reverse is not. Therefore revert to the previous state of not using extended read. Quite probably the Right Thing to do is to read using plain (CHS) read and extended read on failure, but that change would definitely have to go through -mm first. Signed-off-by: H. Peter Anvin commit 16f3051b166bde3f1bd741783b64a8feebdb6f00 Author: Adrian Bunk Date: Tue Aug 14 17:39:43 2007 -0700 [VLAN] net/8021q/vlanproc.c: fix check-after-use The Coverity checker spotted that we'd have already oops'ed if "vlandev" was NULL. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 6f93b9c28326df34b23a6c0dbe4c51d4654bdf0b Author: Adrian Bunk Date: Tue Aug 14 17:38:44 2007 -0700 [NET]: Unexport dev_ethtool This patch removes the no longer used EXPORT_SYMBOL(dev_ethtool). Signed-off-by: Adrian Bunk Acked-by: Matthew Wilcox Signed-off-by: David S. Miller commit 54a09feb0ebb018dadaebeb51e860154198abc83 Author: Shannon Nelson Date: Tue Aug 14 17:36:31 2007 -0700 [IOAT]: Remove redundant struct member to avoid descriptor cache miss The layout for struct ioat_desc_sw is non-optimal and causes an extra cache hit for every descriptor processed. By tightening up the struct layout and removing one item, we pull in the fields that get used in the speedpath and get a little better performance. Before: ------- struct ioat_desc_sw { struct ioat_dma_descriptor * hw; /* 0 8 */ struct list_head node; /* 8 16 */ int tx_cnt; /* 24 4 */ /* XXX 4 bytes hole, try to pack */ dma_addr_t src; /* 32 8 */ __u32 src_len; /* 40 4 */ /* XXX 4 bytes hole, try to pack */ dma_addr_t dst; /* 48 8 */ __u32 dst_len; /* 56 4 */ /* XXX 4 bytes hole, try to pack */ /* --- cacheline 1 boundary (64 bytes) --- */ struct dma_async_tx_descriptor async_tx; /* 64 144 */ /* --- cacheline 3 boundary (192 bytes) was 16 bytes ago --- */ /* size: 208, cachelines: 4 */ /* sum members: 196, holes: 3, sum holes: 12 */ /* last cacheline: 16 bytes */ }; /* definitions: 1 */ After: ------ struct ioat_desc_sw { struct ioat_dma_descriptor * hw; /* 0 8 */ struct list_head node; /* 8 16 */ int tx_cnt; /* 24 4 */ __u32 len; /* 28 4 */ dma_addr_t src; /* 32 8 */ dma_addr_t dst; /* 40 8 */ struct dma_async_tx_descriptor async_tx; /* 48 144 */ /* --- cacheline 3 boundary (192 bytes) --- */ /* size: 192, cachelines: 3 */ }; /* definitions: 1 */ Signed-off-by: Shannon Nelson Signed-off-by: David S. Miller commit 9c29a377f99b42c59721112cd2388cf27547fc84 Author: Alexey Dobriyan Date: Tue Aug 14 17:25:20 2007 -0700 [ECONET]: remove econet_packet_type on unload Steps to reproduce: modprobe econet rmmod econet modprobe econet Unable to handle kernel paging request at ffffffff8870a098 RIP: [] dev_add_pack+0x48/0x90 PGD 203067 PUD 207063 PMD 7817f067 PTE 0 Oops: 0002 [1] PREEMPT SMP CPU 1 Modules linked in: econet [maaaany] Pid: 10671, comm: modprobe Not tainted 2.6.23-rc3-bloat #6 RIP: 0010:[] [] dev_add_pack+0x48/0x90 RSP: 0000:ffff810076293df8 EFLAGS: 00010202 RAX: ffffffff88659090 RBX: ffffffff88659060 RCX: ffffffff8870a090 RDX: 0000000000000080 RSI: ffffffff805ec660 RDI: ffff810078ce4680 RBP: ffff810076293e08 R08: 0000000000000002 R09: 0000000000000000 R10: ffffffff8040bf88 R11: 0000000000000001 R12: ffff810076293e18 R13: 000000000000001b R14: ffff810076dd06b0 R15: ffffffff886590c0 FS: 00002b96a525dae0(0000) GS:ffff81007e0e2138(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: ffffffff8870a098 CR3: 000000007bb67000 CR4: 00000000000026e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process modprobe (pid: 10671, threadinfo ffff810076292000, task ffff810078ce4680) Stack: ffff810076dd06b0 0000000000000000 ffff810076293e38 ffffffff8865b180 0000000000800000 0000000000000000 ffffffff886590c0 ffff810076dd01c8 ffff810076293f78 ffffffff8026723c ffff810076293e48 ffffffff886590d8 Call Trace: [] :econet:econet_proto_init+0x180/0x1da [] sys_init_module+0x15c/0x19e0 [] system_call+0x7e/0x83 Code: 48 89 41 08 48 89 82 e0 c5 5e 80 48 c7 c7 a0 08 5d 80 e8 f1 RIP [] dev_add_pack+0x48/0x90 RSP CR2: ffffffff8870a098 Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 9ac0be9d4fa0c0ec7a447eeaa080bc13cf865319 Author: Alexey Dobriyan Date: Tue Aug 14 17:24:05 2007 -0700 [AX25]: don't free pointers to statically allocated data commit 8d5cf596d10d740b69b5f4bbdb54b85abf75810d started to add statically allocated ax25_protocol's to list. However kfree() was still in place waiting for unsuspecting ones on module removal. Steps to reproduce: modprobe netrom rmmod netrom P.S.: code would benefit greatly from list_add/list_del usage kernel BUG at mm/slab.c:592! invalid opcode: 0000 [1] PREEMPT SMP CPU 0 Modules linked in: netrom ax25 af_packet usbcore rtc_cmos rtc_core rtc_lib Pid: 4477, comm: rmmod Not tainted 2.6.23-rc3-bloat #2 RIP: 0010:[] [] kfree+0x1c6/0x260 RSP: 0000:ffff810079a05e48 EFLAGS: 00010046 RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffff81000000c000 RDX: ffff81007e552458 RSI: 0000000000000000 RDI: 000000000000805d RBP: ffff810079a05e88 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000000 R12: ffffffff8805d080 R13: ffffffff8805d080 R14: 0000000000000000 R15: 0000000000000282 FS: 00002b73fc98aae0(0000) GS:ffffffff805dc000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 000000000053f3b8 CR3: 0000000079ff2000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process rmmod (pid: 4477, threadinfo ffff810079a04000, task ffff8100775aa480) Stack: ffff810079a05e68 0000000000000246 ffffffff8804eca0 0000000000000000 ffffffff8805d080 00000000000000cf 0000000000000000 0000000000000880 ffff810079a05eb8 ffffffff8803ec90 ffff810079a05eb8 0000000000000000 Call Trace: [] :ax25:ax25_protocol_release+0xa0/0xb0 [] :netrom:nr_exit+0x6b/0xf0 [] sys_delete_module+0x170/0x1f0 [] trace_hardirqs_on+0xd5/0x170 [] trace_hardirqs_on_thunk+0x35/0x37 [] system_call+0x7e/0x83 Code: 0f 0b eb fe 66 66 90 66 66 90 48 8b 52 10 48 8b 02 25 00 40 RIP [] kfree+0x1c6/0x260 RSP Kernel panic - not syncing: Fatal exception Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 362cea339a34e04caae6cad67ea9bde5c100d12b Author: H. Peter Anvin Date: Fri Aug 10 14:20:26 2007 -0700 [x86 setup] The current display page is returned in %bh, not %bl The current display page is an 8-bit number, even though struct screen_info gives it a 16-bit number. The number is returned in %bh, so it needs to be >> 8 before storing. Special thanks to Jeff Chua for detailed bug reporting. Signed-off-by: H. Peter Anvin commit b9bf1e60a294fc7795d5198f94a917290e52865b Author: John W. Linville Date: Tue Aug 7 16:33:15 2007 -0400 [PATCH] mac80211: probe for hidden SSIDs in pre-auth scan Probe for hidden SSIDs if initiating pre-authentication scan and SSID is set for STA interface. Signed-off-by: John W. Linville commit 7b7ed879254ad43990c9d67f95be3427401c3392 Author: Johannes Berg Date: Tue Aug 7 10:23:57 2007 +0200 [PATCH] mac80211: fix tx status frame code When I added the monitor for outgoing frames somehow a break statement slipped in. Remove it. Signed-off-by: Johannes Berg commit 02f44315dc4bce8a222564aa023c965efbeb73b5 Author: Jussi Kivilinna Date: Tue Aug 14 13:22:58 2007 -0700 [BRIDGE]: Fix typo in net/bridge/br_stp_if.c Signed-off-by: Jussi Kivilinna Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 17120889b0706b69ae24cba3ef0a340dc3fb7edc Author: Stephen Hemminger Date: Tue Aug 14 13:21:34 2007 -0700 [BRIDGE]: sysfs locking fix. The stp change code generates "sleeping function called from invalid context" because rtnl_lock() called with BH disabled. This fixes it by not acquiring then dropping the bridge lock. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 45241a7a07537266eec363593ef377a1e6b7db7f Author: Patrick McHardy Date: Tue Aug 14 13:14:58 2007 -0700 [NETFILTER]: nf_nat_sip: don't drop short packets Don't drop packets shorter than "SIP/2.0", just ignore them. Keep-alives can validly be shorter for example. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit aa584eda5d2002097de9f608b362d9150730abd7 Author: Patrick McHardy Date: Tue Aug 14 13:14:35 2007 -0700 [NETFILTER]: nf_conntrack_sip: fix SIP-URI parsing The userinfo component of a SIP-URI is optional, continue parsing at the beginning of the SIP-URI in case its not found. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 465f90a486cd724d364167747e8b8b9f806fa91a Author: Patrick McHardy Date: Tue Aug 14 13:13:54 2007 -0700 [NETFILTER]: nf_conntrack_sip: check sname != NULL before calling strncmp The check got lost during the conversion to nf_conntrack. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 35019539d71bacd98de318c34728c97b1b505b49 Author: Eric Dumazet Date: Tue Aug 14 13:13:28 2007 -0700 [NETFILTER]: netfilter: xt_u32 bug correction An extraneous ";" makes xt_u32 match useless Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 28e8351ac22de25034e048c680014ad824323c65 Merge: 3b993e8... d18c4d6... Author: Linus Torvalds Date: Tue Aug 14 10:00:29 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: [GFS2] Revert remounting w/o acl option leaves acls enabled [GFS2] Fix setting of inherit jdata attr [GFS2] Fix incorrect error path in prepare_write() [GFS2] Fix incorrect return code in rgrp.c [GFS2] soft lockup in rgblk_search [GFS2] soft lockup detected in databuf_lo_before_commit [DLM] fix basts for granted PR waiting CW [DLM] More othercon fixes [DLM] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero [DLM] zero unused parts of sockaddr_storage [DLM] fix NULL ls usage [DLM] Clear othercon pointers when a connection is closed commit 3b993e8bee32d6dfe04df560eda8e1aff6248a22 Merge: ab3c556... b5d0b4b... Author: Linus Torvalds Date: Tue Aug 14 09:52:12 2007 -0700 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c-s3c2410: Build fix i2c/menelaus: Build fix i2c-mv64xxx: Reinitialize hw and driver on I2C bus hang i2c-mpc: Don't disable I2C module on stop condition i2c-iop3xx: Set I2C_CLASS_HWMON to adapter class i2c/isp1301_omap: Build fixes, whitespace i2c-mpc: Pass correct dev_id to free_irq on error path i2c-i801: Typo: erroneous commit b5d0b4ba389711183b5af71438fe21b40ee32d6d Author: Ben Dooks Date: Tue Aug 14 18:37:15 2007 +0200 i2c-s3c2410: Build fix Fixup the include files after the arch moves that where included in 2.6.23. Signed-off-by: Ben Dooks Signed-off-by: Jean Delvare commit c1147cc6d18389f6530bae27741b9b2665e862e6 Author: David Brownell Date: Tue Aug 14 18:37:14 2007 +0200 i2c/menelaus: Build fix Fix Menelaus build error, and remove needless "#define DEBUG". Signed-off-by: David Brownell Signed-off-by: Jean Delvare commit a07ad1cc0300931bfd76bfcd2da3ddad743f4a89 Author: Dale Farnsworth Date: Tue Aug 14 18:37:14 2007 +0200 i2c-mv64xxx: Reinitialize hw and driver on I2C bus hang Under certain conditions, the mv64xxx I2C bus can hang preventing further operation. To make the driver more robust, we now reset the I2C hardware and the driver state machine when such hangs are detected. Signed-off-by: Dale Farnsworth Acked-by: Mark A. Greer Signed-off-by: Jean Delvare commit 5af0e07f87e7d9be2a9db514af1e338341240f6d Author: Domen Puncer Date: Tue Aug 14 18:37:14 2007 +0200 i2c-mpc: Don't disable I2C module on stop condition Disabling module on stop doesn't work on some CPUs (ie. mpc8241, as reported by Guennadi Liakhovetski), so remove that. Disable I2C module on errors/interrupts to prevent it from locking up on mpc5200b. Signed-off-by: Domen Puncer Acked-by: Guennadi Liakhovetski Signed-off-by: Jean Delvare commit 432ca994bf7107e88916fd9606ca7402a4571359 Author: Arnaud Patard Date: Tue Aug 14 18:37:14 2007 +0200 i2c-iop3xx: Set I2C_CLASS_HWMON to adapter class In order to be able to use sensors on the IOP3xx SoCs, one needs to set the adapter class to I2C_CLASS_HWMON. Signed-off-by: Arnaud Patard Signed-off-by: Jean Delvare commit 25da383d26a1dcca4f0205769a24e5eac79c6d35 Author: David Brownell Date: Tue Aug 14 18:37:14 2007 +0200 i2c/isp1301_omap: Build fixes, whitespace Build fixes for isp1301_omap driver. I think an earlier version of this must have gotten lost somewhere, or maybe it only went into the Linux-OMAP tree. Also, some whitespace fixes to bring this more into sync with the version of this found in the Linux-OMAP tree. (That version has updates for the OTG controller on the OMAP 1710 which break that functionality on OMAP 161x boards like the H2, so merging all of it is not currently an option.) Signed-off-by: David Brownell Signed-off-by: Jean Delvare commit 322454a65371477bed0eb1d189c50d781ebd7f85 Author: Scott Wood Date: Tue Aug 14 18:37:14 2007 +0200 i2c-mpc: Pass correct dev_id to free_irq on error path Signed-off-by: Scott Wood Signed-off-by: Jean Delvare commit 002cf63191eb8b68b7fed48f014b87c456188acc Author: Jean Delvare Date: Tue Aug 14 18:37:13 2007 +0200 i2c-i801: Typo: erroneous Signed-off-by: Jean Delvare commit ab3c556de19b1888b0830ef066524884d4788131 Merge: c4e7ac5... cae7ca3... Author: Linus Torvalds Date: Tue Aug 14 09:31:19 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: [IPVS]: Use IP_VS_WAIT_WHILE when encessary. [NET]: Share correct feature code between bridging and bonding [ATM] drivers/atm/iphase.c: mostly kmalloc + memset conversion to kzalloc [IRDA] irda-usb.c: mostly kmalloc + memset conversion to k[cz]alloc [WAN] drivers/net/wan/hdlc_fr.c: kmalloc + memset conversion to kzalloc [DCCP]: fix memory leak and clean up style - dccp_feat_empty_confirm() [DCCP]: fix theoretical ccids_{read,write}_lock() race [XFRM]: Clean up duplicate includes in net/xfrm/ [TIPC]: Clean up duplicate includes in net/tipc/ [SUNRPC]: Clean up duplicate includes in net/sunrpc/ [PKT_SCHED]: Clean up duplicate includes in net/sched/ [IPV6]: Clean up duplicate includes in net/ipv6/ [IPV4]: Clean up duplicate includes in net/ipv4/ [ATM]: Clean up duplicate includes in net/atm/ [ATM]: Clean up duplicate includes in drivers/atm/ [IPCONFIG]: ip_auto_config fix [ATM]: fore200e_param_bs_queue() must be __devinit commit c4e7ac5d427a48b91752671523f39a04e63e12ff Merge: c019b19... ce57a02... Author: Linus Torvalds Date: Tue Aug 14 09:30:42 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: e1000: Add device IDs of new 82571 board variants xen-netfront: Avoid deref'ing skbafter it is potentially freed. 3c59x maintainer 3c59x: fix duplex configuration natsemi: fix netdev error acounting ax88796 printk fixes myri10ge: Use the pause counter to avoid a needless device reset via-rhine: disable rx_copybreak on archs that don't allow unaligned DMA access commit daa7162f66ec7f85053b623a3d23ee30b13d036c Author: Andrew Victor Date: Mon Aug 13 10:02:18 2007 +0100 [ARM] 4549/1: KS8695: Fix build errors The PCI driver has not been merged yet, so comment out call to ks8695_init_pci() for now. Also fix some incorrectly marked __init and __initdata sections. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 9857caa42c86d299b7a80b761a62918a185892ba Author: Krzysztof Helt Date: Thu Aug 9 16:37:01 2007 +0100 [ARM] 4546/1: s3c2410: fix architecture typo for s3c2442 From: Krzysztof Helt This patch fixes a typo in architecture constant name. The kernel for s3c2442 machines does not build without this fix. Signed-off-by: Krzysztof Helt Acked-by: Ben Dooks Signed-off-by: Russell King commit d18c4d687dd4625360ee14047d7eb454217719ee Author: Steven Whitehouse Date: Thu Jul 19 16:12:50 2007 +0100 [GFS2] Revert remounting w/o acl option leaves acls enabled This reverts commit 569a7b6c2e8965ff4908003b925757703a3d649c. The code was correct originally. The default setting for ACLs after a remount should be to be the same as before the remount. Signed-off-by: Abhijith Das Signed-off-by: Steven Whitehouse commit b9af7ca6d37d541fb0ed96355fd5c65501cbbda8 Author: Steven Whitehouse Date: Wed Jul 18 11:40:06 2007 +0100 [GFS2] Fix setting of inherit jdata attr Due to a mix up between the jdata attribute and inherit jdata attribute it has not been possible to set the inherit jdata attribute on directories. This is now fixed and the ioctl will report the inherit jdata attribute for directories rather than the jdata attribute as it did previously. This stems from our need to have the one bit in the ioctl attr flags mean two different things according to whether the underlying inode is a directory or not. Signed-off-by: Steven Whitehouse commit a867bb28c1cb49ae86d034d8bd8fe6dbcbb19566 Author: Steven Whitehouse Date: Tue Jul 17 10:29:02 2007 +0100 [GFS2] Fix incorrect error path in prepare_write() The error path in prepare_write() was incorrect in the (very rare) event that the transaction fails to start. The following prevents a NULL pointer dereference, Signed-off-by: Steven Whitehouse commit 6eefaf61f664053c1dd6534a994cab3f8bb07263 Author: Steven Whitehouse Date: Tue Jul 17 10:26:56 2007 +0100 [GFS2] Fix incorrect return code in rgrp.c The following patch fixes a bug where 0 was being used as a return code to indicate "nothing to do" when in fact 0 was a valid block location which might be returned by the function. Signed-off-by: Steven Whitehouse commit 24c7387333c77b602ece7ecd6a85fc94f8f16d8c Author: Bob Peterson Date: Thu Jul 12 16:58:50 2007 -0500 [GFS2] soft lockup in rgblk_search This patch seems to fix the problem described in bugzilla bug 246114. It was written by Steve Whitehouse with some tweaking by me. The code was looping in the relatively new section of code designed to search for and reuse unlinked inodes. In cases where it was finding an appropriate inode to reuse, it was looping around and finding the same block over and over because a "<=" check should have been a "<" when comparing the goal block to the last unlinked block found. Signed-off-by: Bob Peterson Signed-off-by: Steven Whitehouse commit bdcb88562ca90e6cfac13130e147c63aaa4f9e41 Author: Bob Peterson Date: Wed Jul 11 15:55:23 2007 -0500 [GFS2] soft lockup detected in databuf_lo_before_commit This is part 2 of the patch for bug #245832, part 1 of which is already in the git tree. The problem was that sdp->sd_log_num_databuf was not always being protected by the gfs2_log_lock spinlock, but the sd_log_le_databuf (which it is supposed to reflect) was protected. That meant there was a timing window during which gfs2_log_flush called databuf_lo_before_commit and the count didn't match what was really on the linked list in that window. So when it ran out of items on the linked list, it decremented total_dbuf from 0 to -1 and thus never left the "while(total_dbuf)" loop. The solution is to protect the variable sdp->sd_log_num_databuf so that the value will always match the contents of the linked list, and therefore the number will never go negative, and therefore, the loop will be exited properly. Signed-off-by: Bob Peterson Signed-off-by: Steven Whitehouse commit 3650925893469ccb03dbcc6a440c5d363350f591 Author: David Teigland Date: Tue Aug 7 09:44:48 2007 -0500 [DLM] fix basts for granted PR waiting CW Fix a long standing bug where a blocking callback would be missed when there's a granted lock in PR mode and waiting locks in both PR and CW modes (and the PR lock was added to the waiting queue before the CW lock). The logic simply compared the numerical values of the modes to determine if a blocking callback was required, but in the one case of PR and CW, the lower valued CW mode blocks the higher valued PR mode. We just need to add a special check for this PR/CW case in the tests that decide when a blocking callback is needed. Signed-off-by: David Teigland Signed-off-by: Steven Whitehouse commit 9e5f2825a8b721360b291f14f42cd7a25781156b Author: Patrick Caulfield Date: Thu Aug 2 14:58:14 2007 +0100 [DLM] More othercon fixes The last patch to clean out 'othercon' structures only fixed half the problem. The attached addresses the other situations too, and fixes bz#238490 Signed-Off-By: Patrick Caulfield Signed-off-by: Steven Whitehouse commit 1a2bf2eefb63a267aea7f3f80d6ac59160e20810 Author: Jesper Juhl Date: Thu Jul 19 00:27:43 2007 +0200 [DLM] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero There's a memory leak in fs/dlm/member.c::dlm_add_member(). If "dlm_node_weight(ls->ls_name, nodeid)" returns < 0, then we'll return without freeing the memory allocated to the (at that point yet unused) 'memb'. This patch frees the allocated memory in that case and thus avoids the leak. Signed-off-by: Jesper Juhl Signed-off-by: David Teigland Signed-off-by: Steven Whitehouse commit 01c8cab25863de007fe8c598d0033919ea8ae65e Author: Patrick Caulfield Date: Tue Jul 17 16:53:15 2007 +0100 [DLM] zero unused parts of sockaddr_storage When we build a sockaddr_storage for an IP address, clear the unused parts as they could be used for node comparisons. I have seen this occasionally make sctp connections fail. Signed-Off-By: Patrick Caulfield Signed-off-by: Steven Whitehouse commit 41684f9547455b395ffd65e5b7961067d20a2872 Author: David Teigland Date: Fri Jul 13 14:49:06 2007 -0500 [DLM] fix NULL ls usage Fix regression in recent patch "[DLM] variable allocation" which attempts to dereference an "ls" struct when it's NULL. Signed-off-by: David Teigland Signed-off-by: Steven Whitehouse commit 25720c2d73058f4f929f16093f60817ed52a285c Author: Patrick Caulfield Date: Wed Jul 11 13:39:43 2007 +0100 [DLM] Clear othercon pointers when a connection is closed This patch clears the othercon pointer and frees the memory when a connnection is closed. This could cause a small memory leak when nodes leave the cluster. Signed-Off-By: Patrick Caulfield Signed-off-by: Steven Whitehouse commit ce57a02c64052c3f1c62f30a902a937e6c316d88 Author: Auke Kok Date: Thu Aug 9 14:09:34 2007 -0700 e1000: Add device IDs of new 82571 board variants This patch adds support for 2 new board variants: - A Quad port fiber 82571 board - A blade version of the 82571 quad copper board Signed-off-by: Auke Kok Signed-off-by: Jeff Garzik commit cae7ca3d3de48851e929de9469397749638df779 Author: Heiko Carstens Date: Fri Aug 10 15:50:30 2007 -0700 [IPVS]: Use IP_VS_WAIT_WHILE when encessary. For architectures that don't have a volatile atomic_ts constructs like while (atomic_read(&something)); might result in endless loops since a barrier() is missing which forces the compiler to generate code that actually reads memory contents. Fix this in ipvs by using the IP_VS_WAIT_WHILE macro which resolves to while (expr) { cpu_relax(); } (why isn't this open coded btw?) Signed-off-by: Heiko Carstens Signed-off-by: Simon Horman Signed-off-by: David S. Miller commit 7f353bf29e162459f2f1e2ca25e41011fae65241 Author: Herbert Xu Date: Fri Aug 10 15:47:58 2007 -0700 [NET]: Share correct feature code between bridging and bonding http://bugzilla.kernel.org/show_bug.cgi?id=8797 shows that the bonding driver may produce bogus combinations of the checksum flags and SG/TSO. For example, if you bond devices with NETIF_F_HW_CSUM and NETIF_F_IP_CSUM you'll end up with a bonding device that has neither flag set. If both have TSO then this produces an illegal combination. The bridge device on the other hand has the correct code to deal with this. In fact, the same code can be used for both. So this patch moves that logic into net/core/dev.c and uses it for both bonding and bridging. In the process I've made small adjustments such as only setting GSO_ROBUST if at least one constituent device supports it. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit f71417614d63932cf56ed98a0947568d6259d11e Author: Mariusz Kozlowski Date: Fri Aug 10 15:26:18 2007 -0700 [ATM] drivers/atm/iphase.c: mostly kmalloc + memset conversion to kzalloc drivers/atm/iphase.c | 111508 -> 111431 (-77 bytes) drivers/atm/iphase.o | 254740 -> 254260 (-480 bytes) Signed-off-by: Mariusz Kozlowski Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 48e3eeb1a1a89a3ea256cf6d3c898e753787cfaa Author: Mariusz Kozlowski Date: Fri Aug 10 15:25:40 2007 -0700 [IRDA] irda-usb.c: mostly kmalloc + memset conversion to k[cz]alloc drivers/net/irda/irda-usb.c | 59694 -> 59541 (-153 bytes) drivers/net/irda/irda-usb.o | 170588 -> 169256 (-1332 bytes) Signed-off-by: Mariusz Kozlowski Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 1ee325438cdbe374ebea6e3d2f19204072c15038 Author: Mariusz Kozlowski Date: Fri Aug 10 15:24:50 2007 -0700 [WAN] drivers/net/wan/hdlc_fr.c: kmalloc + memset conversion to kzalloc drivers/net/wan/hdlc_fr.c | 31260 -> 31223 (-37 bytes) drivers/net/wan/hdlc_fr.o | 144872 -> 144728 (-144 bytes) Signed-off-by: Mariusz Kozlowski Acked-by: Krzysztof Halasa Signed-off-by: Andrew Morton commit e576de82ee628f68e5a44527c7ee99eadeab2e62 Author: Jesper Juhl Date: Fri Aug 10 15:23:54 2007 -0700 [DCCP]: fix memory leak and clean up style - dccp_feat_empty_confirm() There's a memory leak in net/dccp/feat.c::dccp_feat_empty_confirm(). If we hit the 'default:' case of the 'switch' statement, then we return without freeing 'opt', thus leaking 'struct dccp_opt_pend' bytes. The leak is fixed easily enough by adding a kfree(opt); before the return statement. The patch also changes the layout of the 'switch' to be more in line with CodingStyle. Signed-off-by: Jesper Juhl Acked-by: Ian McDonald Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit d725fdc8027a4cd961f58d92917fbb91b171abfa Author: Oleg Nesterov Date: Fri Aug 10 15:21:17 2007 -0700 [DCCP]: fix theoretical ccids_{read,write}_lock() race Make sure that spin_unlock_wait() is properly ordered wrt atomic_inc(). (akpm: can't we convert this code to use rwlocks?) Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit b5890d8ba47741425fe3c0d753e1b57bc0561b7b Author: Jesper Juhl Date: Fri Aug 10 15:20:21 2007 -0700 [XFRM]: Clean up duplicate includes in net/xfrm/ This patch cleans up duplicate includes in net/xfrm/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 897c77cab0c386103e1c51fe8f3fc7eb5d1eb37f Author: Jesper Juhl Date: Fri Aug 10 15:19:43 2007 -0700 [TIPC]: Clean up duplicate includes in net/tipc/ This patch cleans up duplicate includes in net/tipc/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 08dd2e29468d55f67fa346ede07ddfc58a60536b Author: Jesper Juhl Date: Fri Aug 10 15:19:09 2007 -0700 [SUNRPC]: Clean up duplicate includes in net/sunrpc/ This patch cleans up duplicate includes in net/sunrpc/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 0a26f4cdc207db14a8e7192bac5a7c84d9e2390a Author: Jesper Juhl Date: Fri Aug 10 15:18:31 2007 -0700 [PKT_SCHED]: Clean up duplicate includes in net/sched/ This patch cleans up duplicate includes in net/sched/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 703310e645c639a84e7f4b35d8a508acde9ef360 Author: Jesper Juhl Date: Fri Aug 10 15:17:58 2007 -0700 [IPV6]: Clean up duplicate includes in net/ipv6/ This patch cleans up duplicate includes in net/ipv6/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit f49f9967b263cc88b48d912172afdc621bcb0a3c Author: Jesper Juhl Date: Fri Aug 10 15:17:24 2007 -0700 [IPV4]: Clean up duplicate includes in net/ipv4/ This patch cleans up duplicate includes in net/ipv4/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 6869a35b365c027b7acf50585c5bb34e34d4c41c Author: Jesper Juhl Date: Fri Aug 10 15:16:42 2007 -0700 [ATM]: Clean up duplicate includes in net/atm/ This patch cleans up duplicate includes in net/atm/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit af3502184aee8a0af6da8678e84c3d5bc5cdb83f Author: Jesper Juhl Date: Fri Aug 10 15:15:55 2007 -0700 [ATM]: Clean up duplicate includes in drivers/atm/ This patch cleans up duplicate includes in drivers/atm/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit dcbdc93c6c64daf20622d6deae774d1e740efb8d Author: Joakim Tjernlund Date: Fri Aug 10 15:14:54 2007 -0700 [IPCONFIG]: ip_auto_config fix The following commandline: root=/dev/mtdblock6 rw rootfstype=jffs2 ip=192.168.1.10:::255.255.255.0:localhost.localdomain:eth1:off console=ttyS0,115200 makes ip_auto_config fall back to DHCP and complain "IP-Config: Incomplete network configuration information." depending on if CONFIG_IP_PNP_DHCP is set or not. The only way I can make ip_auto_config accept my IP config is to add an entry for the server IP: ip=192.168.1.10:192.168.1.15::255.255.255.0:localhost.localdomain:eth1:off I think this is a bug since I am not using a NFS root FS. The following patch fixes the above problem. From: Andrew Morton Davem said (in February!): Well, first of all the change in question is not in 2.4.x either. I just checked the current 2.4.x GIT tree and the test is exactly: if (ic_myaddr == INADDR_NONE || #ifdef CONFIG_ROOT_NFS (MAJOR(ROOT_DEV) == UNNAMED_MAJOR && root_server_addr == INADDR_NONE && ic_servaddr == INADDR_NONE) || #endif ic_first_dev->next) { which matches 2.6.x I even checked 2.4.x when it was branched for 2.5.x and the test was the same at the point in time too. Looking at the proposed change a bit it appears that it is probably correct, as it's trying to check that ROOT_DEV is nfs root. But if it is correct then the UNNAMED_MAJOR comparison in the same code block should be removed as it becomes superfluous. I'm happy to apply this patch with that modification made. Signed-off-by: Joakim Tjernlund Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 8aee929eda10b2502fd76c0bf2003f89f7992820 Author: Adrian Bunk Date: Fri Aug 10 15:14:18 2007 -0700 [ATM]: fore200e_param_bs_queue() must be __devinit WARNING: drivers/built-in.o(.text+0x6203bb): Section mismatch: reference to .init.text:fore200e_param_bs_queue (between 'fore200e_initialize' and 'fore200e_monitor_putc') Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 10a273a67343e1f317652d69b09a212ee0284b44 Author: Jeremy Fitzhardinge Date: Mon Aug 13 12:54:37 2007 -0700 xen-netfront: Avoid deref'ing skbafter it is potentially freed. xennet_tx_bug_gc can free the skb before we use it, so make sure we don't. Signed-off-by: Keir Fraser Signed-off-by: Jeremy Fitzhardinge Cc: Jeff Garzik Signed-off-by: Jeff Garzik commit a6d89915aa668776494fec8568d46aa6043ff848 Author: Steffen Klassert Date: Fri Aug 10 14:05:27 2007 -0700 3c59x maintainer Add 3c59x maintainer. Signed-off-by: Steffen Klassert Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 373492d0bdc66680ee598fd5a63e1914631b2522 Author: Steffen Klassert Date: Fri Aug 10 14:05:26 2007 -0700 3c59x: fix duplex configuration A special sequence of ifconfig up/down and plug/unplug the cable can break the duplex configuration of the driver. Setting vp->mii.full_duplex = vp->full_duplex in vortex_up should fix this. Addresses Bug 8575 3c59x duplex configuration broken http://bugzilla.kernel.org/show_bug.cgi?id=8575 Cc: Martin Buck Signed-off-by: Steffen Klassert Cc: Natalie Protasevich Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit c76720cf7ba63a3d179b6da8675653c8b01b6c0b Author: Andrew Morton Date: Fri Aug 10 14:05:23 2007 -0700 natsemi: fix netdev error acounting When a detailed netdev error is counted, we also must account for it in the aggregated error count. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=8106 Cc: Tim Hockin Cc: Jeff Garzik Cc: Chongfeng Hu Cc: Natalie Protasevich Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit b4efe22cc987f4cd68ff838556580c0cc8c64cbc Author: Andrew Morton Date: Fri Aug 10 14:05:21 2007 -0700 ax88796 printk fixes drivers/net/ax88796.c: In function `ax_probe': drivers/net/ax88796.c:825: warning: size_t format, different type arg (arg 4) drivers/net/ax88796.c:825: warning: size_t format, different type arg (arg 5) resource_size_t isn't size_t. Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 626fda948839fc2f488f527076b8f42b1b7a4687 Author: Brice Goglin Date: Thu Aug 9 09:02:14 2007 +0200 myri10ge: Use the pause counter to avoid a needless device reset Use the pause counter to avoid a needless device reset, and print a message telling the admin that our link partner is flow controlling us down to 0 pkts/sec. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit b47157f00414f368f2847697ce48b76f1a5e5110 Author: Dustin Marquess Date: Fri Aug 10 14:05:15 2007 -0700 via-rhine: disable rx_copybreak on archs that don't allow unaligned DMA access Patch to disable the rx_copybreak feature on hardware architectures that don't allow unaligned DMA access. #ifdef code taken from tulip_core.c. Problem pointed out by Ivan Kokshaysky. Signed-off-by: Dustin Marquess Cc: Francois Romieu Cc: Ivan Kokshaysky Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit c019b1933015ee31366eeaa085bad3ee9516991c Author: Alexey Starikovskiy Date: Tue Aug 14 01:03:42 2007 -0400 ACPI: EC: Fix "no battery" regression Restore deleted call to register query methods. http://bugzilla.kernel.org/show_bug.cgi?id=8886 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 352b0ef50d98049bf022a31eaf2272f52e2f5219 Author: Mike Habeck Date: Mon Aug 13 17:13:08 2007 -0500 [IA64] SGI Altix : fix a force_interrupt bug on altix If the interrupt has been disabled, don't call the force_interrupt provider. Doing so can result in an infinite runaway interrupt loop. Signed-off-by: Mike Habeck Signed-off-by: Tony Luck commit 709ae9309102875f9798349b64849b6743e25193 Author: Christoph Lameter Date: Mon Aug 13 14:54:34 2007 -0700 [IA64] Update arch/ia64/configs/* s/SLAB/SLUB/ The slab allocator was changed in 2.6.23 to default to SLUB. However, the config files in arch/ia64/configs still use SLAB. Switch them to SLUB. Added same change to arch/ia64/defconfig ... Tony Signed-off-by: Christoph Lameter Signed-off-by: Tony Luck commit 9bf77d0e20d08f4fd5f3b14e50dce3bb21df03ac Author: David Mosberger-Tang Date: Thu Aug 9 19:58:52 2007 -0600 [IA64] get back PT_IA_64_UNWIND program header Explicitly put the unwind section into its own program-header. This used to be unnecessary (probably because binutils did it for us), but with current binutils (e.g., v2.17.50.20070804) we won't get the PT_IA_64_UNWIND header without this patch which will break unwinding in a debugger and simulators such as Ski. Signed-off-by: David Mosberger-Tang Signed-off-by: Tony Luck commit 336cdba8640677117bc3fd101e3e1a34c98a275d Author: David Mosberger-Tang Date: Thu Aug 9 11:53:15 2007 -0600 [IA64] need NOTES in vmlinux.lds.S Add NOTES to linker script such that the kernel can be built with recent versions of binutils. Without this patch, final link fails with this error: ld: .tmp_vmlinux1: section `.text' can't be allocated in segment 0 ld: final link failed: Bad value This error is due to the fact that the --build-id option is used with newer linkers to include a .notes section on the kernel, but without the NOTES macro, that section won't be included in the kernel which then leads to the above error message. Signed-off-by: David Mosberger-Tang Signed-off-by: Tony Luck commit 5d36aa9bbed32507b21e345f9d065868af5f5991 Author: David Mosberger-Tang Date: Thu Aug 9 16:54:27 2007 -0600 [IA64] make unwinder stop at last frame of the bootloader Add a dummy nop at the end of _start() to maintain the invariant that the return-pointer (rp) always point to the calling function. This makes unwinding stop at the last frame, as it should. Signed-off-by: David Mosberger-Tang Signed-off-by: Tony Luck commit a1287476e86568374ed6aadbb4123d9eff6f7b09 Author: Russ Anderson Date: Fri Aug 3 14:32:37 2007 -0500 [IA64] Clean up CPE handler registration Use local_vector_to_irq() instead of looping through all NR_IRQS. This avoids registering the CPE handler on multiple irqs. Only register if the irq is valid. If no valid irq is found, print an error message and set up polling. Signed-off-by: Russ Anderson Signed-off-by: Tony Luck commit 0b0517a475c2fd601d01acb4a585644eda9c9395 Author: Satyam Sharma Date: Mon Aug 13 23:41:45 2007 +0530 [IA64] Include Kconfig.preempt arch/ia64/Kconfig failed to include kernel/Kconfig.preempt that meant it did not support PREEMPT_VOLUNTARY and PREEMPT_BKL (inadvertently). This was recently noticed when the newly-added PREEMPT_NOTIFIERS in Kconfig.preempt that was "select"ed from drivers/kvm/Kconfig (therefore) started giving bogus warnings ('select' used by config symbol 'KVM' refers to undefined symbol 'PREEMPT_NOTIFIERS') on ia64 builds. So let's remove the open-coded definition of CONFIG_PREEMPT in arch/ia64/Kconfig and replace it with just including Kconfig.preempt instead, like the other archs do. Signed-off-by: Satyam Sharma Signed-off-by: Tony Luck commit af5a032b8082cddb4dc62a9ff94bf1ec4d34a044 Author: Steve French Date: Mon Aug 13 19:53:17 2007 +0000 [CIFS] Update CIFS project web site Signed-off-by: Steve French commit 1115200a3df64d6925bc94b404039e7082409af4 Author: Kenji Kaneshige Date: Mon Aug 13 10:31:26 2007 -0700 [IA64] SN2 needs platform specific irq_to_vector() function. Add base support for implementing platform_irq_to_vector(), and then use it on SN2. Signed-off-by: Kenji Kaneshige Acked-by: John Keller Signed-off-by: Tony Luck commit 6cba986298105a87a09d65baa2658fb5111459c6 Author: Andreas Schwab Date: Fri Aug 10 23:42:59 2007 +0200 [IA64] Use atomic64_read to read an atomic64_t. The routines ia64_atomic64_{add,sub} mistakenly use atomic_read() to grab the old value instead of using atomic64_read(). Signed-off-by: Andreas Schwab Signed-off-by: Tony Luck commit 71416bea5afa9e5a6c76c1509ab69c46c857a2bb Author: Dimitri Sivanich Date: Tue Aug 7 08:49:32 2007 -0500 [IA64] disable irq's and check need_resched before safe_halt While sending interrupts to a cpu to repeatedly wake a thread, on occasion that thread will take a full timer tick cycle (4002 usec in my case) to wakeup. The problem concerns a race condition in the code around the safe_halt() call in the default_idle() routine. Setting 'nohalt' on the kernel command line causes the long wakeups to disappear. void default_idle (void) { local_irq_enable(); while (!need_resched()) { --> if (can_do_pal_halt) --> safe_halt(); else A timer tick could arrive between the check for !need_resched and the actual call to safe_halt() (which does a pal call to PAL_HALT_LIGHT). By the time the timer tick completes, a thread that might now need to run could get held up for as long as a timer tick waiting for the halted cpu. I'm proposing that we disable irq's and check need_resched again before calling safe_halt(). Does anyone see any problem with this approach? Signed-off-by: Dimitri Sivanich Signed-off-by: Tony Luck commit 947b2a8083a03e6fff448ce8928956015614855e Author: Eli Cohen Date: Mon Aug 13 17:57:03 2007 +0300 mlx4_core: Wait 1 second after reset before accessing device Put a 1000 msec delay after resetting the device before attempting to do config cycles on it. Not waiting causes system hangs on some chipsets, e.g. Intel E7520, when the driver is loaded. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit 68a50b567895ea677645ca3cebc484674123532d Author: Jean Delvare Date: Sun Aug 12 13:58:50 2007 +0200 hwmon: (smsc47m1) restore missing name attribute The smsc47m1 driver no longer creates the name attribute used by libsensors to identify chip types. It was lost during the conversion to a platform driver. I was fooled by the fact that we do have a group with all attributes, but only to delete them all at once. The group is not used to create the attributes, so we have to explicitly create the name attribute. This fixes lm-sensors ticket #2236: http://lm-sensors.org/ticket/2236 Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit 0956895aa6f8dc6a33210967252fd7787652537d Author: Jean Delvare Date: Sat Aug 11 13:57:05 2007 +0200 hwmon: (w83627ehf) don't assume bank 0 Don't assume that the default bank is 0. For one thing, we don't even set it to 0 when the driver is loaded, so the initial state might be different. For another, something (say, the BIOS) might access the chip and leave with the bank set to something different, so assuming that the bank value is 0 is not safe. Signed-off-by: Jean Delvare Signed-off-by: Mark M. Hoffman commit ea7be66c44e56b6b7f1d61befc300871e855d43a Author: Mark M. Hoffman Date: Sun Aug 5 12:19:01 2007 -0400 hwmon: (w83627ehf) read fan_div values during probe This patch forces the driver to read the fan divider values during early init. Otherwise, a call to store_fan_min() could access uninitialized variables. Signed-off-by: Mark M. Hoffman Signed-off-by: Jean Delvare commit 5ba056cb3c5d424dc2886fb02305af11fa46af02 Author: Michal Piotrowski Date: Sun Aug 12 12:18:54 2007 +0900 sh64: arch/sh64/kernel/setup.c: duplicate include removal. There is no need to include linux/console.h twice. Signed-off-by: Michal Piotrowski Signed-off-by: Paul Mundt commit f6d7543ab2098cc32d09b8b4edae6934977792c1 Author: Jesper Juhl Date: Sun Aug 12 12:16:45 2007 +0900 sh64: arch/sh64/kernel/signal.c: duplicate include removal Remove the duplicate inclusion of linux/personality.h from arch/sh64/kernel/signal.c Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Paul Mundt commit 1e6a20c9c7848fefa64731ac3d1d88279c447371 Author: Sam Ravnborg Date: Tue Aug 7 19:03:27 2007 +0100 [ARM] 4544/1: arm: fix section mismatch in pxa fb Fix following section mismatch warning: WARNING: drivers/built-in.o(.text+0x73d0): Section mismatch: reference to .init.data: (between 'pxafb_setup' and 'pxafb_init') The warning are caused by __devinit pxafb_setup() that refers to a variable marked __initdata. In a hotplug scenario we would have a reference to the freed .init.data section. Fix this by declaring g_options __devinitdata. Signed-off-by: Sam Ravnborg Signed-off-by: Russell King commit 393cdad6267bc2abf75973d15310168ff3e15441 Author: Mark M. Hoffman Date: Thu Aug 9 08:12:46 2007 -0400 hwmon: fix w83781d temp sensor type setting Commit 348753379a7704087603dad403603e825422fd9a introduced a regression that caused temp2 and temp3 sensor type settings to be written to temp1 instead. The result is that temp sensor readings could be way off. Signed-off-by: Mark M. Hoffman commit 3ac4c949e02f26be1e4378f9acfb07ec87db947b Author: Robert Reif Date: Fri Aug 10 15:52:06 2007 -0700 [SPARC32]: Remove iommu from struct sbus_bus and use archdata like sparc64. Signed-off-by: Robert Reif Signed-off-by: David S. Miller commit 757e2d60c32c5baf1992219b3178da16868423b3 Author: Paul Mundt Date: Fri Aug 10 02:47:31 2007 +0900 sh64: Add missing dma_sync_single_for_*(). Follow the sparc64 and sh change. Signed-off-by: Paul Mundt commit 322392646bc36ff4381861e6589c22c1abc20dbf Author: Paul Mundt Date: Fri Aug 10 02:37:01 2007 +0900 sh: Add missing dma_sync_single_range_for_*(). The b44 build uses these, caught by allmodconfig: drivers/net/b44.c: In function `b44_sync_dma_desc_for_cpu': drivers/net/b44.c:159: error: implicit declaration of function `dma_sync_single_range_for_cpu' Follow the sparc64 change and stub them in. Reported-by: Andrew Morton Signed-off-by: Paul Mundt commit 6958e827f187c9c5cd39af075567f74f02bf3dd1 Author: Jack Morgenstein Date: Mon Aug 6 17:09:09 2007 +0300 IPoIB: Fix leak in ipoib_transport_dev_init() error path ipoib_transport_dev_init() calls ipoib_cm_dev_init(), so it needs to call ipoib_cm_dev_cleanup() to unwind that on the error path. Found by Dotan Barak of Mellanox. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 5556410e2203877e7606bb1008f2e024fe87953a Author: Paul Mundt Date: Tue Aug 7 19:13:23 2007 +0900 sh: panic on machvec section misalignment. Now that __initmv references the machvec section unconditionally there have been cases where folks have been mistakenly flagging non-machvec structures with the machvec section attribute (presumably to shut up modpost). This leads to obscure breakage in earlyprintk amongst other places and is rather non-obvious. Add a simple sanity check to try and catch __initmv misuse and panic early. Reported-by: Markus Brunner Signed-off-by: Paul Mundt commit 662ae2169a16004700cc18c1898aead2e5e944d5 Author: Paul Mundt Date: Sat Aug 4 13:39:21 2007 +0900 sh: Fix PTRACE_PEEKTEXT/PEEKDATA fallout from generic_ptrace_peekdata(). When generic_ptrace_peekdata() was merged, the break for these cases ended up getting dropped, which lead to each PEEKTEXT/PEEKDATA op leaking in to PEEKUSR and get_user_pages() always -EFAULTing. Add the break back in. Signed-off-by: Paul Mundt commit 198919151dea65d83dd0fb66979b1df28402f2b0 Author: Vu Pham Date: Fri Aug 3 14:25:48 2007 -0700 IB/mlx4: Fix opcode returned in RDMA read completion Current code has a cut-and-paste error and returns IB_WC_SEND when it should return IB_WC_RDMA_READ. Signed-off-by: Vu Pham Signed-off-by: Roland Dreier commit 3d1ff48da760968793f3c36672961ffd23088787 Author: Raghava Kondapalli Date: Fri Aug 3 10:45:18 2007 -0700 IB/srp: Add OUI for new Cisco targets New Cisco IB SRP targets use the Cisco OUI 00-1b-0d but still need the Topspin workarounds. Add this OUI to srp_target_is_topspin(). Signed-off-by: Roland Dreier commit 5d7cbfd63136e4469a896acfadb33e19ed62f068 Author: Roland Dreier Date: Fri Aug 3 10:45:18 2007 -0700 IB/srp: Wrap OUI checking for workarounds in helper functions Wrap the checking for Mellanox and Topspin OUIs to decide whether to use a workaround into helper functions. This will make it cleaner to add a new OUI to check (as we need to do now that some targets with a Cisco OUI still need the Topspin workarounds). Signed-off-by: Roland Dreier commit 699924b1e1ea3c9307eb582b9cc386e4af88aaae Author: Steve Wise Date: Sun Jul 29 15:12:29 2007 -0500 RDMA/cxgb3: Always call low level send function via cxgb3_ofld_send() This avoids deadlocks. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 92ddc447ce7382e36b72a240697c00bf4beb8d75 Author: Dotan Barak Date: Wed Aug 1 13:33:56 2007 +0300 IB: Move the macro IB_UMEM_MAX_PAGE_CHUNK() to umem.c After moving the definition of struct ib_umem_chunk from ib_verbs.h to ib_umem.h there isn't any reason for the macro IB_UMEM_MAX_PAGE_CHUNK to stay in ib_verbs.h. Move the macro to umem.c, the only place where it is used. Signed-off-by: Dotan Barak Signed-off-by: Roland Dreier commit bfb3ea125174813cdf87b1120caf0c9bd580283e Author: Dotan Barak Date: Tue Jul 31 16:49:15 2007 +0300 IB: Include and from ib_verbs.h uses struct list_head and rw_semaphore, so while the files and seem to be pulled in indirectly by the other header files it includes, the right thing is to include those files directly. Signed-off-by: Dotan Barak Signed-off-by: Roland Dreier commit e8b398deb73b4a0c3d636f2146c9f35f8eac6d88 Author: Dotan Barak Date: Tue Jul 31 16:37:11 2007 +0300 IB: Include from ib_mad.h uses struct list_head, so while linux/list.h seems to be pulled in indirectly by one of the headers it includes, the right thing is to include linux/list.h directly. Signed-off-by: Dotan Barak Signed-off-by: Roland Dreier commit 38d5af9565f3fa1bf258f3eaeb47c4a95fd7a2b2 Author: Sean Hefty Date: Tue Jul 31 15:10:54 2007 -0700 IB/mad: Fix address handle leak in mad_rmpp The address handle associated with dual-sided RMPP direction switch ACKs is never destroyed. Free the AH for ACKs which fall into this category. Problem was reported by Dotan Barak . Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 8fc394b1971241999ef9b022feabf6a164791e3f Author: Hal Rosenstock Date: Fri Aug 3 10:45:17 2007 -0700 IB/mad: agent_send_response() should be void Nothing looks at the return value of agent_send_response(), so there's no point in returning anything. Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit 86dfbecdea733a6e940b958e94a85af45b89a0b9 Author: Hal Rosenstock Date: Fri Aug 3 10:45:17 2007 -0700 IB/mad: Fix memory leak in switch handling in ib_mad_recv_done_handler() If agent_send_response() returns an error, we shouldn't do anything differently than if it succeeds; setting response to NULL just means that the response buffer gets leaked. Signed-off-by: Suresh Shelvapille Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit 445d68070c9c02acdda38e6d69bd43096f521035 Author: Hal Rosenstock Date: Fri Aug 3 10:45:17 2007 -0700 IB/mad: Fix error path if response alloc fails in ib_mad_recv_done_handler() If ib_mad_recv_done_handler() fails to allocate response, then it just printed a warning and continued, which leads to an oops if the MAD is being handled for a switch device, because the switch code uses response without checking for NULL. Fix this by bailing out of the function if the allocation fails. Signed-off-by: Suresh Shelvapille Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier commit 5399891052badf97948098d01772113801f6ef58 Author: Roland Dreier Date: Fri Aug 3 10:45:17 2007 -0700 IB/sa: Don't need to check for default P_Key twice Now that ib_find_pkey() ignores the membership bit of P_Keys, there's no need for ib_sa to look for both 0x7fff and 0xffff in a port's P_Key table. Signed-off-by: Roland Dreier commit 36026ecc20e5df722bbe2ea9e451c73d686ef107 Author: Moni Shoua Date: Mon Jul 23 10:07:42 2007 +0300 IB/core: Ignore membership bit in ib_find_pkey() ib_find_pkey() is used as a replacement for ib_find_cached_pkey(), and the original function ignored the membership bit when searching for a P_Key, so ib_find_pkey() should ignore the bit too. In particular, IPoIB turns on the P_Key membership bit of limited membership P_Keys when creating a child interface and looks for the full membership P_key. This broke if a port was a partial member of a partition when IPoIB switched from ib_find_cached_pkey() to ib_find_pkey(), and this change fixes things again. Signed-off-by: Moni Shoua Signed-off-by: Roland Dreier commit a403a0a370946e7dbcda6464a3509089daee54bc Author: Steve French Date: Thu Jul 26 15:54:16 2007 +0000 [CIFS] Fix hang in find_writable_file Caused by unneeded reopen during reconnect while spinlock held. Fixes kernel bugzilla bug #7903 Thanks to Lin Feng Shen for testing this, and Amit Arora for some nice problem determination to narrow this down. Acked-by: Dave Kleikamp Signed-off-by: Steve French