commit acd9b7b4e08a3f0f48afa922d8e371414cf2d3b2 tree 663d7edaf98f220623a09a45ff33a1131f8bb727 parent 2edc2689f8183dd21c45621a01580b340ac420ba parent 6921d201f77e14848df2eaa597e26525f468abea author Linus Torvalds Tue, 13 Dec 2005 23:08:24 -0800 committer Linus Torvalds Tue, 13 Dec 2005 23:08:24 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tg3-2.6 commit 2edc2689f8183dd21c45621a01580b340ac420ba tree 8f60092cac007a53e8b0d818dd31bcec84df79da parent a1493d9cd1aaed06860d128a37df1bdfbc61f7c8 author David S. Miller Tue, 13 Dec 2005 22:59:50 -0800 committer David S. Miller Tue, 13 Dec 2005 22:59:50 -0800 [PKT_SCHED]: Disable debug tracing logs by default in packet action API. Noticed by Andi Kleen. Signed-off-by: David S. Miller commit a1493d9cd1aaed06860d128a37df1bdfbc61f7c8 tree c8101a9d1b3b41a2b39d4078458fa15d1dad3c04 parent cd6104572bca9e4afe0dcdb8ecd65ef90b01297b author David S. Miller Tue, 13 Dec 2005 22:59:36 -0800 committer David S. Miller Tue, 13 Dec 2005 22:59:36 -0800 [IPV6] addrconf: Do not print device pointer in privacy log message. Noticed by Andi Kleen, it is pointless to emit the device structure pointer in the kernel logs like this. Signed-off-by: David S. Miller commit cd6104572bca9e4afe0dcdb8ecd65ef90b01297b tree cca09c779e83341507b21c132b3ffe090110602e parent fb79ffa4ddbe3f6f30fdb8429b5bad84d25ae6ef author Adam Kropelin Tue, 13 Dec 2005 17:03:39 -0800 committer Linus Torvalds Tue, 13 Dec 2005 21:18:16 -0800 [PATCH] hid-core: Zero-pad truncated reports When it detects a truncated report, hid-core emits a warning and then processes the report as usual. This is good because it allows buggy devices to still get data thru to userspace. However, the missing bytes of the report should be cleared before processing, otherwise userspace will be handed partially-uninitialized data. This fixes Debian tracker bug #330487. Signed-off-by: Adam Kropelin Cc: Vojtech Pavlik Acked-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb79ffa4ddbe3f6f30fdb8429b5bad84d25ae6ef tree 2118328f37af59e65e024e34d09d9c902aea47bd parent 118c71bcacce82a4317c9bd99c6a15af14020aee author Ole Reinhardt Tue, 13 Dec 2005 17:03:38 -0800 committer Linus Torvalds Tue, 13 Dec 2005 21:18:16 -0800 [PATCH] fbdev: make pxafb more robust to errors with CONFIG_FB_PXA_PARAMETERS pxafb.c runs into an oops if CONFIG_FB_PXA_PARAMETERS is enabled and no parameters are set in command line. The following patch avoids this problem. Signed-off-by: Nicolas Pitre Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 118c71bcacce82a4317c9bd99c6a15af14020aee tree 9a1f286152a7f21242ba04dd5b24b0cf7be88266 parent 664d22ab954de54e52e0f71103a89c7a78738adc author Yasunori Goto Tue, 13 Dec 2005 17:03:37 -0800 committer Linus Torvalds Tue, 13 Dec 2005 21:18:16 -0800 [PATCH] Fix calculation of grow_pgdat_span() in mm/memory_hotplug.c The calculation for node_spanned_pages at grow_pgdat_span() is clearly wrong. This is patch for it. (Please see grow_zone_span() to compare. It is correct.) Signed-off-by: Yasunori Goto Acked-by: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 664d22ab954de54e52e0f71103a89c7a78738adc tree 5b5f525b9d8a109f473b02b553813aa21312eee5 parent 65ab592dc5b34caebabfe1340e7c18f52a785079 author Vojtech Pavlik Tue, 13 Dec 2005 17:03:36 -0800 committer Linus Torvalds Tue, 13 Dec 2005 21:18:16 -0800 [PATCH] Dmitry Torokhov is input subsystem maintainer I haven't been very actively maintaining the input layer in past months, mostly because of my lack of time to concentrate on that. For that reason, I've decided to pass the maintainership of the Linux Input Layer to Dmitry Torokhov, whom I trust to do the job very well. Signed-off-by: Vojtech Pavlik Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6921d201f77e14848df2eaa597e26525f468abea tree cef66b131fd1cb980d209c5ecb590a0783fdf985 parent 16fe9d74f14ed74af778c5db7f9129e29916f4a7 author Michael Chan Tue, 13 Dec 2005 21:15:53 -0800 committer David S. Miller Tue, 13 Dec 2005 21:15:53 -0800 [TG3]: Fix low power state Fix the following bugs in tg3_set_power_state(): 1. Both WOL and ASF flags require switching to aux power. 2. Add a missing handshake with firmware to enable WOL. 3. Turn off the PHY if both WOL and ASF are disabled. 4. Add nvram arbitration before halting the firmware. 5. Fix tg3_setup_copper_phy() to switch to 100Mbps when changing to low power state. Update revision and date. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 16fe9d74f14ed74af778c5db7f9129e29916f4a7 tree 909a2b173d5140b22df9f35a252dc204dba56bdd parent 6a9eba15f51c56da637e45ea1316eaa2a848986a author Michael Chan Tue, 13 Dec 2005 21:09:54 -0800 committer David S. Miller Tue, 13 Dec 2005 21:09:54 -0800 [TG3]: Fix 5704 single-port mode If the dual-port 5704 is configured as a single-port device with only one PCI function, it would trigger a BUG() condition in tg3_find_5704_peer(). This fixes the problem by returning its own pdev if the peer cannot be found. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 6a9eba15f51c56da637e45ea1316eaa2a848986a tree fb18f2580e6aaa2c14c042b51e80bc8eb6b9806b parent 381291b7d3e17ac966498312dc571dcca1b93efc author Michael Chan Tue, 13 Dec 2005 21:08:58 -0800 committer David S. Miller Tue, 13 Dec 2005 21:08:58 -0800 [TG3]: Fix suspend and resume Fix tg3_suspend() and tg3_resume() by clearing and setting the TG3_FLAG_INIT_COMPLETE flag when appropriate. tg3_set_power_state() looks at TG3_FLAG_INIT_COMPLETE on the peer device to determine when to appropriately switch to aux power. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 381291b7d3e17ac966498312dc571dcca1b93efc tree 619ab88cbec0112674f72b3a8c6b3aae1bacd69a parent 65ab592dc5b34caebabfe1340e7c18f52a785079 author Michael Chan Tue, 13 Dec 2005 21:08:21 -0800 committer David S. Miller Tue, 13 Dec 2005 21:08:21 -0800 [TG3]: Fix nvram arbitration bugs. The nvram arbitration rules were not strictly followed in a few places and this could lead to reading corrupted values from the nvram. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 65ab592dc5b34caebabfe1340e7c18f52a785079 tree 568e8ed84290c32551e69b2e001758f8c1178ad8 parent 0910b444bcd7ea7f437a3ff48e0e3d2495ead22e parent eed66cfcbbea851c97e287440d940286fce3f829 author Linus Torvalds Tue, 13 Dec 2005 12:36:54 -0800 committer Linus Torvalds Tue, 13 Dec 2005 12:36:54 -0800 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 0910b444bcd7ea7f437a3ff48e0e3d2495ead22e tree 302f0b5dfef59ff98de24c83ff4e86915b648c55 parent 83bab9a4bbf91af93f45233dc288c4d26308e281 author Linus Torvalds Tue, 13 Dec 2005 11:39:05 -0800 committer Linus Torvalds Tue, 13 Dec 2005 11:39:05 -0800 Expose "Optimize for size" option for everybody Let's put my money where my mouth is. Smaller code is almost always faster, if only because a single I$ miss ends up leaving a lot of cycles to make up for. And system software - kernels in particular - are known for taking more cache misses than most other kinds. On my random config, this made the kernel about 10% smaller, and lmbench seems to say that it's pretty uniformly faster too. Your milage may vary. Signed-off-by: Linus Torvalds commit eed66cfcbbea851c97e287440d940286fce3f829 tree 0d78ff78e693f474c226551ddb4759aa4e62a46b parent 90ac8f7741be4ff66de1f52904f4f67f272f74ce author Tony Luck Tue, 13 Dec 2005 10:41:49 -0800 committer Tony Luck Tue, 13 Dec 2005 10:41:49 -0800 [IA64] Split 16-bit severity field in sal_log_record_header ERR_SEVERITY item is defined as a 8 bits item in SAL documentation ($B.2.1 rev december 2003), but as an u16 in sal.h. This has the side effect that current code in mca.c may not call ia64_sal_clear_state_info() upon receiving corrected platform errors if there are bits set in the validation byte. Reported by Xavier Bru. Signed-off-by: Tony Luck commit 83bab9a4bbf91af93f45233dc288c4d26308e281 tree aff0b85ec2770e87ec8852b62f9832f10656632d parent 90ac8f7741be4ff66de1f52904f4f67f272f74ce author Adrian Bunk Tue, 13 Dec 2005 02:58:07 +0100 committer Linus Torvalds Tue, 13 Dec 2005 09:18:54 -0800 [PATCH] allow KOBJECT_UEVENT=n only if EMBEDDED KOBJECT_UEVENT=n seems to be a common pitfall for udev users in 2.6.14 . -mm already contains a bigger patch removing this option that is IMHO too big for being applied now to 2.6.15-rc. This patch simply allows KOBJECT_UEVENT=n only if EMBEDDED. Signed-off-by: Adrian Bunk Signed-off-by: Linus Torvalds commit 90ac8f7741be4ff66de1f52904f4f67f272f74ce tree d20316f5eb9fe399edd81c14d801602aac64a752 parent 98684a9d91bceff829b6dc7adf0f662d59cfa6e3 parent 50630195bbdfe1ca775d94cd68a5f18bc1b717e4 author Linus Torvalds Tue, 13 Dec 2005 08:53:56 -0800 committer Linus Torvalds Tue, 13 Dec 2005 08:53:56 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 98684a9d91bceff829b6dc7adf0f662d59cfa6e3 tree aab9b27171852e0d933b5bfbc981ae5338e5e062 parent be0d9b6c7aeaad1683059c00131cabd4c894c17c author Jeff Garzik Tue, 13 Dec 2005 11:35:22 -0500 committer Jeff Garzik Tue, 13 Dec 2005 11:35:22 -0500 [netdrvr skge] fix build commit 50630195bbdfe1ca775d94cd68a5f18bc1b717e4 tree ad1e44e89d714b2785fc33a5800488571db7a7c5 parent be0d9b6c7aeaad1683059c00131cabd4c894c17c author Jeff Garzik Tue, 13 Dec 2005 02:29:45 -0500 committer Jeff Garzik Tue, 13 Dec 2005 02:29:45 -0500 [libata] mark certain hardware (or drivers) with a no-atapi flag Some hardware does not support the PACKET command at all. Other hardware supports ATAPI, but the driver does something nasty such as calling BUG() when an ATAPI command is issued. For these such cases, we mark them with a new flag, ATA_FLAG_NO_ATAPI. Initial version contributed by Ben Collins. commit be0d9b6c7aeaad1683059c00131cabd4c894c17c tree f7e55af855531331113cbddb98688f3901d48425 parent 7275b4b6bc2f783c135c3f0eeecc4fdc6e788aa8 author Antonino A. Daplas Mon, 12 Dec 2005 22:17:21 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:17 -0800 [PATCH] fbdev: Fix incorrect unaligned access in little-endian machines The drawing function cfbfillrect does not work correctly when access is not unsigned-long aligned. It manifests as extra lines of pixels that are not complete drawn. Reversing the shift operator solves the problem, so I would presume that this bug would manifest only on little endian machines. The function cfbcopyarea may also have this bug. Aligned access should present no problems. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7275b4b6bc2f783c135c3f0eeecc4fdc6e788aa8 tree be75b6de5a19263ffbc54068251988b3d7e2b754 parent 39942fd8ff57c8623451bbfaffe8a184cc8b463a author Antonino A. Daplas Mon, 12 Dec 2005 22:17:20 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:17 -0800 [PATCH] fbdev: Shift pixel value before entering loop in cfbimageblit In slow imageblit, the pixel value is shifted by a certain amount (dependent on the bpp and endianness) for each iteration. This is inefficient. Better do the shifting once before going into the loop. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39942fd8ff57c8623451bbfaffe8a184cc8b463a tree cc40ada654e14d496dbc4db9d9d42b81c1c8f2f7 parent 4e1567d3aad9bae0ecc5bb047179cd026bfb035c author Knut Petersen Mon, 12 Dec 2005 22:17:19 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:17 -0800 [PATCH] fbdev: fix switch to KD_TEXT, enhanced version Every framebuffer driver relies on the assumption that the set_par() function of the driver is called before drawing functions and other functions dependent on the hardware state are executed. Whenever you switch from X to a framebuffer console for the very first time, there is a chance that a broken X system has _not_ set the mode to KD_GRAPHICS, thus the vt and framebuffer code executes a screen redraw and several other functions before a set_par() is executed. This is believed to be not a bug of linux but a bug of X/xdm. At least some X releases used by SuSE and Debian show this behaviour. There was a 2nd case, but that has been fixed by Antonino Daplas on 10-dec-2005. This patch allows drivers to set a flag to inform fbcon_switch() that they prefer a set_par() call on every console switch, working around the problems caused by the broken X releases. The flag will be used by the next release of cyblafb and might help other drivers that assume a hardware state different to the one used by X. As the default behaviour does not change, this patch should be acceptable to everybody. Signed-off-by: Knut Petersen Acked-by: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e1567d3aad9bae0ecc5bb047179cd026bfb035c tree b3e8820b236c62da6cdbcefbe2850c9cd0158489 parent 1207069f6f8f3d1b71641fdaa6cc04fca6fff9f5 author Antonino A. Daplas Mon, 12 Dec 2005 22:17:18 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:17 -0800 [PATCH] fbcon: Avoid illegal display panning Avoid calls to fb_pan_display when driver is suspended or not in text mode. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1207069f6f8f3d1b71641fdaa6cc04fca6fff9f5 tree c8be44eb73032dd787c18ff3f71d42083258484e parent 4743484718e1d710321f24f8ef7d0124a48291b3 author Antonino A. Daplas Mon, 12 Dec 2005 22:17:17 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:17 -0800 [PATCH] fbdev: Pan display fixes - Fix fb_pan_display rejecting yoffsets that are valid if panning mode is ywrap. - Add more robust error checking in fb_pan_display specially since this function is accessible by userland apps. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4743484718e1d710321f24f8ef7d0124a48291b3 tree fde7dc00a58aa4a326573018d844143ba07e0138 parent 56f0d64de80733bda54d1cfa7ac0c736ab2de33b author Antonino A. Daplas Mon, 12 Dec 2005 22:17:16 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:17 -0800 [PATCH] fbcon: Add ability to save/restore graphics state Add hooks to save and restore the graphics state. These hooks are called in fbcon_blank() when entering/leaving KD_GRAPHICS mode. This is needed by savagefb at least so it can cooperate with savage_dri and by cyblafb. State save/restoration can be full or partial. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56f0d64de80733bda54d1cfa7ac0c736ab2de33b tree c708c7d2375295d0e5e7884771c2dd8275b5e89c parent 2f6331faf58a4727a9f1138cd6db30d05b124220 author Antonino A. Daplas Mon, 12 Dec 2005 22:17:15 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:17 -0800 [PATCH] fbcon: fix complement_mask() with 512 character map There is a bug in the complement_mask when you have a 512-character map. Linux boots to a default 256-character map and most probably your login profile is loading a 512-character map which results in a bad gpm cursor. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f6331faf58a4727a9f1138cd6db30d05b124220 tree a285f5260b8256f018b05db7c8a6b5470baf85ff parent 8309cf66fd90ccba9894adde2f3a8d7e1507e4d2 author Mike Miller Mon, 12 Dec 2005 22:17:14 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:16 -0800 [PATCH] cciss: fix for deregister_disk This patch adds setting our drv->queue = NULL back in deregister_disk. The drv->queue is part of our controller struct. blk_cleanup_queue works only on the queue in the gendisk struct. Signed-off-by: Mike Miller Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8309cf66fd90ccba9894adde2f3a8d7e1507e4d2 tree e9d9045cfa5a2f2599b3682f9f53d68fe3b8ebf2 parent fd4954714e8e7db9f6eb5878fa6111c46445ca81 author Eric Dumazet Mon, 12 Dec 2005 22:17:14 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:16 -0800 [PATCH] x86_64: Bug correction in populate_memnodemap() As reported by Keith Mannthey, there are problems in populate_memnodemap() The bug was that the compute_hash_shift() was returning 31, with incorrect initialization of memnodemap[] To correct the bug, we must use (1UL << shift) instead of (1 << shift) to avoid an integer overflow, and we must check that shift < 64 to avoid an infinite loop. Signed-off-by: Eric Dumazet Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd4954714e8e7db9f6eb5878fa6111c46445ca81 tree 189264d0e9ae74930a3118f3a480ffff233a742a parent df818a52fb5e64c72b21029fb9ba80583106932c author john stultz Mon, 12 Dec 2005 22:17:13 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:16 -0800 [PATCH] x86_64: Fix collision between pmtimer and pit/hpet On systems that do not support the HPET legacy functions (basically the IBM x460, but there could be others), in time_init() we accidentally fall into a PM timer conditional and set the vxtime_hz value to the PM timer's frequency. We then use this value with the HPET for timekeeping. This patch (which mimics the behavior in time_init_gtod) corrects the collision. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df818a52fb5e64c72b21029fb9ba80583106932c tree fd71417e26af6dd57e26730541dd53f0609e08e3 parent d6ece5491ae71ded1237f59def88bcd1b19b6f60 author Andi Kleen Mon, 12 Dec 2005 22:17:12 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:16 -0800 [PATCH] x86_64: Fix 32bit thread coredumps When a register set is passed in don't try to fix up the pointer. Noticed by Al Viro Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6ece5491ae71ded1237f59def88bcd1b19b6f60 tree 3128cb506d050a4007d2724939af15e512d7c5b4 parent 928cf8c62763349efc550a12f6518e52c3390906 author Andi Kleen Mon, 12 Dec 2005 22:17:11 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:16 -0800 [PATCH] i386/x86-64 Correct for broken MCFG tables on K8 systems They report all busses as MMCONFIG capable, but it never works for the internal devices in the CPU's builtin northbridge. It just probes all func 0 devices on bus 0 (the internal northbridge is currently always on bus 0) and if they are not accessible using MCFG they are put into a special fallback bitmap. On systems where it isn't we assume the BIOS vendor supplied correct MCFG. Requires the earlier patch for mmconfig type1 fallback Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 928cf8c62763349efc550a12f6518e52c3390906 tree 5fb257cbdaaebc3814e6df85100712127cdb8526 parent bf5421c309bb89e5106452bc840983b1b4754d61 author Andi Kleen Mon, 12 Dec 2005 22:17:10 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:16 -0800 [PATCH] i386/x86-64 Fall back to type 1 access when no entry found When there is no entry for a bus in MCFG fall back to type1. This is especially important on K8 systems where always some devices can't be accessed using mmconfig (in particular the builtin northbridge doesn't support it for its own devices) Cc: Cc: Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf5421c309bb89e5106452bc840983b1b4754d61 tree dd1b97332a053197175b13a3fe7d62e568c6f3f1 parent 5e9ef02ec00c70840661d174dc2f4862db471bb6 author Andi Kleen Mon, 12 Dec 2005 22:17:09 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:16 -0800 [PATCH] i386/x86-64: Don't call change_page_attr with a spinlock held It's illegal because it can sleep. Use a two step lookup scheme instead. First look up the vm_struct, then change the direct mapping, then finally unmap it. That's ok because nobody can change the particular virtual address range as long as the vm_struct is still in the global list. Also added some LinuxDoc documentation to iounmap. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e9ef02ec00c70840661d174dc2f4862db471bb6 tree 037db38d2f476f71210b7c64eb2bcd2f74aa1486 parent 68e188911263adb06e28fa2c9dc9e017774de68d author Shaohua Li Mon, 12 Dec 2005 22:17:08 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:16 -0800 [PATCH] i386/x86-64 disable LAPIC completely for offline CPU Disabling LAPIC timer isn't sufficient. In some situations, such as we enabled NMI watchdog, there is still unexpected interrupt (such as NMI) invoked in offline CPU. This also avoids offline CPU receives spurious interrupt and anything similar. Signed-off-by: Shaohua Li Signed-off-by: Andi Kleen Acked-by: "Seth, Rohit" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68e188911263adb06e28fa2c9dc9e017774de68d tree 159e570339af78445cd91f4fa8f3a426bf4a9aa6 parent 7cd082f0147c5fc94b455bcc17fe21b22dbac703 author Andi Kleen Mon, 12 Dec 2005 22:17:07 -0800 committer Linus Torvalds Mon, 12 Dec 2005 22:31:16 -0800 [PATCH] x86_64: Make sure hpet_address is 0 when any part of HPET initialization fails Otherwise TSC->HPET fallback could see incorrect state and crash later. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7cd082f0147c5fc94b455bcc17fe21b22dbac703 tree 642dcf3b36d563aa7bb070a2a9355805483e857a parent b11d0e48aa41b644143ca526ef8d69212fdc1cdd parent 1cf9e8a7865c0ac216034e519cf6b8505055ea50 author Linus Torvalds Mon, 12 Dec 2005 21:42:17 -0800 committer Linus Torvalds Mon, 12 Dec 2005 21:42:17 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit b11d0e48aa41b644143ca526ef8d69212fdc1cdd tree bb55e976402bc87cc8a9f5372dc947500777216b parent 47807ce381acc34a7ffee2b42e35e96c0f322e52 parent dfa159886f38344ede31e3b13ec614e0bebc09c6 author Linus Torvalds Mon, 12 Dec 2005 21:41:58 -0800 committer Linus Torvalds Mon, 12 Dec 2005 21:41:58 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 47807ce381acc34a7ffee2b42e35e96c0f322e52 tree d34a8ac9e3e9c05044aa230f9ae2785b12ed64bf parent 0e670506668a43e1355b8f10c33d081a676bd521 author Dave Airlie Tue, 13 Dec 2005 04:18:41 +0000 committer Linus Torvalds Mon, 12 Dec 2005 21:02:22 -0800 [drm] fix radeon aperture issue Ben noticed that on certain cards we've landed the AGP space on top of the second aperture instead of after it.. Which messes things up a lot on those machines. This just moves the gart further out, a more correct fix is in the works from Ben for after 2.6.15. Signed-off-by: Dave Airlie CC: Ben Herrenschmidt Signed-off-by: Linus Torvalds commit 1cf9e8a7865c0ac216034e519cf6b8505055ea50 tree a5466de5195450363371a4ee9ec05f41c19ab66b parent ee1c81917a0c10f44c1b400482b8372e68238ff8 author Olaf Hering Thu, 01 Dec 2005 21:22:37 +0100 committer Jeff Garzik Mon, 12 Dec 2005 23:59:28 -0500 [PATCH] ieee80211_crypt_tkip depends on NET_RADIO *** Warning: ".wireless_send_event" [net/ieee80211/ieee80211_crypt_tkip.ko] undefined! Signed-off-by: Olaf Hering net/ieee80211/Kconfig | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Garzik commit ee1c81917a0c10f44c1b400482b8372e68238ff8 tree 987cfbd2134b82bea55c55fa17bd70d29df70458 parent 0e670506668a43e1355b8f10c33d081a676bd521 author Stephen Hemminger Tue, 06 Dec 2005 15:01:49 -0800 committer Jeff Garzik Mon, 12 Dec 2005 23:33:03 -0500 [PATCH] skge: get rid of warning on race Get rid of warning in case of race with ring full and lockless tx on the skge driver. It is possible to be in the transmit routine with no available slots and already stopped. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit dfa159886f38344ede31e3b13ec614e0bebc09c6 tree 6c6128df37860c42acf00c0bd76797de940a306c parent 0e670506668a43e1355b8f10c33d081a676bd521 author Mark Lord Mon, 12 Dec 2005 23:19:28 -0500 committer Jeff Garzik Mon, 12 Dec 2005 23:19:28 -0500 [PATCH] libata-core.c: fix parameter bug on kunmap_atomic() calls Fix incorrect pointer usage on two calls to kunmap_atomic(). This seems to happen a lot, because kunmap() wants the struct page *, whereas kunmap_atomic() instead wants the mapped virtual address. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 0e670506668a43e1355b8f10c33d081a676bd521 tree 236d238cc234da1e6d375b5c2864cbac836fd71f parent 238523e1a15874b88955ff9c8f63e35597ae2857 parent bf7ececa9b68f4720f1ce344f442435660bcdae7 author Linus Torvalds Mon, 12 Dec 2005 16:48:29 -0800 committer Linus Torvalds Mon, 12 Dec 2005 16:48:29 -0800 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 238523e1a15874b88955ff9c8f63e35597ae2857 tree 3a794b119a40a7dd5bd73b513297c4580a090303 parent 1ff8038988adecfde71d82c0597727fc239d4e8c parent 016cc85072944bfa03c5e4b587ae89588ce2e5df author Linus Torvalds Mon, 12 Dec 2005 16:41:37 -0800 committer Linus Torvalds Mon, 12 Dec 2005 16:41:37 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit 1ff8038988adecfde71d82c0597727fc239d4e8c tree a592cbfad237a5e373724918a0cc17ee9c421237 parent 14ee0a1414536d27bc29373bf23c106b8ef8ce0b author Linus Torvalds Mon, 12 Dec 2005 16:24:33 -0800 committer Linus Torvalds Mon, 12 Dec 2005 16:24:33 -0800 get_user_pages: don't try to follow PFNMAP pages Nick Piggin points out that a few drivers play games with VM_IO (why? who knows..) and thus a pfn-remapped area may not have that bit set even if remap_pfn_range() set it originally. So make it explicit in get_user_pages() that we don't follow VM_PFNMAP pages, since pretty much by definition they do not have a "struct page" associated with them. Signed-off-by: Linus Torvalds commit 14ee0a1414536d27bc29373bf23c106b8ef8ce0b tree 82a6233bc3cedb7f2b7bb0a8da8c112dba76f4b0 parent 225bc8f1c7f534c01a4a8387b0d5fc9ee3830029 parent 2f9616d4c44349c903bc1b54fe46ab0ce0210b74 author Linus Torvalds Mon, 12 Dec 2005 15:49:56 -0800 committer Linus Torvalds Mon, 12 Dec 2005 15:49:56 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/nf-2.6 commit 225bc8f1c7f534c01a4a8387b0d5fc9ee3830029 tree 13f0be67b943be6b0aaee3ad6d80831cebe7a483 parent 94d40b699f0b9fb1b1da3b6abcd31d37c9aa2c22 parent ecc51b6d5ca04bb6346c9ad6b37d6ca8bace12b3 author Linus Torvalds Mon, 12 Dec 2005 15:49:45 -0800 committer Linus Torvalds Mon, 12 Dec 2005 15:49:45 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 94d40b699f0b9fb1b1da3b6abcd31d37c9aa2c22 tree c719fbb7e7d44d74b4d7b571f7ed3f0d338daf71 parent 062dfa433cce9a2c3941b3b8b96ae678f11230fa parent 1df2ab48f995b1599740a3f430df77fe24cb8ce9 author Linus Torvalds Mon, 12 Dec 2005 15:49:27 -0800 committer Linus Torvalds Mon, 12 Dec 2005 15:49:27 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 062dfa433cce9a2c3941b3b8b96ae678f11230fa tree b76f773ef1fab8302e233ac25d23f35d5341b6cd parent 7c9dfb5999a7ba90e93a96d9f3ce55a9e4978ad5 parent 22f975f4ffa707ea24507f6899bb9f5a1ff034bc author Linus Torvalds Mon, 12 Dec 2005 15:25:58 -0800 committer Linus Torvalds Mon, 12 Dec 2005 15:25:58 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 7c9dfb5999a7ba90e93a96d9f3ce55a9e4978ad5 tree 8c1d92c9af1078bef9d8291c8be36045c4515471 parent 1ff9ba7af6033475998be61c7d1dc0e0c8c11181 parent e781de44153885d5f772731726b4c0c16f8af021 author Linus Torvalds Mon, 12 Dec 2005 15:25:15 -0800 committer Linus Torvalds Mon, 12 Dec 2005 15:25:15 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-mmc commit 1ff9ba7af6033475998be61c7d1dc0e0c8c11181 tree c1a938d3cd7964cb7c7239675a49347f9174ca4d parent 66e05225262cd9271fac13fe2fd1e9edb65e3978 parent c2cd6d3c122798c39f63e21e4dd04ee5790010b6 author Linus Torvalds Mon, 12 Dec 2005 15:24:36 -0800 committer Linus Torvalds Mon, 12 Dec 2005 15:24:36 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-serial commit 2f9616d4c44349c903bc1b54fe46ab0ce0210b74 tree a26737c50950261b92d9cc948d7e29053f30466e parent 66e05225262cd9271fac13fe2fd1e9edb65e3978 author Marcus Sundberg Mon, 12 Dec 2005 15:02:48 -0800 committer David S. Miller Mon, 12 Dec 2005 15:02:48 -0800 [NETFILTER]: ip_nat_tftp: Fix expectation NAT When a TFTP client is SNATed so that the port is also changed, the port is never changed back for the expected connection. Signed-off-by: Marcus Sundberg Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 1df2ab48f995b1599740a3f430df77fe24cb8ce9 tree 37558db63f64b1a5a11a12d8388a5c9b1a461851 parent 1d66a79dc8dd892c0db04396a0b1d05e0f53fe4f author Paul Jackson Mon, 12 Dec 2005 14:42:44 -0800 committer David S. Miller Mon, 12 Dec 2005 14:42:44 -0800 [SPARC]: block/ needed in final image link With this fix, sparc links vmlinuz again using crosstool. Without this fix, the final link fails missing several dozen dozen symbols, beginning with: kernel/built-in.o(.text+0x6fd0): In function `do_exit': : undefined reference to `exit_io_context' (exit_io_context is defined in block/ll_rw_blk.c). Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 1d66a79dc8dd892c0db04396a0b1d05e0f53fe4f tree bce1150d180d02982c5462e40cccdb7bb2af0dd2 parent 2c27d4e53043de1c821e0af09e08dee3e92a01d6 author Paul Jackson Mon, 12 Dec 2005 14:42:31 -0800 committer David S. Miller Mon, 12 Dec 2005 14:42:31 -0800 [SPARC]: atomic_clear_mask build fix This fixes one build error introduced in sparc with the patch of Oct 30, resent Nov 4 "[patch 3/5] atomic: atomic_inc_not_zero" I still can't get sparc to build, but at least it gets further after I remove this line. Apparently, this change was agreed to by Andrew and Nick on Nov 14, but everyone thought someone else was doing it. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 2c27d4e53043de1c821e0af09e08dee3e92a01d6 tree a877527c4c1918a9200175024abed630b7b342bf parent 806f7bf605bdb0f2ea2253f832943890edb85d83 author Hareesh Nagarajan Mon, 12 Dec 2005 14:42:07 -0800 committer David S. Miller Mon, 12 Dec 2005 14:42:07 -0800 [SBUSFB] tcx: Use FB_BLANK_UNBLANK instead of magic constant. From: Hareesh Nagarajan Signed-off-by: David S. Miller commit 806f7bf605bdb0f2ea2253f832943890edb85d83 tree fdae9e869f0512aae8fd32daa9f5d8fde60679ed parent 66e05225262cd9271fac13fe2fd1e9edb65e3978 author David S. Miller Mon, 12 Dec 2005 14:41:20 -0800 committer David S. Miller Mon, 12 Dec 2005 14:41:20 -0800 [SBUSFB]: Kill 'list' member from foo_par structs, totally unused. Based upon a patch from Hareesh Nagarajan. Signed-off-by: David S. Miller commit ecc51b6d5ca04bb6346c9ad6b37d6ca8bace12b3 tree 4056dc6a739d43d052989ea39bb213e3a84392e0 parent 66e05225262cd9271fac13fe2fd1e9edb65e3978 author Arnaldo Carvalho de Melo Mon, 12 Dec 2005 14:38:10 -0800 committer David S. Miller Mon, 12 Dec 2005 14:38:10 -0800 [TCPv6]: Fix skb leak Spotted by Francois Romieu, thanks! Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 66e05225262cd9271fac13fe2fd1e9edb65e3978 tree d2eefc27030003707b7c230897d206c8dfbeda6f parent 49d7bc64283970ee83d2c954d04ba00d04e5943d author Brian King Mon, 12 Dec 2005 13:05:08 -0600 committer Linus Torvalds Mon, 12 Dec 2005 12:35:39 -0800 [PATCH] Fix SCSI scanning slab corruption There is a double free in the scsi scan code if a LLDD's slave_alloc() call fails. There is a direct call to scsi_free_queue and then the following put_device calls the release function, which also frees the queue. Remove the redundant scsi_free_queue. Signed-off-by: Brian King Tested-by: Nathan Lynch [ Also removed some strange whitespace artifacts in that area ] Signed-off-by: Linus Torvalds commit 016cc85072944bfa03c5e4b587ae89588ce2e5df tree 4e50ca29a0e4a3ff260f8eae0972ab7f83e08cd1 parent 20234989a8ae0ff418e2acdef72205fb7cb3f819 author Olaf Hering Fri, 09 Dec 2005 19:12:10 +0100 committer Jeff Garzik Mon, 12 Dec 2005 15:30:38 -0500 [PATCH] pcnet32: use MAC address from prom also on powerpc The CSR contains garbage after a coldboot on RS/6000. One some systems (like my 44p 270) the MAC address is all FF, on others (like my B50) it is ff:ff:ff:fd:ff:6b. It can eventually be fixed by loading pcnet32, set the interface into the UP state, rmmod pcnet32 and load it again. But this worked only on the 270. Only netbooting after a cold start provides the correct MAC address via prom and CSR. This makes it very unreliable. I dont know why the MAC is stored in two different places. Remove the special case for powerpc, which was added in early 2.4 development. Signed-off-by: Olaf Hering drivers/net/pcnet32.c | 5 ----- 1 files changed, 5 deletions(-) Signed-off-by: Jeff Garzik commit 20234989a8ae0ff418e2acdef72205fb7cb3f819 tree 6888e6c6b8f2beef67b3f85570aebb853f8443f9 parent 92f268e034faf793f6d40de2f0fc81478a14ff39 parent 49d7bc64283970ee83d2c954d04ba00d04e5943d author Jeff Garzik Mon, 12 Dec 2005 15:30:15 -0500 committer Jeff Garzik Mon, 12 Dec 2005 15:30:15 -0500 Merge branch 'master' commit 49d7bc64283970ee83d2c954d04ba00d04e5943d tree 7011cfcf89a09a2ef4fdcd04cb835bfed4b6677a parent 5036805be7b815eb18dcce489d974f3aee4f3841 author Linus Torvalds Mon, 12 Dec 2005 11:25:04 -0800 committer Linus Torvalds Mon, 12 Dec 2005 11:25:04 -0800 Revert revert of "[SCSI] fix usb storage oops" This reverts commit 1b0997f561bf46689cc6e0903f342e9bf2506bf1, which in turn reverted 34ea80ec6a02ad02e6b9c75c478c18e5880d6713 (which is thus re-instated). Quoth James Bottomley: "All it's doing is deferring the device_put() from the scsi_put_command() to after the scsi_run_queue(), which doesn't fix the sleep while atomic problem of the device release method. In both cases we still get the semaphore in atomic context problem which is caused by scsi_reap_target() doing a device_del(), which I assumed (wrongly) was valid from atomic context." who also promised to fix scsi_reap_target(). Signed-off-by: Linus Torvalds commit 5036805be7b815eb18dcce489d974f3aee4f3841 tree 3d112acbe459fafee17f41cb634e483080b48607 parent 3795bb0fc52fe2af2749f3ad2185cb9c90871ef8 author NeilBrown Mon, 12 Dec 2005 02:39:17 -0800 committer Linus Torvalds Mon, 12 Dec 2005 09:06:04 -0800 [PATCH] md: use correct size of raid5 stripe cache when measuring how full it is The raid5 stripe cache was recently changed from fixed size (NR_STRIPES) to variable size (conf->max_nr_stripes). However there are two places that still use the constant and as a result, reducing the size of the stripe cache can result in a deadlock. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3795bb0fc52fe2af2749f3ad2185cb9c90871ef8 tree 764aa053d592b4ce555e2ca91077d7c6fc9eaa16 parent 0de502aa44aae5712a18d471818d6c785e07c92e author NeilBrown Mon, 12 Dec 2005 02:39:16 -0800 committer Linus Torvalds Mon, 12 Dec 2005 09:06:04 -0800 [PATCH] md: fix a use-after-free bug in raid1 Who would submit code with a FIXME like that in it !!!! Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0de502aa44aae5712a18d471818d6c785e07c92e tree 95435fe88ec7b43d9de0583ba00ed4f4e023589d parent a64882e795cc1d890e3359d0aa143af1cf67e8d4 author Andrew Morton Mon, 12 Dec 2005 00:37:41 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:46 -0800 [PATCH] raw driver: Kconfig fix CONFIG_MAX_RAW_DEVS should appear immediately after CONFIG_RAW_DRIVER. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a64882e795cc1d890e3359d0aa143af1cf67e8d4 tree 9b766783e8034d81f1e460a02da0ffbdc8a4aef1 parent 66d43e98ea6ff291cd4e524386bfb99105feb180 author Dave Jones Mon, 12 Dec 2005 00:37:40 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:45 -0800 [PATCH] ACPI: fix sleeping whilst atomic warnings on resume This has been broken for months. On resume, we call acpi_pci_link_set() with interrupts off, so we get a warning when we try to do a kmalloc of non atomic memory. The actual allocation is just 2 long's (plus extra byte for some reason I can't fathom), so a simple conversion to GFP_ATOMIC is probably the safest way to fix this. The error looks like this.. Debug: sleeping function called from invalid context at mm/slab.c:2486 in_atomic():0, irqs_disabled():1 [] kmem_cache_alloc+0x40/0x56 [] acpi_pci_link_set+0x3f/0x17f [] irqrouter_resume+0x1e/0x3c [] __sysdev_resume+0x11/0x6b [] sysdev_resume+0x34/0x52 [] device_power_up+0x5/0xa Signed-off-by: Dave Jones Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66d43e98ea6ff291cd4e524386bfb99105feb180 tree 56cff27261a3f9b16022c9ec8d53e4913f758eb9 parent ff9569bc5558e958777fd43580f2ccd83733cdf6 author Haren Myneni Mon, 12 Dec 2005 00:37:39 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:45 -0800 [PATCH] fix in __alloc_bootmem_core() when there is no free page in first node's memory Hitting BUG_ON() in __alloc_bootmem_core() when there is no free page available in the first node's memory. For the case of kdump on PPC64 (Power 4 machine), the captured kernel is used two memory regions - memory for TCE tables (tce-base and tce-size at top of RAM and reserved) and captured kernel memory region (crashk_base and crashk_size). Since we reserve the memory for the first node, we should be returning from __alloc_bootmem_core() to search for the next node (pg_dat). Currently, find_next_zero_bit() is returning the n^th bit (eidx) when there is no free page. Then, test_bit() is failed since we set 0xff only for the actual size initially (init_bootmem_core()) even though rounded up to one page for bdata->node_bootmem_map. We are hitting the BUG_ON after failing to enter second "for" loop. Signed-off-by: Haren Myneni Cc: Andy Whitcroft Cc: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff9569bc5558e958777fd43580f2ccd83733cdf6 tree be1c365ac50ea68253f896caab82f5a00b1fd223 parent 1393c3edc307e0a2ec4274f67e342907ffd7deb5 author Yasunori Goto Mon, 12 Dec 2005 00:37:37 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:45 -0800 [PATCH] Fix Kconfig of DMA32 for ia64 I realized ZONE_DMA32 has a trivial bug at Kconfig for ia64. In include/linux/gfp.h on 2.6.15-rc5-mm1, CONFIG is define like followings. #ifdef CONFIG_DMA_IS_DMA32 #define __GFP_DMA32 ((__force gfp_t)0x01) /* ZONE_DMA is ZONE_DMA32 */ : : So, CONFIG_"ZONE"_DMA_IS_DMA32 is clearly wrong. Signed-off-by: Yasunori Goto Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1393c3edc307e0a2ec4274f67e342907ffd7deb5 tree 08e9e2bba7013301b30ea0a51ba9651a60f61620 parent 68799398cea44b81d1e919f842d8d84d471053d5 author Nicolas Pitre Mon, 12 Dec 2005 00:37:36 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:45 -0800 [PATCH] input: fix ucb1x00-ts breakage after conversion to dynamic input_dev allocation The bd622663192e8ebebb27dc1d9397f352a82d2495 commit broke the UCB1x00 touchscreen driver since the idev structure was assumed to be into the ts structure, simply casting the former to the later in a couple places. This patch fixes those, and also cache the idev pointer between multiple calls to input_report_abs() to avoid growing the compiled code needlessly. Signed-off-by: Nicolas Pitre Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68799398cea44b81d1e919f842d8d84d471053d5 tree 0b2522ffc93f01e3e5e6a039074a523952e54fe7 parent bf8d5c52c3b6b27061e3b7d779057fd9a6cac164 author Dave Jones Mon, 12 Dec 2005 00:37:35 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:45 -0800 [PATCH] broken cast in parport_pc Spotted by a Fedora user. Compiling with DEBUG_PARPORT set fails due to the broken cast. Just remove it. Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf8d5c52c3b6b27061e3b7d779057fd9a6cac164 tree e4371185eba27db47282410dd490b78598d20636 parent 00d7c05ab168c10f9b520e07400923267bc04419 author Keshavamurthy Anil S Mon, 12 Dec 2005 00:37:34 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:45 -0800 [PATCH] kprobes: increment kprobe missed count for multiprobes When multiple probes are registered at the same address and if due to some recursion (probe getting triggered within a probe handler), we skip calling pre_handlers and just increment nmissed field. The below patch make sure it walks the list for multiple probes case. Without the below patch we get incorrect results of nmissed count for multiple probe case. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 00d7c05ab168c10f9b520e07400923267bc04419 tree 5899743965a801e34e7dc6bfe59dba20ba023540 parent cda315aba34ff4fb66bbb2945b723688f3414a75 author Keshavamurthy Anil S Mon, 12 Dec 2005 00:37:33 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:45 -0800 [PATCH] kprobes: no probes on critical path For Kprobes critical path is the path from debug break exception handler till the control reaches kprobes exception code. No probes can be supported in this path as we will end up in recursion. This patch prevents this by moving the below function to safe __kprobes section onto which no probes can be inserted. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cda315aba34ff4fb66bbb2945b723688f3414a75 tree 842370af28aded095f62ffac030e918c432b605f parent dd815408106f3c56c3050493dda97f9355aa4971 author Matt Domsch Mon, 12 Dec 2005 00:37:32 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:45 -0800 [PATCH] ipmi: fix panic generator ID The IPMI specifcation says the generator ID is 0x20, but that is for bits 7-1. Bit 0 is set to specify it is a software event. The correct value is 0x41. Without this fix, panic events written into the System Event Log appear to come from an "unknown" generator, rather than from the kernel. Signed-off-by: Jordan Hargrave Signed-off-by: Matt Domsch Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd815408106f3c56c3050493dda97f9355aa4971 tree 032811558e78801ed93e249c86265abb8c849af7 parent 3639c8619d50a6dea8fa106a5c61d848ffdcd3d6 author Mauro Carvalho Chehab Mon, 12 Dec 2005 00:37:31 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:45 -0800 [PATCH] V4L/DVB: (3151) I2C ID renamed to I2C_DRIVERID_INFRARED I2C ID renamed to I2C_DRIVERID_INFRARED Acked-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3639c8619d50a6dea8fa106a5c61d848ffdcd3d6 tree f2ec8303fee79b26097ba996941a6550ffac7dbc parent 225a0cb6716da3aafaeb9ed2f8d9a7a1f2af9f09 author Sascha Sommer Mon, 12 Dec 2005 00:37:30 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:44 -0800 [PATCH] V4L/DVB: (3113) Convert em28xx to use vm_insert_page instead of remap_pfn_range Convert em28xx to use vm_insert_page instead of remap_pfn_range Signed-off-by: Sascha Sommer Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 225a0cb6716da3aafaeb9ed2f8d9a7a1f2af9f09 tree 99354b41d67518378d62652a0175d3ba2efab9b6 parent 674434c691e10015660022fc00b04985a23ef87b author Ricardo Cerqueira Mon, 12 Dec 2005 00:37:28 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:44 -0800 [PATCH] V4L/DVB: (3135) Fix tuner init for Pinnacle PCTV Stereo - The Pinnacle PCTV Stereo needs tda9887 port2 set to 1 - Without this patch, mt20xx tuner is not detected and the board doesn't tune. Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 674434c691e10015660022fc00b04985a23ef87b tree d4768ec66f479902791e0704512aa8d85261073f parent afd1a0c9ac281eed3b22b293ccd92af7b0d60889 author Mauro Carvalho Chehab Mon, 12 Dec 2005 00:37:28 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:44 -0800 [PATCH] V4L/DVB: (3086c) Whitespaces cleanups part 4 Clean up whitespaces at v4l/dvb files Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afd1a0c9ac281eed3b22b293ccd92af7b0d60889 tree 686c03cf1a1a2efb1fba6dc6e682fbb48edc7c58 parent 808824b5f73e361503420ee318ca9689781da034 author Mauro Carvalho Chehab Mon, 12 Dec 2005 00:37:27 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:44 -0800 [PATCH] V4L/DVB: (3086c) Whitespaces cleanups part 3 Clean up whitespaces at v4l/dvb files Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 808824b5f73e361503420ee318ca9689781da034 tree 0de37d1f1ab551efae930faf9999bba67b5560bd parent 9101e6222cb115240e24160bb90cce425bb74de5 author Mauro Carvalho Chehab Mon, 12 Dec 2005 00:37:25 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:44 -0800 [PATCH] V4L/DVB: (3086b) Whitespaces cleanups part 2 Clean up whitespaces at v4l/dvb files Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9101e6222cb115240e24160bb90cce425bb74de5 tree e479e909a558ab5a0c9f913a75f8d05b866ad8bc parent 68352e6ee3675e23b492c51908951058de4f6fe0 author Mauro Carvalho Chehab Mon, 12 Dec 2005 00:37:24 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:44 -0800 [PATCH] V4L/DVB: (3086a) Whitespaces cleanups part 1 Clean up whitespaces at v4l/dvb files Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68352e6ee3675e23b492c51908951058de4f6fe0 tree 0a033cd8cc7d800657a92ce710c107eafdbaa96a parent 7a4ae749a478f8bca73d4b5b8c1b8cbb178b2db5 author Hugh Dickins Mon, 12 Dec 2005 00:37:23 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:43 -0800 [PATCH] mips: setup_zero_pages count 1 Page count should be initialized to 1 on each of the MIPS empty zero pages, to avoid a bad_page warning whenever one of them is freed from all mappings. Signed-off-by: Hugh Dickins Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a4ae749a478f8bca73d4b5b8c1b8cbb178b2db5 tree a8480cc6ab547c01818182112ce4bc8bdcc6f91f parent bf001b26793bd9f8a446577c361226fbcd617182 author Pierre Ossman Mon, 12 Dec 2005 00:37:22 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:43 -0800 [PATCH] Add try_to_freeze to kauditd kauditd was causing suspends to fail because it refused to freeze. Adding a try_to_freeze() to its sleep loop solves the issue. Signed-off-by: Pierre Ossman Acked-by: Pavel Machek Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf001b26793bd9f8a446577c361226fbcd617182 tree a3b4ddadeaf2c5c580569f46e3a5c56f9df2f623 parent 8140a5005bc6f1c9d0fa103460d50d472e6e3426 author Pekka J Enberg Mon, 12 Dec 2005 00:37:16 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:43 -0800 [PATCH] uml: fix compile error for tt arch/um/kernel/tt/uaccess.c: In function `copy_from_user_tt': arch/um/kernel/tt/uaccess.c:11: error: `FIXADDR_USER_START' undeclared (first use in this function) arch/um/kernel/tt/uaccess.c:11: error: (Each undeclared identifier is reported only once arch/um/kernel/tt/uaccess.c:11: error: for each function it appears in.) I get the compile error when I disable CONFIG_MODE_SKAS. Signed-off-by: Pekka Enberg Acked-by: Paolo Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8140a5005bc6f1c9d0fa103460d50d472e6e3426 tree 9c5ae431bf1db43e3a1e7a4cceb472c76077ac18 parent b4788f6d55548e587ced330ece711456f40ec8f1 author John McCutchan Mon, 12 Dec 2005 00:37:14 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:43 -0800 [PATCH] inotify: add two inotify_add_watch flags The below patch lets userspace have more control over the inodes that inotify will watch. It introduces two new flags. IN_ONLYDIR -- only watch the inode if it is a directory. This is needed to avoid the race that can occur when we want to be sure that we are watching a directory. IN_DONT_FOLLOW -- don't follow a symlink. In combination with IN_ONLYDIR we can make sure that we don't watch the target of symlinks. The issues the flags fix came up when writing the gnome-vfs inotify backend. Default behaviour is unchanged. Signed-off-by: John McCutchan Acked-by: Robert Love Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4788f6d55548e587ced330ece711456f40ec8f1 tree 42468e3b7fbdcb5d9e7f93857df39003dbaa6b46 parent adad0f331f9c693129e81e233c5461e2e7c3e443 author Jens Axboe Mon, 12 Dec 2005 00:37:13 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:43 -0800 [PATCH] cciss: double put_disk() This undoes the put_disk patch I sent in before. If I had been paying attention I would have seen that we call put_disk from free_hba during driver unload. That's the only time we want to call it. If it's called from deregister disk we may remove the controller (cNd0) unintentionally. Signed-off-by: Mike Miller Signed-off-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit adad0f331f9c693129e81e233c5461e2e7c3e443 tree 846b37c12e8a07b7f4f3f5dbecb4b060c2be01c1 parent b88cb42428f14fabdaf947150c00d65891820635 author Keshavamurthy Anil S Mon, 12 Dec 2005 00:37:12 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:43 -0800 [PATCH] kprobes: fix race in aggregate kprobe registration When registering multiple kprobes at the same address, we leave a small window where the kprobe hlist will not contain a reference to the registered kprobe, leading to potentially, a system crash if the breakpoint is hit on another processor. Patch below now automically relpace the old kprobe with the new kprobe from the hash list. Signed-off-by: Anil S Keshavamurthy Acked-by: Ananth N Mavinakayanahalli Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b88cb42428f14fabdaf947150c00d65891820635 tree 21546720b90d1263f2e61760eb515c00f350ee12 parent 5650b736ad328f7f3e4120e8790940289b8ac144 author Ingo Molnar Mon, 12 Dec 2005 00:37:11 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:43 -0800 [PATCH] add hlist_replace_rcu() Add list_replace_rcu: replace old entry by new one. Signed-off-by: Paul E. McKenney Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5650b736ad328f7f3e4120e8790940289b8ac144 tree fb2287d21b6f826f3e291892c3d5c6e640a13c45 parent 64123fd42c7a1e4ebf6acd2399c98caddc7e0c26 author Matt Helsley Mon, 12 Dec 2005 00:37:10 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:42 -0800 [PATCH] Add timestamp field to process events This adds a timestamp field to the events sent via the process event connector. The timestamp allows listeners to accurately account the duration(s) between a process' events and offers strong means with which to determine the order of events with respect to a given task while also avoiding the addition of per-task data. This alters the size and layout of the event structure and hence would break compatibility if process events connector as it stands in 2.6.15-rc2 were released as a mainline kernel. Signed-off-by: Matt Helsley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64123fd42c7a1e4ebf6acd2399c98caddc7e0c26 tree d6b1794fa33287d145a44ab55bc2e2ef65ebf248 parent 894ec8707ced240b96dc45944790fb35d9a6b03c author Matt Helsley Mon, 12 Dec 2005 00:37:09 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:42 -0800 [PATCH] Add getnstimestamp function There are several functions that might seem appropriate for a timestamp: get_cycles() current_kernel_time() do_gettimeofday() Each has problems with combinations of SMP-safety, low resolution, and monotonicity. This patch adds a new function that returns a monotonic SMP-safe timestamp with nanosecond resolution where available. Changes: Split timestamp into separate patch Moved to kernel/time.c Renamed to getnstimestamp Fixed unintended-pointer-arithmetic bug Signed-off-by: Matt Helsley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 894ec8707ced240b96dc45944790fb35d9a6b03c tree 6498b7f6606027f3a52417431222b7a69c43391d parent c3f5902325d3053986e7359f706581d8f032e72f author Daniel Drake Mon, 12 Dec 2005 00:37:08 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:42 -0800 [PATCH] Fix listxattr() for generic security attributes Commit f549d6c18c0e8e6cf1bf0e7a47acc1daf7e2cec1 introduced a generic fallback for security xattrs, but appears to include a subtle bug. Gentoo users with kernels with selinux compiled in, and coreutils compiled with acl support, noticed that they could not copy files on tmpfs using 'cp'. cp (compiled with acl support) copies the file, lists the extended attributes on the old file, copies them all to the new file, and then exits. However the listxattr() calls were failing with this odd behaviour: llistxattr("a.out", (nil), 0) = 17 llistxattr("a.out", 0x7fffff8c6cb0, 17) = -1 ERANGE (Numerical result out of range) I believe this is a simple problem in the logic used to check the buffer sizes; if the user sends a buffer the exact size of the data, then its ok :) This change solves the problem. More info can be found at http://bugs.gentoo.org/113138 Signed-off-by: Daniel Drake Acked-by: James Morris Acked-by: Stephen Smalley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3f5902325d3053986e7359f706581d8f032e72f tree 1d56b7626b83556982eafad69c597b180c2ef62b parent 89d46b8778f65223f732d82c0166e0abba20fb1e author Srivatsa Vaddagiri Mon, 12 Dec 2005 00:37:07 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:42 -0800 [PATCH] Fix RCU race in access of nohz_cpu_mask Accessing nohz_cpu_mask before incrementing rcp->cur is racy. It can cause tickless idle CPUs to be included in rsp->cpumask, which will extend graceperiods unnecessarily. Fix this race. It has been tested using extensions to RCU torture module that forces various CPUs to become idle. Signed-off-by: Srivatsa Vaddagiri Cc: Dipankar Sarma Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89d46b8778f65223f732d82c0166e0abba20fb1e tree 2ea43a40659bbc30cf1bd6b48c7ee7c95714feb7 parent ab4720ec76b756e1f8705e207a7b392b0453afd6 author Srivatsa Vaddagiri Mon, 12 Dec 2005 00:37:06 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:42 -0800 [PATCH] Fix bug in RCU torture test While doing some test of RCU torture module, I hit a OOPS in rcu_do_batch, which was trying to processes callback of a module that was just removed. This is because we weren't waiting long enough for all callbacks to fire. Signed-off-by: Srivatsa Vaddagiri Cc: Dipankar Sarma Acked-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab4720ec76b756e1f8705e207a7b392b0453afd6 tree 1c4235ec8ac0e8e7f75a6f97ea6169e93647004f parent 85b872424984e79519be904e7df02a91ba0a9486 author Dipankar Sarma Mon, 12 Dec 2005 00:37:05 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:42 -0800 [PATCH] add rcu_barrier() synchronization point This introduces a new interface - rcu_barrier() which waits until all the RCUs queued until this call have been completed. Reiser4 needs this, because we do more than just freeing memory object in our RCU callback: we also remove it from the list hanging off super-block. This means, that before freeing reiser4-specific portion of super-block (during umount) we have to wait until all pending RCU callbacks are executed. The only change of reiser4 made to the original patch, is exporting of rcu_barrier(). Cc: Hans Reiser Cc: Vladimir V. Saveliev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85b872424984e79519be904e7df02a91ba0a9486 tree 82645e473714b29f8ff5e47bd842ec3e32e3eef5 parent 6b6a462c4ab75c1a5293b22562052cdf0e8bfb22 author Andreas Gruenbacher Mon, 12 Dec 2005 00:37:04 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:42 -0800 [PATCH] ext3: fix mount options documentation Reported by Jacques de Mer and Daniel Drake . Signed-off-by: Andreas Gruenbacher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b6a462c4ab75c1a5293b22562052cdf0e8bfb22 tree 51cbda219d791b13aad398fa8478403decba2e96 parent 82584ef75b7c14f22028595b0e8aa904464c5240 author Andreas Schwab Mon, 12 Dec 2005 00:37:03 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:42 -0800 [PATCH] KERNELRELEASE depends on CONFIG_LOCALVERSION Sam Ravnborg writes: > Author: Uwe Zeisberger > > [PATCH] kbuild: make kernelrelease in unconfigured kernel prints an error > > Do not include .config for target kernelrelease This is wrong. KERNELRELEASE depends on CONFIG_LOCALVERSION, thus you need .config. Signed-off-by: Andreas Schwab Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82584ef75b7c14f22028595b0e8aa904464c5240 tree 3f144ec21f06b0d2f57a67f0b543a42ae3dac5a4 parent b3e55c727ff7349c5db722fbdb8d99a151e8e0bf author Shaohua Li Mon, 12 Dec 2005 00:37:02 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:42 -0800 [PATCH] x86: fix NMI with CPU hotplug With CPU hotplug enabled, NMI watchdog stoped working. It appears the violation is the cpu_online check in nmi handler. local ACPI based NMI watchdog is initialized before we set CPU online for APs. It's quite possible a NMI is fired before we set CPU online, and that's what happens here. Signed-off-by: Shaohua Li Acked-by: Zwane Mwaikambo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3e55c727ff7349c5db722fbdb8d99a151e8e0bf tree 90d437e565082afe25d68e530e793faeab4b49ac parent 3fe968f167975d10c639f03c4934f05a29da73c0 author Mao, Bibo Mon, 12 Dec 2005 00:37:00 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:41 -0800 [PATCH] Kprobes: Reference count the modules when probed on it When a Kprobes are inserted/removed on a modules, the modules must be ref counted so as not to allow to unload while probes are registered on that module. Without this patch, the probed module is free to unload, and when the probing module unregister the probe, the kpobes code while trying to replace the original instruction might crash. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Mao Bibo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fe968f167975d10c639f03c4934f05a29da73c0 tree 0d76b04b8d422ea5e187fe20cb2c572f69222c82 parent 67121172f9753f38689651b613a4850e0e75876f author Andrew Morton Mon, 12 Dec 2005 00:36:59 -0800 committer Linus Torvalds Mon, 12 Dec 2005 08:57:41 -0800 [PATCH] blkmtd: use clear_page_dirty() SetPageDirty() and ClearPageDirty() are low-level thing which filesystems shouldn't be using. They bypass dirty page accounting. Cc: David Woodhouse Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf7ececa9b68f4720f1ce344f442435660bcdae7 tree 7caff55f6ce8cfee2547ad0c93ad893c8f9583cb parent f64fa6772aa874e5cad02a9d87e6b0d99ced3d48 author Keith Owens Sat, 10 Dec 2005 14:24:28 +1100 committer Tony Luck Mon, 12 Dec 2005 08:54:18 -0800 [IA64] Define an ia64 version of __raw_read_trylock IA64 is using the generic version of __raw_read_trylock, which always waits for the lock to be free instead of returning when the lock is in use. Define an ia64 version of __raw_read_trylock which behaves correctly, and drop the generic one. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 67121172f9753f38689651b613a4850e0e75876f tree cfb6ea8365c44a43ee254385c7d246f0418cedd0 parent 913f2d792ff584bf9ebf5968472b3e4ffe0fd9c8 author Linus Torvalds Sun, 11 Dec 2005 20:38:17 -0800 committer Linus Torvalds Sun, 11 Dec 2005 20:38:17 -0800 Allow arbitrary read-only shared pfn-remapping too The VM layer (for historical reasons) turns a read-only shared mmap into a private-like mapping with the VM_MAYWRITE bit clear. Thus checking just VM_SHARED isn't actually sufficient. So use a trivial helper function for the cases where we wanted to inquire if a mapping was COW-like or not. Moo! Signed-off-by: Linus Torvalds commit 913f2d792ff584bf9ebf5968472b3e4ffe0fd9c8 tree 37c499384a1e516a9b92ddb841fada84e9be0167 parent fe3f2053fd42148b3ebb7b90de5f20eaf3393860 parent 73d4f84fd001b0be67fea46e84b75e6a7a5da08e author Linus Torvalds Sun, 11 Dec 2005 20:23:58 -0800 committer Linus Torvalds Sun, 11 Dec 2005 20:23:58 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit fe3f2053fd42148b3ebb7b90de5f20eaf3393860 tree 8915aff27ef95943659565eff008f4a81e00577a parent 7fc7e2eeecb599ba719c4c4503100fc8cd6a6920 parent ef969434005e772218c0b8086539804605070fa8 author Linus Torvalds Sun, 11 Dec 2005 20:23:25 -0800 committer Linus Torvalds Sun, 11 Dec 2005 20:23:25 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge commit 7fc7e2eeecb599ba719c4c4503100fc8cd6a6920 tree 389b63cf2cbdf27fceef52a450b4b05367fe4425 parent fb155c1619f056ae9765eed272cd6aba6e1a7399 author Linus Torvalds Sun, 11 Dec 2005 19:57:52 -0800 committer Linus Torvalds Sun, 11 Dec 2005 19:57:52 -0800 Remove (at least temporarily) the "incomplete PFN mapping" support With the previous commit, we can handle arbitrary shared re-mappings even without this complexity, and since the only known private mappings are for strange users of /dev/mem (which never create an incomplete one), there seems to be no reason to support it. Signed-off-by: Linus Torvalds commit fb155c1619f056ae9765eed272cd6aba6e1a7399 tree 04a82b5fbf83bdb9dcf7fec9aeaaecf92532d88c parent e4f5c82a92c2a546a16af1614114eec19120e40a author Linus Torvalds Sun, 11 Dec 2005 19:46:02 -0800 committer Linus Torvalds Sun, 11 Dec 2005 19:46:02 -0800 Allow arbitrary shared PFNMAP's A shared mapping doesn't cause COW-pages, so we don't need to worry about the whole vm_pgoff logic to decide if a PFN-remapped page has gone through COW or not. This makes it possible to entirely avoid the special "partial remapping" logic for the common case. Signed-off-by: Linus Torvalds commit ef969434005e772218c0b8086539804605070fa8 tree f47f7edd35a4cb30d2d5155e3c26343481208649 parent b39f9485e6cfe1bf21b18b60fd8c631a72a1304d author Johannes Berg Sat, 10 Dec 2005 18:41:50 -0800 committer Paul Mackerras Mon, 12 Dec 2005 14:26:39 +1100 [PATCH] ppc32: set smp_tb_synchronized on UP with SMP kernel ppc32 kernel, when built with CONFIG_SMP and booted on a single CPU machine, will not properly set smp_tb_synchronized, thus causing gettimeofday() to not use the HW timebase and to be limited to jiffy resolution. This, among others, causes unacceptable pauses when launching X.org. Signed-Off-By: Johannes Berg Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras commit b39f9485e6cfe1bf21b18b60fd8c631a72a1304d tree 250c26d0c8251c5a5228a44a4192efb47e8715a4 parent 23ed6cb9a237902cce6018a24d1993c346abddb4 author Benjamin Herrenschmidt Mon, 12 Dec 2005 13:13:24 +1100 committer Paul Mackerras Mon, 12 Dec 2005 14:16:09 +1100 [PATCH] powerpc: Fix clock spreading setting on some powermacs The code that sets the clock spreading feature of the Intrepid ASIC must not be run on some machine models or those won't boot. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 22f975f4ffa707ea24507f6899bb9f5a1ff034bc tree b82d3d97110b8f5c9d80dfca36d38be98498fd5a parent 5b35193f5868da5e63f5b4cfe8fbcf9f10fe65cd author Nikola Valerjev Sat, 10 Dec 2005 11:59:15 +0000 committer Russell King Sat, 10 Dec 2005 11:59:15 +0000 [ARM] 3200/1: Singlestep over ARM BX and BLX instructions using ptrace fix Patch from Nikola Valerjev Single stepping an application using ptrace() fails over ARM instructions BX and BLX. Steps to reproduce: Compile and link the following files main.c ----- void foo(); int main() { foo(); return 0; } foo.s ----- .text .globl foo foo: BX LR Using ptrace() functionality, run to main(), and start singlestepping. Singlestep over \"BX LR\" instruction won\'t transfer the control back to main, but run the code to completion. This problems seems to be in the function get_branch_address() in arch/arm/kernel/ptrace.c. The function doesn\'t seem to recognize BX and BLX instructions as branches. BX and BLX instructions can be used to convert from ARM to Thumb mode if the target address has the low bit set. However, they are also perfectly legal in the ARM only mode. Although other things in the kernel seem to indicate that only ARM mode is accepted (and not Thumb), many compilers will generate BX and BLX instructions even when generating ARM only code. Signed-off-by: Nikola Valerjev Signed-off-by: Russell King commit 73d4f84fd001b0be67fea46e84b75e6a7a5da08e tree b56eebc83fbf5ffab87f254ecdd19fc142ae3e9f parent 246a421207007a034da9b8cfa578bc00d16a9553 author Kazunori MIYAZAWA Thu, 08 Dec 2005 23:11:42 -0800 committer David S. Miller Thu, 08 Dec 2005 23:11:42 -0800 [IPv6] IPsec: fix pmtu calculation of esp It is a simple bug which uses the wrong member. This bug does not seriously affect ordinary use of IPsec. But it is important to pass IPv6 ready logo phase-2 conformance test of IPsec SGW. Signed-off-by: Kazunori MIYAZAWA Signed-off-by: David S. Miller commit 23ed6cb9a237902cce6018a24d1993c346abddb4 tree e74b61d6da509fe85f5ec028a47c7e952bdae71a parent cbf52afdc0eb88492cf7808cc4b4f58a46f1b1ad author David Gibson Fri, 09 Dec 2005 16:45:17 +1100 committer Paul Mackerras Fri, 09 Dec 2005 16:57:35 +1100 [PATCH] powerpc: Fix SLB flushing path in hugepage On ppc64, when opening a new hugepage region, we need to make sure any old normal-page SLBs for the area are flushed on all CPUs. There was a bug in this logic - after putting the new hugepage area masks into the thread structure, we copied it into the paca (read by the SLB miss handler) only on one CPU, not on all. This could cause incorrect SLB entries to be loaded when a multithreaded program was running simultaneously on several CPUs. This patch corrects the error, copying the context information into the PACA on all CPUs using the mm in question before flushing any existing SLB entries. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit cbf52afdc0eb88492cf7808cc4b4f58a46f1b1ad tree 89910c9d9a054f0bf64670757a3715e19fcc62b2 parent dabcafd3f363bacd6b89f537af27dc79128e4806 author David Gibson Fri, 09 Dec 2005 14:20:52 +1100 committer Paul Mackerras Fri, 09 Dec 2005 16:30:48 +1100 [PATCH] powerpc: Add missing icache flushes for hugepages On most powerpc CPUs, the dcache and icache are not coherent so between writing and executing a page, the caches must be flushed. Userspace programs assume pages given to them by the kernel are icache clean, so we must do this flush between the kernel clearing a page and it being mapped into userspace for execute. We were not doing this for hugepages, this patch corrects the situation. We use the same lazy mechanism as we use for normal pages, delaying the flush until userspace actually attempts to execute from the page in question. Tested on G5. Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit dabcafd3f363bacd6b89f537af27dc79128e4806 tree 92e9ff42b77b76609668fb7c8b262678a1f8bbef parent 326743ead7d0c08e0da715832386660ff3823170 author Olof Johansson Thu, 08 Dec 2005 19:40:17 -0600 committer Paul Mackerras Fri, 09 Dec 2005 15:42:52 +1100 [PATCH] powerpc: Set cache info defaults Cache info is setup by walking the device tree in initialize_cache_info(). However, icache_flush_range might be called before that, in slb_initialize()->patch_slb_encoding, which modifies the load immediate instructions used with SLB fault code. Not only that, but depending on memory layout, we might take SLB faults during unflatten_device_tree. So that fault will load an SLB entry that might not contain the right LLP flags for the segment. Either we can walk the flattened device tree to setup cache info, or we can pick the known defaults that are known to work. Doing it in the flattened device tree is hairier since we need to know the machine type to know what property to look for, etc, etc. For now, it's just easier to go with the defaults. Worst thing that happens from it is that we might waste a few cycles doing too small dcbst/icbi increments. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 326743ead7d0c08e0da715832386660ff3823170 tree 3733704d8dc8d458cd8a208b05be8b57372b4b50 parent 6184b723876cd1a374e2d1094b3c73765d4c31c1 author Michal Ostrowski Thu, 08 Dec 2005 16:56:17 +1100 committer Paul Mackerras Fri, 09 Dec 2005 15:42:17 +1100 [PATCH] Fix windfarm model-id table model_id fields of wf_smu_sys_all_params should match the model ID they are supposed to represent (as commented). Fixes windfarm on some iMac 8,1 models. Signed-off-by: Michal Ostrowski Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 5b35193f5868da5e63f5b4cfe8fbcf9f10fe65cd tree 8d8f4a507403bdc59b30d7b92db4e775ae08c2e4 parent 31a5539e57fa80e877a2f180cd4ec9ce9de6fea0 author Deepak Saxena Thu, 08 Dec 2005 23:34:44 +0000 committer Russell King Thu, 08 Dec 2005 23:34:44 +0000 [ARM] 3199/1: Remove bogus function prototype from arch-pxa/irq.h Patch from Deepak Saxena This looks like a leftover from 2.4 days... Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 246a421207007a034da9b8cfa578bc00d16a9553 tree c9703c0c19784f39b8a11a60e63499df2c388419 parent 1f064a87c80c86bd3878e6633de61e8b71aa6788 author Stephen Hemminger Thu, 08 Dec 2005 15:21:39 -0800 committer David S. Miller Thu, 08 Dec 2005 15:21:39 -0800 [NET]: Fix NULL pointer deref in checksum debugging. The problem I was seeing turned out to be that skb->dev is NULL when the checksum is being completed in user context. This happens because the reference to the device is dropped (to allow it to be released when packets are in the queue). Because skb->dev was NULL, the netdev_rx_csum_fault was panicing on deref of dev->name. How about this? Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6184b723876cd1a374e2d1094b3c73765d4c31c1 tree d8d71c1a82a9933975ed92c3c8b7e855737c74aa parent 325c82a029ca7ea80f8cb24815d6c9288d177190 author Benjamin Herrenschmidt Thu, 08 Dec 2005 16:53:34 +1100 committer Paul Mackerras Thu, 08 Dec 2005 16:57:47 +1100 [PATCH] powerpc: Remove debug code in hash path Some debug code wasn't properly removed from the initial 64k pages patch, and while it's harmless, it's also slowing down significantly a very hot code path, thus it should really be removed. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 325c82a029ca7ea80f8cb24815d6c9288d177190 tree 898b1a900bbf2ca0f60d6bf552f2db70d307746b parent 6d91bb93e45857259ec80cf7393ea561dba1a1de author Benjamin Herrenschmidt Thu, 08 Dec 2005 16:51:44 +1100 committer Paul Mackerras Thu, 08 Dec 2005 16:57:41 +1100 [PATCH] powerpc: Fix a huge page bug The 64k pages patch changed the meaning of one argument passed to the low level hash functions (from "large" it became "psize" or page size index), but one of the call sites wasn't properly updated, causing potential random weird problems with huge pages. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 6d91bb93e45857259ec80cf7393ea561dba1a1de tree 5be12353a58cc4b7bbaa53948e971ea38b7b3cfc parent ca507eaf32fa599a92182ce91050046e807a994c author Mike Kravetz Wed, 07 Dec 2005 13:07:23 -0800 committer Paul Mackerras Thu, 08 Dec 2005 16:54:39 +1100 [PATCH] powerpc/pseries: boot failures on numa if no memory on node This bug exists in the current code and prevents machines from booting with numa enabled if there is a node that does not contain memory. Workaround is to boot with 'numa=off'. Looks like a simple typo. Signed-off-by: Mike Kravetz Signed-off-by: Paul Mackerras commit f64fa6772aa874e5cad02a9d87e6b0d99ced3d48 tree 9e8f1a1a73486b07b65e9764e6a05f961510864a parent 590711b7dd731bb04e7892c0451566d788985e79 author Christoph Lameter Wed, 07 Dec 2005 11:24:42 -0800 committer Tony Luck Wed, 07 Dec 2005 11:30:11 -0800 [IA64] Fix missing parameter for local_add/sub Local add/sub macros need to have a parameter to specify the addend/subtrahend respectively. Signed-off-by: Christoph Lameter Signed-off-by: Tony Luck commit c2cd6d3c122798c39f63e21e4dd04ee5790010b6 tree 3fe06528fa7108dbcc6424689b4edc2dbbf47e7a parent e4f5c82a92c2a546a16af1614114eec19120e40a author Dave Jones Wed, 07 Dec 2005 18:11:26 +0000 committer Russell King Wed, 07 Dec 2005 18:11:26 +0000 [SERIAL] 8250_pci: Remove redundant assignment, and mark fallthrough. Signed-off-by: Dave Jones commit 1f064a87c80c86bd3878e6633de61e8b71aa6788 tree b5e5eefaa380590f118176c4c1855b9f98b5e85b parent 4ebf0ae2618fbbb0d365e5d295a30ccfcb91fe0b author Stephen Hemminger Tue, 06 Dec 2005 17:36:44 -0800 committer David S. Miller Tue, 06 Dec 2005 17:36:44 -0800 [TG3]: remove warning on race [ Move assosciated code comment to the correct spot, and update driver version and release date -DaveM ] Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4ebf0ae2618fbbb0d365e5d295a30ccfcb91fe0b tree a58dbe174373f0e9614cd1e354825d8957c3de29 parent dfb4b9dceb35c567a595ae5e9d035cfda044a103 author David S. Miller Tue, 06 Dec 2005 16:38:35 -0800 committer David S. Miller Tue, 06 Dec 2005 16:38:35 -0800 [AF_PACKET]: Convert PACKET_MMAP over to vm_insert_page(). So we can properly use __GFP_COMP and avoid the use of PG_reserved pages. With extremely helpful review from Hugh Dickins. Signed-off-by: David S. Miller commit dfb4b9dceb35c567a595ae5e9d035cfda044a103 tree 1a76209896509b38458df03593b78ff1abeb0cd9 parent 0d7bef600acab393898bd5553e167496587da3e1 author David S. Miller Tue, 06 Dec 2005 16:24:52 -0800 committer David S. Miller Tue, 06 Dec 2005 16:24:52 -0800 [TCP] Vegas: timestamp before clone We have to store the congestion control timestamp on the SKB before we clone it, not after. Else we get no timestamping information at all. tcp_transmit_skb() has been reworked so that we can do the timestamp still in one spot, instead of at all the call sites. Problem discovered, and initial fix, from Tom Young . Signed-off-by: David S. Miller commit 0d7bef600acab393898bd5553e167496587da3e1 tree eef994f627b324e0e774a6ba2a5537b35e46c819 parent 5b4956138173cb8b58d83d3173360e8e681a2b66 author Thomas Young Tue, 06 Dec 2005 16:17:11 -0800 committer David S. Miller Tue, 06 Dec 2005 16:17:11 -0800 [TCP] Vegas: Remove extra call to tcp_vegas_rtt_calc Remove unneeded call to tcp_vegas_rtt_calc. The more accurate microsecond value has already been registered prior to calling tcp_vegas_cong_avoid. Signed-off-by: Thomas Young Signed-off-by: David S. Miller commit 5b4956138173cb8b58d83d3173360e8e681a2b66 tree 5dc8d539a6d7deff6ab595ce90657bb16e6731f9 parent 1f12bcc9d1840fd26bf577065214f1ebeb2609ba author Thomas Young Tue, 06 Dec 2005 16:16:34 -0800 committer David S. Miller Tue, 06 Dec 2005 16:16:34 -0800 [TCP] Vegas: stop resetting rtt every ack Move the resetting of rtt measurements to inside the once per RTT block of code. Signed-off-by: Thomas Young Signed-off-by: David S. Miller commit 590711b7dd731bb04e7892c0451566d788985e79 tree aa5f23e68992eaaeec13b80e13b546ff56d1e316 parent bd1d6e2451f2bb0132416fda4d129c4f57a827bc author Jack Steiner Tue, 06 Dec 2005 08:05:24 -0600 committer Tony Luck Tue, 06 Dec 2005 09:13:42 -0800 [IA64-SGI] Fix SN PTC deadlock recovery The patch that added support for a new platform chipset (shub2) broke PTC deadlock recovery on older versions of the chipset. (PTCs are the SN platform-specific method for doing a global TLB purge). This patch fixes deadlock recovery so that it works on both the old & new chipsets. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit bd1d6e2451f2bb0132416fda4d129c4f57a827bc tree 64fc1ba7d4734ea5ecec8942795b32a32e4623a4 parent acb7f67280128a9ddaa756ff10212391d28caec4 author Robin Holt Mon, 05 Dec 2005 20:02:31 -0600 committer Tony Luck Tue, 06 Dec 2005 09:12:34 -0800 [IA64] Change SET_PERSONALITY to comply with comment in binfmt_elf.c. We have a customer application which trips a bug. The problem arises when a driver attempts to call do_munmap on an area which is mapped, but because current->thread.task_size has been set to 0xC0000000, the call to do_munmap fails thinking it is an unmap beyond the user's address space. The comment in fs/binfmt_elf.c in load_elf_library() before the call to SET_PERSONALITY() indicates that task_size must not be changed for the running application until flush_thread, but is for ia64 executing ia32 binaries. This patch moves the setting of task_size from SET_PERSONALITY() to flush_thread() as indicated. The customer application no longer is able to trip the bug. Signed-off-by: Robin Holt Signed-off-by: Tony Luck commit acb7f67280128a9ddaa756ff10212391d28caec4 tree 2c475d61a7842cf1849a109c5ad5c189f4053aee parent 3ec829b6895092b0686254c315f42642b4a07efc author Jack Steiner Mon, 05 Dec 2005 13:56:50 -0600 committer Tony Luck Tue, 06 Dec 2005 09:10:37 -0800 [IA64] Limit the maximum NODEDATA_ALIGN() offset The per-node data structures are allocated with strided offsets that are a function of the node number. This prevents excessive cache-aliasing from occurring. On systems with a large number of nodes, the strided offset becomes too large. This patch restricts the maximum offset to 32MB. This is far larger than the size of any current L3 cache. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 3ec829b6895092b0686254c315f42642b4a07efc tree 8e1c58fffe2b16a791c6d3e09783daf1f75a3b7b parent 3e356b2660eda9da7776144cbc0a038c93dcb335 author John Keller Tue, 29 Nov 2005 16:36:32 -0600 committer Tony Luck Tue, 06 Dec 2005 09:09:23 -0800 [IA64-SGI] altix: pci_window fixup Altix only patch to add fixup code that sets up pci_controller->window. This code is a temporary fix until ACPI support on Altix is added. Also, corrects the usage of pci_dev->sysdata, which had previously been used to reference platform specific device info, to now point to a pci_controller struct. Signed-off-by: John Keller Signed-off-by: Tony Luck commit 92f268e034faf793f6d40de2f0fc81478a14ff39 tree 8983344799b050f7394e3d85413576b6a63842b3 parent 436b0f76f2cee6617f27a649637766628909dd5d author Stephen Hemminger Mon, 05 Dec 2005 11:00:40 -0800 committer Jeff Garzik Tue, 06 Dec 2005 04:43:40 -0500 [PATCH] sk98lin: rx checksum offset not set The checksum offsets for receive offload were not being set correctly. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 1f12bcc9d1840fd26bf577065214f1ebeb2609ba tree 4fb87a594d00671e2bc31998d94b3d470e9062d3 parent dab9630fb3d206f49658066a3ecf80ea120364db author Steven Whitehouse Mon, 05 Dec 2005 13:42:06 -0800 committer David S. Miller Mon, 05 Dec 2005 13:42:06 -0800 [DECNET]: add memory buffer settings The patch (originally from Steve) simply adds memory buffer settings to DECnet similar to those in TCP. Signed-off-by: Patrick Caulfield Signed-off-by: David S. Miller commit dab9630fb3d206f49658066a3ecf80ea120364db tree c20b7d40dbd41146f4583b9dc14afbb1d4a534fd parent 2fdf1faa8e33082d691bcba18814276f2bd5a6f0 author Martin Waitz Mon, 05 Dec 2005 13:40:12 -0800 committer David S. Miller Mon, 05 Dec 2005 13:40:12 -0800 [NET]: make function pointer argument parseable by kernel-doc When a function takes a function pointer as argument it should use the 'return (*pointer)(params...)' syntax used everywhere else in the kernel as this is recognized by kernel-doc. Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 2fdf1faa8e33082d691bcba18814276f2bd5a6f0 tree 72c789e69e84e4b66d4f5a4162d92233cb0b8b91 parent 266c8543480e2202ab63d1d604a5ca049f350cd8 author Patrick McHardy Mon, 05 Dec 2005 13:38:16 -0800 committer David S. Miller Mon, 05 Dec 2005 13:38:16 -0800 [NETFILTER]: Don't use conntrack entry after dropping the reference Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 266c8543480e2202ab63d1d604a5ca049f350cd8 tree 77c754dce63f39e1f9dc2d1768ecd348c1d50c74 parent 6636568cf85ef5898a892e90fcc88b61cca9ca27 author Patrick McHardy Mon, 05 Dec 2005 13:37:33 -0800 committer David S. Miller Mon, 05 Dec 2005 13:37:33 -0800 [NETFILTER]: Fix unbalanced read_unlock_bh in ctnetlink NFA_NEST calls NFA_PUT which jumps to nfattr_failure if the skb has no room left. We call read_unlock_bh at nfattr_failure for the NFA_PUT inside the locked section, so move NFA_NEST inside the locked section too. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6636568cf85ef5898a892e90fcc88b61cca9ca27 tree 5e2be9dbd35853c55198a64c3261ab3bfe15e804 parent a79575633300adb5d3f1bd856cc518c45fefcb86 author Patrick McHardy Mon, 05 Dec 2005 13:36:50 -0800 committer David S. Miller Mon, 05 Dec 2005 13:36:50 -0800 [NETFILTER]: Wait for untracked references in nf_conntrack module unload Noticed by Pablo Neira . Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a79575633300adb5d3f1bd856cc518c45fefcb86 tree ec14cd8b3390be41e41b419fa5c34131c99bf4f1 parent 0be7fa92ca162bf5e7993c392e6f93909d617bbb author Patrick McHardy Mon, 05 Dec 2005 13:36:25 -0800 committer David S. Miller Mon, 05 Dec 2005 13:36:25 -0800 [NETFILTER]: Mark ctnetlink as EXPERIMENTAL Should have been marked EXPERIMENTAL from the beginning, as the current bunch of fixes show. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0be7fa92ca162bf5e7993c392e6f93909d617bbb tree cdb6774f5783e972e2c08084fc99324ce748a116 parent afe5c6bb034bfa5824f8e7def6a739653e8f4655 author Patrick McHardy Mon, 05 Dec 2005 13:34:51 -0800 committer David S. Miller Mon, 05 Dec 2005 13:34:51 -0800 [NETFILTER]: Fix CTA_PROTO_NUM attribute size in ctnetlink CTA_PROTO_NUM is a u_int8_t. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit afe5c6bb034bfa5824f8e7def6a739653e8f4655 tree e8fdac508c1691047991578e7109766f22bd1d58 parent 3ebbe0cdd41f62e5c79cb4d7aa42a1ca50d7d2f2 author Patrick McHardy Mon, 05 Dec 2005 13:33:50 -0800 committer David S. Miller Mon, 05 Dec 2005 13:33:50 -0800 [NETFILTER]: Fix ip_conntrack_flush abuse in ctnetlink ip_conntrack_flush() used to be part of ip_conntrack_cleanup(), which needs to drop _all_ references on module unload. Table flushed using ctnetlink just needs to clean the table and doesn't need to flush the event cache or wait for any references attached to skbs. Move everything but pure table flushing back to ip_conntrack_cleanup(). Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3ebbe0cdd41f62e5c79cb4d7aa42a1ca50d7d2f2 tree 127df7610279a985d9045df00a01ae6882f8626b parent f16c910724250c1af0f53111b4c76505000819f6 author Yasuyuki Kozakai Mon, 05 Dec 2005 13:33:26 -0800 committer David S. Miller Mon, 05 Dec 2005 13:33:26 -0800 [NETFILTER]: nfnetlink: Fix calculation of minimum message length At least, valid nfnetlink message should have nlmsghdr and nfgenmsg. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f16c910724250c1af0f53111b4c76505000819f6 tree 8b64d67f21ebab0a2127b1ca53679a47a9aca174 parent 8d1ca69984ed1e5930c0537b8f606c54007d7319 author Yasuyuki Kozakai Mon, 05 Dec 2005 13:32:50 -0800 committer David S. Miller Mon, 05 Dec 2005 13:32:50 -0800 [NETFILTER]: nf_conntrack: Fix missing check for ICMPv6 type This makes nf_conntrack_icmpv6 check that ICMPv6 type isn't < 128 to avoid accessing out of array valid_new[] and invmap[]. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 8d1ca69984ed1e5930c0537b8f606c54007d7319 tree 32565f0a3709c671988de88c2407a96499dacd6a parent e4f5c82a92c2a546a16af1614114eec19120e40a author Pablo Neira Ayuso Mon, 05 Dec 2005 13:32:14 -0800 committer David S. Miller Mon, 05 Dec 2005 13:32:14 -0800 [NETFILTER]: Fix incorrect argument to ip_nat_initialized() in ctnetlink ip_nat_initialized() takes enum ip_nat_manip_type as it's second argument, not a hook number. Noticed and initial patch by Marcus Sundberg . Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3e356b2660eda9da7776144cbc0a038c93dcb335 tree 378a38636f6b67a5f092a73850223d11cdfb5ff5 parent 05f70395c642bed0300bc1955bfa8c0f93de2bc2 parent e4f5c82a92c2a546a16af1614114eec19120e40a author Tony Luck Mon, 05 Dec 2005 11:50:17 -0800 committer Tony Luck Mon, 05 Dec 2005 11:50:17 -0800 Auto-update from upstream commit 05f70395c642bed0300bc1955bfa8c0f93de2bc2 tree c73f6ddd31d53863a569f234792719e3f77cb416 parent 885da19e8044051a92cfd70099398c373245c431 author Keith Owens Fri, 02 Dec 2005 13:40:15 +1100 committer Tony Luck Mon, 05 Dec 2005 11:49:17 -0800 [IA64] Allow salinfo_decode to detect signals on read Return -EINTR instead of -ERESTARTSYS when signals are delivered during a blocked read of /proc/sal/*/event. This allows salinfo_decode to detect signals when it is blocked on a read of those files. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit 31a5539e57fa80e877a2f180cd4ec9ce9de6fea0 tree 36b3821339c9925b0922a8a3df14c436bfc6747f parent a0d95af5c28666155ad4c85a63a5065436ae1d79 author Hiroki Kaminaga Mon, 05 Dec 2005 10:55:00 +0000 committer Russell King Mon, 05 Dec 2005 10:55:00 +0000 [ARM] 3194/1: add pfn_to_kaddr macro for ARM take2 Patch from Hiroki Kaminaga This patch defines a new macro: pfn_to_kaddr(pfn). Same macro is already defined on other arch, such as i386. Signed-off-by: Hiroki Kaminaga Signed-off-by: Russell King commit a0d95af5c28666155ad4c85a63a5065436ae1d79 tree 9a4d0b2c4298b402bd731faacd085ae62f0f2532 parent 9ddf61bd09a7668279d2b208a96eba784bec3d80 author Deepak Saxena Mon, 05 Dec 2005 10:54:59 +0000 committer Russell King Mon, 05 Dec 2005 10:54:59 +0000 [ARM] 3191/1: Mark I/O pointer as const in __raw_reads[bwl] Patch from Deepak Saxena Mark the ioremap'd cookie/pointer in said functions as const since we should not be actualy touching the data. This fixes a slew of compile warnings on IXP4xx as our reads[bwl] already mark this parameter as const. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 9ddf61bd09a7668279d2b208a96eba784bec3d80 tree 55116fe3e45703ca7d45f4400ac3ced091537632 parent db20da32a22ccfa3a118408034eeb0ba61a42329 author Marcelo Tosatti Mon, 05 Dec 2005 10:15:06 +0000 committer Russell King Mon, 05 Dec 2005 10:15:06 +0000 [ARM SMP] mpcore_wdt bogus fpos check drivers/char/watchdog/mpcore_wdt.c write function contains a check for (ppos != &file->f_pos). Such check used to make sense when a pointer to file->f_pos was handed by vfs_write(), not a copy of it as it stands now. Signed-off-by: Marcelo Tosatti Signed-off-by: Russell King commit e781de44153885d5f772731726b4c0c16f8af021 tree f250d18bb4a912945dc9c1fb7208e75010546987 parent e4f5c82a92c2a546a16af1614114eec19120e40a author Pierre Ossman Mon, 05 Dec 2005 10:00:50 +0000 committer Russell King Mon, 05 Dec 2005 10:00:50 +0000 [MMC] Proper check of SCR error code The routine reading the SCR wasn't paying proper attention to the error codes returned from the driver. Signed-off-by: Pierre Ossman Signed-off-by: Russell King commit ca507eaf32fa599a92182ce91050046e807a994c tree 2402d87614e2cb19d67ffc208a27bc2eec13dde5 parent b6d78157ad129b1bce87cc831d0d038e97ca5551 author Olof Johansson Tue, 29 Nov 2005 14:04:17 -0600 committer Paul Mackerras Mon, 05 Dec 2005 15:41:35 +1100 [PATCH] powerpc: remove redundant code in stab init There's never been a hardware platform that has both pSeries/RPA LPAR hypervisor and stab (pre-POWER4 segment management). This removes the redundant code in stab_initalize(). Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit b6d78157ad129b1bce87cc831d0d038e97ca5551 tree 08125fb9c4f78eb103d4cc456204aba89e7ed9b5 parent 6fbb618f5da0424adcba5f666035e4772a8df526 author Paul Mackerras Mon, 05 Dec 2005 14:39:53 +1100 committer Paul Mackerras Mon, 05 Dec 2005 14:39:53 +1100 ppc: Build in all three of powermac, PREP and CHRP support This reverts commit da0825fd201a03294dbf7f8f030676d608da122c, making it so that if you select CONFIG_PPC_MULTIPLATFORM you get support for PMAC, PREP and CHRP built in. The reason for not allowing PMAC, PREP and CHRP to be selected individually for ARCH=ppc is that there is too much interdependency between them in the platform support code. For example, CHRP uses the PMAC nvram code. Configuring with ARCH=powerpc does allow you to select support for PMAC and CHRP separately. Support for PREP is not there yet but should be there soon. Signed-off-by: Paul Mackerras commit 6fbb618f5da0424adcba5f666035e4772a8df526 tree 599edd9f3bce29e3153b086bec87862e78bb889d parent e8a167accb47de528d2ffddc0f13f8e84eaa71de author Paul Mackerras Mon, 05 Dec 2005 14:19:10 +1100 committer Paul Mackerras Mon, 05 Dec 2005 14:19:10 +1100 powerpc/pseries: Optimize IOMMU setup The previous commit will use the page-at-a-time hypervisor call for setting up IOMMU entries when we are using 64k pages and setting up one 64k page, even though that means 16 calls to the hypervisor, since the hypervisor still works on 4k pages. This optimizes this case by using the multi-page IOMMU setup hypervisor call instead. Signed-off-by: Paul Mackerras commit db20da32a22ccfa3a118408034eeb0ba61a42329 tree 39f5627435f926b929d62d017921d3b75e8134df parent 436b0f76f2cee6617f27a649637766628909dd5d author Russell King Sun, 04 Dec 2005 17:56:46 +0000 committer Russell King Sun, 04 Dec 2005 17:56:46 +0000 [ARM] Add memory.txt to 00-INDEX Signed-off-by: Russell King commit e4f5c82a92c2a546a16af1614114eec19120e40a tree 75f680b437862b125cbce00709fcebf57f146b88 parent 436b0f76f2cee6617f27a649637766628909dd5d author Mauro Carvalho Chehab Sun, 04 Dec 2005 12:41:54 -0200 committer Linus Torvalds Sun, 04 Dec 2005 08:09:38 -0800 [PATCH] V4L/DVB (3087) fix analog NTSC for pcHDTV 3000 - fix analog NTSC for pcHDTV 3000 - Fix regression: broken analog NTSC for DViCO FusionHDTV3 Gold-T - add tda9887 to card struct, required for both cards. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Linus Torvalds commit 885da19e8044051a92cfd70099398c373245c431 tree 5f26f3fcf069c2d56169a777708899f00aebe5bc parent 1448652a54b5de5189a217374706700275b857e6 author Tony Luck Fri, 02 Dec 2005 16:18:42 -0800 committer Tony Luck Fri, 02 Dec 2005 16:18:42 -0800 [IA64] refresh tiger_defconfig ready for 2.6.15 Signed-off-by: Tony Luck commit 1448652a54b5de5189a217374706700275b857e6 tree 073f1e6f4a6cf137c20c0504336fd8df11c0c5b5 parent deda498710e190c7922c2634ed630ee64ce86c05 author Robin Holt Fri, 02 Dec 2005 11:14:41 -0600 committer Tony Luck Fri, 02 Dec 2005 13:32:44 -0800 [IA64] Updates to the sn2_defconfig for 2.6.15. This updates the sn2_defconfig file for the Altix 330 hardware, enables the AGP graphics for the SGI Prism, and removes prompts for the remainder of the new features. Greg Edwards reviewed the changes. Signed-off-by: Robin Holt Signed-off-by: Greg Edwards Signed-off-by: Tony Luck commit e8a167accb47de528d2ffddc0f13f8e84eaa71de tree 43d1e4bc078910584ce94b5e2bf542586974282a parent cc8b5c96a7ac7d695c2887427b1003bd33ec9c97 author Olaf Hering Thu, 01 Dec 2005 21:10:10 +0100 committer Paul Mackerras Fri, 02 Dec 2005 14:51:35 +1100 [PATCH] powerpc: correct the NR_CPUS description text Update the help text to match the allowed range. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit cc8b5c96a7ac7d695c2887427b1003bd33ec9c97 tree a8a745d54dae93438b6479cf807e07a51f8b210e parent deda498710e190c7922c2634ed630ee64ce86c05 author Michal Ostrowski Fri, 02 Dec 2005 13:09:13 +1100 committer Paul Mackerras Fri, 02 Dec 2005 14:51:22 +1100 [PATCH] powerpc/pseries: Fix TCE building with 64k pagesize Must adjust tcenum and npages by TCE_PAGE_FACTOR to convert between 64KB pages and TCE (4K) pages. (This is done in other places, except for this one location.) Signed-off-by: Michal Ostrowski Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras