commit 9a351e30d72d409ec62c83f380e330e0baa584b4 Author: Linus Torvalds Date: Mon Aug 1 21:45:48 2005 -0700 Linux v2.6.13-rc5 Ok, let's get it right this time commit 96cd5b0856a25e2ec366702e1923070ffca53dae Author: Mike Kravetz Date: Mon Aug 1 21:11:48 2005 -0700 [PATCH] ppc64: POWER 4 fails to boot with NUMA If CONFIG_NUMA is set, some POWER 4 systems will fail to boot. This is because of special processing needed to handle invalid node IDs (0xffff) on POWER 4. My previous patch to handle memory 'holes' within nodes forgot to add this special case for POWER 4 in one place. In reality, I'm not sure that configuring the kernel for NUMA on POWER 4 makes much sense. Are there POWER 4 based systems with NUMA characteristics that are presented by the firmware? But, distros want one kernel for all systems so NUMA is on by default in their kernels. The patch handles those cases. Signed-off-by: Mike Kravetz Signed-off-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 842bbaaa7394820c8f1fe0629cd15478653caf86 Author: Rusty Russell Date: Mon Aug 1 21:11:47 2005 -0700 [PATCH] Module per-cpu alignment cannot always be met The module code assumes noone will ever ask for a per-cpu area more than SMP_CACHE_BYTES aligned. However, as these cases show, gcc asks sometimes asks for 32-byte alignment for the per-cpu section on a module, and if CONFIG_X86_L1_CACHE_SHIFT is 4, we hit that BUG_ON(). This is obviously an unusual combination, as there have been few reports, but better to warn than die. See: http://www.ussg.iu.edu/hypermail/linux/kernel/0409.0/0768.html And more recently: http://bugs.gentoo.org/show_bug.cgi?id=97006 Signed-off-by: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 561fb765b97f287211a2c73a844c5edb12f44f1d Author: Anton Blanchard Date: Mon Aug 1 21:11:46 2005 -0700 [PATCH] ppc64: topology API fix Dont include asm-generic/topology.h unconditionally, we end up overriding all the ppc64 specific functions when NUMA is on. Signed-off-by: Anton Blanchard Acked-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ade43fbbcc3c12f0ddba112351d14d6c82ae476 Author: Andrew Morton Date: Mon Aug 1 21:11:45 2005 -0700 [PATCH] shm: CONFIG_SHMEM=n build fix Fix bug found by Grant Coady 's autobuild setup. shmem_set_policy() and shmem_get_policy() are macros if !CONFIG_SHMEM, so this doesn't work. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39bbb07d7c0cf3e374831d1474e2246d9cabd931 Author: Andrew Morton Date: Mon Aug 1 21:11:44 2005 -0700 [PATCH] transmeta: CONFIG_PROC_FS=n build fix Fix bug found by Grant Coady 's autobuild setup. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba17101b41977f124948e0a7797fdcbb59e19f3e Author: Eric Dumazet Date: Mon Aug 1 21:11:43 2005 -0700 [PATCH] sys_set_mempolicy() doesnt check if mode < 0 A kernel BUG() is triggered by a call to set_mempolicy() with a negative first argument. This is because the mode is declared as an int, and the validity check doesnt check < 0 values. Alternatively, mode could be declared as unsigned int or unsigned long. Signed-off-by: Eric Dumazet Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 690dbe1ced143876d8fa56b72310738dbe079d0a Author: Hugh Dickins Date: Mon Aug 1 21:11:42 2005 -0700 [PATCH] x86_64: access of some bad address x86_64 has a large sparse gate area between VSYSCALL_START and VSYSCALL_END, not all of it presently backed by pmds. Alexander Nyberg has found that in some circumstances gdb may try to ptrace here, and hit get_user_pages BUG_ON. It seems odd that gdb should be accessing here, but it certainly shouldn't crash in this way: relax BUG_ON to -EFAULT. Fixes kernel bugzilla #4801. Signed-off-by: Hugh Dickins Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74f9c9c258249fba3e2e78f70691528426a6c010 Author: Roman Zippel Date: Mon Aug 1 21:11:41 2005 -0700 [PATCH] hfs: don't reference missing page If there was a read error, the bnode might miss some pages, so skip them. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f76d28d235cf777dd2e1c1d48c16ee10c1d1587f Author: Roman Zippel Date: Mon Aug 1 21:11:40 2005 -0700 [PATCH] hfs: don't dirty unchanged inode If inode size hasn't changed, don't do anything further in truncate, which also prevents a dirty inode, what might upset some readonly devices quite badly. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0072b1389c25355ccc01048114adb9652c13fd9f Author: Adrian Bunk Date: Mon Aug 1 21:11:39 2005 -0700 [PATCH] include/linux/dcookies.h: dummy functions must be "static inline" We don't want these to be global functions. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 001abc93bf83f95737cd455b6ec875e6412f7d53 Author: Mauro Carvalho Chehab Date: Mon Aug 1 21:11:38 2005 -0700 [PATCH] v4l: bug fix to correct tea5767 autodetection This patch does correct radio chip autodetection to avoid misdetecting mt20xx microtune as tea5767 chip. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43f2f3d343f9d00a94a9242547a59d9dfb2338c4 Author: Mark Haverkamp Date: Mon Aug 1 21:11:37 2005 -0700 [PATCH] aacraid: Fix for controller load based timeouts Martin Drab found that he could get aacraid timeouts with high load on his controller / disk drive combinations. After some experimentation Mark Salyzyn has come up with a patch to reduce the default max_sectors to something that will keep the controller from being overloaded and will eliminate the timeout issues. Signed-off-by: Mark Haverkamp Cc: James Bottomley Acked-by: Mark Salyzyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2757a71c3122c7653e3dd8077ad6ca71efb1d450 Author: Hirokazu Takata Date: Mon Aug 1 21:11:35 2005 -0700 [PATCH] m32r: Fix local-timer event handling There was a scheduling problem of the m32r SMP kernel; A process rarely stopped and gave no responding but the other process have been handled by the other CPU still lives, then if we did something in the other terminal or something like that, the stopped process came back to life and continued its operation... (ex. LMbench: lat_sig) In the m32r SMP kernel, a local-timer event is delivered by using an IPI(inter processor interrupts); LOCAL_TIMER_IPI. And a function smp_send_timer() is prepared to send the LOCAL_TIMER_IPI from the current CPU to the other CPUs. The funtion smp_send_timer() was placed and used in do_IRQ() in former times (before 2.6.10-rc3-mm1 kernel), however, it was unintentionally removed when arch/m32r/kernel/irq.c was modified to employ the generic hardirq framework (CONFIG_GENERIC_HARDIRQ) in my previous patch. [PATCH 2.6.10-rc3-mm1] m32r: Use generic hardirq framework http://www.ussg.iu.edu/hypermail/linux/kernel/0412.2/0358.html The following patch fixes the above problem. Signed-off-by: Hitoshi Yamamoto Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2013485a52fb7ece48e5688b443cc098f4dbbdf Author: Martin Schwidefsky Date: Mon Aug 1 21:11:34 2005 -0700 [PATCH] s390: ioprio & inotify system calls. Add system calls for io priorities and inotify. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d3f229fcd4409d3e182b204defc122eb7833535 Author: Heiko Carstens Date: Mon Aug 1 21:11:33 2005 -0700 [PATCH] s390: kexec fixes and improvements. Disable pseudo page fault handling before starting the new kernel and try to use diag308 to reset the machine. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4374ae10e5ef577d8fd73fdadcdb37149d8b3953 Author: Eugene Surovegin Date: Sun Jul 31 22:34:54 2005 -0700 [PATCH] ppc32: add missing 4xx EMAC sysfs nodes Add missing 4xx EMAC data sysfs nodes. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61d44c777a02245a5032a2ca77a12f915416572d Author: Matt Porter Date: Sun Jul 31 22:34:53 2005 -0700 [PATCH] ppc32: add bamboo defconfig Add Bamboo platform defconfig Signed-off-by: Wade Farnsworth Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 497799d368b2106c3266a20d75ff221eed068cad Author: Matt Porter Date: Sun Jul 31 22:34:53 2005 -0700 [PATCH] ppc32: add bamboo platform Add Bamboo platform support. This is an AMCC 440EP-based reference platform. Signed-off-by: Wade Farnsworth Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9cf73aee140baa425429902aaed2c758401343f Author: Matt Porter Date: Sun Jul 31 22:34:52 2005 -0700 [PATCH] ppc32: add 440ep support Add PPC440EP core support. PPC440EP is a PPC440-based SoC with a classic PPC FPU and another set of peripherals. Signed-off-by: Wade Farnsworth Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8be1c8e065691c332fd8e9bae70c7096a69c31d Author: Kumar Gala Date: Sun Jul 31 22:34:51 2005 -0700 [PATCH] ppc32: Mark boards that don't build as BROKEN Marked APUS and GEMINI as BROKEN since they do not build at the platform level. We have requested that the maintainers of these boards/platforms fix them by the time 2.6.15 is released or we plan on concerning them unmaintained and thus removing them. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01bdc0336f8f42b32b9be9ace7775329b25202a5 Author: Denis Vlasenko Date: Sun Jul 31 22:34:50 2005 -0700 [PATCH] silence cs89x0 cs89x0 talks a lot at boot. Seems like debug leftover. This patch downgrades printks to KERN_DEBUG. While we're at it, make these messages a bit less obscure. Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1581566183f310abbd2d384a9079d4039faca05 Author: NeilBrown Date: Sun Jul 31 22:34:50 2005 -0700 [PATCH] md: make sure raid5/raid6 resync uses correct 'max_sectors' The default resync_max_sector is set to "mddev->size << 1". If the raid-personality-module updates mddev->size, it must update resync_max_sectors too. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57ee67af35183c60e924ebb6d6b3e1d2d9c03366 Author: Benjamin Herrenschmidt Date: Sun Jul 31 22:34:49 2005 -0700 [PATCH] ppc64: Fix CONFIG_ALTIVEC not set The code that sets the altivec capability of the CPU based on firmware informations can enable altivec when the kernel has CONFIG_ALTIVEC disabled. This results in "interesting" crashes. Signed-off-by: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1caf1f0f187d99eb898bdc216de5a761740fe814 Author: Paul Jackson Date: Sun Jul 31 22:34:48 2005 -0700 [PATCH] plug MAN-PAGES maintainer in Documentation/SubmittingPatches Improve the likelihood that someone submitting a patch will notify the MAN-PAGES maintainer. This is a follow-up to comments on the July 29 lkml email thread: "Broke nice range for RLIMIT NICE" Signed-off-by: Paul Jackson Cc: "Michael Kerrisk" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit faf1668c954d24285d7b213cf1ff38fe93569f01 Author: Michael Kerrisk Date: Sun Jul 31 22:34:47 2005 -0700 [PATCH] MAINTAINERS record -- MAN-PAGES Michael maintains the kernel manpages. He wants us to tell him when we change or augment the userspace API. Add his contact details to MAINTAINERS. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9fef07ca8574bff104d506c07f9161fe7fbaba57 Author: Michael Krufky Date: Sun Jul 31 22:34:46 2005 -0700 [PATCH] v4l: cx88 card support and documentation finishing touches Peter Missel: - Add support for the SVideo input on the GDI Black Gold. Mauro Carvalho Chehab: - Linux/version.h removed. Replaced by linux/utsname.h Michael Krufky: - Added analog support for DViCO FusionHDTV5 Gold. CC: Peter Missel Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd3113e84e188781aa2935fbc4351d64ccdd171b Author: Mauro Carvalho Chehab Date: Sun Jul 31 22:34:43 2005 -0700 [PATCH] V4L: Miscellaneous fixes - Fixed some bttv card numbers. - BTTV and SAA7134 version numbers incremented to reflect changes. - pci_dma_supported() is called after pci_set_dma_mask() which already did check that for us. This patch removes the unneeded call to pci_dma_supported() at bttv-driver.c - Ensure a sufficient I2C bus idle time between 2 messages for saa7134-i2c.c - It is important to write at first to MO_GP3_IO for cx88-tvaudio.c - Use try_to_freeze() instead of refrigerator at msp3400.c - Recognizing the MFPE05-2 Tuner at tveeprom.c - Add new parameter to help identify radio chipsets at tuner module: show_i2c=1 will show 16 reading bytes from detected tuners. - BTTV does generate some Unimplemented IOCTL log at tuner module: 0x40046d11(dir=1,tp=0x6d,nr=17,sz=4) means that it is sending MSP3400 calls to non-msp3400 tuners. Warning eliminated. VIDIOSAUDIO is also called, so debug messages updated. It is still requiring IOCTL implementation. - Added two more tuners. - Add support for the SVideo input on the GDI Black Gold. Signed-off-by: Peter Missel Signed-off-by: Graham Bevan Signed-off-by: Torsten Seeboth Signed-off-by: Hartmut Hackmann Signed-off-by: Tobias Klauser Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cdf32eaa4e601b15146e21b6470de00f149ce37f Author: Eric Lammerts Date: Sun Jul 31 22:34:42 2005 -0700 [PATCH] disable addres space randomization default on transmeta CPUs We know that the randomisation slows down some workloads on Transmeta CPUs by quite large amounts. We think it's because the CPU needs to recode the same x86 instructions when they pop up at a different virtual address after a fork+exec. So disable randomization by default on those CPUs. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fef3fa24d8d1bb6d82cad195f73917fa6534dac Author: Andrew Morton Date: Sun Jul 31 22:34:40 2005 -0700 [PATCH] skge build fix Make it compile with CONFIG_PM=n Cc: "Rafael J. Wysocki" Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de5b31101fdefab2a7858a17601c1a35aadf237f Author: Andrew Morton Date: Sun Jul 31 22:34:40 2005 -0700 [PATCH] i2c-mpc.c: revert duplicate patch Seems that both Greg and I submitted the same patch and it just kept on applying... Cc: Greg KH Cc: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 697a2d63a3844caaa2b6565ab7f3d69086af94d4 Author: Linus Torvalds Date: Mon Aug 1 12:37:54 2005 -0700 Revert ACPI interrupt resume changes If there are devices that use interrupts over a suspend event, ACPI must restore the PCI interrupt links on resume. Anything else breaks any device that hasn't been converted to the new (dubious) PM rules. Drivers that need the irq free/re-aquire sequence can be done one by one independently of this one. commit 4ceb5db9757aaeadcf8fbbf97d76bd42aa4df0d6 Author: Linus Torvalds Date: Mon Aug 1 11:14:49 2005 -0700 Fix get_user_pages() race for write access There's no real guarantee that handle_mm_fault() will always be able to break a COW situation - if an update from another thread ends up modifying the page table some way, handle_mm_fault() may end up requiring us to re-try the operation. That's normally fine, but get_user_pages() ended up re-trying it as a read, and thus a write access could in theory end up losing the dirty bit or be done on a page that had not been properly COW'ed. This makes get_user_pages() always retry write accesses as write accesses by making "follow_page()" require that a writable follow has the dirty bit set. That simplifies the code and solves the race: if the COW break fails for some reason, we'll just loop around and try again. Signed-off-by: Linus Torvalds commit 8d894c47975f7222c5537e450e71310b395488c7 Author: Antonino A. Daplas Date: Mon Aug 1 23:51:34 2005 +0800 [PATCH] tridentfb: Fix scrolling artifacts during disk IO Reported by: Jochen Hein (Bugzilla Bug 4312) When there is disk I/O happening, the framebuffer has a little snow on the screen. Once I/O has finished, no garbage remains on screen. This bug was explained by: Knut Petersen Most important is CRTC register 2f, signal quality is also improved for higher vclk values by changing set_vclk() according to the X drivers and cyblafb.c The fix is to set the performance register (0x2f) with a more stable value. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 8dad46cf38c029248d1331b6a97b2999e0751cfa Author: Antonino A. Daplas Date: Mon Aug 1 23:46:44 2005 +0800 [PATCH] tridentfb: Fix scrolling artifacts if acceleration is enabled Reported by: Jochen Hein (Bugzilla Bug 4386) booting leaves the end of long lines in the last line on screen when scrolling. When X is running, scrolling puts garbage on the screen (looks like X data) Console switch fixes the screen. Behaviour seems to be identical with noaccel and without on the video=tridentfb parameter in lilo.conf. This bug was explained by: Knut_Petersen Acceleration is broken for all BLADE 3D chips for all versions of kernel 2.6 except for 32bit modes. Most important reason is that the u32 col parameter of the graphics engine needs the color value replicated to all u8 of the u32 (8bit modes) and to both u16 of the u32. Fix color value passed to graphics engine, verified by the reporter. Signed-off-by: Antonino Daplas Signed-off-by: Linus Torvalds commit 6cb54819d7b1867053e2dfd8c0ca3a8dc65a7eff Author: Ingo Molnar Date: Mon Aug 1 13:39:13 2005 +0200 [PATCH] remove sys_set_zone_reclaim() This removes sys_set_zone_reclaim() for now. While i'm sure Martin is trying to solve a real problem, we must not hard-code an incomplete and insufficient approach into a syscall, because syscalls are pretty much for eternity. I am quite strongly convinced that this syscall must not hit v2.6.13 in its current form. Firstly, the syscall lacks basic syscall design: e.g. it allows the global setting of VM policy for unprivileged users. (!) [ Imagine an Oracle installation and a SAP installation on the same NUMA box fighting over the 'optimal' setting for this flag. What will they do? Will they try to set the flag to their own preferred value every second or so? ] Secondly, it was added based on a single datapoint from Martin: http://marc.theaimsgroup.com/?l=linux-mm&m=111763597218177&w=2 where Martin characterizes the numbers the following way: ' Run-to-run variability for "make -j" is huge, so these numbers aren't terribly useful except to see that with reclaim the benchmark still finishes in a reasonable amount of time. ' in other words: the fundamental problem has likely not been solved, only a tendential move into the right direction has been observed, and a handful of numbers were picked out of a set of hugely variable results, without showing the variability data. How much variance is there run-to-run? I'd really suggest to first walk the walk and see what's needed to get stable & predictable kernel compilation numbers on that NUMA box, before adding random syscalls to tune a particular aspect of the VM ... which approach might not even matter once the whole picture has been analyzed and understood! The third, most important point is that the syscall exposes VM tuning internals in a completely unstructured way. What sense does it make to have a _GLOBAL_ per-node setting for 'should we go to another node for reclaim'? If then it might make sense to do this per-app, via numalib or so. The change is minimalistic in that it doesnt remove the syscall and the underlying infrastructure changes, only the user-visible changes. We could perhaps add a CAP_SYS_ADMIN-only sysctl for this hack, a'ka /proc/sys/vm/swappiness, but even that looks quite counterproductive when the generic approach is that we are trying to reduce the number of external factors in the VM balance picture. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit 5d546f54324e04747e82ccbb4ea85f54bdcacd6d Author: Dominik Brodowski Date: Mon Aug 1 14:55:51 2005 +0200 [PATCH] pcmcia: fix multiple insertion of multifunction cards The ordering of setting and clearing device_add_pending went wrong on some occasions, causing multifunction cards only to be handled correctly on the first insertion, not on subsequent ones. Signed-off-by: Dominik Brodowski Signed-off-by: Linus Torvalds commit 2b8d4669376332a6819e21994a78ecd5502d3ebc Author: Dominik Brodowski Date: Mon Aug 1 14:16:55 2005 +0200 [PATCH] pcmcia: defer ide-cs initialization after other IDE drivers started up Avoid registering PCMCIA CF cards before other IDE stuff. This means the risk of /dev/hd* being re-ordered is lessened. The _sane_ thing to assert any ordering is to use udev, nameif and so on, of course. Signed-off-by: Dominik Brodowski Signed-off-by: Linus Torvalds commit b9c55d29e9fced1eb1b4c252b2efd4b55a0c3c7f Author: John McCutchan Date: Mon Aug 1 11:00:45 2005 -0400 [PATCH] inotify: fix race between the kernel and user space When you rm a watch, an IN_IGNORED event is sent down the event queue with the watch descriptor that you just rm'd. If you then add a watch you could get the ignored watch's wd and if you haven't read the entire event queue, user space will think that it's newly created watch was just ignored. To avoid this problem we just use idr_get_new_above instead of idr_get_new. Signed-off-by: John McCutchan Signed-off-by: Robert Love Signed-off-by: Linus Torvalds commit 7544953685859875b5ac0260b6b1856066c092d6 Author: John McCutchan Date: Mon Aug 1 11:00:45 2005 -0400 [PATCH] inotify: fix file deletion by rename detection When a file is moved over an existing file that you are watching, inotify won't send you a DELETE_SELF event and it won't unref the inode until the inotify instance is closed by the application. Signed-off-by: John McCutchan Signed-off-by: Robert Love Signed-off-by: Linus Torvalds commit be2ac68f7b66e90b8d25c168fc4d033b034f5c43 Merge: e0b98c79e605f64f263ede53344f283f5e0548be e064cd7e3ac797df1e81b55ff4fed5fca5d106b5 Author: Linus Torvalds Date: Sun Jul 31 16:49:07 2005 -0700 Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit e0b98c79e605f64f263ede53344f283f5e0548be Merge: 02459eaab98a6a57717bc0cacede148fc76af881 faa725332f39329288f52b7f872ffda866ba5b09 Author: Linus Torvalds Date: Sun Jul 31 16:48:39 2005 -0700 Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 02459eaab98a6a57717bc0cacede148fc76af881 Author: James Simmons Date: Sat Jul 30 23:49:54 2005 +0100 [PATCH] Display name of fbdev device This patch displays the name of the fbdev driver in sysfs. Down the road this will replace the current proc handle we have. Signed-off-by: James Simmons Signed-off-by: Linus Torvalds commit e064cd7e3ac797df1e81b55ff4fed5fca5d106b5 Author: Ralf Baechle Date: Mon Jul 4 18:30:42 2005 +0100 [PATCH] SMP fix for 6pack driver Drivers really only work well in SMP if they actually can be selected. This is a leftover from the time when the 6pack drive only used to be a bitrotten variant of the slip driver. Signed-off-by: Ralf Baechle DL5RB Kconfig | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Garzik commit af44f5bf775e0d36aa5879c94369216ff6f717a6 Author: Tony Lindgren Date: Thu Jun 30 06:40:18 2005 -0700 [PATCH] Fix OMAP specific typo in smc91x.h --ReaqsoxgOBHFXBhH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Jeff, Here's a little patch fixing a typo in smc91x.h. Regards, Tony --ReaqsoxgOBHFXBhH Content-Type: text/x-chdr; charset=us-ascii Content-Disposition: inline; filename="patch-fix-typo-smc91x.h" Signed-off-by: Jeff Garzik commit 3f309db33e7868fe11f8fc3a0dd291703df3c662 Author: Stephen Hemminger Date: Mon Jun 27 15:47:25 2005 -0700 [PATCH] sk98lin: fix workaround for yukon-lite chipset (> rev 7) Yukon-Lite chipset needs workaround for revision 7 (or later). Without this patch, chip gets stuck in low power mode and never boots. Newer SysKonnect vendor code already had same patch. Related bug in skge is http://bugs.gentoo.org/87822 Chris, please add for 2.6.12.2 Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 00354cfb92bd819a0d09d3ef9988e509b6675fdd Author: Jay Vosburgh Date: Thu Jul 21 12:18:02 2005 -0700 [PATCH] bonding: documentation update Contains general updates (additional configuration info, hopefully better examples, updated some out of date info, and a bonus pass through ispell to banish the "paramters.") and info specific to gratuitous ARP and xmit policy functionality already in 2.6.13-rc2. Signed-off-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit faa725332f39329288f52b7f872ffda866ba5b09 Author: Adrian Bunk Date: Wed Jul 27 01:06:35 2005 -0700 [PATCH] SCSI_SATA has to be a tristate SCSI=m must disallow static drivers. The problem is that all the SATA drivers depend on SCSI_SATA. With SCSI=m and SCSI_SATA=y this allows the static enabling of the SATA drivers with unwanted effects, e.g.: - SCSI=m, SCSI_SATA=y, SCSI_ATA_ADMA=y -> SCSI_ATA_ADMA is built statically but scsi/built-in.o is not linked into the kernel - SCSI=m, SCSI_SATA=y, SCSI_ATA_ADMA=y, SCSI_SATA_AHCI=m -> SCSI_ATA_ADMA and libata are built statically but scsi/built-in.o is not linked into the kernel, SCSI_SATA_AHCI is built modular (unresolved symbols due to missing libata) Signed-off-by: Adrian Bunk Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit f2e1e47d14aae1f33e98cf8d9ea93e2fe9e2f521 Author: Stephen Hemminger Date: Fri Jul 22 16:26:11 2005 -0700 [PATCH] skge: version 0.8 Increase driver version to 0.8 Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 6abebb538d317ead09cc0f3c2a0752047f9ff961 Author: Stephen Hemminger Date: Fri Jul 22 16:26:10 2005 -0700 [PATCH] skge: led toggle cleanup Cleanup code that is used to toggle LED's. Since we get called from ethtool, can use that thread rather than setting up a timer. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 4cde06ed0fb58402ec1d6d117122d1058983a393 Author: Stephen Hemminger Date: Fri Jul 22 16:26:09 2005 -0700 [PATCH] skge: ignore phy interrupts during negotiation During autonegotiation set PHY interrupt mask to ignore bogus speed change interrupts. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit d8a09943ebbaca9befd995d8fe10dd9885256dbf Author: Stephen Hemminger Date: Fri Jul 22 16:26:08 2005 -0700 [PATCH] skge: fifo control register access fix The code to clear fifo errors was incorrect and sending garbage to the external phy. Removed the no longer used inline's funcs. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 2c66851460c9438823e39b76887376d1511fb67c Author: Stephen Hemminger Date: Fri Jul 22 16:26:07 2005 -0700 [PATCH] skge: whitespace fixes Minor whitespace cleanups. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 382317138b3ade02c9c319531ab0619e95dbc672 Author: Stephen Hemminger Date: Fri Jul 22 16:26:06 2005 -0700 [PATCH] skge: support yukon lite rev 4 The check for Yukon lite changes was restricting itself to rev A3. It turns out that these changes are also true on A4 and later. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 4ff6ac052b90ee4dfee92f8e2c5cb7ef8a4d8f13 Author: Stephen Hemminger Date: Fri Jul 22 16:26:05 2005 -0700 [PATCH] skge: phy lock deadlock Cleanup the phy_lock deadlock because of relocking in the nway_reset path. Reported by Francois Romieu. Also, don't need to do irqsave/restore for blink, just excluding bh is good enough. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 0eedf4ac5b536c7922263adf1b1d991d2e2397b9 Author: Stephen Hemminger Date: Fri Jul 22 16:26:04 2005 -0700 [PATCH] skge: disable tranmitter on shutdown Here is a fix for a typo, thanks Eliot Dresselhaus. Since transmitter not active when device is down, it wasn't really noticed. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit acdd80d514a08800380c9f92b1bf4d4c9e818125 Author: Stephen Hemminger Date: Fri Jul 22 16:26:03 2005 -0700 [PATCH] skge: remove SK-9EE support The SK-9E boards use the Marvell Yukon2 chipset which is not supported by the skge driver. Thanks to Ralph Roesler for noticing. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit f6620cab9485d435aa93490533b8268d36dc4526 Author: Stephen Hemminger Date: Fri Jul 22 16:26:02 2005 -0700 [PATCH] skge: silence mac data parity messages Using Genesis board, I get harmless error reports. Rather than console error, turn it into a error counter. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit f0098f7863f814a5adc0b9cb271605d063cad7fa Author: Denis Lunev Date: Sat Jul 30 17:47:25 2005 -0700 [NET] Fix too aggressive backoff in dst garbage collection The bug is evident when it is seen once. dst gc timer was backed off, when gc queue is not empty. But this means that timer quickly backs off, if at least one destination remains in use. Normally, the bug is invisible, because adding new dst entry to queue cancels the backoff. But it shots deadly with destination cache overflow when new destinations are not released for long time f.e. after an interface goes down. The fix is to cancel backoff when something was released. Signed-off-by: Denis Lunev Signed-off-by: Alexey Kuznetsov Signed-off-by: David S. Miller commit db44575f6fd55df6ff67ddd21f7ad5be5a741136 Author: Alexey Kuznetsov Date: Sat Jul 30 17:46:44 2005 -0700 [NET]: fix oops after tunnel module unload Tunnel modules used to obtain module refcount each time when some tunnel was created, which meaned that tunnel could be unloaded only after all the tunnels are deleted. Since killing old MOD_*_USE_COUNT macros this protection has gone. It is possible to return it back as module_get/put, but it looks more natural and practically useful to force destruction of all the child tunnels on module unload. Signed-off-by: Alexey Kuznetsov Signed-off-by: David S. Miller commit 1f494c0e040b001cf844280910d04ba7ebdc2898 Author: Harald Welte Date: Sat Jul 30 17:44:07 2005 -0700 [NETFILTER] Inherit masq_index to slave connections masq_index is used for cleanup in case the interface address changes (such as a dialup ppp link with dynamic addreses). Without this patch, slave connections are not evicted in such a case, since they don't inherit masq_index. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit d1b04c081e3fb0a08ac108737e4efa9f4830c916 Author: Baruch Even Date: Sat Jul 30 17:41:59 2005 -0700 [NET]: Spelling mistakes threshoulds -> thresholds Just simple spelling mistake fixes. Signed-Off-By: Baruch Even Signed-off-by: David S. Miller commit 889371f61fd5bb914d0331268f12432590cf7e85 Author: Linus Torvalds Date: Sat Jul 30 13:41:56 2005 -0700 Revert "yenta free_irq on suspend" ACPI is wrong. Devices should not release their IRQ's on suspend and re-aquire them on resume. ACPI should just re-init the IRQ controller instead of breaking most drivers very subtly. Breakage reported by Hugh Dickins Undo: d8c4b4195c7d664baf296818bf756775149232d3 Signed-off-by: Linus Torvalds commit 035a4a4f8976bdf12aab992c630d3a6cfba90ea8 Author: Rafael J. Wysocki Date: Sat Jul 30 13:12:18 2005 -0700 [PATCH] sk98lin: basic suspend/resume support fixes An early version of the sk98lin patch was merged via Len's tree. But there were subsequent updates as a result of review from Jeff. THis fixes things up. Signed-off-by: Rafael J. Wysocki Cc: Jeff Garzik Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a1caa21d66bcb9ba9892435a0a54fc32cd9eeab Author: Natalie.Protasevich@unisys.com Date: Sat Jul 30 11:25:32 2005 -0700 [PATCH] x86_64: avoid wasting IRQs patch update The patch adds boundary check for the MAX_GSI_NUM. Same as the update for i386, the patch addresses a problem with ACPI SCI IRQ. The patch corrects the code such that SCI IRQ is skipped and duplicate entry is avoided. The VIA chipset uses 4-bit IRQ register for internal interrupt routing, and therefore cannot handle IRQ numbers assigned to its devices. The patch corrects this problem by allowing PCI IRQs below 16. Signed-off-by: Natalie Protasevich Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c70f5d6610c601ea2ae4ae4e49f66c80801e895f Author: Andrew Morton Date: Sat Jul 30 10:22:49 2005 -0700 [PATCH] revert bogus softirq changes This snuck in with an x86_64 change. Thanks to Richard Purdie for spotting it. Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d1d07e41a1de478a0da3cc14b4a8054ef09931c Merge: d7a465b4740806e4ee34061ad455595b2fa9fad5 adbedd34244e2b054557002817f979a9b004a405 Author: Linus Torvalds Date: Sat Jul 30 10:15:57 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus commit d7a465b4740806e4ee34061ad455595b2fa9fad5 Author: Antonino A. Daplas Date: Fri Jul 29 22:59:21 2005 -0700 [PATCH] vesafb: Document mtrr boot option usage Document mtrr boot option usage to Documentation/fb/vesafb.txt. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 92ed0223aefa795d1873427e25599cb70b2148ee Author: Dave Peterson Date: Fri Jul 29 22:59:20 2005 -0700 [PATCH] x86_64: fix bug in csum_partial_copy_generic() I was observing reproducible crashes on the "movw %bx,(%rsi)" instruction below while a process in a recvfrom() system call was copying packet data to user space. The patch below fixes the exception table and causes the crash to no longer reproduce. Please apply. Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ce17b18e16177dd6409dabd38df5c2c9b58fc2d Author: Eugene Surovegin Date: Fri Jul 29 22:59:19 2005 -0700 [PATCH] ppc32: fix 44x early serial debug for configurations with more than 512M of RAM Fix 44x early serial debugging for big RAM configurations (more than 512M). We cannot use default OpenBIOS virtual mapping, because it interferes with pinned TLB entry. While we are at it, move early UART mapping to TLB slot 0, so it can survive longer during boot process (slot 1 is used by the first ioremap call, effectively killing UART mapping if it occupies this slot). Also, change UART TLB entry size to 4K (256M is too much for a bunch of registers :). Squash some warnings on the way. Tested on Ebony and Ocotea with 1G of RAM. Thanks to Scott Coulter for diagnosing this problem. Signed-off-by: Eugene Surovegin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e310fd43256b3cf4d37f6447b8f7413ca744657a Author: Martin J. Bligh Date: Fri Jul 29 22:59:18 2005 -0700 [PATCH] Fix NUMA node sizing in nr_free_zone_pages We are iterating over all nodes in nr_free_zone_pages(). Because the fallback zonelists contain all nodes in the system, and we walk all the zonelists, we're counting memory multiple times (once for each node). This caused us to make a size estimate of 32GB for an 8GB AMD64 box, which makes all the dirty ratio calculations, etc incorrect. There's still a further bug to fix from e820 holes causing overestimation as well, but this fix is separate, and good as is, and fixes one class of problems. Problem found by Badari, and tested by Ram Pai - thanks! Signed-off-by: Martin J. Bligh Signed-off-by: Matt Dobson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fa918b451f625870cd4275ca908b2392ee86a51 Author: Robert Love Date: Fri Jul 29 22:59:17 2005 -0700 [PATCH] ppc64: inotify syscalls inotify system call support for PPC64 [ I don't think we need sys32 compatibility versions--and if we do, I failed in life. ] Signed-off-by: Robert Love Acked-by: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 141d751e264c16db554f6681d84056ebde0e8078 Author: Robert Love Date: Fri Jul 29 22:59:16 2005 -0700 [PATCH] ppc32: inotify syscalls Add inotify system call stubs to PPC32. Signed-off-by: Robert Love Acked-by: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit adbedd34244e2b054557002817f979a9b004a405 Merge: d6ac1a7910d22626bc77e73db091e00b810715f4 b0825488a642cadcf39709961dde61440cb0731c Author: Len Brown Date: Sat Jul 30 01:55:32 2005 -0400 merge 2.6.13-rc4 with ACPI's to-linus tree commit d6ac1a7910d22626bc77e73db091e00b810715f4 Merge: 577a4f8102d54b504cb22eb021b89e957e8df18f 87bec66b9691522414862dd8d41e430b063735ef Author: Len Brown Date: Fri Jul 29 23:31:17 2005 -0400 /home/lenb/src/to-linus branch 'acpi-2.6.12' commit 87bec66b9691522414862dd8d41e430b063735ef Author: David Shaohua Li Date: Wed Jul 27 23:02:00 2005 -0400 [ACPI] suspend/resume ACPI PCI Interrupt Links Add reference count and disable ACPI PCI Interrupt Link when no device still uses it. Warn when drivers have not released Link at suspend time. http://bugzilla.kernel.org/show_bug.cgi?id=3469 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit 68ac767686fd72f37a25bb4895fb4ab0080ba755 Author: Venkatesh Pallipadi Date: Mon Apr 25 14:38:00 2005 -0400 [ACPI] delete boot-time printk()s from processor_idle.c http://bugzilla.kernel.org/show_bug.cgi?id=4401 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 90158b83204842c0108d744326868d91cc9c4dfd Author: Rafael J. Wysocki Date: Sun Jul 24 14:22:00 2005 -0400 [ACPI] fix resume issues on Asus L5D http://bugzilla.kernel.org/show_bug.cgi?id=4416 Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 4b31e77455b868b43e665edceb111c9a330c8e0f Author: Dominik Brodowski Date: Wed May 18 13:49:00 2005 -0400 [ACPI] Always set P-state on initialization Otherwise a platform that supports ACPI based cpufreq and boots up at lowest possible speed could stay there forever. This because the governor may request max speed, but the code doesn't update if there is no change in speed, and it assumed the initial state of max speed. http://bugzilla.kernel.org/show_bug.cgi?id=4634 Signed-off-by: Dominik Brodowski Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 45bea1555f5bf0cd5871b208b4b02d188f106861 Author: Luming Yu Date: Sat Jul 23 04:08:00 2005 -0400 [ACPI] Add "ec_polling" boot option EC burst mode benefits many machines, some of them significantly. However, our current implementation fails on some machines such as Rafael's Asus L5D. This patch restores the alternative EC polling code, which can be enabled at boot time via "ec_polling" http://bugzilla.kernel.org/show_bug.cgi?id=4665 Signed-off-by: Luming Yu Signed-off-by: Len Brown commit 335f16be5d917334f56ec9ef7ecf983476ac0563 Author: David Shaohua Li Date: Wed Jun 22 18:37:00 2005 -0400 [ACPI] address boot-freeze with updated DMI blacklist for c-states http://bugzilla.kernel.org/show_bug.cgi?id=4763 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit b0825488a642cadcf39709961dde61440cb0731c Author: Matthew Garrett Date: Fri Jul 29 14:03:39 2005 -0700 [PATCH] agp: restore APBASE after setting APSIZE When leaving S3 state, the AGP bridge may not have all PCI configuration registers set in the same way as they were at boot. This should be fixed by pci_restore_state - however, the APBASE register cannot be set to conflict with the APSIZE register. If APSIZE is larger than it was before suspend, pci_restore_state will not restore APBASE correctly. The attached patch adds an extra item to the agp_bridge_data structure and uses it to store the value of APBASE. On resume, this is then written after APSIZE has been set. This patch only touches the path used for Intel chipsets without integrated graphics, and may need to be extended to work with the others. Without this patch, I get the symptoms described in bug 4921 - APBASE ends up overlapping various PCI devices, and as a result they fail to work after resume. Signed-off-by: Matthew Garrett Acked-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b87a1e506115e7df4c6bfd266267ee0088cba3b7 Author: Gerald Schaefer Date: Fri Jul 29 14:03:38 2005 -0700 [PATCH] s390: fix inline assembly in appldata Fix inline assembly that gets miscompiled by gcc 4. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ffa92340b22a59575afe60ea155195c43213120 Author: Cornelia Huck Date: Fri Jul 29 14:03:37 2005 -0700 [PATCH] s390: device recognition Close a small window where a device may be not operational again after senseid finished and the "same device" check fails due to dev=0000 by checking for dnv after stsch() by then setting the device to not operational. (No need to check for dnv in ccw_device_handle_oper() again since we don't do stsch() into the subchannel's schib in the meantime and will get a crw anyway if the device becomes not oper again). Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 350e3ade9ed0809a94c51db6ee66883a35f0d6c9 Author: Heiko Carstens Date: Fri Jul 29 14:03:36 2005 -0700 [PATCH] s390: check for interrupt before waiting The patch that introduced waiting for interrupts after resetting the reader can cause the boot to fail because the system is waiting for an interrupt that will never arrive. Add code to check if an interrupt is supposed to arrive before waiting endlessly. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5712f52e8c024c6b7b82ae5c7b5b3d0f3e6f711b Author: Martin Schwidefsky Date: Fri Jul 29 14:03:35 2005 -0700 [PATCH] s390: default configuration Update default configuration of s390. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a502a3593c7aa2aff99a61ed71e7cb828ee4da8b Author: Jeff Dike Date: Fri Jul 29 14:03:33 2005 -0700 [PATCH] uml: fix vsyscall brokenness The #if/#ifdef cleanup exposed a bug in UML's ELF header processing. With this bug fixed, UML recognizes the vsyscall info coming from the host. On FC4, there is a vsyscall page low in the address space, which UML doesn't provide. This causes an infinite page fault loop and a hang on boot. This patch works around that by making this look like a no-vsyscall system. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4c5c82024f5f292c0069cf40422b8f3bf5e684e Author: Antonino A. Daplas Date: Fri Jul 29 14:03:33 2005 -0700 [PATCH] fbdev: Replace memcpy with for-loop when preparing bitmap Do not use memcpy in fb_pad_aligned_buffer. It is suboptimal because only a few bytes are moved at a time. Replace with a for-loop. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1afc3f522ed088405fc8932110d338330db82bb Author: Natalie.Protasevich@unisys.com Date: Fri Jul 29 14:03:32 2005 -0700 [PATCH] x86: avoid wasting IRQs patch update The patch addresses a problem with ACPI SCI interrupt entry, which gets re-used, and the IRQ is assigned to another unrelated device. The patch corrects the code such that SCI IRQ is skipped and duplicate entry is avoided. Second issue came up with VIA chipset, the problem was caused by original patch assigning IRQs starting 16 and up. The VIA chipset uses 4-bit IRQ register for internal interrupt routing, and therefore cannot handle IRQ numbers assigned to its devices. The patch corrects this problem by allowing PCI IRQs below 16. Signed-off by: Natalie Protasevich Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80625942094b114d85811e5ff1fbc9e06dabe0ff Author: Antonino A. Daplas Date: Fri Jul 29 14:03:31 2005 -0700 [PATCH] vesafb: Fix mtrr bugs >> vesafb: mode is 800x600x16, linelength=1600, pages=16 >> vesafb: scrolling: redraw >> vesafb: Truecolor: size=0:5:6:5, shift=0:11:5:0 >> mtrr: type mismatch for fc000000,1000000 old: write-back new: write- >> combining Range is already set to write-back, vesafb attempts to add a write-combining mtrr (default for vesafb). >> mtrr: size and base must be multiples of 4 kiB This is a bug, vesafb attempts to add a size < PAGE_SIZE triggering the messages below. To eliminate the warning messages, you can add the option mtrr:2 to add a write-back mtrr for vesafb. Or just use nomtrr option. 1. Fix algorithm for finding the best power of 2 size with mtrr_add(). 2. Add option to choose the mtrr type by extending the mtrr boot option: mtrr:n where n 0 = no mtrr (equivalent to using the nomtrr option) 1 = uncachable 2 = write back 3 = write combining (default) 4 = write through Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 655a0a7799cddf9a469916c07ac22f1106abc2be Author: Bjorn Helgaas Date: Fri Jul 29 14:03:30 2005 -0700 [PATCH] serial: add MMIO support to 8250_pnp Add support for UARTs in MMIO space and clean up a little whitespace. HP legacy-free ia64 machines need this. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d483f47579461a4715db33c68ef8752e5a97a2d Author: Eric W. Biederman Date: Fri Jul 29 14:03:29 2005 -0700 [PATCH] Fix sync_tsc hang sync_tsc was using smp_call_function to ask the boot processor to report it's tsc value. smp_call_function performs an IPI_send_allbutself which is a broadcast ipi. There is a window during processor startup during which the target cpu has started and before it has initialized it's interrupt vectors so it can properly process an interrupt. Receveing an interrupt during that window will triple fault the cpu and do other nasty things. Why cli does not protect us from that is beyond me. The simple fix is to match ia64 and provide a smp_call_function_single. Which avoids the broadcast and is more efficient. This certainly fixes the problem of getting stuck on boot which was very easy to trigger on my SMP Hyperthreaded Xeon, and I think it fixes it for the right reasons. Minor changes by AK Signed-off-by: Eric W. Biederman Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94d2ac66c12397e2ca7988dbf59f24a966d275cb Author: Ravikiran G Thirumalai Date: Fri Jul 29 14:03:28 2005 -0700 [PATCH] mm: Ensure proper alignment for node_remap_start_pfn While reserving KVA for lmem_maps of node, we have to make sure that node_remap_start_pfn[] is aligned to a proper pmd boundary. (node_remap_start_pfn[] gets its value from node_end_pfn[]) Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 590f47a1d945c611530a85057e9ad7a3bbb50578 Merge: a9b2e9170bdf1dd27ca4aa9a63048065d252d116 094ce7fde493a1196b8152f9f9e73c20e24a2b05 Author: Linus Torvalds Date: Fri Jul 29 14:40:08 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq commit a9b2e9170bdf1dd27ca4aa9a63048065d252d116 Author: Pete Zaitcev Date: Fri Jul 29 12:18:34 2005 -0700 [PATCH] USB: hidinput_hid_event() oops fix It seems that I see a bug in hidinput_hid_event. The check for NULL can never work, becaue &hidinput->input is nonzero at all times. Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 498f78e6fcf558d0dec31f5648f43426ae16433f Author: Dan Streetman Date: Fri Jul 29 12:18:28 2005 -0700 [PATCH] USB: fix in usb_calc_bus_time This patch does the same swap, i.e. use the ISO macro if (isoc). Additionally, it fixes the return value - the usb_calc_bus_time function returns the time in nanoseconds (I didn't notice that before) while the HS_USECS and HS_USECS_ISO are microseconds. This fixes the function to return nanoseconds always, and adjusts ehci-q.c (the only high-speed caller of the function) to wrap the call in NS_TO_US(). Signed-off-by: Dan Streetman Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 6b216df87cb5f3bb7d47a33f1cd955ebc7b84dfd Author: Conger, Chris A Date: Fri Jul 29 12:18:23 2005 -0700 [PATCH] USB: fix Bug in usb-skeleton.c Compare endpoint address to USB_ENDPOINT_DIR_MASK to determine endpoint direction... From: "Conger, Chris A." Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 3eb0c5f4b539873ca88f8597db6a49e83ddfd7e2 Author: Ben Dooks Date: Fri Jul 29 12:18:03 2005 -0700 [PATCH] USB: add S3C24XX USB Host driver support USB (OHCI) Host driver for S3C2410/S3C2440 based systems Signed-off-by: Ben Dooks Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit f29080976d109b6c08e42be8a1888f338785c502 Author: Mathieu Date: Fri Jul 29 12:17:29 2005 -0700 [PATCH] USB: drivers/net/usb/zd1201.c: Gigabyte GN-WLBZ201 dongle usbid Gigabyte GN-WLBZ201 wifi usb dongle works very well, using the zd1201 driver. the only missing part is that the corresponding usbid is not declared. The following patch should fix this. From: "Mathieu" Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 8753e65e34a7b02f8473e7c6ce1cf7e08db4c6e3 Author: Masahito Omote Date: Fri Jul 29 12:17:25 2005 -0700 [PATCH] USB: Patch for KYOCERA AH-K3001V support This patch enables a support of KYOCERA AH-K3001V, one of the most popular cell phone in Japan. This device has vendor specific ID but works with acm driver by adding USB ID. This device already works on FreeBSD and OS X by native USB ACM driver with USB ID added. This device is probed as NO_UNION_NORMAL not to hang up when probing. Signed-off-by: Masahito Omote Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit a6db592e1624bb7ec62cf56629c9556442169ac5 Author: Michael Hund Date: Fri Jul 29 12:17:20 2005 -0700 [PATCH] USB: ldusb fixes below you will find the forgotten kmalloc check (sorry). Signed-off-by: Michael Hund Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 86d30741e480f40676c2173e1153368a4846da48 Author: Alan Stern Date: Fri Jul 29 12:17:16 2005 -0700 [PATCH] USB: Usbcore: Don't try to delete unregistered interfaces This patch handles a rarely-encountered failure mode in usbcore. It's legal for device_add to fail (although now it happens even more rarely than before since failure to bind a driver is no longer fatal). So when we destroy the interfaces in a configuration, we shouldn't try to delete ones which weren't successfully registered. Also, failure to register an interface shouldn't be fatal either -- I think; you may disagree about this part of the patch. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 4a0d73c463765ce34b22ac3924d0661caf2a7539 Author: Adrian Bunk Date: Fri Jul 29 12:17:11 2005 -0700 [PATCH] USB: drivers/usb/net/: remove two unused multicast_filter_limit variables The only uses of both variables were recently removed. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit fe0410c7f43e133e156e54e3156392e800bedc21 Author: Alan Stern Date: Fri Jul 29 12:16:58 2005 -0700 [PATCH] USB: usbfs: Don't leak uninitialized data This patch fixes an information leak in the usbfs snoop facility: uninitialized data from __get_free_page can be returned to userspace and written to the system log. It also improves the snoop output by printing the wLength value. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 279e1545a1350b9147ae884f848ffc8b7db18967 Author: Ian Abbott Date: Fri Jul 29 12:16:52 2005 -0700 [PATCH] USB: ftdi_sio: fix a couple of timeouts ftdi_sio: Fix timeouts in a couple of usb_control_msg() calls due to change of units from jiffies to milliseconds in 2.6.12. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 74ede0ff59fb18787213ed979641624a2f234821 Author: Ian Abbott Date: Fri Jul 29 12:16:41 2005 -0700 [PATCH] USB: ftdi_sio: Update RTS and DTR simultaneously ftdi_sio: Update RTS and DTR simultaneously, using a single control URB instead of separate control URBs for RTS and DTR. Reinhard Bergmann observed time differences of up to 680 ms with his application on a 2.4.22 kernel when RTS and DTR were updated using separate control URBs, which is unacceptable. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9b1513d91e195af46b8e59626f74d3d41a7565af Author: Ian Abbott Date: Fri Jul 29 12:16:31 2005 -0700 [PATCH] USB: ftdi_sio: new microHAM and Evolution Robotics devices The attached patch adds the following new devices to the ftdi_sio driver: * microHAM USB-Y6 and USB-Y8 devices submitted by Justin Burket (KL1RL). * Evolution Robotics ER1 Control Module submitted by Shawn M. Lavelle. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit a46e812620bd7db457ce002544a1a6572c313d8a Author: Kumar Gala Date: Fri Jul 29 12:16:27 2005 -0700 [PATCH] PCI: fix up errors after dma bursting patch and CONFIG_PCI=n -- bug? In the patch from: http://www.uwsg.iu.edu/hypermail/linux/kernel/0506.3/0985.html Is the the following line suppose inside the if CONFIG_PCI=n #define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0) Signed-off-by: Kumar Gala Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 10f4338ca8534823bc6c843edbbe42fd4e73d258 Author: Ivan Kokshaysky Date: Fri Jul 29 12:16:22 2005 -0700 [PATCH] PCI: remove PCI_BRIDGE_CTL_VGA handling from setup-bus.c The setup-bus code doesn't work correctly for configurations with more than one display adapter in the same PCI domain. This stuff actually is a leftover of an early 2.4 PCI setup code and apparently it stopped working after some "bridge_ctl" changes. So the best thing we can do is just to remove it and rely on the fact that any firmware *has* to configure VGA port forwarding for the boot display device properly. But then we need to ensure that the bus->bridge_ctl will always contain valid information collected at the probe time, therefore the following change in pci_scan_bridge() is needed. Signed-off-by: Ivan Kokshaysky Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 761a3ac08c63718dacde12aaf0ec6d6760e8c2b7 Author: Jon Smirl Date: Fri Jul 29 12:16:17 2005 -0700 [PATCH] PCI: Adjust PCI rom code to handle more broken ROMs There are ROMs reporting that their size exceeds their PCI ROM resource window. This patch returns the minimum of the resource window size or the size in the ROM. An example of this breakage is the XGI Volari Z7. Signed-off-by: Jon Smirl Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit e96e2f148060330f6178b502574dcb81eb7318bf Author: Daniele Gaffuri Date: Fri Jul 29 12:15:46 2005 -0700 [PATCH] PCI: Hidden SMBus bridge on Toshiba Tecra M2 Patch against 2.6.12 to unhide SMBus on Toshiba Centrino laptops using Intel 82855PM chipset. Tested on Toshiba Tecra M2. Signed-off-by: Daniele Gaffuri Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit ea5860d22b37b47c5023949edad2ec23e75169d1 Author: Evgeniy Polyakov Date: Fri Jul 29 12:15:38 2005 -0700 [PATCH] w1: kconfig/Makefile fix. This patch was sent first time very long time ago, but magically was disapeared, it probably exists in your queue, but to be sure, I resend it. If can not be applied cleanly after your w1 queue is flushed into upstrem tree, just drop it. Thanks. Patch from Michael Farmbauer . Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 0d73adc14e239b05a9393c09c067a26a5ba86b6c Author: Jean Delvare Date: Fri Jul 29 12:15:33 2005 -0700 [PATCH] I2C: 24RF08 corruption prevention (again) The 24RF08 corruption prevention in the eeprom and max6875 drivers wasn't complete. For one thing, the additional quick write should happen as soon as possible and unconditionally, while both drivers had error paths before. For another, when a given chip is forced, the core does not emit a quick write, so a second quick write would cause the corruption rather than prevent it. I plan to move the corruption prevention in the core in the long run, so that individual drivers don't have to care anymore. But I need to merge i2c_probe and i2c_detect before I do (work in progress). Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 86749e8512d2c37618dc5814ef41abbf168f291b Author: Jean Delvare Date: Fri Jul 29 12:15:29 2005 -0700 [PATCH] I2C: missing new lines in i2c-core messages Two log messages lack their trailing new line in i2c-core. I'd swear I had fixed them already, but it seems not. Bonus: improved coding style. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 0cacdf298211ec9e87354cf102f20d070e76e075 Author: Jean Delvare Date: Fri Jul 29 12:15:12 2005 -0700 [PATCH] I2C: use time_after in 3 chip drivers A few i2c drivers were not updated to use time_after() yet. Signed-off-by: Marcelo Feitoza Parisi Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 368609c5a8bd75b77721e69726ddfd3c6a30f7d4 Author: Jean Delvare Date: Fri Jul 29 12:15:07 2005 -0700 [PATCH] I2C: Missing space in split strings A few split string in i2c (and now hwmon) drivers lack a joining space, causing them to display incorrectly. This trivial patch fixes that up. Please apply, thanks. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d91e16943fdaf02bf3459059abca1032589c0663 Author: Ladislav Michl Date: Fri Jul 29 12:15:00 2005 -0700 [PATCH] I2C: ds1337 - fix 12/24 hour mode bug DS1339 manual, page 6, chapter Date and time operation: The DS1339 can be run in either 12-hour or 24-hour mode. Bit 6 of the hours register is defined as the 12-hour or 24-hour mode-select bit. When high, the 12-hour mode is selected. Patch below makes ds1337 driver work as documented in manual. Signed-off-by: Ladislav Michl Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit cb14c3a13cb1e78acf54a9ddc9e5f3e2f023523e Author: Kumar Gala Date: Fri Jul 29 12:14:40 2005 -0700 [PATCH] I2C-MPC: Restore code removed I2C-MPC: Restore code removed A previous patch to remove support for the OCP device model was way to generious and moved some of the platform device model code, oops. Signed-off-by: Kumar Gala Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit fc185d95ecf3ca62fa9afb5214a69b39060ff537 Author: Greg KH Date: Fri Jul 29 12:14:34 2005 -0700 [PATCH] Add the rules about the -stable kernel releases to the Documentation directory This was the last agreed upon set of rules, it's probably time we actually add them to the kernel tree to make them "official". Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 3348e05a4f25489908d9f7ed4e80ac291ead18f4 Author: Adrian Bunk Date: Fri Jul 29 12:14:28 2005 -0700 [PATCH] DEBUG_FS must depend on SYSFS CONFIG_DEBUG_FS=y and CONFIG_SYSFS=n results in the following compile error: <-- snip --> ... LD vmlinux fs/built-in.o: In function `debugfs_init': inode.c:(.init.text+0x31be): undefined reference to `kernel_subsys' make: *** [vmlinux] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9ca1eb3282b6050c295adb296761f8d26baf4ca5 Author: Maneesh Soni Date: Fri Jul 29 12:14:19 2005 -0700 [PATCH] sysfs: fix sysfs_setattr o sysfs_dirent's s_mode field should also be updated in sysfs_setattr(), else there could be inconsistency in the two fields. s_mode is used while ->readdir so as not to bring in the inode to cache. Signed-off-by: Maneesh Soni Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit bc062b1b5c6bef4e3a29c7fda57967251d12beb0 Author: Maneesh Soni Date: Fri Jul 29 12:13:35 2005 -0700 [PATCH] sysfs: fix sysfs_chmod_file o sysfs_chmod_file() must update the new iattr field in sysfs_dirent else the mode change will not be persistent in case of inode evacuation from cache. Signed-off-by: Maneesh Soni Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 30d07a22a19329c89628a2057b0120245c482c9e Author: Daniel Walker Date: Fri Jul 29 12:14:07 2005 -0700 [PATCH] stable_api_nonsense.txt fixes Signed-off-by: Daniel Walker Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 8bf2755664bfe03a414e7ec02d9f16a3d5beb60d Author: Eric W. Biederman Date: Fri Jul 29 13:25:28 2005 -0600 [PATCH] x86_64 machine_kexec: Use standard pagetable helpers Use the standard hardware page table manipulation macros. This is possible now that linux works with all 4 levels of the page tables. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 0b6b2f08c24a65535cb18893ca27516389c5fc0f Author: Venkatesh Pallipadi Date: Fri Jul 29 16:00:13 2005 -0400 [ACPI] Fix memset arguments in acpi processor_idle.c http://bugzilla.kernel.org/show_bug.cgi?id=4954 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 094ce7fde493a1196b8152f9f9e73c20e24a2b05 Author: Dave Jones Date: Fri Jul 29 12:55:40 2005 -0700 arch/i386/kernel/cpu/cpufreq/powernow-k8.c: In function `powernow_k8_cpu_init_acpi': arch/i386/kernel/cpu/cpufreq/powernow-k8.c:740: warning: unused variable `vid' arch/i386/kernel/cpu/cpufreq/powernow-k8.c:739: warning: unused variable `fid' arch/i386/kernel/cpu/cpufreq/powernow-k8.c:743: warning: unused variable `vid' arch/i386/kernel/cpu/cpufreq/powernow-k8.c:742: warning: unused variable `fid' arch/i386/kernel/cpu/cpufreq/powernow-k8.c:746: `fid' undeclared (first use in this function) arch/i386/kernel/cpu/cpufreq/powernow-k8.c:746: `vid' undeclared (first use in this function) Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit 4a7164023959040e687e51663dee67cff4d2b770 Author: Venkatesh Pallipadi Date: Fri Jul 29 15:51:36 2005 -0400 [ACPI] Fix the regression with c1_default_handler on some systems where C-states come from FADT. Thanks to Kevin Radloff for identifying the issue and isolating it to exact line of code that is causing the issue. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 36c4fd23cc06f81d68ee968c4c1bf1cebb3dcea5 Author: Eric W. Biederman Date: Fri Jul 29 13:02:09 2005 -0600 [PATCH] x86_64 machine_kexec: Cleanup inline assembly. In an uncensored copy of code from i386 to x86_64 I wound up with inline assembly with the wrong constraints. Use input constraints instead of output constraints. So I know the assembler will do the right thing specify the size of the operand lidtq and lgdtq instead of just lidt and lgdt. Make load_segments use an input constraint, and delete the macro fun. Without having to reload %cs like I do on i386 this code is noticeably simpler. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit e7b47ccaf655cbaf336745a9b65cf7b22a536fca Author: Eric W. Biederman Date: Fri Jul 29 13:01:18 2005 -0600 [PATCH] i386 machine_kexec: Cleanup inline assembly For some reason I was telling my inline assembly that the input argument was an output argument. Playing in the trampoline code I have seen a couple of instances where lgdt get the wrong size (because the trampolines run in 16bit mode) so use lgdtl and lidtl to be explicit. Additionally gcc-3.3 and gcc-3.4 want's an lvalue for a memory argument and it doesn't think an array of characters is an lvalue so use a packed structure instead. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 1108bae41e2ac596f46bc4cd8876b93063203d2b Author: Eric W. Biederman Date: Fri Jul 29 12:50:57 2005 -0600 [PATCH] reboot: remove device_suspend(PMSG_FREEZE) from kernel_kexec If device_suspend(PMSG_FREEZE) is not ready to be called in kernel_restart it is definitely not ready to be called in the even more fickle kernel_kexec. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 2bcad935a3bb149833bf249e6b159f22a90d6218 Author: Dave Jones Date: Fri Jul 29 09:56:41 2005 -0700 Fix up powernow-k8 compile. (Missing definitions). From: Mark Langsdorf Signed-off-by: Dave Jones commit d6d2a2ab05da6e44bd127fe375078bb7c36a0ad0 Author: Linus Torvalds Date: Fri Jul 29 11:01:22 2005 -0400 x86: fix new find_first_bit() Some edge problems with the original C rewrite. Thanks go to Cal Peake, who pinpointed the breakage to the rewrite, and tested this fixed version. Signed-off-by: Linus Torvalds commit 33ac02aa4cef417871e128ab4a6565e751e5f3b2 Merge: e0d7ff168a71299919f01500b3d507aae0c67513 2bcad935a3bb149833bf249e6b159f22a90d6218 Author: Linus Torvalds Date: Fri Jul 29 10:16:25 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq commit e0d7ff168a71299919f01500b3d507aae0c67513 Merge: ca49a601c2b4b74e5cf57fef62122204d1982372 33fdfa97f2b3aab698ef849ec50dcc5102017f0a Author: Linus Torvalds Date: Fri Jul 29 09:48:34 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input commit ca49a601c2b4b74e5cf57fef62122204d1982372 Merge: 5a90fa71f6d45054c78b2bd6dbc4feba1638e1d2 7ac5ae4b122f9415948c642b945a26938aa8f347 Author: Linus Torvalds Date: Fri Jul 29 09:47:08 2005 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp commit 5a90fa71f6d45054c78b2bd6dbc4feba1638e1d2 Merge: dddf8f9e4b1af852bcd735d5f737c0d0e2ce6e76 7b6dbd6872ca1d0c03dc0e0a7108d79c8dafa793 Author: Linus Torvalds Date: Fri Jul 29 09:04:47 2005 -0700 Merge head 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 7ac5ae4b122f9415948c642b945a26938aa8f347 Author: Russell King Date: Fri Jul 29 16:36:48 2005 +0100 [ARM SMP] Ensure secondary CPUs see their pen release Since the secondary CPUs will not be operating in symetric mode while they are held in the pen, we need to ensure that the write to pen_release is visible to them, by flushing the cache. Signed-off-by: Russell King commit dddf8f9e4b1af852bcd735d5f737c0d0e2ce6e76 Merge: 911656f8a630e36b22c7e2bba3317dec9174209c 6192b54b845ed05cb838f86ca588cc625c703a09 Author: Linus Torvalds Date: Thu Jul 28 22:12:57 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 911656f8a630e36b22c7e2bba3317dec9174209c Author: Stephen Smalley Date: Thu Jul 28 21:16:21 2005 -0700 [PATCH] selinux: Fix address length checks in connect hook This patch fixes the address length checks in the selinux_socket_connect hook to be no more restrictive than the underlying ipv4 and ipv6 code; otherwise, this hook can reject valid connect calls. This patch is in response to a bug report where an application was calling connect on an INET6 socket with an address that didn't include the optional scope id and failing due to these checks. Signed-off-by: Stephen Smalley Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0b9d796002d9d39575cf1beabfb625f68b507fa Author: Jon Smirl Date: Thu Jul 28 21:16:19 2005 -0700 [PATCH] fbdev: colormap fixes fix Fix a buffer overflow vunerabilty in previous cmap patch Signed-off-by: Jon Smirl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1474e2d9dfb782e6c6517a180b5a8913c69dfad Author: Dave Hansen Date: Thu Jul 28 21:16:18 2005 -0700 [PATCH] re-disable TSC on NUMAQ Somewhere recently, the TSC got re-enabled for timekeeping on NUMAQ machines. However, the hardware makes these get unsynchronized quite badly. So badly, in fact, that the code to fix up the skew can just hang on boot. This patch re-disables them. It's nicely confined to the numaq.c file. It would be great if this could make it into 2.6.13, I think it counts as a bugfix. Tested on a 16-proc 4-node NUMAQ. Signed-off-by: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78fa74a23b16bdb0d944272b696915c4e0bb3ee1 Author: George Anzinger Date: Thu Jul 28 21:16:16 2005 -0700 [PATCH] posix timers: fix normalization problem (We found this (after a customer complained) and it is in the kernel.org kernel. Seems that for CLOCK_MONOTONIC absolute timers and clock_nanosleep calls both the request time and wall_to_monotonic are subtracted prior to the normalize resulting in an overflow in the existing normalize test. This causes the result to be shifted ~4 seconds ahead instead of ~2 seconds back in time.) The normalize code in posix-timers.c fails when the tv_nsec member is ~1.2 seconds negative. This can happen on absolute timers (and clock_nanosleeps) requested on CLOCK_MONOTONIC (both the request time and wall_to_monotonic are subtracted resulting in the possibility of a number close to -2 seconds.) This fix uses the set_normalized_timespec() (which does not have an overflow problem) to fix the problem and as a side effect makes the code cleaner. Signed-off-by: George Anzinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2d76bd8fa29f9b6dbf3ee8f6bc7bdda21bc5ce8 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Jul 28 21:16:15 2005 -0700 [PATCH] uml: implement hostfs syncing Actually implement the hostfs "sync" method. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30f417c65e151dc96998a8ef721149a43998bc65 Author: Christophe Lucas Date: Thu Jul 28 21:16:12 2005 -0700 [PATCH] uml: Clean up prink calls printk() calls should include appropriate KERN_* constant. Signed-off-by: Christophe Lucas Signed-off-by: Domen Puncer Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 201134ca168c27c1f895ecfd74f9ebf1129483d0 Author: Bodo Stroesser Date: Thu Jul 28 21:16:11 2005 -0700 [PATCH] uml: Fix typo Fix a typo in wait_stub_done. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e1f49da6881bbf938e502d99335ad5488eb93b4 Author: Jeff Dike Date: Thu Jul 28 21:16:09 2005 -0700 [PATCH] uml: Fix load average >=1 update_process_times was missing its irq_enter/irq_exit wrapper. This caused ksoftirqd to be scheduled on every clock tick. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d9b7cc84afc7f4ebcef27691279d557e13128818 Author: Jeff Dike Date: Thu Jul 28 21:16:08 2005 -0700 [PATCH] uml: Fix redundant assignment By this point, .is_user has already been set, so this assignment is useless. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9057e9deee648cb2824d83b9eb7058edb5442a21 Author: Bodo Stroesser Date: Thu Jul 28 21:16:06 2005 -0700 [PATCH] uml: Fix skas0 stub return It's wrong to pop a fixed number of words from stack before calling sigreturn, as the number depends on what code is generated by the compiler for the start of stub_segv_handler(). What we need is esp containing the address of sigcontext. So we explicitly load that pointer into esp. Signed-off-by: Bodo Stroesser Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f313b12335abf010802751c45249e7a0007a232 Author: Jeff Dike Date: Thu Jul 28 21:16:05 2005 -0700 [PATCH] uml: vm86 compile fix We added an include of asm/vm86.h in include/asm-i386/ptrace.h. Since UML includes the underlying arch's ptrace.h, it needs an asm/vm86.h in order to build. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8afe07ce0003d4c63b7d76b6f28264503cb80d71 Author: Paolo 'Blaisorblade' Giarrusso Date: Thu Jul 28 21:16:03 2005 -0700 [PATCH] uml: avoid unnecessary pcap rebuild Just a Kbuild subtlety, not listing a target file inside targets causes it to be rebuilt each time, and as a consequence everything depending on it is rebuilt. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b85e9680a33ae2df04bd493f220a76dcf183ce80 Author: Jeff Dike Date: Thu Jul 28 21:16:01 2005 -0700 [PATCH] uml: fix TT mode by reverting "use fork instead of clone" With Paolo 'Blaisorblade' Giarrusso Revert the following patch, because of miscompilation problems in different environments leading to UML not working *at all* in TT mode; it was merged lately in 2.6 development cycle, a little after being written, and has caused problems to lots of people; I know it's a bit too long, but it shouldn't have been merged in first place, so I still apply for inclusion in the -stable tree. Anyone using this feature currently is either using some older kernel (some reports even used 2.6.12-rc4-mm2) or using this patch, as included in my -bs patchset. For now there's not yet a fix for this patch, so for now the best thing is to drop it (which was widely reported to give a working kernel, and as such was even merged in -stable tree). "Convert the boot-time host ptrace testing from clone to fork. They were essentially doing fork anyway. This cleans up the code a bit, and makes valgrind a bit happier about grinding it." URL: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=98fdffccea6cc3fe9dba32c0fcc310bcb5d71529 Signed-off-by: Jeff Dike Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ca3310e78912a527d7d2c62c01da7cbf7346b8d Author: Alasdair G Kergon Date: Thu Jul 28 21:16:00 2005 -0700 [PATCH] device-mapper: fix md->lock deadlocks in core This patch is an attempt to fix deadlocks discovered in the core dm. The problems boil down to md->lock having to be held in too many places, so I've split it into two: md->suspend_lock and md->io_lock. suspend_lock is now held throughout dm_suspended() as well as dm_resume() and dm_swap_table() so that these functions cannot run concurrently: there's no requirement for that and it added complexity. DMF_FS_LOCKED becomes redundant: DMF_SUSPENDED provides adequate protection. Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e90188be4a56f37fbb4ffb5b58745683526dcb9 Author: Alasdair G Kergon Date: Thu Jul 28 21:15:59 2005 -0700 [PATCH] device-mapper: fix deadlocks in core Avoid another bdget_disk which can deadlock. Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf222b3769c3759488579441ab724ed33a2da5f4 Author: Alasdair G Kergon Date: Thu Jul 28 21:15:57 2005 -0700 [PATCH] device-mapper: fix deadlocks in core (prep) Some code tidy-ups in preparation for the next patches. Change dm_table_pre/postsuspend_targets to accept NULL. Use dm_suspended() throughout. Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c56ac3f3b12936b03d2626c7572fed5977af515 Author: Ravikiran G Thirumalai Date: Thu Jul 28 21:15:55 2005 -0700 [PATCH] x86_64: fix cpu_to_node setup for sparse apic_ids While booting with SMT disabled in bios, when using acpi srat to setup cpu_to_node[], sparse apic_ids create problems. Without this patch, intel x86_64 boxes with hyperthreading disabled in the bios (and which rely on srat for numa setup) endup having incorrect values in cpu_to_node[] arrays, causing sched domains to be built incorrectly etc. Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a7b90137d9f05390cf953d756e1edda2ca88053 Author: Andi Kleen Date: Thu Jul 28 21:15:54 2005 -0700 [PATCH] x86_64: Remove unused variable in k8-bus.c arch/x86_64/pci/k8-bus.c: In function `fill_mp_bus_to_cpumask': arch/x86_64/pci/k8-bus.c:32: warning: unused variable `printed' Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef6e525393dbbab7e1dc42594d35a1dfd688d1d7 Author: Nishanth Aravamudan Date: Thu Jul 28 21:15:53 2005 -0700 [PATCH] x86_64: Use msleep in smpboot.c Replace schedule_timeout() with msleep() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d224d32c28c165f7100a670d61d64dd15d49a1e Author: Jesse Millan Date: Thu Jul 28 21:15:51 2005 -0700 [PATCH] x86_64: Fix gcc 4 warning in sched_find_first_bit This patch eliminates the GCC4 warning on the x86_64 platform: kernel/sched.c:1824: warning: control may reach end of non-void function 'sched_find_first_bit' being inlined. The change follows the lead of others, i.e. it is guaranteed that at least one of b[0], b[1], or b[2] will have a bit set and evaluate to true. That being said, GCC4.0.0 notices that the code flow does not return anything if b[0], b[1] and b[2] are not true. Since we know better, if it's not b[0] or b[1], it has to be b[2]. Signed-off-by: Jesse Millan Signed-off-by: Domen Puncer Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07291d431ce6c6660c35dd4e5e980a406dc3629a Author: Andi Kleen Date: Thu Jul 28 21:15:50 2005 -0700 [PATCH] x86_64: Fix SRAT handling on non dual core systems Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed6b676ca8b50e0b538e61c283d52fd04f007abf Author: Andi Kleen Date: Thu Jul 28 21:15:49 2005 -0700 [PATCH] x86_64: Switch to the interrupt stack when running a softirq in local_bh_enable() This avoids some potential stack overflows with very deep softirq callchains. i386 does this too. TOADD CFI annotation Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3829ee6b1be03d5aa3005fe7d19f30088b539836 Author: Andi Kleen Date: Thu Jul 28 21:15:48 2005 -0700 [PATCH] x86_64: Small assembly improvements Save a byte here and there. Ultimatively useless, but these things always catch my eyes when reading the code so just fix them for now. Also I got at least one patch fixing of them already, which gives a good excuse. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ba80e7595f3e308e5e7135445b513779fc0ba3b Author: Andi Kleen Date: Thu Jul 28 21:15:47 2005 -0700 [PATCH] x86_64: Remove unnecessary include in fault.c Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2cac78935ff1705e1eb53be28da704d3482b4f5 Author: Andi Kleen Date: Thu Jul 28 21:15:46 2005 -0700 [PATCH] x86_64: When running cpuid4 need to run on the correct CPU Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6a68a16dc15c65fe76acb7502a806ae415cd3e4 Author: Andi Kleen Date: Thu Jul 28 21:15:45 2005 -0700 [PATCH] x86_64: Turn BUG data into valid instruction This avoids confusing the disassembler. Costs 2 bytes per BUG. Thanks to Suresh Siddha and Jan Beulich for suggesting suitable instructions. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2275cfa8bcb833cdac7dcc616d11306ca35eec58 Author: Andreas Gruenbacher Date: Thu Jul 28 21:15:44 2005 -0700 [PATCH] x86_64: Icecream has no way of detecting assembler-level includes Icecream preprocesses c sources locally, and sends the result off to a remote host for compiling. It does not recognize includes at assembler level. The fix is to put the assemberincludes an a separate .s file, which will always be assembled locally. Signed-off-by: Andreas Gruenbacher Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8d311939f9d2b2a5e935df8dceb98b7cbe08d43 Author: Andi Kleen Date: Thu Jul 28 21:15:42 2005 -0700 [PATCH] x86_64: Support more than 8 cores on AMD systems Use physical mode instead of logical mode to address more CPUs. This is also used in the CPU hotplug case to avoid a race. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37a47e65fa58d413a31f27ee88f6cb98583b6157 Author: Andi Kleen Date: Thu Jul 28 21:15:41 2005 -0700 [PATCH] x86_64: Remove the broadcast options that were added for cpuhotplug Will be obsolete with physflat. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f68c1388ada34998c2902c289c6a6b625a73c4e Author: Andi Kleen Date: Thu Jul 28 21:15:41 2005 -0700 [PATCH] x86_64: Remove IA32_* build tools in Makefile Not used anymore since quite some time. Just uses -m32 instead. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91c6d400940e97f2809c04fcf383517f7650dbd4 Author: Andi Kleen Date: Thu Jul 28 21:15:39 2005 -0700 [PATCH] x86_64: Create per CPU machine check sysfs directories This patch will create machinecheck sysdev directories per CPU. All of the cpus still share the same ctl banks. When compiled with CONFIG_HOTPLUG_CPU, it will also bring up/down sysdev directories as cpus go up/down. I have tested the patch along with CONFIG_HOTPLUG_CPU option on in 2.6.13-rc1 kernel. Minor changes by AK: remove useless unload function Signed-off-by: Jacob Shin Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69cb62eb6dceb0da701e04395d3b412a0648c118 Author: Andi Kleen Date: Thu Jul 28 21:15:39 2005 -0700 [PATCH] x86_64: Print a boot message for hotplug memory zones From: Keith Manning Print a boot message for hotplug memory zones Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b684664fd495fd640353c0f786751763db77dcfb Author: Keith Mannthey Date: Thu Jul 28 21:15:38 2005 -0700 [PATCH] x86_64: Fix overflow in NUMA hash function setup Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17158d17aa726142255050b407ad701a6f191aba Author: Andi Kleen Date: Thu Jul 28 21:15:37 2005 -0700 [PATCH] x86_64: Fix incorrectly defined MSR_K8_SYSCFG Harmless because the kernel didn't use it. Noticed by Travis Betak Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca4e6b740206fc943cc1c90fd434d4d389da8f2b Author: Andi Kleen Date: Thu Jul 28 21:15:36 2005 -0700 [PATCH] x86_64: Fix some typos in system.h comments Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6391ad0aa487e7b13588b1439d2462a320b07d0d Author: Andi Kleen Date: Thu Jul 28 21:15:35 2005 -0700 [PATCH] x86_64: Remove obsolete eat_key prototype Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d970a5218088a856d80acd9da6c6742f55cb0a0d Author: Andi Kleen Date: Thu Jul 28 21:15:35 2005 -0700 [PATCH] x86_64: Fix some comments in tlbflush.h Were either outdated or misleading. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ef4d7cbea773a77b36e732779cab4018ba2c037b Author: Andi Kleen Date: Thu Jul 28 21:15:34 2005 -0700 [PATCH] x86_64: Some updates for boot-options.txt Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a54649b801e5fe69755dc55e6589f7a65af25d79 Author: Andi Kleen Date: Thu Jul 28 21:15:32 2005 -0700 [PATCH] x86_64: Improve CONFIG_GART_IOMMU description and make it default y Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c853cc7e7940a2d6ad66cfe666192516fc06b0e3 Author: Andi Kleen Date: Thu Jul 28 21:15:31 2005 -0700 [PATCH] x86_64: Remove unused variable in delay.c Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a940199f206dcf51c65fae27e2ce412f2c5a2b22 Author: Andi Kleen Date: Thu Jul 28 21:15:30 2005 -0700 [PATCH] x86_64: Some cleanup in setup64.c Minor cleanup. Move things into their include files, remove obsolete includes, fix indentation, remove obsolete special cases etc. I also added the per cpu section to asm-generic/sections.h and fixed init/main.c to use it. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de04f3220b9789cc40fd6b1d151dfa0a7e3b03b9 Author: Andi Kleen Date: Thu Jul 28 21:15:29 2005 -0700 [PATCH] x86_64: Clarify Booting processor ... message No need to print kernel addresses there and clarify what the APIC-ID is. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3019e8ebe6281843488250ee3a539106806da93a Author: Andi Kleen Date: Thu Jul 28 21:15:28 2005 -0700 [PATCH] x86_64: Minor clean up to CPU setup - use smp_processor_id instead of custom hack Does not change any semantics because numa_add_cpu checks for CPU 0 anyways. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61b1b2d0239da82c0bed8adaa1d070c6551d4afd Author: Andi Kleen Date: Thu Jul 28 21:15:27 2005 -0700 [PATCH] x86_64: Move cpu_present/possible_map parsing earlier Various code needs this information now before the actual SMP bootup. Instead of computing it on the fly while booting the other CPUs set it up now while initial MPtable/MADT parsing. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b943fbfaf0dbdd3cd9ff2dda100f0b8c47a7d8c Author: Andi Kleen Date: Thu Jul 28 21:15:26 2005 -0700 [PATCH] x86_64: i386/x86_64: remove prototypes for not existing functions in smp.h Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74f0629397cb435e144ff47c48f3bc39e879f196 Author: Andi Kleen Date: Thu Jul 28 21:15:25 2005 -0700 [PATCH] x86_64: Use for_each_cpu_mask for clustered IPI flush Makes it slightly more efficient. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit acc7b6f01c3d387faa34233a25949eaaf18e0753 Author: Andi Kleen Date: Thu Jul 28 21:15:23 2005 -0700 [PATCH] x86_64: Update defconfig Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5df3574ec0eac0eb8d758e8e9b1ad95d909a9e1f Author: Andi Kleen Date: Thu Jul 28 21:15:22 2005 -0700 [PATCH] x86_64: Always ack IPIs even on errors Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a16a3007d5b5896ff62d149bb4dca1a29fd78c4 Author: Alexander Nyberg Date: Thu Jul 28 21:15:20 2005 -0700 [PATCH] x86_64: cpu hotplug changes kills nmi watchdog When the x86_64 cpu hotplug changes went in it added a check in default_do_nmi() which kills NMI delivery on any CPU but the BSP. The NMI watchdog is brought up quite some time before the online bit is set in num_online_cpus so this won't work very well. The nmi watchdogs on cpus that are not BSP will never be reprogrammed and no NMIs. Why was this check added? How does an offlined cpu receive an NMI? Signed-off-by: Alexander Nyberg Cc: Andi Kleen Cc: Andrew Morton Cc: Zwane Mwaikambo Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b6dbd6872ca1d0c03dc0e0a7108d79c8dafa793 Author: Greg Felix Date: Thu Jul 28 15:54:15 2005 -0400 libata: Check PCI sub-class code before disabling AHCI This patch adds functionality to check the PCI sub-class code of an AHCI capable device before disabling AHCI. It fixes a bug where an ICH7 sata controller is being setup by the BIOS as sub-class 1 (ide) and the AHCI control registers weren't being initialized, thus causing an IO error in piix_disable_ahci(). Signed-off-by: Gregory Felix commit e7ec02938dbe8ca35b750f29eaa4b12de0b52754 Author: Russell King Date: Thu Jul 28 20:36:26 2005 +0100 [ARM SMP] Fix another ARMv6 bitop problem We sometimes forgot to check whether the exclusive store succeeded. Ensure that we always check. Also ensure that we always use the out of line versions, since the inline versions are not SMP safe. Signed-off-by: Russell King commit 505d7b193181be029f4f9aea59e6bdbfdd1e9e76 Author: Russell King Date: Thu Jul 28 20:32:47 2005 +0100 [ARM SMP] Ensure secondary CPUs have a clean TLB Since ARMv6 CPUs will not flush the TLB on context switches, it is possible that we may end up with some global TLB entries remaining present, eventually upsetting userspace. Explicitly flush the entire TLB on secondary CPUs as they startup, after we have switched to the init_mm page tables. Signed-off-by: Russell King commit 6192b54b845ed05cb838f86ca588cc625c703a09 Author: David S. Miller Date: Thu Jul 28 12:12:58 2005 -0700 [NET]: Fix busy waiting in dev_close(). If the current task has signal_pending(), the loop we have to wait for the __LINK_STATE_RX_SCHED bit to clear becomes a pure busy-loop. Fixed by using msleep() instead of the hand-crafted version. Noticed by Andrew Morton. Signed-off-by: David S. Miller commit 7153d9612fe5cefc29f9f17d7a6b9f0dcd07b20e Author: Dave Jones Date: Thu Jul 28 09:45:10 2005 -0700 powernow-k8.c: In function `query_current_values_with_pending_wait': powernow-k8.c:110: warning: `hi' may be used uninitialized in this function Signed-off-by: Brian Gerst Signed-off-by: Dave Jones Signed-off-by: Andrew Morton commit cc993cab0239cb07af329d2e18faac7888821075 Author: Dave Jones Date: Thu Jul 28 09:43:56 2005 -0700 Here are two possible cleanups in cpufreq.c: * ret has no need to be unsigned in cpufreq_driver_target() * ret has no need to be initialized in __cpufreq_governor() Signed-off-by: Jean Delvare Signed-off-by: Dave Jones commit 841e40b380a70933e8dc1184e0f9ba1c6cac48af Author: Dave Jones Date: Thu Jul 28 09:40:04 2005 -0700 Opteron revision F will support higher frequencies than can be encoded in the current driver's 4 bit frequency field. This patch updates the driver to support Rev F including 6 bit FIDs and processor ID updates. This should apply cleanly whether or not the dual-core bugfix I sent out last week is applied. I'd prefer that both get applied, of course. Signed-off-by: David Keck Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones commit 03938c3f1062b0f279a0ef937a471d4db83702ed Author: Dave Jones Date: Thu Jul 28 09:38:21 2005 -0700 powernow-k8 requires that a data structure for each core be created in the _cpu_init function call. The cpufreq infrastructure doesn't call _cpu_init for the second core in each processor. Some systems crashed when _get was called with an odd-numbered core because it tried to dereference a NULL pointer since the data structure had not been created. The attached patch solves the problem by initializing data structures for all shared cores in the _cpu_init function. It should apply to 2.6.12-rc6 and has been tested by AMD and Sun. Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones commit 33fdfa97f2b3aab698ef849ec50dcc5102017f0a Author: Sergey Vlasov Date: Sun Jul 24 00:53:32 2005 -0500 Input: synaptics - fix setting packet size on passthrough port. Synaptics driver used child->type to select either 3-byte or 4-byte packet size for the pass-through port; this gives wrong results for the newer protocols. Change the check to use child->pktsize instead. Signed-off-by: Sergey Vlasov Signed-off-by: Dmitry Torokhov commit 5ac7ba3ff599d66ffde182676f2e4fbcac61a2fe Author: Vojtech Pavlik Date: Sun Jul 24 00:50:03 2005 -0500 Input: check keycodesize when adjusting keymaps When changing key mappings we need to make sure that the new keycode value can be stored in dev->keycodesize bytes. Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 463a4f76a79bce00ca8964e0b2ebf7f10f376965 Author: Dmitry Torokhov Date: Fri Jul 15 01:51:56 2005 -0500 Input: i8042 - don't use negation to mark AUX data Currently i8042_command() negates data coming from the AUX port of keyboard controller; this is not a very reliable indicator. Change i8042_command() to fail if response to I8042_CMD_AUX_LOOP is not coming from AUX channel and get rid of negation. Based on patch by Vojtech Pavlik. Signed-off-by: Dmitry Torokhov commit 7b4019d04895de7407c9989895c3664c24ed01f7 Author: Vojtech Pavlik Date: Fri Jul 15 01:50:08 2005 -0500 Input: psmouse - wheel mice (imps, exps) always have 3rd button There are wheel mice that respond to Logitech probes and report that they have only 2 buttons (such as e-Aser mouse) and this stops the wheel from being used as a middle button. Change the driver to always report BTN_MIDDLE capability if a wheel is present. Also, never reset BTN_RIGHT capability in logips2pp code - there are no Logitech mice that have only one button and if some other mice happen to respond to Logitech's query we could do the wrong thing. Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit bc5d04822bd9f34ea93a681f05f5e5683935d574 Author: Adam Kropelin Date: Mon Jul 11 01:09:32 2005 -0500 Input: HID - only report events coming from interrupts to hiddev Currently hid-core follows the same code path for input reports regardless of whether they are a result of interrupt transfers or control transfers. That leads to interrupt events erroneously being reported to hiddev for regular control transfers. Prior to 2.6.12 the problem was mitigated by the fact that reporting to hiddev is supressed if the field value has not changed, which is often the case. Said filtering was removed in 2.6.12-rc1 which means any input reports fetched via control transfers result in hiddev interrupt events. This behavior can quickly lead to a feedback loop where a userspace app, in response to interrupt events, issues control transfers which in turn create more interrupt events. This patch prevents input reports that arrive via control transfers from being reported to hiddev as interrupt events. Signed-off-by: Adam Kropelin Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 153ab429cad3b585ddf1a5521cfaadb57402cd31 Author: Michael Prokop Date: Mon Jul 11 01:09:10 2005 -0500 Input: elo - fix help in Kconfig (wrong module name) Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 6f5eacfc1e9a12ffca10b4abe8e9fddf1997da6f Author: Tobias Klauser Date: Mon Jul 11 01:08:56 2005 -0500 Input: joydev - remove custom conversion from jiffies to msecs Replace the MSECS() macro with the jiffies_to_msecs() function provided in jiffies.h Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 6345fdfd190659a2316d18065871245e3a1e0f84 Author: Luca T Date: Mon Jul 11 01:08:40 2005 -0500 Input: HID - add a quirk for Aashima Trust (06d6:0025) gamepad Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 963f626d46d5caeeb3cff29998d8a64df5b25591 Author: Peter Osterlund Date: Mon Jul 11 01:08:04 2005 -0500 Input: ALPS - unconditionally enable tapping mode The condition in alps_init() was also inverted and the driver was enabling tapping mode only if it was already enabled. Signed-off-by: Peter Osterlund Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit b30dc120a7471a961272aeca24ede1c0530e6455 Author: David Moore Date: Mon Jul 11 01:07:48 2005 -0500 Input: ALPS - fix resume (for DualPoints) The driver would not reset pass-through mode when performing resume of a DualPoint touchpad causing it to stop working until next reboot. Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 9ba5eaafa1bff1d2dc7f6b9fb4cc6e313dcd6105 Author: Simon Horman Date: Mon Jul 11 01:07:20 2005 -0500 Input: synaptics - limit rate to 40pps on Toshiba Dynabooks Toshiba Dynabooks require the same workaround as Satellites - Synaptics report rate should be lowered to 40pps (from 80), otherwise KBC starts losing keypresses. Signed-off-by: Simon Horman Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 20f07944af80a2916b2f6ac1559c0a680c309c0e Author: Vojtech Pavlik Date: Mon Jul 11 01:06:28 2005 -0500 Input: i8042 - add Fujitsu T3010 to NOMUX blacklist. Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit 865190cdbba995936700346c2daabbed97ac30ba Author: Dmitry Torokhov Date: Mon Jul 11 01:06:06 2005 -0500 Input: i8042 - add Alienware Sentia to NOMUX blacklist. Signed-off-by: Dmitry Torokhov commit bef5a66fd7fd8d606da5c9f210e2673f4e636f57 Author: Neil Brown Date: Mon Jul 11 01:05:47 2005 -0500 Input: serio_raw - fix Kconfig help Signed-off-by: Neil Brown Signed-off-by: Vojtech Pavlik Signed-off-by: Dmitry Torokhov commit dc1e97b5eaed1921f421cf56fd233f064464b300 Author: Dmitry Torokhov Date: Mon Jul 11 01:02:16 2005 -0500 Input: serio_raw - link serio_raw misc device to corresponding serio port in sysfs. Signed-off-by: Dmitry Torokhov commit e0d21d9cca25f424f3129649be48a63c128ed42d Merge: beffbdc2211826b174c68307b1b48c93c05d7ded 5c23804a0941a111752fdacefe0bea2db1b4d93f Author: Dmitry Torokhov Date: Mon Jul 11 00:58:04 2005 -0500 Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit beffbdc2211826b174c68307b1b48c93c05d7ded Author: Andrew Morton Date: Fri Jul 1 23:54:30 2005 -0500 Input: cannot refer to __exit from within __init. Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 5b6271bda42be8edb77fbd588621cc09199fa7fb Author: Dmitry Torokhov Date: Thu Jun 30 00:50:38 2005 -0500 Input: make name, phys and uniq be 'const char *' because once set noone should attempt to change them. Signed-off-by: Dmitry Torokhov commit f96b434d3bf70845a7541ab217f525918267281e Author: Dmitry Torokhov Date: Thu Jun 30 00:50:29 2005 -0500 Input: rearrange procfs code to reduce number of #ifdefs Signed-off-by: Dmitry Torokhov commit fb2ce3c005ede30b65b891c58ff56398df6089f8 Author: Dmitry Torokhov Date: Thu Jun 30 00:50:10 2005 -0500 Sonypi: make sure that input_work is not running when unloading the module; submit/retrieve key release data into/from input_fifo in one shot. Signed-off-by: Dmitry Torokhov commit 16a334c0de5a94b1d10a1ac9a33f4dedac89a075 Author: Dmitry Torokhov Date: Thu Jun 30 00:49:08 2005 -0500 Input: introduce usb_to_input_id() to uniformly produce struct input_id for USB input devices. Signed-off-by: Dmitry Torokhov commit c27a748225fe5c7e485ea471178c26e43f9f7fbe Author: Dmitry Torokhov Date: Thu Jun 30 00:48:51 2005 -0500 Input: acecad - drop unneeded cast and couple unneeded spaces. Noticed by Joe Perches. Signed-off-by: Dmitry Torokhov Acked-by: Stephane VOLTZ commit ae87dff7ca2723a2428fb55dd57da1315878eb08 Author: Dmitry Torokhov Date: Thu Jun 30 00:48:34 2005 -0500 Input: serio - add modalias attribute and environment variable to simplify hotplug scripts. Signed-off-by: Dmitry Torokhov commit 0048e6030d41453c2f5ce0e9aead910d46cfd448 Author: Dmitry Torokhov Date: Thu Jun 30 00:48:14 2005 -0500 Input: uinput - use completions instead of events and manual wakeups in force feedback code. Signed-off-by: Dmitry Torokhov commit 152c12f568d4fc6e9a7dfd42f2d51347fb41d9b7 Author: Dmitry Torokhov Date: Thu Jun 30 00:47:50 2005 -0500 Input: clean up uinput driver (formatting, extra braces) Signed-off-by: Dmitry Torokhov