commit 811803c5572b296e0031e0099203de90d77c7bcf tree d2cd86c706af9e6ad47e2dda6b24df0d93f6f98f parent 42f9cabebe5915351bdba2f6f7f80e47c68e6ac8 parent d5ea655376c471731845735dfe9a0bdfbe4492e9 author Linus Torvalds Thu, 17 Nov 2005 17:26:56 -0800 committer Linus Torvalds Thu, 17 Nov 2005 17:26:56 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 42f9cabebe5915351bdba2f6f7f80e47c68e6ac8 tree ae7487319d876ce736430a97a178af557fe2a189 parent 976164497d6d8050403c96894ad418de44ec748f parent 9e147a1cfce5ec6308b024abe425d5b4e1884a03 author Linus Torvalds Thu, 17 Nov 2005 17:26:26 -0800 committer Linus Torvalds Thu, 17 Nov 2005 17:26:26 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 976164497d6d8050403c96894ad418de44ec748f tree 5795746426c22eb8cb8b6e9ce3df761a154e0f91 parent 6b1de9161e973bac8c4675db608fe4f38d2689bd author Kumar Gala Thu, 17 Nov 2005 17:45:40 -0600 committer Linus Torvalds Thu, 17 Nov 2005 17:26:09 -0800 [PATCH] ppc: Fix warnings related to seq_file When we moved things around in irq.h seq_file became an issue. Fix warnings related to its usage. Signed-off-by: Kumar Gala Signed-off-by: Linus Torvalds commit 9e147a1cfce5ec6308b024abe425d5b4e1884a03 tree cbf4e057d96c38519dec3f1399654523a780ff6a parent 05b8b0fafd4cac75d205ecd5ad40992e2cc5934d author David S. Miller Thu, 17 Nov 2005 16:52:51 -0800 committer David S. Miller Thu, 17 Nov 2005 16:52:51 -0800 [IPV6]: Fib dump really needs GFP_ATOMIC. Revert: 8225ccbaf01b459cf1e462047a51b2851e756bc1 Based upon a report by Yan Zheng. Signed-off-by: David S. Miller commit 05b8b0fafd4cac75d205ecd5ad40992e2cc5934d tree b5ff4b545fc9d65b2c2ffe44b199621c675d4c7a parent 381998241fd1fc635596f4e8ae835f0d64ca1ba2 author Roman Zippel Thu, 17 Nov 2005 15:22:39 -0800 committer David S. Miller Thu, 17 Nov 2005 15:22:39 -0800 [NET]: Sanitize NET_SCHED protection in /net/sched/Kconfig On Thu, 17 Nov 2005, David Gómez wrote: > I found out that if i select NET_CLS_ROUTE4, save my changes and exit > menuconfig, execute again make menuconfig and go to QoS options, then the new > available options are visible. So menuconfig has some problem refreshing > contents :? No, they were there before too, but you have to go up one level to see them. It's better in 2.6.15-rc1-git5, but the menu structure is still a little messed up, the patch below properly indents all menu entries. Signed-off-by: Roman Zippel Signed-off-by: David S. Miller commit 381998241fd1fc635596f4e8ae835f0d64ca1ba2 tree 7e480e6ddba0144fc6029adf4a66fa00f72019bd parent 2fce76afdb067fa3e7f8ee33c9fe366bd65887ea author David S. Miller Thu, 17 Nov 2005 15:17:42 -0800 committer David S. Miller Thu, 17 Nov 2005 15:17:42 -0800 [LLC]: Fix compiler warnings introduced by TX window scaling changes. Noticed by Olaf Hering. The comparisons want a u8 here (the data type on the left-hand branch is a u8 structure member, and the constant on the right-hand branch is "~((u8) 128)"), but C turns it into an integer so we get: net/llc/llc_c_ac.c: In function `llc_conn_ac_inc_npta_value': net/llc/llc_c_ac.c:998: warning: comparison is always true due to limited range of data type net/llc/llc_c_ac.c:999: warning: large integer implicitly truncated to unsigned type Fix this up by explicitly recasting the right-hand branch constant into a "u8" once more. Signed-off-by: David S. Miller commit 2fce76afdb067fa3e7f8ee33c9fe366bd65887ea tree 1c3c543169d446d495711860250dca4b319343fb parent bd6af700a7191f483f41706467033588f28c8877 author Harald Welte Thu, 17 Nov 2005 15:06:47 -0800 committer David S. Miller Thu, 17 Nov 2005 15:06:47 -0800 [NETFILTER] ip_conntrack: fix ftp/irc/tftp helpers on ports >= 32768 Since we've converted the ftp/irc/tftp helpers to use the new module_parm_array() some time ago, we ware accidentially using signed data types - thus preventing those modules from being used on ports >= 32768. This patch fixes it by using 'ushort' module parameters. Thanks to Jan Nijs for reporting this bug. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit d5ea655376c471731845735dfe9a0bdfbe4492e9 tree 27564e45ef7656c9130edad80a5f1495f927f3ef parent 6b1de9161e973bac8c4675db608fe4f38d2689bd author David S. Miller Thu, 17 Nov 2005 15:04:34 -0800 committer David S. Miller Thu, 17 Nov 2005 15:04:34 -0800 [COMPAT]: Add ext3 ioctl translations. So things like on-line resizing et al. work. Based almost entirely upon a patch by Guido Günther Signed-off-by: David S. Miller commit bd6af700a7191f483f41706467033588f28c8877 tree 8a795f3effcc7086eee5addcc56646cf2cbb6c6e parent 6b1de9161e973bac8c4675db608fe4f38d2689bd author Stephen Hemminger Thu, 17 Nov 2005 14:11:18 -0800 committer David S. Miller Thu, 17 Nov 2005 14:11:18 -0800 [TCP]: TCP highspeed build error There is a compile error that crept in with the last patch of TCP patches. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6b1de9161e973bac8c4675db608fe4f38d2689bd tree 3ab6aaad7d22dcb7a00a339b8b49c2f5b2ecc12d parent bb833986674ce1fc1b237b3d81459511ad2df393 author Jens Axboe Thu, 17 Nov 2005 21:35:02 +0100 committer Linus Torvalds Thu, 17 Nov 2005 12:43:01 -0800 [PATCH] VM: fix zone list restart in page allocatate We must reassign z before looping through the zones kicking kswapd, since it will be NULL if we hit an OOM condition and jump back to the beginning again. 'z' is initially assigned before the restart: label. So move the restart label up a little. Signed-off-by: Jens Axboe commit bb833986674ce1fc1b237b3d81459511ad2df393 tree dca61cffabb03ab262be578f6e6d3b446383afbf parent 2d117403ae4006eeeb9037b82e9ecd8b3b043584 author Greg Kroah-Hartman Thu, 17 Nov 2005 09:48:18 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:55 -0800 [PATCH] USB: add the anydata usb-serial driver Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 2d117403ae4006eeeb9037b82e9ecd8b3b043584 tree 26283c3bd04bb17ccaa79036c540ee9f39d0aee6 parent 654f31189e550cd5924b786487a5d93d9feaada9 author Greg Kroah-Hartman Thu, 17 Nov 2005 09:48:13 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:55 -0800 [PATCH] USB: delete the nokia_dku2 driver It was causing too many problems, and this is not the proper type of driver for this device. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 654f31189e550cd5924b786487a5d93d9feaada9 tree 3502129c017607c961e396b4f32566f48436cc70 parent 87cf203935a646d5fb00464dc5887292da71d928 author Greg Kroah-Hartman Thu, 17 Nov 2005 09:48:09 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:55 -0800 [PATCH] USB: move CONFIG_USB_DEBUG checks into the Makefile This lets us remove a lot of code in the drivers that were all checking the same thing. It also found some bugs in a few of the drivers, which has been fixed up. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 87cf203935a646d5fb00464dc5887292da71d928 tree 8e5ca7b152755b03723dc3180eb931b41e66d652 parent 9465663965fbe7de4e21d090e8eb0cc34b65294f author Richard Purdie Thu, 17 Nov 2005 09:47:57 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:55 -0800 [PATCH] USB: OHCI lh7a404 platform device conversion fixup Fix an error in the OHCI lh7a404 driver after the platform device conversion. Signed-off-by: Richard Purdie Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9465663965fbe7de4e21d090e8eb0cc34b65294f tree c44aba9fdcdab05b096bfc0bbbdb185eaa893aaf parent 058120d70ebb430e27ad55871429028361c5baed author Antti Andreimann Thu, 17 Nov 2005 09:47:53 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:54 -0800 [PATCH] USB: Maxtor OneTouch button support for older drives This small patch adds a device ID used by older Maxtor OneTouch drives (the ones with blue face-plate instead of the fancy silver one used in newer models). The button on those drives works well with the current driver. From: Antti Andreimann Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 058120d70ebb430e27ad55871429028361c5baed tree 83310b7403f841311b054f2509d12f2b4096f4e9 parent d23b536bb715673ca0ccbdaac2b6ce2c001d06e9 author Andrew Morton Thu, 17 Nov 2005 09:47:49 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:54 -0800 [PATCH] usb devio warning fix drivers/usb/core/devio.c: In function `proc_ioctl_compat': drivers/usb/core/devio.c:1401: warning: passing arg 1 of `compat_ptr' makes integer from pointer without a cast Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d23b536bb715673ca0ccbdaac2b6ce2c001d06e9 tree ea784d44ab72378b716c084f79926e4435eea046 parent 8845add380854ffce5268714a093df8c80b4a6e2 author Herbert Xu Thu, 17 Nov 2005 09:47:45 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:54 -0800 [PATCH] USB: fix race in kaweth disconnect this patch from Herbert Xu fixes a race by moving termination of the URBs into close() exclusively. Signed-off-by: Herbert Xu Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 8845add380854ffce5268714a093df8c80b4a6e2 tree dd2a06773bcfe716d1a35bcec0dfce5de5077cc5 parent 9142d59a451731d23539d218c962418acc93283c author Daniel Drake Thu, 17 Nov 2005 09:48:01 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:54 -0800 [PATCH] usb-storage: Fix detection of kodak flash readers in shuttle_usbat driver Peter Favrholdt reported that his Kodak flash device was getting detected as a CDROM, and he helped me track this down to the fact that the device takes a long time (approx 440ms!) to reset. This patch increases the delay to 500ms, which solves the problem. Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9142d59a451731d23539d218c962418acc93283c tree 620f7c15bd32f2e21962f20ab82490944b56526f parent b8f4c1d6674463e5824eada1ad7ec799276718bd author Oliver Neukum Thu, 17 Nov 2005 09:47:41 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:54 -0800 [PATCH] USB: Adapt microtek driver to new scsi features the scsi layer now uses very short sg lists. This breaks the microtek driver. Here is a patch fixes this and some other issues. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b8f4c1d6674463e5824eada1ad7ec799276718bd tree 65b7b3bed0f5534eeded951a7a0852c495ec6a83 parent a8310f3b8b713e52d77c56d4b8865685ee40d02a author Luiz Fernando Capitulino Thu, 17 Nov 2005 09:47:36 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:54 -0800 [PATCH] USB: pl2303: updates pl2303_update_line_status() Updates pl2303_update_line_status() to handle X75 and SX1 Siemens mobiles Signed-off-by: Luiz Capitulino Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit a8310f3b8b713e52d77c56d4b8865685ee40d02a tree e21db029b1e175603ef2227226c10b0b6c7fc1f3 parent c9d00fc148b210aa8cf388d6e1eac187a0e855a6 author Luiz Fernando Capitulino Thu, 17 Nov 2005 09:47:32 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:54 -0800 [PATCH] USB: pl2303: adds new IDs. This patch adds two new Siemens mobiles IDs for the pl2303 driver. Signed-off-by: Luiz Capitulino Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c9d00fc148b210aa8cf388d6e1eac187a0e855a6 tree bc6e85fc0f7f207b2d95e17acac37add6d96a104 parent b0ce84d5539de88a1001f9aa3deeaa20fde3d152 author David Brownell Thu, 17 Nov 2005 09:47:28 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:54 -0800 [PATCH] USB: onetouch doesn't suspend yet The onetouch support doesn't suspend correctly (leaves an interrupt URB posted, instead of unlinking it) so for now just disable it when PM is in the air. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b0ce84d5539de88a1001f9aa3deeaa20fde3d152 tree 781d6b520e592440305a18e3f326bdfdbf8567ee parent c5dbf868e2bbeea6581f388a09539779c0d61357 author Josef Balatka Thu, 17 Nov 2005 09:47:24 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:54 -0800 [PATCH] USB: cp2101.c: Jablotron usb serial interface identification Jablotron usb serial interface identification Signed-off-by: Josef Balatka Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c5dbf868e2bbeea6581f388a09539779c0d61357 tree 2c3ca2e6c333c153517622cc9e28c0db90b6c462 parent 777da5905e82695d1dd73eee6cfe50bd486d8fe9 author Pavel Machek Thu, 17 Nov 2005 09:47:11 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:53 -0800 [PATCH] USB: kill unneccessary usb-storage blacklist entries I actually have this device, and kernel reports blacklist entry is no longer neccessary. Signed-off-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 777da5905e82695d1dd73eee6cfe50bd486d8fe9 tree cb605466ad446c4e2bb2a2e3332686e7ca9b3112 parent bc7cb323bab717660830211d50555dedf19e372e author Andrew Morton Thu, 17 Nov 2005 09:47:02 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:53 -0800 [PATCH] USB: usbdevfs_ioctl 32bit fix drivers/usb/core/devio.c: In function `proc_ioctl_compat': drivers/usb/core/devio.c:1401: warning: passing arg 1 of `compat_ptr' makes integer from pointer without a cast NFI if this is correct... Cc: Pete Zaitcev Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit bc7cb323bab717660830211d50555dedf19e372e tree c0fdd088380e42bed04fde77dd56428507bf02d4 parent c611d2cd2f74988baa9a4c6cfc8a48064fd075e6 author OGAWA Hirofumi Thu, 17 Nov 2005 09:47:07 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:53 -0800 [PATCH] usbfs: usbfs_dir_inode_operations cleanup Signed-off-by: OGAWA Hirofumi Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c611d2cd2f74988baa9a4c6cfc8a48064fd075e6 tree 052db5410bf71436f3c0b81c628280f09d07fb74 parent d4ece29d89d424ea045753c639971429faa9ee58 author Marcel Holtmann Thu, 17 Nov 2005 09:46:39 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:53 -0800 [PATCH] USB: Delete leftovers from bluetty driver This patch deletes the bluetooth.txt help file of the bluetty driver and hands over its major device nodes for character devices to the RFCOMM TTY implementation of the Bluetooth subsystem. Signed-off-by: Marcel Holtmann Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d4ece29d89d424ea045753c639971429faa9ee58 tree e92d83765fbd0a854480c6761459d65540008df9 parent ebb6f371ac5ce623051c4431c5d0f093462f679b author Dmitry Torokhov Thu, 17 Nov 2005 09:46:44 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:53 -0800 [PATCH] USB: fix 'unused variable' warning USB: fix 'unused variable' warning Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit ebb6f371ac5ce623051c4431c5d0f093462f679b tree d805f477f728f142c702bf4309c6d00f76c2f588 parent 116d75bd4d539309e0e1391e509f852a9cce82a6 author Ping Cheng Thu, 17 Nov 2005 09:46:51 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:53 -0800 [PATCH] USB: wacom tablet driver update This patch adds support for Graphire4, Cintiq 710, Intuos3 6x11, etc. and report Device IDs. Signed-off-by: Ping Cheng Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 116d75bd4d539309e0e1391e509f852a9cce82a6 tree 137d19f8db4308fca6f6104265cc69ac45dee327 parent 80ed89f6105fd2f35b3b9ee2078f31e1510da71e author Ping Cheng Thu, 17 Nov 2005 09:46:33 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:52 -0800 [PATCH] USB: add new wacom devices to usb hid-core list This patch adds support for Graphire4, Cintiq 710, Intuos3 6x11, etc. Signed-off-by: Ping Cheng Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 80ed89f6105fd2f35b3b9ee2078f31e1510da71e tree 68d81165ddbcd8e4b6ed68371e55db710b3273d9 parent cca2362c64429283d384df5b4cb948dcd6e8127b author Greg Kroah-Hartman Thu, 17 Nov 2005 09:46:28 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:52 -0800 [PATCH] USB Serial: rename ChangeLog.old People are complaining about a .old file in the tree. So rename drivers/usb/serial/ChangeLog.old to ChangeLog.history. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit cca2362c64429283d384df5b4cb948dcd6e8127b tree ebac113302eec1b91bee4481d85f2152ac4c2bf6 parent 1a7ec1a6a1df63aab9a1fa6174bd704241329805 author Greg Kroah-Hartman Thu, 17 Nov 2005 09:46:24 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:29:52 -0800 [PATCH] USB: fix build breakage in dummy_hcd.c Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 1a7ec1a6a1df63aab9a1fa6174bd704241329805 tree 3e0048b905f1f118559b08f3c909582db8b6cad1 parent 7652aab77fbf6de8bcc69ee6a864270b0da6b3f6 author Deepak Saxena Thu, 17 Nov 2005 11:09:53 -0800 committer Linus Torvalds Thu, 17 Nov 2005 11:23:48 -0800 [PATCH] Fix IXP4xx I2C driver build breakage Platform device conversion missed a couple of spots. Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds commit 7652aab77fbf6de8bcc69ee6a864270b0da6b3f6 tree cc380ac53a720a905232463cd8fed9cb27875723 parent cd02e27b1514a27b2a8ab59755ae6d23d4d8a10f parent aec8b7557cf0fc4dac059112328b5aa89271c77e author Linus Torvalds Thu, 17 Nov 2005 10:56:34 -0800 committer Linus Torvalds Thu, 17 Nov 2005 10:56:34 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus commit cd02e27b1514a27b2a8ab59755ae6d23d4d8a10f tree 75f624b82ab95446661a6322f644dae01dced710 parent 6027994423e12a3c0b22d3dbf9ac87364ca4e0ec author Linus Torvalds Thu, 17 Nov 2005 10:04:31 -0800 committer Linus Torvalds Thu, 17 Nov 2005 10:04:31 -0800 x86: Fix silly typo in recent fixes The second __const_sigaddset() should have been a sigdelset.. Compile trouble noted by Greg K-H. Signed-off-by: Linus Torvalds commit 6027994423e12a3c0b22d3dbf9ac87364ca4e0ec tree 9ba435e73247a7ea0f07a28d717bd1f58deaffec parent d0fa7e9f8ebeb19db4d2aed33c35f9d16fa7f32d parent 4a59a810513d5f7aa76515908b8e3620fa1b9b69 author Linus Torvalds Thu, 17 Nov 2005 09:06:54 -0800 committer Linus Torvalds Thu, 17 Nov 2005 09:06:54 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit d0fa7e9f8ebeb19db4d2aed33c35f9d16fa7f32d tree 092bf1f6cd50db2272d12ad6991ac3465f2d19ef parent fbf0e1348ec4023675123d432ce1fdfa1eef8e54 parent 5470dc656820fb67c0a2e352f0aaa48b86c19026 author Linus Torvalds Thu, 17 Nov 2005 08:45:42 -0800 committer Linus Torvalds Thu, 17 Nov 2005 08:45:42 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit fbf0e1348ec4023675123d432ce1fdfa1eef8e54 tree 06dff2cb05cd8f2d610aff11b1c7905153391a65 parent b7fd1edd2c0c225afa96af92d4adecb91e7d439d parent a2c91a8819e315e9fd1aef3ff57badb6c1be3f80 author Linus Torvalds Thu, 17 Nov 2005 08:43:38 -0800 committer Linus Torvalds Thu, 17 Nov 2005 08:43:38 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit b7fd1edd2c0c225afa96af92d4adecb91e7d439d tree 5e8d4cbc6d16eb318bc7df102b39a09056981817 parent 3b26b1100e26811e54770abaa221eae140ba840d author Constantine Gavrilov Thu, 17 Nov 2005 11:40:43 +0200 committer Linus Torvalds Thu, 17 Nov 2005 08:42:26 -0800 [PATCH] x86: fix sigaddset() inline asm memory constraint Due to incomplete memory constraints, gcc would miscompile code with sigaddset on i386 if sig arg was const. A quote form Jakub to make the issue clear: "You need either __asm__("btsl %1,%0" : "+m"(*set) : "Ir"(_sig-1) : "cc"); or __asm__("btsl %1,%0" : "=m"(*set) : "Ir"(_sig-1), "m"(*set) : "cc"); because the btsl instruction doesn't just set the memory to some value, but needs to read its previous content as well. If you don't tell that fact to GCC, GCC is of course free to optimize as if the asm was just setting the value and not depended on the previous value." Signed-off-by: Linus Torvalds commit 3b26b1100e26811e54770abaa221eae140ba840d tree eb19e8e3145dfeb93ca5f1f9882302f5831fb35b parent efb3442cf1c65747a858476e10f705612383eed1 author Zhu Yi Thu, 17 Nov 2005 13:58:30 +0800 committer Linus Torvalds Thu, 17 Nov 2005 08:32:58 -0800 [PATCH] ipw2200: fix error log offset calculation This fixes a slab corruption issue in the ipw2200 driver: it essentially multiplied the error log number _twice_ by the size of the error element entry (once explicitly in the code, and once implicitly as part of the regular pointer arithmetic). Cc: Henrik Brix Andersen Cc: Bernard Blackham Cc: Zilvinas Valinskas Cc: Pekka Enberg Signed-off-by: Zhu Yi Signed-off-by: Linus Torvalds -- commit efb3442cf1c65747a858476e10f705612383eed1 tree a093915da40a7887a8c8a3f927177764a55d33d2 parent 0db169f9703115bab09eda5d89a8f6937a7bf98e author Pekka Enberg Wed, 16 Nov 2005 21:55:05 +0200 committer Linus Torvalds Thu, 17 Nov 2005 08:32:58 -0800 [PATCH] ipw2200: disallow direct scanning when device is down The function ipw_request_direct_scan() should bail out when the device is down. This fixes a lockup caused by wpa_supplicant triggering ipw_request_direct_scan() while the driver was in a middle of a reset due to firmware errors. Thanks to Zilvinas Valinskas for reporting the bug and helping me debug it. Signed-off-by: Pekka Enberg Acked-by: Zhu Yi Signed-off-by: Linus Torvalds commit aec8b7557cf0fc4dac059112328b5aa89271c77e tree fb431327fcbdc0b474183c8016e9e8d25a72afb7 parent 1a6ea3ec6784cf3dedc338e1980dc0b4cf28a805 author Ralf Baechle Thu, 17 Nov 2005 16:23:58 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:58 +0000 [MIPS] Update defconfigs Signed-off-by: Ralf Baechle commit 1a6ea3ec6784cf3dedc338e1980dc0b4cf28a805 tree 91870e1281226e7ac1fac450c58e26d01f4028c5 parent 09b696efd93560609f25821208dae18027187425 author Ralf Baechle Tue, 15 Nov 2005 16:10:01 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:57 +0000 [MIPS] SEAD: More build fixes. Signed-off-by: Ralf Baechle commit 09b696efd93560609f25821208dae18027187425 tree 54618abf054e5a94e530f9bfe8ea53e6cf929334 parent 561a0792405bea8ead78990d755dd1f95b8e95b8 author Ralf Baechle Tue, 15 Nov 2005 13:55:06 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:56 +0000 [MIPS] TX3927: Try to glue the PCI code. Signed-off-by: Ralf Baechle commit 561a0792405bea8ead78990d755dd1f95b8e95b8 tree a9efc705f30fe603a64b33d21bffd28373ea55fa parent 3d5d44017601c927f5e14c43b0efee34e7e50a66 author Ralf Baechle Tue, 15 Nov 2005 13:25:59 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:55 +0000 [MIPS] SEAD: Delete seadint_init() prototype. There is no definition for seadint_init() and the unprotected prototype breaks compilation of assembler files. Signed-off-by: Ralf Baechle commit 3d5d44017601c927f5e14c43b0efee34e7e50a66 tree 372b4d998b82368e172c4355f6973c609ff7cff0 parent c183f1224bbae052b5fbb971d6eafc5cbdc6be4f author Ralf Baechle Tue, 15 Nov 2005 13:11:35 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:55 +0000 [MIPS] Ocelot G: Use CPU_MASK_NONE instead of 0 to initialize cpu mask. Signed-off-by: Ralf Baechle commit c183f1224bbae052b5fbb971d6eafc5cbdc6be4f tree b9ff7a60bf519d27ce89ad440bbef520b4ecd7dd parent c32cf78c0289c4d8f5973c985dda18f2b3a03e2b author Ralf Baechle Tue, 15 Nov 2005 13:05:26 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:54 +0000 [MIPS] JMR3927: Fix include wrapper symbol. Signed-off-by: Ralf Baechle commit c32cf78c0289c4d8f5973c985dda18f2b3a03e2b tree 0cf5b2e36eeb3d6bde3f4c1051f7443cf4d4788a parent 5135b0cdb23e47dd48d8100e45bd48ce937732ff author Ralf Baechle Tue, 15 Nov 2005 13:01:50 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:53 +0000 [MIPS] JMR3927: Fix compilation by including . Signed-off-by: Ralf Baechle commit 5135b0cdb23e47dd48d8100e45bd48ce937732ff tree 60270c0c35fb9d948cfb88b22b03acf9fee2862f parent 8bf4057bdd8912c7388c28e625f0b846a4ca1468 author Ralf Baechle Tue, 15 Nov 2005 12:19:46 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:52 +0000 [MIPS] JMR3927: need include/asm-mips/mach-jmr3927 in it's include path. Signed-off-by: Ralf Baechle commit 8bf4057bdd8912c7388c28e625f0b846a4ca1468 tree 4487f32aee83cc1f1cffe2d63b564716f386679b parent 4237f229018ccf937578dee97565a49d712809e8 author Ralf Baechle Tue, 15 Nov 2005 12:17:42 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:51 +0000 [MIPS] JMR3927: It's ops-tx3927.o not ops-jmr3927.o Signed-off-by: Ralf Baechle commit 4237f229018ccf937578dee97565a49d712809e8 tree f18e3560f64364b02f06a32d0a23af5f4095794b parent b60ccd575c2d96041b856aad19a7d3af168d79b9 author Ralf Baechle Thu, 17 Nov 2005 16:23:50 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:50 +0000 [IDE] Add driver for Sibyte Swarm evaluation board This driver supports the IDE port on the Sibyte Swarm evaluation boards and it's relatives for the BCM1250 family of systems on a chip. Signed-off-by: Ralf Baechle Acked-by: Bartlomiej Zolnierkiewicz commit b60ccd575c2d96041b856aad19a7d3af168d79b9 tree 4b5cd16ca45fc8f959cc32d9cd4a3ac984d54f74 parent f10d14ddec8daf11a298f05ab3d644887df39830 author Pantelis Antoniou Sun, 13 Nov 2005 23:27:46 +0200 committer Ralf Baechle Thu, 17 Nov 2005 16:23:50 +0000 [MIPS] Alchemy: Console output fixup This is needed to make console output appear with the new driver... Signed-off-by: Ralf Baechle commit f10d14ddec8daf11a298f05ab3d644887df39830 tree cb720c4553760ac37937eb56ef2255ae8aec70dd parent 99289a4e8a9cb3fa6caa8fc4ebf57a33db497340 author Arnaud Giersch Sun, 13 Nov 2005 00:38:18 +0100 committer Ralf Baechle Thu, 17 Nov 2005 16:23:49 +0000 [MIPS] Fix documentation typos. Signed-off-by: Arnaud Giersch Signed-off-by: Ralf Baechle commit 99289a4e8a9cb3fa6caa8fc4ebf57a33db497340 tree 53a149795f88ea1da576b4cec0d218cc998670a3 parent 59f145d28ce853b13dafdfab438c48f3ead0b38e author Arnaud Giersch Sun, 13 Nov 2005 00:38:18 +0100 committer Ralf Baechle Thu, 17 Nov 2005 16:23:49 +0000 [MIPS] Add const qualifier to writes##bwlq. Add const qualifier to parameter addr of writes##bwlq. Signed-off-by: Arnaud Giersch Signed-off-by: Ralf Baechle commit 59f145d28ce853b13dafdfab438c48f3ead0b38e tree e758652a96e8d63ac2b413bcba4266743af09d78 parent 84c493d8e143360cfba3efede97e5a93d62c4d3d author Arnaud Giersch Sun, 13 Nov 2005 00:38:18 +0100 committer Ralf Baechle Thu, 17 Nov 2005 16:23:48 +0000 [MIPS] IP32: Fix sparse warnings. Add __iomem qualifier to crime and mace pointers. Signed-off-by: Arnaud Giersch Signed-off-by: Ralf Baechle commit 84c493d8e143360cfba3efede97e5a93d62c4d3d tree 1530db463632b6cdb279aa0078d2249452d815aa parent 19ce1cfb2d53e5b9f70d0199d551789db2718e6f author Arnaud Giersch Sun, 13 Nov 2005 00:38:18 +0100 committer Ralf Baechle Thu, 17 Nov 2005 16:23:47 +0000 [MIPS] IP32 Fix and complete IP32 parport definitions Fix, complete, and indent IP32 parport definitions. Definition were wrong for CTXINUSE and DMACTIVE (1-bit shift). Add macros DATA_BOUND, DATALEN_SHIFT, and CTRSHIFT. Signed-off-by: Arnaud Giersch Signed-off-by: Ralf Baechle commit 19ce1cfb2d53e5b9f70d0199d551789db2718e6f tree 6a8e08b25a64718c5fad3c60e1aa1aedff6fdca5 parent 70ad7d1840d3479ea8503c9f89ec503115bfd2cf author Arnaud Giersch Sun, 13 Nov 2005 00:38:18 +0100 committer Ralf Baechle Thu, 17 Nov 2005 16:23:47 +0000 [MIPS] IP32: Export mace symbol. Export mace symbol so that it can be used in modules. Signed-off-by: Arnaud Giersch Signed-off-by: Ralf Baechle commit 70ad7d1840d3479ea8503c9f89ec503115bfd2cf tree 804f9d3678bb4aa39be1e47229236ad8c1d0e2c6 parent efd9412d850397fc129c17eb33c84f74abb0d3ee author Ralf Baechle Fri, 11 Nov 2005 11:49:53 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:46 +0000 [MIPS] JMR3927: Fix syntax error. Signed-off-by: Ralf Baechle commit efd9412d850397fc129c17eb33c84f74abb0d3ee tree 49d832872141ed2982312e705b863be35a61c489 parent d93efab838ee399b45379bd97b2812ecee84471b author Ralf Baechle Fri, 11 Nov 2005 11:46:25 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:45 +0000 [MIPS] JMR3927: Undo accidental rename. Signed-off-by: Ralf Baechle commit d93efab838ee399b45379bd97b2812ecee84471b tree 3d6ef302f593e7d7f7d4da95adb65166b41a0124 parent 16212017a54afdb702ecc796aaa0448b795de03b author Ralf Baechle Fri, 11 Nov 2005 11:15:41 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:45 +0000 [MIPS] DDB5477: Fix unused variable warning. Signed-off-by: Ralf Baechle commit 16212017a54afdb702ecc796aaa0448b795de03b tree 3ee7edf2f92d531689bcb0db0be91a5d9e8d2a61 parent cd017fbdd33f2d8294b0e0324faa1dc7750b4af0 author Ralf Baechle Thu, 17 Nov 2005 16:23:44 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:44 +0000 [MIPS] IP32: No need to include . Signed-off-by: Ralf Baechle commit cd017fbdd33f2d8294b0e0324faa1dc7750b4af0 tree 7d7191c3be2270b036876a137d417c1ef9da7e11 parent 443bf3292f04c53e92bf0588f1aa2c9b421545e2 author Ralf Baechle Thu, 17 Nov 2005 16:23:43 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:43 +0000 Add definitions for the Dallas DS1742 RTC / non-volatile memory. Signed-off-by: Ralf Baechle commit 443bf3292f04c53e92bf0588f1aa2c9b421545e2 tree 686f01621b7144c17c5b4340c5cdd40f299fedf3 parent bdc3c3c7cbc3e1244c03640b4b372d097a1dacf3 author Ralf Baechle Thu, 17 Nov 2005 16:23:42 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:42 +0000 Add definitions for the Dallas DS17287 RTC. Signed-off-by: Ralf Baechle commit bdc3c3c7cbc3e1244c03640b4b372d097a1dacf3 tree 513f7beb915ef2adae11f9222879a6eab911ef02 parent 6f17ce33fef3fd84e3e45850c9388d118adfad96 author Ralf Baechle Thu, 17 Nov 2005 16:23:42 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:42 +0000 [MIPS] Add missing arch defines for the Alchemy MTD driver. Signed-off-by: Ralf Baechle commit 6f17ce33fef3fd84e3e45850c9388d118adfad96 tree 062cc6c191d9db6450d37c36051506218e0a66e8 parent 0905780aae58ea69f2dafea9716ee2ea78dbe4e2 author Yoichi Yuasa Thu, 10 Nov 2005 22:42:36 +0900 committer Ralf Baechle Thu, 17 Nov 2005 16:23:41 +0000 Add GT64111 PCI ID back Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 0905780aae58ea69f2dafea9716ee2ea78dbe4e2 tree 8285d824fce3959edb64af5fbc2511cd549321e4 parent e0c9b7973021ea4baa1ed76ff25ceb80f75edd8f author Maciej W. Rozycki Mon, 13 Jun 2005 19:58:50 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:39 +0000 [MIPS] zs.c: Resurrect the deceased zs.c for now. Not that it's meant to be sustained for long, but from time to time it's useful to have some console... Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle commit e0c9b7973021ea4baa1ed76ff25ceb80f75edd8f tree 020d0d255ae1632563f415a0a5943057d70ef8f3 parent db7f6861822c80f17a23647b4d0042dcc56e2024 author Ralf Baechle Tue, 08 Nov 2005 22:36:48 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:39 +0000 [MIPS] feature-removal-schedule.txt: Schedule au1x00_uart for removal. The 8250 serial driver now has the ability to deal with the differences between the standard 8250 family of UARTs and their slightly strange brother on Alchemy SOCs. The loss of features is not considered an issue. Signed-off-by: Ralf Baechle commit db7f6861822c80f17a23647b4d0042dcc56e2024 tree 45f030d4feb1146e09c95d96d108797564c3558a parent 0db169f9703115bab09eda5d89a8f6937a7bf98e author Ralf Baechle Tue, 08 Nov 2005 22:23:13 +0000 committer Ralf Baechle Thu, 17 Nov 2005 16:23:38 +0000 [MIPS] Delete duplicate definitions of break codes. Signed-off-by: Ralf Baechle commit a2c91a8819e315e9fd1aef3ff57badb6c1be3f80 tree 0b75460b200383d341b8473fc187f5db2c681795 parent 22374677d18c5eeefd3a283431d312b8c44fef02 author Jeff Garzik Thu, 17 Nov 2005 05:44:44 -0500 committer Jeff Garzik Thu, 17 Nov 2005 05:44:44 -0500 [libata sata_mv] handle lack of hardware nIEN support Handle errata (it was unintentional on this h/w, whereas its intentional on others) whereby the nIEN bit in Device Control is ignored, leading to a situation where a hardware interrupt completes the qc before the polling code has a chance to. This will get fixed The Right Way(tm) once Albert Lee's irq-pio branch is merged, as the more natural PIO method on this hardware is interrupt-driven. commit 22374677d18c5eeefd3a283431d312b8c44fef02 tree 4d923291cdab7c84e0346a8500f090f2b11e2bc1 parent 64f043d80752a8e5f0d55255e7bb9a1a05af206f author Jeff Garzik Thu, 17 Nov 2005 10:59:48 -0500 committer Jeff Garzik Thu, 17 Nov 2005 10:59:48 -0500 [libata sata_mv] SATA probe, DMA boundary fixes - DMA boundary was being handled incorrectly. Copied the code from ata_fill_sg(), since Marvell has the same DMA boundary needs. (we can't use ata_fill_sg directly since we have different hardware descriptors) - cleaned up the SATA phy reset code, to deal with various errata commit 64f043d80752a8e5f0d55255e7bb9a1a05af206f tree 3dc2a2511e29f6d8e2b26884ea090ce5d8c9f6c2 parent 556c66db0794b9b85481cb5e3cb57688eabad982 author Jeff Garzik Thu, 17 Nov 2005 10:50:01 -0500 committer Jeff Garzik Thu, 17 Nov 2005 10:50:01 -0500 [libata] add timeout to commands for which we call wait_completion() commit 4a59a810513d5f7aa76515908b8e3620fa1b9b69 tree 02bf53df48d9a9e6f7f7b4f690eb8b62227f8fa9 parent e7c8a41e817f381ac5c2a59ecc81b483bd68a7df author Patrick McHardy Wed, 16 Nov 2005 23:14:19 -0800 committer David S. Miller Wed, 16 Nov 2005 23:14:19 -0800 [NETFILTER]: Fix nf_conntrack compilation with CONFIG_NETFILTER_DEBUG CC [M] net/netfilter/nf_conntrack_core.o net/netfilter/nf_conntrack_core.c: In function 'nf_ct_unlink_expect': net/netfilter/nf_conntrack_core.c:390: error: 'exp_timeout' undeclared (first use in this function) net/netfilter/nf_conntrack_core.c:390: error: (Each undeclared identifier is reported only once net/netfilter/nf_conntrack_core.c:390: error: for each function it appears in.) Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 556c66db0794b9b85481cb5e3cb57688eabad982 tree 5bc225b790d855aa61ec06abae19e21f6e6b1a82 parent 3be4bb06b53df2c0a760eeaa5f53448faddedfca parent 8b200abdcf237528a3eb0fe8c680c711fc9824b5 author Jeff Garzik Wed, 16 Nov 2005 20:45:51 -0500 committer Jeff Garzik Wed, 16 Nov 2005 20:45:51 -0500 Merge branch 'upstream-fixes' commit 8b200abdcf237528a3eb0fe8c680c711fc9824b5 tree d88ac91f037be98f35f216a2be7a263491286078 parent 7bdd720869ff75700b48b132ee71852615b55808 parent 0db169f9703115bab09eda5d89a8f6937a7bf98e author Jeff Garzik Wed, 16 Nov 2005 20:45:40 -0500 committer Jeff Garzik Wed, 16 Nov 2005 20:45:40 -0500 Merge branch 'master' commit e7c8a41e817f381ac5c2a59ecc81b483bd68a7df tree 650b33c804a1a66c72acaef9595eb9fe6cc2c0e9 parent 0db169f9703115bab09eda5d89a8f6937a7bf98e author Yasuyuki Kozakai Wed, 16 Nov 2005 12:55:37 -0800 committer David S. Miller Wed, 16 Nov 2005 12:55:37 -0800 [IPV4,IPV6]: replace handmade list with hlist in IPv{4,6} reassembly Both of ipq and frag_queue have *next and **prev, and they can be replaced with hlist. Thanks Arnaldo Carvalho de Melo for the suggestion. Signed-off-by: Yasuyuki Kozakai Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 3be4bb06b53df2c0a760eeaa5f53448faddedfca tree 67dc02f39e48a8a37d8f3e4a38422d86f5164820 parent 85d6162d6cea9220e483989817eac0cebc03070e parent 7bdd720869ff75700b48b132ee71852615b55808 author Jeff Garzik Wed, 16 Nov 2005 15:12:58 -0500 committer Jeff Garzik Wed, 16 Nov 2005 15:12:58 -0500 Merge branch 'upstream-fixes' commit 5470dc656820fb67c0a2e352f0aaa48b86c19026 tree 4e2de34af202c628372bb9bbad878d060714687f parent 45e109d07275e0820745dc465302de0aa5a8703b author Russell King Wed, 16 Nov 2005 18:36:49 +0000 committer Russell King Wed, 16 Nov 2005 18:36:49 +0000 [ARM] No need to include asm/proc-fns.h into asm/system.h In the old days when arm26/arm32 was combined into the same architecture, proc-fns.h provided the xchg implementation for arm26 CPUs. Since we no longer combine these two, this include is no longer required. Remove it. Signed-off-by: Russell King commit 45e109d07275e0820745dc465302de0aa5a8703b tree 31de40e5511c4d7c64431e5d793f3e63e8bf6dad parent 49ee57a3295a227b6a02785f75ccd521e493e983 author Russell King Wed, 16 Nov 2005 18:29:51 +0000 committer Russell King Wed, 16 Nov 2005 18:29:51 +0000 [ARM] sa1111.c needs asm/sizes.h Signed-off-by: Russell King commit 49ee57a3295a227b6a02785f75ccd521e493e983 tree 3e1ab74e95d1599c6944f24fc32a30e601554827 parent 1b12050f17460dc312cfd8cc59c79e181b23062b author Russell King Wed, 16 Nov 2005 18:03:10 +0000 committer Russell King Wed, 16 Nov 2005 18:03:10 +0000 [ARM] Use unsigned long not u32 in atomic_cmpxchg Since atomic.h does not include types.h, u32 may not be defined. Since atomics are supposed to work on unsigned long quantities, use unsigned long instead. Signed-off-by: Russell King commit 1b12050f17460dc312cfd8cc59c79e181b23062b tree 5f21465d9eb11f9825d89c3ac225a291f279b1a1 parent 8dc39b883e9497445b53c498be7493c3e43af006 author Russell King Wed, 16 Nov 2005 17:38:40 +0000 committer Russell King Wed, 16 Nov 2005 17:38:40 +0000 [ARM] Move zone adjustment for SA1111 on SA11x0 platforms Unfortunately, using PAGE_SHIFT in asm/arch/memory.h is unsafe, and we can't include asm/page.h into this file because then we have a circular dependency. Move the offending code to arch/arm/common/sa1111.c instead. Signed-off-by: Russell King commit 8dc39b883e9497445b53c498be7493c3e43af006 tree c2d14a82bcfd02687db8d27072bcd8fa7b02df75 parent 994e12805336f899d0ec1cf38a99c7b6405d144a author Russell King Wed, 16 Nov 2005 17:23:57 +0000 committer Russell King Wed, 16 Nov 2005 17:23:57 +0000 [ARM] Add linux/compiler.h includes where required atomic.h, bitops.h and mmu_context.h are using likely/unlikely. thread_info.h uses __attribute_const__. Hence these files require linux/compiler.h to be included. Signed-off-by: Russell King commit 0db169f9703115bab09eda5d89a8f6937a7bf98e tree c7fb83d10394e33dffe4ae13d9878e8e500bb60a parent d58a75ef75ad98f2d20ee6dccfc71f881aabffb0 parent 6e87abd0b8cbb23ed9ffe5cc9f790fb5cac45eae author Linus Torvalds Wed, 16 Nov 2005 08:25:28 -0800 committer Linus Torvalds Wed, 16 Nov 2005 08:25:28 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 7bdd720869ff75700b48b132ee71852615b55808 tree 5d42dddd1cda8462fe1b2739a40ab28df28c227d parent c2cd76ff106b8bd9c0a754c6439c74e86fd2aba7 author Jeff Garzik Wed, 16 Nov 2005 11:06:59 -0500 committer Jeff Garzik Wed, 16 Nov 2005 11:06:59 -0500 [libata] bump versions commit d58a75ef75ad98f2d20ee6dccfc71f881aabffb0 tree fbfa28526e3e2695c61d83a1a4997a8c3d00b686 parent f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 parent 5d66da3d71e6aeca80ca08dbebd8a1cd72e6ee1f author Linus Torvalds Wed, 16 Nov 2005 07:58:48 -0800 committer Linus Torvalds Wed, 16 Nov 2005 07:58:48 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge commit 994e12805336f899d0ec1cf38a99c7b6405d144a tree 24c2ffcb00f26b49f7cf943e1696de73a91be8fe parent b526bf23fd4138456b1bb4f1305862695604c798 author Ben Dooks Wed, 16 Nov 2005 15:05:13 +0000 committer Russell King Wed, 16 Nov 2005 15:05:13 +0000 [ARM] 3162/1: S3C2410 - updated defconfig Patch from Ben Dooks Minor changes, including add SysRq, selecting the DM9000 as a built-in driver, not as a module, and selecting the framebuffer. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit b526bf23fd4138456b1bb4f1305862695604c798 tree 20ed1a434af1d8bf94a655650a539de7ff0f169a parent a7d068336197945dc4af65c5973c996e526d51cb author Ben Dooks Wed, 16 Nov 2005 15:05:12 +0000 committer Russell King Wed, 16 Nov 2005 15:05:12 +0000 [ARM] 3161/1: BAST - fix commas on end of structs Patch from Ben Dooks Make the use of , on the lsat entry structs consistenent through arch/arm/mach-s3c2410/mach-bast.c Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a7d068336197945dc4af65c5973c996e526d51cb tree cbe903bef21fce0d5923cc83071b7b66d00d94c4 parent 224b5be6ddc12fa7587433878866cd39e7b935f5 author Nicolas Pitre Wed, 16 Nov 2005 15:05:11 +0000 committer Russell King Wed, 16 Nov 2005 15:05:11 +0000 [ARM] 3165/1: fix atomic_cmpxchg() implementation for ARMv6+ Patch from Nicolas Pitre If 'old' and 'oldval' are different then 'res' never gets set. In that case, if ever %0 happened to contain anything but zero (rather likely) then the code will loop forever (or until another CPU just come along and change the atomic value to match 'old' which is rather unlikely). Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 224b5be6ddc12fa7587433878866cd39e7b935f5 tree 25e4a47d9c21a3b927f1ea793f0d14628afa86f7 parent 0a5709b2dc84140082ea235130a05c05d51f94a2 author Russell King Wed, 16 Nov 2005 14:59:51 +0000 committer Russell King Wed, 16 Nov 2005 14:59:51 +0000 [ARM] compressed/head.S debugging defaults to asm/arch/debug-macro.S Since we want new platforms to use debug-macro.S, make the decompressor debugging method default to using this include file rather than having new platforms add to an #if defined(). Signed-off-by: Russell King commit 0a5709b2dc84140082ea235130a05c05d51f94a2 tree 096bdbc0a86fde503722611bba1feaca76e91d3a parent ce07d90aa80a4c9a956eb2f662e4be5ea5c6baf8 author Russell King Wed, 16 Nov 2005 14:51:20 +0000 committer Russell King Wed, 16 Nov 2005 14:51:20 +0000 [ARM] Include asm/hardware.h instead of asm/arch/hardware.h Rationalise hardware.h include. Signed-off-by: Russell King commit ce07d90aa80a4c9a956eb2f662e4be5ea5c6baf8 tree 7411f04f6136f52b840696bf791626ae218d7a05 parent f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 author Russell King Wed, 16 Nov 2005 14:38:19 +0000 committer Russell King Wed, 16 Nov 2005 14:38:19 +0000 [ARM] Fix arch-realview/system.h to use __io_address() Move __io_address to arch-realview/hardware.h, drop core.h from platsmp.c and localtimer.c, and include asm/io.h where required. Signed-off-by: Russell King commit c2cd76ff106b8bd9c0a754c6439c74e86fd2aba7 tree d3a7848336627da12c47c18cbbe42fc70fe8db71 parent 75b1f2f865c6e6c6c04e2779750192b8d3d504e8 author Jeff Garzik Wed, 16 Nov 2005 09:23:30 -0500 committer Jeff Garzik Wed, 16 Nov 2005 09:23:30 -0500 [libata ahci] tone down ATAPI errors ATA devices don't generate many errors, so the preferred method is to printk() when they occur. ATAPI devices generate tons of exceptions during the normal course of operation, so this change skips logging the most common class of errors. commit 75b1f2f865c6e6c6c04e2779750192b8d3d504e8 tree 9e95f56cc033943f26c21c61377cb7e8ed0d8b4b parent d10cb35a876c72b4b6711a366e341a1e4d8aa709 author Albert Lee Wed, 16 Nov 2005 17:06:18 +0800 committer Jeff Garzik Wed, 16 Nov 2005 07:59:22 -0500 [PATCH] libata: honor the transfer cycle time speficied by the EIDE device The following code segment is not functional because the transfer cycle time speficied by the EIDE device is later overwritten by ata_timing_quantize(): /* * If the drive is an EIDE drive, it can tell us it needs extended * PIO/MW_DMA cycle timing. */ if (adev->id[ATA_ID_FIELD_VALID] & 2) { /* EIDE drive */ memset(&p, 0, sizeof(p)); (snip) ata_timing_merge(&p, t, t, ATA_TIMING_CYCLE | ATA_TIMING_CYC8B); <== uninitialized "t" is used here } /* * Convert the timing to bus clock counts. */ ata_timing_quantize(s, t, T, UT); <== t is overwritten by quantized s The patch has been submitted for ide-timing.h before: http://marc.theaimsgroup.com/?l=linux-ide&m=110820013425454&w=2 Resubmitted for libata. Changes: - Minor fix to honor the following transfer cycle time speficied by the device - id[65]: Minimum Multiword DMA transfer cycle time per word - id[67]: Minimum PIO transfer cycle time without flow control - id[68]: Minimum PIO transfer cycle time with IORDY Signed-off-by: Albert Lee ======= Signed-off-by: Jeff Garzik commit d10cb35a876c72b4b6711a366e341a1e4d8aa709 tree 5e871ea2af668fd85f80bf369d6f057e24c4fd7f parent f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 author Tejun Heo Wed, 16 Nov 2005 16:56:49 +0900 committer Jeff Garzik Wed, 16 Nov 2005 07:11:42 -0500 [PATCH] sil24: add constants Adds constants for ATAPI support to sata_sil24. This patch is originally from Jeff Garzik . Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 6e87abd0b8cbb23ed9ffe5cc9f790fb5cac45eae tree 2469b23b6410153c7b25f03b6e5d3b846874a7d7 parent 7b5603e056b8b5f3175f14badd895b9ac567f315 author David S. Miller Wed, 16 Nov 2005 00:52:57 -0800 committer David S. Miller Wed, 16 Nov 2005 00:52:57 -0800 [DVB]: Add compat ioctl handling. Based upon a patch by Guido Guenther . Some of these ioctls had embedded time_t objects or pointers, so needed translation. Signed-off-by: David S. Miller commit 7b5603e056b8b5f3175f14badd895b9ac567f315 tree 202d8d9d05f02f9d287c4e4a69694c5136fa3077 parent 574780d56fdafe2c8ea98660a932760dfea9bffc author David S. Miller Wed, 16 Nov 2005 00:11:50 -0800 committer David S. Miller Wed, 16 Nov 2005 00:11:50 -0800 [DVB] cinergyT2: cinergyt2_register_rc() should return 0 on success Currently, the version when ENABLE_RC is defined, falls through to the end of the function without returning anything. Signed-off-by: David S. Miller commit 574780d56fdafe2c8ea98660a932760dfea9bffc tree 492e34919f14ffede70dae0ac6f0414fa701d564 parent f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 author Guido Guenther Wed, 16 Nov 2005 00:08:44 -0800 committer David S. Miller Wed, 16 Nov 2005 00:08:44 -0800 [SPARC64]: Oops in pci_alloc_consistent with cingergyT2 From: Guido Guenther - Use correct API for allocating and freeing DMA buffers. Acked-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 5d66da3d71e6aeca80ca08dbebd8a1cd72e6ee1f tree 1bdc54e617fc209925f33118f414ce0a4ebb62ac parent d3ed65832029dcaf5fe086670a2f2c25600b51e9 author Benjamin Herrenschmidt Wed, 16 Nov 2005 13:54:32 +1100 committer Paul Mackerras Wed, 16 Nov 2005 14:05:11 +1100 [PATCH] powerpc: Make the vDSO functions set error code (#2) The vDSO functions should have the same calling convention as a syscall. Unfortunately, they currently don't set the cr0.so bit which is used to indicate an error. This patch makes them clear this bit unconditionally since all functions currently succeed. The syscall fallback done by some of them will eventually override this if the syscall fails. This also changes the symbol version of all vdso exports to make sure glibc can differenciate between old and fixed calls for existing ones like __kernel_gettimeofday. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit d3ed65832029dcaf5fe086670a2f2c25600b51e9 tree 00b3ea25477868607b0aa47d55b0854118f73fb2 parent 94b212c29f685ca54b5689a8e89ac7671c43d651 author Benjamin Herrenschmidt Wed, 16 Nov 2005 13:40:43 +1100 committer Paul Mackerras Wed, 16 Nov 2005 14:05:07 +1100 [PATCH] ppc: Fix build with CONFIG_CHRP not set Building ARCH=ppc for multiplatforms with CONFIG_CHRP not set fails due to some unshielded code in xmon Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 94b212c29f685ca54b5689a8e89ac7671c43d651 tree 356266520a5ba530b2a5b77b68e90e87a2402ecb parent 7486a38f683d49e6f8b2b9050ff06778b151a40c author Paul Mackerras Wed, 16 Nov 2005 13:38:21 +1100 committer Paul Mackerras Wed, 16 Nov 2005 13:52:21 +1100 powerpc: Move ppc64 boot wrapper code over to arch/powerpc This also extends the code to handle 32-bit ELF vmlinux files as well as 64-bit ones. This is sufficient for booting on new-world 32-bit powermacs (i.e. all recent machines). Signed-off-by: Paul Mackerras commit 7486a38f683d49e6f8b2b9050ff06778b151a40c tree 6a43a59ae4892d8993105d7151fe0676c10d02e1 parent 950fc0025f8566d1c44da04fed216513f83268af author Kumar Gala Tue, 15 Nov 2005 11:03:24 -0600 committer Paul Mackerras Wed, 16 Nov 2005 13:52:12 +1100 [PATCH] powerpc: replace page_to_virt() with lowmem_page_address() for Book-E page_to_virt and lowmem_page_address provided equiavlent functionality so use the more standard lowmem_page_address This also addresses build issue in ARCH=powerpc since page_to_virt() has been removed from include/asm-powerpc/page.h Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras commit 950fc0025f8566d1c44da04fed216513f83268af tree 73a098992d35f2d8b547a704da6447862aaeab8e parent de93f0d62ccaa730fd46de14d46c0317bd82596a author Olof Johansson Tue, 15 Nov 2005 09:05:14 -0800 committer Paul Mackerras Wed, 16 Nov 2005 13:52:06 +1100 [PATCH] powerpc: add new powerbooks to feature table Hi, The previous PowerBook patch didn't contain the feature table updates for ARCH=powerpc. Here they are. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit de93f0d62ccaa730fd46de14d46c0317bd82596a tree 38184c1a318f111abd0f20c541ea2e1b69da0b41 parent c0ce5c5228dd17d4e3dd1d15b8d52714262cab70 author Benjamin Herrenschmidt Tue, 15 Nov 2005 18:21:45 +1100 committer Paul Mackerras Wed, 16 Nov 2005 13:51:58 +1100 [PATCH] ppc: Fix boot with yaboot with ARCH=ppc The merge of machine types broke boot with yaboot & ARCH=ppc due to the old code still retreiving the old-syle machine type passed in by yaboot. This patch fixes it by translating those old numbers. Since that whole mecanism is deprecated, this is a temporary fix until ARCH=ppc uses the new prom_init that the merged architecture now uses for both ppc32 and ppc64 (after 2.6.15) Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit c0ce5c5228dd17d4e3dd1d15b8d52714262cab70 tree c4666405c979bd4fb327030416b01fe917259a7f parent b5166cc252190be80465f3b4f050e4a0310f71af author Guido Guenther Tue, 15 Nov 2005 17:28:05 +1100 committer Paul Mackerras Wed, 16 Nov 2005 13:51:50 +1100 [PATCH] PowerBook 6,1: headphone not detected after suspend ever since suspend to disk works I had the problem that headphone (un)plugging doesn't get detected properly anymore after the first resume. Reloading the module worked around this ever since, however the real cause of the problem was that after a resume the driver only got interrupts on "unplug" not on "plug". Reactivating the headphone status interrupt in tumbler_resume fixes this. This shouldn't cause any trouble with software suspend, but it would be nice if somebody could confirm this: Signed-off-by: Guido Guenther Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit b5166cc252190be80465f3b4f050e4a0310f71af tree 565d11c2ea25d1553489d6c8a9b4d2c00e110288 parent f9e4ec57c66586d0c165ed9373efaf9e329d5766 author Benjamin Herrenschmidt Tue, 15 Nov 2005 16:05:33 +1100 committer Paul Mackerras Wed, 16 Nov 2005 13:29:46 +1100 [PATCH] powerpc: pci_64 fixes & cleanups I discovered that in some cases (PowerMac for example) we wouldn't properly map the PCI IO space on recent kernels. In addition, the code for initializing PCI host bridges was scattered all over the place with some duplication between platforms. This patch fixes the problem and does a small cleanup by creating a pcibios_alloc_controller() in pci_64.c that is similar to the one in pci_32.c (just takes an additional device node argument) that takes care of all the grunt allocation and initialisation work. It should work for both boot time and dynamically allocated PHBs. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit f9e4ec57c66586d0c165ed9373efaf9e329d5766 tree c2704119cc2d7f369bff0610e815f49231649d3e parent eb481899aa319cf5cbeccfd9deac907300698b57 author Michael Ellerman Tue, 15 Nov 2005 15:16:38 +1100 committer Paul Mackerras Wed, 16 Nov 2005 13:29:40 +1100 [PATCH] powerpc: More debugging fixups Add a few more missing includes of udbg.h Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit eb481899aa319cf5cbeccfd9deac907300698b57 tree 2dc0499415e968fca864a2ba38674dbced6094fb parent 5444a5e9e872f599ec12534bd1bf9bc79a1c72ca author Michael Ellerman Tue, 15 Nov 2005 14:49:22 +1100 committer Paul Mackerras Wed, 16 Nov 2005 13:28:40 +1100 [PATCH] powerpc: Fixup debugging in lmb.c Somewhere we lost the include of udbg.h in lmb.c. While we're there, add a DBG macro like every other file has and use it in lmb_dump_all(). Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 5444a5e9e872f599ec12534bd1bf9bc79a1c72ca tree 3ed0871f034bd90248a8de538c0530ab4400dd7a parent eb07d964b4491d1bb5864cd3d7e7633ccdda9a53 author Benjamin Herrenschmidt Tue, 15 Nov 2005 14:40:25 +1100 committer Paul Mackerras Wed, 16 Nov 2005 13:28:32 +1100 [PATCH] powerpc: update defconfigs My patch moving ppc64 RTC to genrtc was supposed to update all defconfigs, but for some reason, the patch actually posted only had the pseries one... ouch. This patch properly updates all defconfigs. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit eb07d964b4491d1bb5864cd3d7e7633ccdda9a53 tree b76d2cdf2159ee2d11ae708ee876a21dbf0838e3 parent 1e185b97b4364063f1135604b87f8d8469944233 author Marcelo Tosatti Mon, 14 Nov 2005 05:38:31 -0200 committer Paul Mackerras Wed, 16 Nov 2005 13:28:22 +1100 [PATCH] ppc32 8xx: update_mmu_cache() needs unconditional tlbie Currently 8xx fails to boot due to endless pagefaults. Seems the bug is exposed by the change which avoids flushing the TLB when not necessary (in case the pte has not changed), introduced recently: __handle_mm_fault(): entry = pte_mkyoung(entry); if (!pte_same(old_entry, entry)) { ptep_set_access_flags(vma, address, pte, entry, write_access); update_mmu_cache(vma, address, entry); lazy_mmu_prot_update(entry); } else { /* * This is needed only for protection faults but the arch code * is not yet telling us if this is a protection fault or not. * This still avoids useless tlb flushes for .text page faults * with threads. */ if (write_access) flush_tlb_page(vma, address); } The "update_mmu_cache()" call was unconditional before, which caused the TLB to be flushed by: if (pfn_valid(pfn)) { struct page *page = pfn_to_page(pfn); if (!PageReserved(page) && !test_bit(PG_arch_1, &page->flags)) { if (vma->vm_mm == current->active_mm) { #ifdef CONFIG_8xx /* On 8xx, cache control instructions (particularly * "dcbst" from flush_dcache_icache) fault as write * operation if there is an unpopulated TLB entry * for the address in question. To workaround that, * we invalidate the TLB here, thus avoiding dcbst * misbehaviour. */ _tlbie(address); #endif __flush_dcache_icache((void *) address); } else flush_dcache_icache_page(page); set_bit(PG_arch_1, &page->flags); } Which worked to due to pure luck: PG_arch_1 was always unset before, but now it isnt. The root of the problem are the changes against the 8xx TLB handlers introduced during v2.6. What happens is the TLBMiss handlers load the zeroed pte into the TLB, causing the TLBError handler to be invoked (thats two TLB faults per pagefault), which then jumps to the generic MM code to setup the pte. The bug is that the zeroed TLB is not invalidated (the same reason for the "dcbst" misbehaviour), resulting in infinite TLBError faults. The "two exception" approach requires a TLB flush (to nuke the zeroed TLB) at each PTE update for correct behaviour: Signed-off-by: Marcelo Tosatti Signed-off-by: Paul Mackerras commit f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 tree 0ec4807d49a602ba785e60e5352b542f1581d4c9 parent fb6d73d3014babb69f5cc2d1d78b31e9d09fc5df parent 5a6f294e43e432bd207a702fea49ebb303ef9b23 author Linus Torvalds Tue, 15 Nov 2005 16:59:38 -0800 committer Linus Torvalds Tue, 15 Nov 2005 16:59:38 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit fb6d73d3014babb69f5cc2d1d78b31e9d09fc5df tree 9d8ee68b8754fc57948098945113871aee0b23bb parent 1e185b97b4364063f1135604b87f8d8469944233 author Paul Mackerras Wed, 16 Nov 2005 11:43:26 +1100 committer Linus Torvalds Tue, 15 Nov 2005 16:57:12 -0800 [PATCH] powerpc: Fix sparsemem with memory holes [was Re: ppc64 oops..] This patch should fix the crashes we have been seeing on 64-bit powerpc systems with a memory hole when sparsemem is enabled. I'd appreciate it if people who know more about NUMA and sparsemem than me could look over it. There were two bugs. The first was that if NUMA was enabled but there was no NUMA information for the machine, the setup_nonnuma() function was adding a single region, assuming memory was contiguous. The second was that the loops in mem_init() and show_mem() assumed that all pages within the span of a pgdat were valid (had a valid struct page). I also fixed the incorrect setting of num_physpages that Mike Kravetz pointed out. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 5a6f294e43e432bd207a702fea49ebb303ef9b23 tree ccc0aefb94c6c6f26eff9eaf177df99b0b364be2 parent 96479376c89e5be92c85bd350e3e2e8f0e7e3b52 author KOVACS Krisztian Tue, 15 Nov 2005 16:47:34 -0800 committer David S. Miller Tue, 15 Nov 2005 16:47:34 -0800 [NETFILTER] Free layer-3 specific protocol tables at cleanup Although the comment around the allocation code tells us that the layer-3 specific protocol tables will be freed when cleaning up, they aren't. And this makes nfsim complain loudly... Signed-off-by: KOVACS Krisztian Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 96479376c89e5be92c85bd350e3e2e8f0e7e3b52 tree 3e856951a7b7d1cb4f7ae9d5ffcb9342ca05bbb7 parent 31f3426904e066f17e3f88c468a2f7c869ad4aac author KOVACS Krisztian Tue, 15 Nov 2005 16:47:09 -0800 committer David S. Miller Tue, 15 Nov 2005 16:47:09 -0800 [NETFILTER] Remove nf_conntrack stat proc file when cleaning up Fix nf_conntrack statistics proc file removal. Looks like the old bug was forward-ported from ip_conntrack. :-] Signed-off-by: KOVACS Krisztian Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 1e185b97b4364063f1135604b87f8d8469944233 tree 0184e24ae1e9247b7dee62838b981c2d2a741d2e parent 47227d50c4ba7d2308b30c19b14e6edf133d5aa8 author Chen, Kenneth W Tue, 15 Nov 2005 14:37:05 -0800 committer Linus Torvalds Tue, 15 Nov 2005 15:50:51 -0800 [PATCH] ia64: cpu_idle performance bug fix Our performance validation on 2.6.15-rc1 caught a disastrous performance regression on ia64 with netperf (-98%) and volanomark (-58%) compares to previous kernel version 2.6.14-git7. See the following chart (result group 1 & 2). http://kernel-perf.sourceforge.net/results.machine_id=26.html We have root caused it to commit 64c7c8f88559624abdbe12b5da6502e8879f8d28 This changeset broke the ia64 task resched notification. In sched.c:resched_task(), a reschedule IPI is conditioned upon TIF_POLLING_NRFLAG. However, the above changeset unconditionally set the polling thread flag for idle tasks regardless whether pal_halt_light is in use or not. As a result, resched IPI is not sent from resched_task(). And since the default behavior on ia64 is to use pal_halt_light, we end up delaying the rescheduling task until next timer tick, and thus cause the performance regression. This fixes the performance bug. I'm glad our performance suite is turning up bad performance bug like this in time. Signed-off-by: Ken Chen Signed-off-by: Linus Torvalds commit 31f3426904e066f17e3f88c468a2f7c869ad4aac tree 11e67ebf551552dad83cf53815945ff299344273 parent cf225356578326308b16a0fd03ff3fa72fe3da07 author Stephen Hemminger Tue, 15 Nov 2005 15:17:10 -0800 committer David S. Miller Tue, 15 Nov 2005 15:17:10 -0800 [TCP]: More spelling fixes. From Joe Perches Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 47227d50c4ba7d2308b30c19b14e6edf133d5aa8 tree 531356e3b004da443c01dac74420f4f28b91679f parent 7ae8c5ec122e4e909193dbbdb2ad2de349e307c9 parent 72724382d3c9caab1d85e54080d338b854f10dd3 author Linus Torvalds Tue, 15 Nov 2005 12:46:57 -0800 committer Linus Torvalds Tue, 15 Nov 2005 12:46:57 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 7ae8c5ec122e4e909193dbbdb2ad2de349e307c9 tree 42ef1a96f9286f8ddab8edd6d037506a9cbe889f parent e1f1def6ef3f0c71d0df302c3759f6937adaf9ae parent 9f68a24853dd37d18f2cfa979cf4e131f5a10e8f author Linus Torvalds Tue, 15 Nov 2005 12:45:33 -0800 committer Linus Torvalds Tue, 15 Nov 2005 12:45:33 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 72724382d3c9caab1d85e54080d338b854f10dd3 tree a55045e2987edcbdc65cee9a3f610119eec002c0 parent eceab4ac8d9dd8955e0961fd7477664c087a9017 author Russell King Tue, 15 Nov 2005 19:04:22 +0000 committer Russell King Tue, 15 Nov 2005 19:04:22 +0000 [ARM] Initialise SA1111 core before SA1111 PCMCIA This avoids a BUG_ON with kref.c when SA1111 tries to register a driver with an unregistered bus type. Signed-off-by: Russell King commit 9f68a24853dd37d18f2cfa979cf4e131f5a10e8f tree 0e6c81b47ff6f4e2e3a5149873d9d3c176d9e292 parent c6e6e666cbfe40f0d7fb1a293ff6332973acac37 author Jeff Garzik Tue, 15 Nov 2005 14:03:47 -0500 committer Jeff Garzik Tue, 15 Nov 2005 14:03:47 -0500 [libata ahci] command completion fixes, improved debug msgs - Fix a regression in command completion, which prevented the restart of the DMA engine after the device throws an error. - Pack more hardware info into the port-reset error message. - Promote "welcome to our timeout" message from debug msg to normal printk. commit e1f1def6ef3f0c71d0df302c3759f6937adaf9ae tree 794c56b9e279e95d6cf5e132cff60746568b77d9 parent 1d193f4f112b9d8855ba1339fa784ee95f25b9c7 author Dave Jones Tue, 15 Nov 2005 00:09:24 -0800 committer Linus Torvalds Tue, 15 Nov 2005 08:59:20 -0800 [PATCH] oops-tracing: mention extended VGA Something I've found handy countless times when users do this.. Signed-off-by: Dave Jones Acked-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d193f4f112b9d8855ba1339fa784ee95f25b9c7 tree 089f01b69c080df59405cb65ff3a9782bfdcb15e parent 400bb2369df481abae5aa801e63e70008e15fba5 author Ben Collins Tue, 15 Nov 2005 00:09:21 -0800 committer Linus Torvalds Tue, 15 Nov 2005 08:59:20 -0800 [PATCH] Update location of ll_rw_blk.c in docs Picked from the ubuntu-2.6 tree The change in location for ll_rw_blk.c from drivers/block/ to block/ caused failure to generate documentation. Signed-off-by: Ben Collins Cc: Jeff Garzik Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 400bb2369df481abae5aa801e63e70008e15fba5 tree cdf7e02f7cc49bdb522b9c5935cf1d59b24b8b7f parent 0c53508980a95b84c296c4336a831776cc22cf58 author Grant Coady Tue, 15 Nov 2005 00:09:20 -0800 committer Linus Torvalds Tue, 15 Nov 2005 08:59:20 -0800 [PATCH] cciss_scsi warning fix drivers/block/cciss_scsi.c:264: warning: `print_bytes' defined but not used drivers/block/cciss_scsi.c:298: warning: `print_cmd' defined but not used Signed-off-by: Grant Coady Acked-by: Mike Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c53508980a95b84c296c4336a831776cc22cf58 tree 66f908cb6cbdeb2bbc34fd3a3ab08090ecc3d9a2 parent f4eeb0a20f017fd8bc849cc50469c2e2e6a0c05c author Christoph Hellwig Tue, 15 Nov 2005 00:09:18 -0800 committer Linus Torvalds Tue, 15 Nov 2005 08:59:20 -0800 [PATCH] v850: use generic hardirq code Signed-off-by: Christoph Hellwig Acked-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4eeb0a20f017fd8bc849cc50469c2e2e6a0c05c tree 8abf99bcc413ffaae8dcf8a80d6dbb31c184f417 parent 228322f13fe20bd29e81fca8341cc1fc7ffc5929 author Miles Bader Tue, 15 Nov 2005 00:09:17 -0800 committer Linus Torvalds Tue, 15 Nov 2005 08:59:19 -0800 [PATCH] v850: Add missing include in hardirq.h Signed-off-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 228322f13fe20bd29e81fca8341cc1fc7ffc5929 tree 7c587e6a0ebd88aa868d1f8c074e1f29c7918ca8 parent 09071e35f9f0b308c37c9853766de573591589ea author Miles Bader Tue, 15 Nov 2005 00:09:16 -0800 committer Linus Torvalds Tue, 15 Nov 2005 08:59:19 -0800 [PATCH] v850: Fix show_interrupts A variable was being used in multiple conflicting ways. I also restructured the code a bit for clarity. Signed-off-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09071e35f9f0b308c37c9853766de573591589ea tree c835059c4463cda91814955920c29a513caf7ff3 parent d6a1a64aec2b2e2e13b629ed72afd319d8bce5da author Toni Mueller Tue, 15 Nov 2005 00:09:14 -0800 committer Linus Torvalds Tue, 15 Nov 2005 08:59:19 -0800 [PATCH] sdladrv.c build fix gcc4 doesn't allow typecasted lvals. Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6a1a64aec2b2e2e13b629ed72afd319d8bce5da tree 6d6a85d0cbf697a94635a9f1749db7e3e1f8079f parent 93588e2284b6be1873cc0bb7fbf0947bdbf72830 author Andrew Morton Tue, 15 Nov 2005 00:09:13 -0800 committer Linus Torvalds Tue, 15 Nov 2005 08:59:19 -0800 [PATCH] hfc_usb: fix usb device table We need to use the USB_DEVICE macro here, else the modinfo aliases go all wrong. Also, correctly terminate the table, as noted by Dave Jones Cc: Greg KH Signed-off-by: Andrew Morton Acked-by: Karsten Keil Signed-off-by: Linus Torvalds commit 93588e2284b6be1873cc0bb7fbf0947bdbf72830 tree 685a5b21312c6d057f1db37d75085944db646cb9 parent e8a0033451f7972169b2f375be34d9d805ad8687 author NeilBrown Tue, 15 Nov 2005 00:09:12 -0800 committer Linus Torvalds Tue, 15 Nov 2005 08:59:19 -0800 [PATCH] md: make md threads interruptible again Despite the fact that md threads don't need to be signalled, and won't respond to signals anyway, we need to have an 'interruptible' wait, else they stay in 'D' state and add to the load average. (akpm: the signal_pending() test is unneeded - we'll fix that up in the next round. For now, leave it there because that's how the code used to be). Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8a0033451f7972169b2f375be34d9d805ad8687 tree 5b6f56750e4b829b75e0cecbf36d85bf0ec29432 parent 1887b93529410633b5529a7c2d304897dbed5b3e author NeilBrown Tue, 15 Nov 2005 00:09:11 -0800 committer Linus Torvalds Tue, 15 Nov 2005 08:59:19 -0800 [PATCH] md: mark START_ARRAY deprecated with a date This was marked deprecated "after 2.6" back in the 2.5 days. But now it seems there isn't going to be any "after 2.6", and we deprecate by date now. So set a date. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1887b93529410633b5529a7c2d304897dbed5b3e tree bb51359d16e40503dc8faa56bd429311d3514bda parent fa63b229829e73361900183bc1ae21b71b6c2dae author NeilBrown Tue, 15 Nov 2005 00:09:10 -0800 committer Linus Torvalds Tue, 15 Nov 2005 08:59:19 -0800 [PATCH] knfsd: make sure nfsd doesn't hog a cpu forever Being kernel-threads, nfsd servers don't get pre-empted (depending on CONFIG). If there is a steady stream of NFS requests that can be served from cache, an nfsd thread may hold on to a cpu indefinitely, which isn't very friendly. So it is good to have a cond_resched in there (just before looking for a new request to serve), to make sure we play nice. Signed-off-by: Neil Brown Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa63b229829e73361900183bc1ae21b71b6c2dae tree 75d0e8cef43964561b957f6c81e34fdecdb35597 parent 3225e1d3d1ebc3fcb74fbbb166520f35c35a22f4 author Ben Collins Tue, 15 Nov 2005 00:09:09 -0800 committer Linus Torvalds Tue, 15 Nov 2005 08:59:19 -0800 [PATCH] Add missing EXPORT_SYMBOLS() for __ide_mm_* functions on powerpc These exported symbols are in arch/ppc/ but missing from arch/powerpc/ for ppc32 builds. Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3225e1d3d1ebc3fcb74fbbb166520f35c35a22f4 tree ccd62d1ae676d7bfa893a473849ed5e1d1edb245 parent d4ed803c564701eae9534ab26a86ddb06acaf49c author Corey Minyard Tue, 15 Nov 2005 00:09:07 -0800 committer Linus Torvalds Tue, 15 Nov 2005 08:59:19 -0800 [PATCH] ipmi: bump-driver-version Lots of good changes to the driver lately that userspace will care about the version of the driver. Bump the version from 36.0 to 38.0 to be higher than 37 that the 2.4 driver came out with a few weeks ago which doesn't have all the same changes. Signed-off-by: Matt Domsch Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4ed803c564701eae9534ab26a86ddb06acaf49c tree 573ecacf5ea40a3dc847f8ceb82a1aa0e95fe15c parent 19842d67340e4a8f616552d344e97fc7452aa37a author Harald Welte Tue, 15 Nov 2005 00:09:06 -0800 committer Linus Torvalds Tue, 15 Nov 2005 08:59:18 -0800 [PATCH] Make sysctl.h (again) usable from userspace Make sysctl.h (again) useable from userspace Signed-off-by: Harald Welte Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19842d67340e4a8f616552d344e97fc7452aa37a tree 470e9884d77d319d14baa7489a03635c14d0cae1 parent 4060994c3e337b40e0f6fa8ce2cc178e021baf3d author Vivek Goyal Tue, 15 Nov 2005 00:09:04 -0800 committer Linus Torvalds Tue, 15 Nov 2005 08:59:18 -0800 [PATCH] drop "[PATCH] i386 kexec-on-panic: Don't shutdown the apics" A patch by Eric was merged (f2b36db692b7ff6972320ad9839ae656a3b0ee3e) and later on reverted back (1e4c85f97fe26fbd70da12148b3992c0e00361fd). Along with above patch, another patch was posted and has been merged (3d1675b41b02d64bd1185903ea0d25a8c0bb6dea). That patch was dependent on the above patch and now it should also be reverted. Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eceab4ac8d9dd8955e0961fd7477664c087a9017 tree 47614fc4f8312687d29fc31e4c31088f61e2a9f3 parent 4060994c3e337b40e0f6fa8ce2cc178e021baf3d author Russell King Tue, 15 Nov 2005 11:31:41 +0000 committer Russell King Tue, 15 Nov 2005 11:31:41 +0000 [ARM] Use kernel/power/Kconfig Rather than defining our own PM option, use kernel/power/Kconfig. This fixes build errors introduced by bca73e4bf8563d83f7856164caa44d5f42e44cca Signed-off-by: Russell King commit cf225356578326308b16a0fd03ff3fa72fe3da07 tree 76510d0004761f02a0f2de1437671d1feeb58fde parent 451677c46feb5fb39cb7f71035b8716064fcbd57 author Jochen Friedrich Mon, 14 Nov 2005 21:58:18 -0800 committer David S. Miller Mon, 14 Nov 2005 21:58:18 -0800 [LLC]: Fix typo Signed-off-by: Jochen Friedrich Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 451677c46feb5fb39cb7f71035b8716064fcbd57 tree 42b4c9273bb13eef9256d094c10d974f0e9fd0ac parent 59c6196e59a4b85d9c994e70ff20a460cdbaa003 author Jochen Friedrich Mon, 14 Nov 2005 21:57:46 -0800 committer David S. Miller Mon, 14 Nov 2005 21:57:46 -0800 [LLC]: Make core block on remote busy. Signed-off-by: Jochen Friedrich Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 59c6196e59a4b85d9c994e70ff20a460cdbaa003 tree 574e979829d3363c16c8c6d1fe624b206d8ce4f9 parent cb422c464bdaeeb3b9ad4539010e357bf1bd1745 author Jochen Friedrich Mon, 14 Nov 2005 21:57:15 -0800 committer David S. Miller Mon, 14 Nov 2005 21:57:15 -0800 [LLC]: Fix TX window scaling Signed-off-by: Jochen Friedrich Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit cb422c464bdaeeb3b9ad4539010e357bf1bd1745 tree 44c6384a76035c578b8ec40fe37dee591536b421 parent 12da2a435c1e8b9abb780d928ccbf04fc3d860a7 author Luiz Capitulino Mon, 14 Nov 2005 21:43:36 -0800 committer David S. Miller Mon, 14 Nov 2005 21:43:36 -0800 [IPV6]: Fixes sparse warning in ipv6/ipv6_sockglue.c The patch below fixes the following sparse warning: net/ipv6/ipv6_sockglue.c:291:13: warning: Using plain integer as NULL pointer Signed-off-by: Luiz Capitulino Signed-off-by: David S. Miller commit 12da2a435c1e8b9abb780d928ccbf04fc3d860a7 tree bf04e2ac774febba938035f019f57ca4e81169ee parent 4060994c3e337b40e0f6fa8ce2cc178e021baf3d author Yan Zheng Mon, 14 Nov 2005 21:42:46 -0800 committer David S. Miller Mon, 14 Nov 2005 21:42:46 -0800 [IPV6]: small fix for ipv6_dev_get_saddr(...) The "score.rule++" doesn't make any sense for me. According to codes above, I think it should be "hiscore.rule++;" . Signed-off-by: Yan Zheng Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 4060994c3e337b40e0f6fa8ce2cc178e021baf3d tree 980297c1747ca89354bc879cc5d17903eacb19e2 parent 0174f72f848dfe7dc7488799776303c81b181b16 parent d3ee871e63d0a0c70413dc0aa5534b8d6cd6ec37 author Linus Torvalds Mon, 14 Nov 2005 19:56:02 -0800 committer Linus Torvalds Mon, 14 Nov 2005 19:56:02 -0800 Merge x86-64 update from Andi commit d3ee871e63d0a0c70413dc0aa5534b8d6cd6ec37 tree 79114c735614c4811d02ac9ccc81f6c9798a73ec parent 8893166ff8694f36655009aa9bf8e7f2e1c9339f author Bob Picco Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:18 -0800 [PATCH] x86_64: Fix sparse mem Fix up booting with sparse mem enabled. Otherwise it would just cause an early PANIC at boot. Signed-off-by: Bob Picco Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8893166ff8694f36655009aa9bf8e7f2e1c9339f tree 89f030c84d807f58444667a401194cda06fcc1b0 parent 9e43e1b7c7c9872da032442d8e4bb112a02d16f4 author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:17 -0800 [PATCH] x86_64: Increase the maximum number of local APICs to the maximum This is needed for large multinode IBM systems which have a sparse APIC space in clustered mode, fully covering the available 8 bits. The previous kernels would limit the local APIC number to 127, which caused it to reject some of the CPUs at boot. I increased the maximum and shrunk the apic_version array a bit to make up for that (the version is only 8 bit, so don't need an full int to store) Cc: Chris McDermott Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 9e43e1b7c7c9872da032442d8e4bb112a02d16f4 tree 04399c723a8fbd3f859a462add5db34c389ebf45 parent ffd10a2b77bca50dd05ba26acd5a6e68bcc8f61f author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:17 -0800 [PATCH] x86_64: Remove CONFIG_CHECKING and add command line option for pagefault tracing CONFIG_CHECKING covered some debugging code used in the early times of the port. But it wasn't even SMP safe for quite some time and the bugs it checked for seem to be gone. This patch removes all the code to verify GS at kernel entry. There haven't been any new bugs in this area for a long time. Previously it also covered the sysctl for the page fault tracing. That didn't make much sense because that code was unconditionally compiled in. I made that a boot option now because it is typically only useful at boot. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ffd10a2b77bca50dd05ba26acd5a6e68bcc8f61f tree 92bd5c702cde0c6582950ff66f648e59bf5fb2cd parent e583538f077d5f70191670b47a046ba436ec3428 author Magnus Damm Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:17 -0800 [PATCH] x86_64: Make node boundaries consistent The current x86_64 NUMA memory code is inconsequent when it comes to node memory ranges. The exact behaviour varies depending on which config option that is used. setup_node_bootmem() has start and end as arguments and these are used to calculate the size of the node like this: (end - start). This is all fine if end is pointing to the first non-available byte. The problem is that the current x86_64 code sometimes treats it as the last present byte and sometimes as the first non-available byte. The result is that some configurations might lose a page at the end of the range. This patch tries to fix CONFIG_ACPI_NUMA, CONFIG_K8_NUMA and CONFIG_NUMA_EMU so they all treat the end variable as the first non-available byte. This is the same way as the single node code. The patch is boot tested on dual x86_64 hardware with the above configurations, but maybe the removed code is needed as some workaround? Signed-off-by: Magnus Damm Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e583538f077d5f70191670b47a046ba436ec3428 tree 576298f190ce8a4f321bb84efce2ace41aa12194 parent b0bd35e622ffbda2c01dc67a0381c6a18817a29a author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:17 -0800 [PATCH] x86_64: Log machine checks from boot on Intel systems The logging for boot errors was turned off because it was broken on some AMD systems. But give Intel EM64T systems a chance because they are supposed to be correct there. The advantage is that there is a chance to actually log uncorrected machine checks after the reset. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b0bd35e622ffbda2c01dc67a0381c6a18817a29a tree dffb53b490f81481b2df41758d239db2b8dbb9bd parent efbbdce94f6ea54cf06d9a06e4c95f6874ad64a8 author Ravikiran G Thirumalai Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:17 -0800 [PATCH] x86_64: Make ACPI NUMA and NUMA emulation peers of K8_NUMA in Kconfig On x86_64 arches, there is no way to choose ACPI_NUMA without having to choose K8_NUMA. CONFIG_K8_NUMA is not needed for Intel EM64T NUMA boxes. It also looks odd if you have to select ACPI_NUMA from the power management menu. This patch fixes those oddities. Patch does the following: 1. Makes NUMA a config option like other arches 2. Makes topology detection options like K8_NUMA dependent on NUMA 3. Choosing ACPI NUMA detection can be done from the standard "Processor type and features" menu AK: I fixed up the dependencies and changed the help texts a bit on top of Kiran's patch. Signed-off-by: Ravikiran Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit efbbdce94f6ea54cf06d9a06e4c95f6874ad64a8 tree 8f2b387266cae7ea06a1cd100174cb849fd45a8d parent bf0f2e23834e2bf7d64b467ef07095b1c7e2c04b author Paolo 'Blaisorblade' Giarrusso Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:17 -0800 [PATCH] x86_64: Use common sys_time64 Keeping this function does not makes sense because it's a copied (and buggy) copy of sys_time. The only difference is that now.tv_sec (which is a time_t, i.e. a 64-bit long) is copied (and truncated) into a int (32-bit). The prototype is the same (they both take a long __user *), so let's drop this and redirect it to sys_time (and make sure it exists by defining __ARCH_WANT_SYS_TIME). Only disadvantage is that the sys_stime definition is also compiled (may be fixed if needed by adding a separate __ARCH_WANT_SYS_STIME macro, and defining it for all arch's defining __ARCH_WANT_SYS_TIME except x86_64). Acked-by: Andi Kleen Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit bf0f2e23834e2bf7d64b467ef07095b1c7e2c04b tree 0a652a8e4cc51f50139d892cee17f7a699c4afa4 parent 8e0d4f4e9132ae6e353f9cf27261627bcc7c65cc author Paolo 'Blaisorblade' Giarrusso Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:17 -0800 [PATCH] x86_64: Set ____cacheline_maxaligned_in_smp alignment to 128 bytes The current value was correct before the introduction of Intel EM64T support - but now L1_CACHE_SHIFT_MAX can be less than L1_CACHE_SHIFT, which _is_ funny! Between the few users of ____cacheline_maxaligned_in_smp, we also have (for example) rcu_ctrlblk, and struct zone, with zone->{lru_,}lock. I.e. we have a lot of excess cacheline bouncing on them. No correctness issues, obviously. So this could even be merged for 2.6.14 (I'm not a fan of this idea, though). CC: Andi Kleen Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8e0d4f4e9132ae6e353f9cf27261627bcc7c65cc tree 01dbb78723ccd375e7bbaeae1016469179948289 parent a5b250a428aabc619ace872f8220a7d0b8f7d557 author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:17 -0800 [PATCH] x86_64: Remove asm-x86_64/rwsem.h Not needed since x86-64 always uses the spinlock based rwsems. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a5b250a428aabc619ace872f8220a7d0b8f7d557 tree 11cabf07982ae37f94bc929f9a605cbbd20e35ab parent a6f5deb2be4c82f24fefadcbf7e448f540c05ae6 author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:17 -0800 [PATCH] x86_64: Remove optimization for B stepping AMD K8 B stepping were the first shipping Opterons. memcpy/memset/copy_page/ clear_page had special optimized version for them. These are really old and in the minority now and the difference to the generic versions (using rep microcode) is not that big anyways. So just remove them. TODO: figure out optimized versions for Intel Netburst based EM64T Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a6f5deb2be4c82f24fefadcbf7e448f540c05ae6 tree f138057dbbd6bf08d52404e758f3db8502af1c29 parent 2b0918758dd68d6b8d01318a5200b65b9209760d author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:16 -0800 [PATCH] x86_64: Reduce number of retries for reset through keyboard controller Old code could retry for 10 seconds worst time. Only try it for one second now. Suggested by Yinghai Lu Cc: Yinghai.Lu@amd.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2b0918758dd68d6b8d01318a5200b65b9209760d tree 1f4bd49d9d6827a2121fc698d1a9c9fc889ad3fe parent 94605eff572b727aaad9b4b29bc358b919096503 author Siddha, Suresh B Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:16 -0800 [PATCH] x86_64: x86_64/i386 fix Intel cache detection code assumption about threads sharing Fix the Intel cache detection code assumption that number of threads sharing the cache will either be equal to number of HT or core siblings. This also cleans up the code in general a bit. Signed-off-by: Suresh Siddha Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 94605eff572b727aaad9b4b29bc358b919096503 tree 657a848d8ef34d2f94bbad3aa4e5458d2d3f2d2b parent e90f22edf432512219cc2952f5811961abbd164f author Siddha, Suresh B Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:16 -0800 [PATCH] x86-64/i386: Intel HT, Multi core detection fixes Fields obtained through cpuid vector 0x1(ebx[16:23]) and vector 0x4(eax[14:25], eax[26:31]) indicate the maximum values and might not always be the same as what is available and what OS sees. So make sure "siblings" and "cpu cores" values in /proc/cpuinfo reflect the values as seen by OS instead of what cpuid instruction says. This will also fix the buggy BIOS cases (for example where cpuid on a single core cpu says there are "2" siblings, even when HT is disabled in the BIOS. http://bugzilla.kernel.org/show_bug.cgi?id=4359) Signed-off-by: Suresh Siddha Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e90f22edf432512219cc2952f5811961abbd164f tree adff9041edf84d365b209c353fe8112e8e2bb719 parent 3506229ff9968e5dbc862a50285fbea0e8821b58 author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:16 -0800 [PATCH] x86_64: Fix NUMA node lookup debug code which had bitrotted Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 3506229ff9968e5dbc862a50285fbea0e8821b58 tree 76306c140f9a4bec3b3f429467a7dee32c810859 parent a88cde13bae3fffd6ecc812bdd02c91eafb6073e author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:16 -0800 [PATCH] x86_64: Don't enable interrupt unconditionally in reboot path When they were disabled before (e.g. after a panic) it's better to keep them off, otherwise followon panics can happen from timer interrupt handlers etc. Drawback is that pageup in the console won't work anymore though. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a88cde13bae3fffd6ecc812bdd02c91eafb6073e tree 60c80590f2d2245bc7fa3ef44eeb0fc2af7b9371 parent ea0be473a1f0ee89024a24d8ea4b05fbf6efcee3 author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:16 -0800 [PATCH] x86_64: Formatting fixes for arch/x86_64/kernel/process.c No functional changes. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit ea0be473a1f0ee89024a24d8ea4b05fbf6efcee3 tree 15821beb060e3e5811063a7c9eef3b1e5b7f4e8b parent af9c142de94ecf724a18700273bbba390873e072 author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:16 -0800 [PATCH] x86_64: Allow modular build of ia32 aout loader Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit af9c142de94ecf724a18700273bbba390873e072 tree 12ecf9850dc75c19cca7a14233d5ba3efe7dbb9d parent 1d2e6bd86152ab86fb866555281869df340e6c6a author Shaohua Li Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:16 -0800 [PATCH] x86_64: Force correct address space size for MTRR on some 64bit Intel Xeons They report 40bit, but only have 36bits of physical address space. This caused problems with setting up the correct masks for MTRR. CPUID workaround for steppings 0F33h(supporting x86) and 0F34h(supporting x86 and EM64T). Detail info can be found at: http://download.intel.com/design/Xeon/specupdt/30240216.pdf http://download.intel.com/design/Pentium4/specupdt/30235221.pdf Signed-off-by: Shaohua Li Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1d2e6bd86152ab86fb866555281869df340e6c6a tree abdaeb1737b4ba6562af6482b435c7f3afcdc0f4 parent 172efbb40333d0ca10ebaab11a98f9be687bee39 author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:16 -0800 [PATCH] AGP: Make gart iterator in K8 AGP driver SMP safe Ugh! Cc: davej@redhat.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 172efbb40333d0ca10ebaab11a98f9be687bee39 tree 2e5094bb79635d1a74c1933880a06c22b7f5987c parent 870b7681cd3f867c1ffc8d7fbe9b22216e73a536 author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:15 -0800 [PATCH] AGP: Try unsupported AGP chipsets on x86-64 by default So far all new ones have worked and there isn't much variation because the CPU does all the interesting bits. So enable try unsupported by default. Can be still disabled with try_unsupported=0 (module) or amd64.try_unsupported=0 (boot option) Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 870b7681cd3f867c1ffc8d7fbe9b22216e73a536 tree 734a1e1da4b2ef0bf5798167324812e24b47a922 parent 529a340402e419f935d411ce0a085e96fcaf3872 author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:15 -0800 [PATCH] AGP: Support ULI/ALI 1689 bridge on AMD64 (no name because I'm not sure of the correct name) Cc: davej@redhat.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 529a340402e419f935d411ce0a085e96fcaf3872 tree d5941a16060f3c64912e6cb393d6eaa8f4704652 parent e4e5d324b9c5586f408a72d1534474c449dd5212 author Eric Dumazet Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:15 -0800 [PATCH] x86_64: Optimize NUMA node hash function Compute the highest possible value for memnode_shift, in order to reduce footprint of memnodemap[] to the minimum, thus making all users (phys_to_nid(), kfree()), more cache friendly. Before the patch : Node 0 MemBase 0000000000000000 Limit 00000001ffffffff Node 1 MemBase 0000000200000000 Limit 00000003ffffffff Using 23 for the hash shift. Max adder is 3ffffffff After the patch : Node 0 MemBase 0000000000000000 Limit 00000001ffffffff Node 1 MemBase 0000000200000000 Limit 00000003ffffffff Using 33 for the hash shift. In this case, only 2 bytes of memnodemap[] are used, instead of 2048 Signed-off-by: Eric Dumazet Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e4e5d324b9c5586f408a72d1534474c449dd5212 tree 21a7a3758c07ae1bb5263e88946e1cc18835c2fe parent 420f8f68c9c5148dddf946bebdbc7eacde2172cb author Bryan Ford Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:15 -0800 [PATCH] x86_64: Save/restore CS in 64bit signal handlers and force __USER_CS for CS This allows to run 64bit signal handlers in 64bit processes that run small code snippets in compat mode. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 420f8f68c9c5148dddf946bebdbc7eacde2172cb tree 59cf49ac38e0c7560bb57d988869f67b1ff20342 parent 485832a5d928facd82f1525270d9f048da2063a1 author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:15 -0800 [PATCH] x86_64: New heuristics to find out hotpluggable CPUs. With a NR_CPUS==128 kernel with CPU hotplug enabled we would waste 4MB on per CPU data of all possible CPUs. The reason was that HOTPLUG always set up possible map to NR_CPUS cpus and then we need to allocate that much (each per CPU data is roughly ~32k now) The underlying problem is that ACPI didn't tell us how many hotplug CPUs the platform supports. So the old code just assumed all, which would lead to this memory wastage. This implements some new heuristics: - If the BIOS specified disabled CPUs in the ACPI/mptables assume they can be enabled later (this is bending the ACPI specification a bit, but seems like a obvious extension) - The user can overwrite it with a new additionals_cpus=NUM option - Otherwise use half of the available CPUs or 2, whatever is more. Cc: ashok.raj@intel.com Cc: len.brown@intel.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 485832a5d928facd82f1525270d9f048da2063a1 tree 4266c612f32c2ccaca080af00cfee3a9f420331c parent 8315eca25583c369e28f48909d3341dc21d6214d author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:15 -0800 [PATCH] x86_64: Use int operations in spinlocks to support more than 128 CPUs spinning. Pointed out by Eric Dumazet Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 8315eca25583c369e28f48909d3341dc21d6214d tree 271677ef4bb1159284c0920aabc903218868fc1f parent 59170891049cc469777a392e0b3f5aa7aad784a6 author Andi Kleen Sat, 05 Nov 2005 17:25:54 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:15 -0800 [PATCH] x86_64: Some clarifications for Documention/x86_64/mm.txt I got some questions on this, so just fix up the documentation. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 59170891049cc469777a392e0b3f5aa7aad784a6 tree 7b04918a1c0ca496ee1b3aaf673abf220cc66716 parent 4d74dbd79a571b31f7cd2c69bb5e44368972bf93 author Andi Kleen Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:15 -0800 [PATCH] x86_64: Replace swiotlb extern with include Minor victory on the continuous quest against all stray extern. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4d74dbd79a571b31f7cd2c69bb5e44368972bf93 tree 0b5c7143490ca6cb8c21528ab1db0c00e262bdc9 parent 2bc0414ee04fd8bb798760801f5d7476dff44241 author Andi Kleen Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:15 -0800 [PATCH] x86_64: Replace cpu_pda extern with include Minor cleanup - remove obsolete extern Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 2bc0414ee04fd8bb798760801f5d7476dff44241 tree 3ae48fd461dca1f7f46f440325c674717a36f693 parent 6b75aeedde1e8a8513393d3c1367bf81bc5b0c67 author Andi Kleen Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:14 -0800 [PATCH] x86_64: Only use asm/sections.h to declare section symbols Adding __initdata_* to asm-generic/sections.h Replaces a lot of open coded externs in arch/x86_64/* I had to change __bss_end to __bss_stop to match the other architectures. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6b75aeedde1e8a8513393d3c1367bf81bc5b0c67 tree f8f25d30bf097a58e535adf3ac84b89b027b33e3 parent f6c2e3330d3fdd5474bc3756da46fca889a30e33 author Andi Kleen Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:14 -0800 [PATCH] x86_64: Don't apply __PHYSICAL_MASK to page frame numbers It is for physical addresses, not for PFNs. Pointed out by Tejun Heo. Cc: htejun@gmail.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f6c2e3330d3fdd5474bc3756da46fca889a30e33 tree 41b7534c39a6aea4ae1f0a75c6eb03f6e4b6312c parent 69d81fcde7797342417591ba7affb372b9c86eae author Siddha, Suresh B Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:14 -0800 [PATCH] x86_64: Unmap NULL during early bootup We should zap the low mappings, as soon as possible, so that we can catch kernel bugs more effectively. Previously early boot had NULL mapped and didn't trap on NULL references. This patch introduces boot_level4_pgt, which will always have low identity addresses mapped. Druing boot, all the processors will use this as their level4 pgt. On BP, we will switch to init_level4_pgt as soon as we enter C code and zap the low mappings as soon as we are done with the usage of identity low mapped addresses. On AP's we will zap the low mappings as soon as we jump to C code. Signed-off-by: Suresh Siddha Signed-off-by: Ashok Raj Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 69d81fcde7797342417591ba7affb372b9c86eae tree 97fbc73fd20f8ebc313b2bc41367a8efe36c2c3d parent 50895c5d76e15d8af480eff1aaab5770cabbc2c2 author Andi Kleen Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:14 -0800 [PATCH] x86_64: Speed up numa_node_id by putting it directly into the PDA Not go from the CPU number to an mapping array. Mode number is often used now in fast paths. This also adds a generic numa_node_id to all the topology includes Suggested by Eric Dumazet Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 50895c5d76e15d8af480eff1aaab5770cabbc2c2 tree ce304c3774375c61a492cf642d285fb8af46b364 parent f5f786d0455c359c554b8f74783f887c0a2c9fac author Andi Kleen Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:14 -0800 [PATCH] x86_64: Fix gcc 4 warning in aperture.c Fix arch/x86_64/kernel/aperture.c: In function #iommu_hole_init#: arch/x86_64/kernel/aperture.c:199: warning: #aper_order# may be used uninitialized in this function Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit f5f786d0455c359c554b8f74783f887c0a2c9fac tree 2d8bf241afe4d9242657f29f6494ce8763b3418d parent e9b59d834faf0305cb6214a358f65f72c57b9e99 author Suresh Siddha Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:14 -0800 [PATCH] x86-64/i386: Fix CPU model for family 6 According to cpuid instruction in IA32 SDM-Vol2, when computing cpu model, we need to consider extended model ID for family 0x6 also. AK: Also added fixes/simplifcation from Petr Vandrovec Signed-off-by: Suresh Siddha Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e9b59d834faf0305cb6214a358f65f72c57b9e99 tree 5321ee83273d1fc0de136f9de90bed14a63739a3 parent 47492d3667ec519172ab978bd8231b8c7152fa9d author Ashok Raj Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:14 -0800 [PATCH] x86_64: Remove duplicate __cpuinit define Remove duplicate __cpuinit in smp.c. Already defined in init.h which is already included. Signed-off-by: Ashok Raj Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 47492d3667ec519172ab978bd8231b8c7152fa9d tree 06e86f5fe27976d75a935458b1f428af410a04fe parent 07808b74e7dab1aa385e698795875337d72daf7d author Andi Kleen Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:14 -0800 [PATCH] x86_64: Use the DMA32 zone for dma_alloc_coherent()/pci_alloc_consistent Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 07808b74e7dab1aa385e698795875337d72daf7d tree 3b593c31e6e58364f4001105bfeebefa94708209 parent 1dff7f3db5f045ccbfeca5bb00b0958a78501557 author Andi Kleen Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:14 -0800 [PATCH] x86_64: Remove obsolete ARCH_HAS_ATOMIC_UNSIGNED and page_flags_t Has been introduced for x86-64 at some point to save memory in struct page, but has been obsolete for some time. Just remove it. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 1dff7f3db5f045ccbfeca5bb00b0958a78501557 tree f4bf00e22827bd586a5fa3939b660039a3c5b199 parent 6004e1b7effcbb385a6b7c790e4b8008682cf679 author Andi Kleen Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:13 -0800 [PATCH] x86_64: Fix up outdated pfn_to_page comment pfn_to_page really requires pfn_valid to be true now, no question. Some people stumbled over it, but it was misleading and wrong. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 6004e1b7effcbb385a6b7c790e4b8008682cf679 tree b22c05874deeee6ee7ec75f98746717db5830d8d parent 89b831ef8bf5cfbb357dbc0a2e07700d7f20eec5 author James Cleverdon Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:13 -0800 [PATCH] i386/x86-64: Share interrupt vectors when there is a large number of interrupt sources Here's a patch that builds on Natalie Protasevich's IRQ compression patch and tries to work for MPS boots as well as ACPI. It is meant for a 4-node IBM x460 NUMA box, which was dying because it had interrupt pins with GSI numbers > NR_IRQS and thus overflowed irq_desc. The problem is that this system has 270 GSIs (which are 1:1 mapped with I/O APIC RTEs) and an 8-node box would have 540. This is much bigger than NR_IRQS (224 for both i386 and x86_64). Also, there aren't enough vectors to go around. There are about 190 usable vectors, not counting the reserved ones and the unused vectors at 0x20 to 0x2F. So, my patch attempts to compress the GSI range and share vectors by sharing IRQs. Cc: "Protasevich, Natalie" Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 89b831ef8bf5cfbb357dbc0a2e07700d7f20eec5 tree 25118081599eab69bd20d1a1b34ba0f8f679f24f parent 979edfadbae2286eec5b46143c00e81bca96498e author Jacob Shin Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:13 -0800 [PATCH] x86_64: Support for AMD specific MCE Threshold. MC4_MISC - DRAM Errors Threshold Register realized under AMD K8 Rev F. This register is used to count correctable and uncorrectable ECC errors that occur during DRAM read operations. The user may interface through sysfs files in order to change the threshold configuration. bank%d/error_count - reads current error count, write to clear. bank%d/interrupt_enable - set/clear interrupt enable. bank%d/threshold_limit - read/write the threshold limit. APIC vector 0xF9 in hw_irq.h. 5 software defined bank ids in mce.h. new apic.c function to setup threshold apic lvt. defaults to interrupt off, count enabled, and threshold limit max. sysfs interface created on /sys/devices/system/threshold. AK: added some ifdefs to make it compile on UP Signed-off-by: Jacob Shin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 979edfadbae2286eec5b46143c00e81bca96498e tree 947eacbffcdd8227f54764b9d6882489807a9e40 parent e18c6874a505958d153a11f9d6947971c349008a author Jan Beulich Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:13 -0800 [PATCH] x86_64: Adjust, correct, and complete the HPET definitions for x86-64. Signed-off-by: Jan Beulich Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e18c6874a505958d153a11f9d6947971c349008a tree 809d61a9e36f9869d875542c9adce1952e202d4b parent b0d41693217b3bb5b837940dc7465e82a9d49476 author Andi Kleen Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:13 -0800 [PATCH] x86_64: Account mem_map in VM holes accounting The VM needs to know about lost memory in zones to accurately balance dirty pages. This patch accounts mem_map in there too, which fixes a constant errror of a few percent. Also some other misc mappings and the kernel text itself are accounted too. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit b0d41693217b3bb5b837940dc7465e82a9d49476 tree 965dbdfea6644d57fd107619b2ea9e0c9ec6bdc1 parent fed644132f8ec4bf05b63f79c507c0acaa692c37 author Andi Kleen Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:13 -0800 [PATCH] x86_64: When cpu_up fails clean up page allocator properly Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit fed644132f8ec4bf05b63f79c507c0acaa692c37 tree 6b16c1bc5e63a755a5a952b0363bbcb30974370d parent d1e3dfdc2c934a279bcfa19359e4daec02bda18f author Andi Kleen Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:13 -0800 [PATCH] x86_64: Make i386 compile again with fourth DMA32 zone The code should deal with an additional empty zone, so fix up the #error. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d1e3dfdc2c934a279bcfa19359e4daec02bda18f tree 3135781b99cb7a816569ded60485639057c96b6c parent a2f1b424900715ed9d1699c3bb88a434a2b42bc0 author Andi Kleen Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:13 -0800 [PATCH] x86_64: Set compatibility flag for 4GB zone on IA64 IA64 traditionally had a 4GB DMA32 zone. Set the compatibility flag to keep old drivers working. For new drivers it would be better to use ZONE_DMA32 now. Cc: tony.luck@intel.com Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit a2f1b424900715ed9d1699c3bb88a434a2b42bc0 tree 8ef440f840656365166ff2d71aa445c224c53546 parent 56720367cd89ef5265f39da2d674c5b92cd4cd87 author Andi Kleen Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:13 -0800 [PATCH] x86_64: Add 4GB DMA32 zone Add a new 4GB GFP_DMA32 zone between the GFP_DMA and GFP_NORMAL zones. As a bit of historical background: when the x86-64 port was originally designed we had some discussion if we should use a 16MB DMA zone like i386 or a 4GB DMA zone like IA64 or both. Both was ruled out at this point because it was in early 2.4 when VM is still quite shakey and had bad troubles even dealing with one DMA zone. We settled on the 16MB DMA zone mainly because we worried about older soundcards and the floppy. But this has always caused problems since then because device drivers had trouble getting enough DMA able memory. These days the VM works much better and the wide use of NUMA has proven it can deal with many zones successfully. So this patch adds both zones. This helps drivers who need a lot of memory below 4GB because their hardware is not accessing more (graphic drivers - proprietary and free ones, video frame buffer drivers, sound drivers etc.). Previously they could only use IOMMU+16MB GFP_DMA, which was not enough memory. Another common problem is that hardware who has full memory addressing for >4GB misses it for some control structures in memory (like transmit rings or other metadata). They tended to allocate memory in the 16MB GFP_DMA or the IOMMU/swiotlb then using pci_alloc_consistent, but that can tie up a lot of precious 16MB GFPDMA/IOMMU/swiotlb memory (even on AMD systems the IOMMU tends to be quite small) especially if you have many devices. With the new zone pci_alloc_consistent can just put this stuff into memory below 4GB which works better. One argument was still if the zone should be 4GB or 2GB. The main motivation for 2GB would be an unnamed not so unpopular hardware raid controller (mostly found in older machines from a particular four letter company) who has a strange 2GB restriction in firmware. But that one works ok with swiotlb/IOMMU anyways, so it doesn't really need GFP_DMA32. I chose 4GB to be compatible with IA64 and because it seems to be the most common restriction. The new zone is so far added only for x86-64. For other architectures who don't set up this new zone nothing changes. Architectures can set a compatibility define in Kconfig CONFIG_DMA_IS_DMA32 that will define GFP_DMA32 as GFP_DMA. Otherwise it's a nop because on 32bit architectures it's normally not needed because GFP_NORMAL (=0) is DMA able enough. One problem is still that GFP_DMA means different things on different architectures. e.g. some drivers used to have #ifdef ia64 use GFP_DMA (trusting it to be 4GB) #elif __x86_64__ (use other hacks like the swiotlb because 16MB is not enough) ... . This was quite ugly and is now obsolete. These should be now converted to use GFP_DMA32 unconditionally. I haven't done this yet. Or best only use pci_alloc_consistent/dma_alloc_coherent which will use GFP_DMA32 transparently. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 56720367cd89ef5265f39da2d674c5b92cd4cd87 tree f368e64539b865f5faba7cffd31f654d0e9e66bd parent 6037d6bbdff65eb5a84fe35e140f4da4f7cc103a author Andi Kleen Sat, 05 Nov 2005 17:25:53 +0100 committer Linus Torvalds Mon, 14 Nov 2005 19:55:12 -0800 [PATCH] x86_64: Update defconfig Rerun and enable autofs 4, relayfs and softdog Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 0174f72f848dfe7dc7488799776303c81b181b16 tree 3f92a0ea6d1780823f2c56e512942bcc6e7817ef parent 302fe1758d85ad9c868e77625f61b7edad106381 parent ba76cd575ffd461d83507c23cf53c78d56d1ea0a author Linus Torvalds Mon, 14 Nov 2005 17:56:00 -0800 committer Linus Torvalds Mon, 14 Nov 2005 17:56:00 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge commit ba76cd575ffd461d83507c23cf53c78d56d1ea0a tree 256053e3982f8e0e5c541fa887faccad2bb0a9ed parent a272e24cc8751d125f9582befed0213a2a2b270f author Paul Mackerras Mon, 14 Nov 2005 21:56:57 +1100 committer Paul Mackerras Tue, 15 Nov 2005 11:17:09 +1100 powerpc: Remove __init from a function used in suspend/resume. Suspend/resume on powermacs uses the pmac_get_boot_time function, so it can't be marked as __init. Signed-off-by: Paul Mackerras commit a272e24cc8751d125f9582befed0213a2a2b270f tree a2b33767566f054b8100cf3e99f9247d1b0d5016 parent cc657f53928997c65bf2409c45166c6ceee8d306 author Paul Mackerras Mon, 14 Nov 2005 21:55:48 +1100 committer Paul Mackerras Tue, 15 Nov 2005 11:17:02 +1100 powerpc: Remove an extraneous and incorrect declaration of pmac_nvram_init. Signed-off-by: Paul Mackerras commit cc657f53928997c65bf2409c45166c6ceee8d306 tree 247e16076381a947b4305bb6467acde1189f3918 parent 493f25ef4087395891c99fcfe2c72e62e293e89f author Paul Mackerras Mon, 14 Nov 2005 21:55:15 +1100 committer Paul Mackerras Tue, 15 Nov 2005 11:11:32 +1100 powerpc: Fix clearing of the FPSCR when invoking a signal handler As pointed out by Gary Byers, we were clearing the image of the FPSCR (floating point status and control register) in the thread_struct before copying it to the user stack when invoking a signal. Thus the task would see its FPSCR getting cleared when it took a signal. While fixing it I noticed that our swapcontext system call was also clearing FPSCR. It shouldn't, so I fixed that too. Signed-off-by: Paul Mackerras commit 302fe1758d85ad9c868e77625f61b7edad106381 tree b3b9a6a356c0f59f871d55353f727250a8c74e51 parent 1ba430bc3e243d38c0bb2b185bea664b04fc59df author Yasuyuki Kozakai Mon, 14 Nov 2005 15:28:45 -0800 committer David S. Miller Mon, 14 Nov 2005 15:28:45 -0800 [NETFILTER] fix leak of fragment queue at unloading nf_conntrack_ipv6 This patch makes nf_conntrack_ipv6 free all IPv6 fragment queues at module unloading time. Also introduce a BUG_ON if we ever again have leaks in the memory accounting. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 1ba430bc3e243d38c0bb2b185bea664b04fc59df tree f675bb89f3ac344ddf25ecbdf3a89484a7f3ac4f parent 7686a02c0ebc11e4f881fe14db3df18569b7dbc1 author Yasuyuki Kozakai Mon, 14 Nov 2005 15:28:18 -0800 committer David S. Miller Mon, 14 Nov 2005 15:28:18 -0800 [NETFILTER] nf_conntrack: fix possibility of infinite loop while evicting nf_ct_frag6_queue This synchronizes nf_ct_reasm with ipv6 reassembly, and fixes a possibility of an infinite loop if CPUs evict and create nf_ct_frag6_queue in parallel. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 7686a02c0ebc11e4f881fe14db3df18569b7dbc1 tree 3fd8e9221881db36d8e1dd9562efa27fd36d344e parent 9bdf87d90bbd1a3e3183ac116a6a9d861f32baca author Yasuyuki Kozakai Mon, 14 Nov 2005 15:27:43 -0800 committer David S. Miller Mon, 14 Nov 2005 15:27:43 -0800 [NETFILTER]: fix type of sysctl variables in nf_conntrack_ipv6 These variables should be unsigned. This fixes sysctl handler for nf_ct_frag6_{low,high}_thresh. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 9bdf87d90bbd1a3e3183ac116a6a9d861f32baca tree d8d5c1d527e71d2c28a33a7610fc991248336f67 parent 47d4305bf2275f82a51fa025257c2c1996356d6b author Yasuyuki Kozakai Mon, 14 Nov 2005 15:26:58 -0800 committer David S. Miller Mon, 14 Nov 2005 15:26:58 -0800 [NETFILTER]: cleanup IPv6 Netfilter Kconfig This removes linux 2.4 configs in comments as TODO lists. And this also move the entry of nf_conntrack to top like IPv4 Netfilter Kconfig. Based on original patch by Krzysztof Piotr Oledzki . Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 47d4305bf2275f82a51fa025257c2c1996356d6b tree a2535f404655905a6e0b86b4a54b54ca9a93764c parent 37d2e7a20d745035b600f1a6be56cbb9c7259419 author Krzysztof Oledzki Mon, 14 Nov 2005 15:25:59 -0800 committer David S. Miller Mon, 14 Nov 2005 15:25:59 -0800 [NETFILTER]: link 'netfilter' before ipv4 Staticaly linked nf_conntrack_ipv4 requires nf_conntrack. but currently nf_conntrack is linked after it. This changes the order of ipv4 and netfilter to fix this. Signed-off-by: Krzysztof Oledzki Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 37d2e7a20d745035b600f1a6be56cbb9c7259419 tree c76e0ba522d34c8b3021bf0f012632f7877f5281 parent 3746a2b1402e7933c7f1eabdce384b8454dc2ef7 author Harald Welte Mon, 14 Nov 2005 15:24:59 -0800 committer David S. Miller Mon, 14 Nov 2005 15:24:59 -0800 [NETFILTER] nfnetlink: unconditionally require CAP_NET_ADMIN This patch unconditionally requires CAP_NET_ADMIN for all nfnetlink messages. It also removes the per-message cap_required field, since all existing subsystems use CAP_NET_ADMIN for all their messages anyway. Patrick McHardy owes me a beer if we ever need to re-introduce this. Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 3746a2b1402e7933c7f1eabdce384b8454dc2ef7 tree 154061b5e4f038a490173370c53472d077fec4ef parent 56558208521729fa6b2a0f12df22e1569dee297a author KOVACS Krisztian Mon, 14 Nov 2005 15:23:01 -0800 committer David S. Miller Mon, 14 Nov 2005 15:23:01 -0800 [NETFILTER] nf_conntrack: Add missing code to TCP conntrack module Looks like the nf_conntrack TCP code was slightly mismerged: it does not contain an else branch present in the IPv4 version. Let's add that code and make the testsuite happy. Signed-off-by: KOVACS Krisztian Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 56558208521729fa6b2a0f12df22e1569dee297a tree 0edad3244ac80e9cf00707ac4940e8c3a758cf75 parent c0400c4f5a08cfd1c657f7f616fcf1dfbd76a4d7 author Pablo Neira Ayuso Mon, 14 Nov 2005 15:22:11 -0800 committer David S. Miller Mon, 14 Nov 2005 15:22:11 -0800 [NETFILTER] ctnetlink: More thorough size checking of attributes Add missing size checks. Thanks Patrick McHardy for the hint. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit c0400c4f5a08cfd1c657f7f616fcf1dfbd76a4d7 tree 61a90f49481595e707e0968f889483a4f0ff454f parent dbd36ea496726460299842fdbeaaa7fff2f0c5c7 author Pablo Neira Ayuso Mon, 14 Nov 2005 15:21:41 -0800 committer David S. Miller Mon, 14 Nov 2005 15:21:41 -0800 [NETFILTER] nfnetlink: skip size check if size not specified (== 0) Skip sizecheck if the size of the attribute wasn't specified, ie. zero. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit dbd36ea496726460299842fdbeaaa7fff2f0c5c7 tree 54e994d90640602cd81b968fe99f0f7623dd335c parent ee90f62b3e69d0cd9f8edc6b95f07b1a8c38aaf4 author Pablo Neira Ayuso Mon, 14 Nov 2005 15:21:01 -0800 committer David S. Miller Mon, 14 Nov 2005 15:21:01 -0800 [NETFILTER] ctnetlink: use size_t to make gcc-4.x happy Make gcc-4.x happy. Use size_t instead of int. Thanks to Patrick McHardy for the hint. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit c6e6e666cbfe40f0d7fb1a293ff6332973acac37 tree 21609c228d8aaf1f9a2217f7fd08266ed669f5bc parent 2c13b7cee045af689b36349c2bc6a9ed6e3d73fa author Jeff Garzik Mon, 14 Nov 2005 14:50:05 -0500 committer Jeff Garzik Mon, 14 Nov 2005 14:50:05 -0500 [libata] REQUEST SENSE handling fixes - Move ATAPI check-condition handling out of the timeout handler - Use multi-qc-issue feature to issue REQUEST SENSE ATAPI PACKET command upon receiving an ATAPI check-condition. This cleans things up a lot, and eliminates a nasty recursion bug. commit 2c13b7cee045af689b36349c2bc6a9ed6e3d73fa tree 594a061fa9b9c1fa03bfe01c9177cc016e1bb1a4 parent e1410f2d951d45aee3bdbcc05ecedaaa9db276e5 author Jeff Garzik Mon, 14 Nov 2005 14:14:16 -0500 committer Jeff Garzik Mon, 14 Nov 2005 14:14:16 -0500 [libata] minor fixes, new helpers - in ata_dev_identify(), don't assume that all devices are either ATA or ATAPI. In the future, this code will see port multipliers and other devices. - make a debugging printk less verbose - add new helper ata_qc_reinit() - add new helper BPRINTK() and port flag ATA_FLAG_DEBUGMSG, for fine-grained debugging use. commit e1410f2d951d45aee3bdbcc05ecedaaa9db276e5 tree 16d7ab46582219e349df6bfd48c6e20a5ba8e8fc parent ad36d1a533da91d3448029b4da1113c5b880f25d author Jeff Garzik Mon, 14 Nov 2005 14:06:26 -0500 committer Jeff Garzik Mon, 14 Nov 2005 14:06:26 -0500 [libata] fix bugs in ATAPI padding DMA mapping code The ATAPI pad-to-next-32bit-boundary code modifies the scatterlist's length variable, sometimes to zero. x86-64 platform would oops if a zero-length scatterlist entry was asked to be mapped. Work around this by ensuring that we never DMA-map a zero length buffer or SG entry. commit ad36d1a533da91d3448029b4da1113c5b880f25d tree 00e66685a3572daed99fa8def4580ea6022b6db7 parent 4ba529a8a39e15688b6a3d31b11930d1f8a1edad author Jeff Garzik Mon, 14 Nov 2005 13:56:37 -0500 committer Jeff Garzik Mon, 14 Nov 2005 13:56:37 -0500 [libata ahci] error handling fixes Needed to get ATAPI working. - dump hardware error bits, if hardware signals an error - only reset hardware during timeout if a command was active - call ata_qc_complete() with a fine-grained error mask. Needed so that atapi_qc_complete() can distinguish between device errors and other errors. commit 493f25ef4087395891c99fcfe2c72e62e293e89f tree bdb2339dba841e1c459292769e1cafd9698ae1a7 parent 5be396b00ca0f2f769c55cf69bbd7c77451c925e author Paul Mackerras Mon, 14 Nov 2005 17:32:50 +1100 committer Paul Mackerras Mon, 14 Nov 2005 17:32:50 +1100 powerpc: Fix 32-bit compile: PPC_MEMSTART was undeclared This defines PPC_MEMSTART as 0 because it is still used in a couple of places in the 32-bit code. Signed-off-by: Paul Mackerras commit 5be396b00ca0f2f769c55cf69bbd7c77451c925e tree 3e6d9d85fdb985be3a70aeb76d61f29f631260ce parent 1dfc6772097ef4eadd39a10ce44557c782d5058e author Paul Mackerras Mon, 14 Nov 2005 17:31:55 +1100 committer Paul Mackerras Mon, 14 Nov 2005 17:31:55 +1100 powerpc: Mark PREP and embedded as broken for now These machines don't have working ARCH=powerpc support yet, so make them depend on BROKEN so people don't enable them inadvertently and get compile errors. Signed-off-by: Paul Mackerras commit 1dfc6772097ef4eadd39a10ce44557c782d5058e tree 4427008f2f36c92ad7784d5f8fd2e2981f868ef3 parent 7568cb4ef6c507164b65b01f972a3bd026898ae1 author Paul Mackerras Mon, 14 Nov 2005 17:30:40 +1100 committer Paul Mackerras Mon, 14 Nov 2005 17:30:40 +1100 powerpc: Export a couple of prom functions These are needed by the TPM driver, apparently. Signed-off-by: Paul Mackerras commit 7568cb4ef6c507164b65b01f972a3bd026898ae1 tree ba608f4c84d8765d5a1491c345f6dc265b5ec4ea parent c55377ee73f6efeb373ae06f6e918d87660b4852 author Paul Mackerras Mon, 14 Nov 2005 17:30:17 +1100 committer Paul Mackerras Mon, 14 Nov 2005 17:30:17 +1100 powerpc: Move most remaining ppc64 files over to arch/powerpc Also deletes files in arch/ppc64 that are no longer used now that we don't compile with ARCH=ppc64 any more. Signed-off-by: Paul Mackerras commit c55377ee73f6efeb373ae06f6e918d87660b4852 tree 8085472005f758e73d996d2b3e0e91064524d533 parent 821077b2617ef70662a861393c929d7e47609512 author Paul Mackerras Mon, 14 Nov 2005 17:22:01 +1100 committer Paul Mackerras Mon, 14 Nov 2005 17:22:01 +1100 powerpc: Move a bunch of ppc64 headers to include/asm-powerpc ... and also delete some that are no longer used because we already had an include/asm-powerpc version of the header. Signed-off-by: Paul Mackerras commit 821077b2617ef70662a861393c929d7e47609512 tree a1ea11b67418bb2f84efb7f0b44a772c3f625f2a parent 3136254ca5dfaf53486f7032c674f9b6d7fd1d53 parent d7867959e7e928ab52ef204e2559937e5c9fc4ce author Paul Mackerras Mon, 14 Nov 2005 17:15:45 +1100 committer Paul Mackerras Mon, 14 Nov 2005 17:15:45 +1100 Merge git://oak/home/sfr/kernels/iseries/work commit d7867959e7e928ab52ef204e2559937e5c9fc4ce tree d5e4c82050b70383e4d3b92d3b1b3eb3b65a0813 parent 868accb7b9126dffdebb6b45631e145991e3535d author Stephen Rothwell Mon, 14 Nov 2005 17:14:51 +1100 committer Stephen Rothwell Mon, 14 Nov 2005 17:14:51 +1100 powerpc: iSeries build fixes log_plpar_hcall_return is only used on PPC_PSERIES, so move it closer to its users and inside ifdef CONFIG_PPC_PSERIES. remove the last vestiges of systemcfg in iSeries. Signed-off-by: Stephen Rothwell commit 3136254ca5dfaf53486f7032c674f9b6d7fd1d53 tree 101934218e83511dc2783e02d1a458ec85d98da9 parent 0c37ec2aa88bd8a6aaeb284ff5c86f4c6d8e8469 author Benjamin Herrenschmidt Mon, 14 Nov 2005 15:49:48 +1100 committer Paul Mackerras Mon, 14 Nov 2005 16:36:08 +1100 [PATCH] powerpc: kill ppc64 rtc.c, use genrtc instead This moves the rtas RTC callbacks to rtas-rtc.c in arch/powerpc/kernel, and kills the rest of arch/ppc64/kernel/rtc.c which was just a duplicate of the genrtc functionality. Also enable build of genrtc for CONFIG_PPC64 (it just works are we already have the required callbacks) and enable it in all defconfigs. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 0c37ec2aa88bd8a6aaeb284ff5c86f4c6d8e8469 tree d70e4b48664b86a9abfe21ff26561318316fb9c2 parent 50092b233afa96b4c9a4b24ac38199c34e0880cd author Benjamin Herrenschmidt Mon, 14 Nov 2005 14:55:58 +1100 committer Paul Mackerras Mon, 14 Nov 2005 16:35:58 +1100 [PATCH] powerpc: vdso fixes (take #2) This fixes various errors in the new functions added in the vDSO's, I've now verified all functions on both 32 and 64 bits vDSOs. It also fix a sign extension bug getting the initial time of day at boot that could cause the monotonic clock value to be completely on bogus for 64 bits applications (with either the vDSO or the syscall) on powermacs. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 50092b233afa96b4c9a4b24ac38199c34e0880cd tree 03bf19e82f5808f9d8f7fe538b0a3f56c70c3672 parent 593e537b93193d1696809817533ce5ad510445b1 author Benjamin Herrenschmidt Mon, 14 Nov 2005 11:02:20 +1100 committer Paul Mackerras Mon, 14 Nov 2005 16:35:50 +1100 [PATCH] powerpc: Always rebuild arch/powerpc/include/asm symlink This patch uses a FORCE dependency on the arch/powerpc/include/asm symlink so that it always gets rebuilt, thus avoiding all sort of funny errors if the .config is changed between 32 and 64 bits. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 593e537b93193d1696809817533ce5ad510445b1 tree b2045132486c3d39950899e3a9b574188df55ce6 parent c5e24354efae9f962e0e369d875d45f47e0bb9aa author Michael Ellerman Sat, 12 Nov 2005 00:06:06 +1100 committer Paul Mackerras Mon, 14 Nov 2005 16:34:06 +1100 [PATCH] powerpc: Export htab start/end via device tree The userspace kexec-tools need to know the location of the htab on non-lpar machines, as well as the end of the kernel. Export via the device tree. NB. This patch has been updated to use "linux,x" property names. You may need to update your kexec-tools to match. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit c5e24354efae9f962e0e369d875d45f47e0bb9aa tree 9a92ab7168cd45eb5104ce662e82626b62609aa4 parent 5cd16ee934eafca74a6bb790328950cec68a8b78 author Michael Ellerman Sat, 12 Nov 2005 00:06:05 +1100 committer Paul Mackerras Mon, 14 Nov 2005 16:33:09 +1100 [PATCH] powerpc: Turn cpu_irq_down into kexec_cpu_down We currently have a ppc_md member called cpu_irq_down, which disables IRQs for the cpu in question. The only caller of cpu_irq_down is the kexec code. On pSeries we need to do more than just teardown IRQs at kexec time, so rename the ppc_md member to kexec_cpu_down and expand it. The pSeries code needs to know, and other platforms might too, whether we're doing a crash shutdown (ie. panicking) or a regular kexec, so add a flag for that. The pSeries implementation of kexec_cpu_down does an unregister VPA call, which tells the Hypervisor to stop writing stuff into our pacas. Without this we can get weird memory corruption bugs when we kexec, caused by the Hypervisor writing into the first kernel's pacas which happens to be somewhere interesting in the second kernel's memory. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 5cd16ee934eafca74a6bb790328950cec68a8b78 tree 2f4335c9559f5d1d199ea6e0b20185ceede4a2b5 parent ee90f62b3e69d0cd9f8edc6b95f07b1a8c38aaf4 author Michael Ellerman Fri, 11 Nov 2005 14:25:24 +1100 committer Paul Mackerras Mon, 14 Nov 2005 16:33:05 +1100 [PATCH] powerpc: Merge page.h Merge asm-ppc/page.h and asm-ppc64/page.h into asm-powerpc/page.h, asm-powerpc/page_32.h and asm-powerpc/page_64.h Built for PPC (common_defconfig), with ARCH=powerpc, mostly built with ARCH=ppc (other things break the build). Built and booted on P5 LPAR for PPC64 with ARCH=ppc/powerpc (pseries_defconfig). Mostly built for iSeries powerpc. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 85d6162d6cea9220e483989817eac0cebc03070e tree 275f1594f1ab7a2e033c4df1af660f5695bcf060 parent c9d39130123238ac18478a42e25cb7996eacfcc0 parent 4ba529a8a39e15688b6a3d31b11930d1f8a1edad author Jeff Garzik Sun, 13 Nov 2005 23:20:16 -0500 committer Jeff Garzik Sun, 13 Nov 2005 23:20:16 -0500 Merge branch 'master' commit 868accb7b9126dffdebb6b45631e145991e3535d tree 1245ba78565c6b3a4482b714cd733264b29d6fbe parent d9ae2bad5c92cd116e3daedf16f79cf597e09ad7 author Stephen Rothwell Thu, 10 Nov 2005 18:38:46 +1100 committer Stephen Rothwell Mon, 14 Nov 2005 14:44:33 +1100 powerpc: have only one definition of __irq_offset_value Signed-off-by: Stephen Rothwell commit d9ae2bad5c92cd116e3daedf16f79cf597e09ad7 tree 5a1d58b46b6712b10caceb2a4d703fc69a31e2f5 parent 4ba529a8a39e15688b6a3d31b11930d1f8a1edad author Stephen Rothwell Thu, 10 Nov 2005 18:11:19 +1100 committer Stephen Rothwell Mon, 14 Nov 2005 14:44:24 +1100 powerpc: make iSeries use generic virtual irq mapping Signed-off-by: Stephen Rothwell commit ee90f62b3e69d0cd9f8edc6b95f07b1a8c38aaf4 tree 9ceff60a5db6b98556e1eccd008ecddd470aace9 parent 70ac551651a2c5a234b703d9a495817f2ca09639 parent 807277cbf9a240b133ee378a53b65375088ef62a author Linus Torvalds Sun, 13 Nov 2005 18:22:49 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:22:49 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 commit 70ac551651a2c5a234b703d9a495817f2ca09639 tree 71f55b9a3de438969a7a0d951971febf59784294 parent 7f729ccff35befa08a836ab33a4372c7f6735645 parent bd5d080ab99642e3245ef7cfa54490384c01d878 author Linus Torvalds Sun, 13 Nov 2005 18:17:54 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:17:54 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 7f729ccff35befa08a836ab33a4372c7f6735645 tree 0719139e279c8054d734df5be78154f3b536f22f parent cbc749518235b0f1dacb867c8c25059a1b876276 parent ee31b337852ca8a65840702544ff5c64d37740f5 author Linus Torvalds Sun, 13 Nov 2005 18:17:21 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:17:21 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-serial commit cbc749518235b0f1dacb867c8c25059a1b876276 tree 83ebc2ab3c9e2407fc3939cd266fca454eac3965 parent 71f95cfbcfc31ba0d002ddb6e37ca5a0b5eaf02c parent 69177e890cd43e781c3aa9eed98ea091c4cb0788 author Linus Torvalds Sun, 13 Nov 2005 18:16:56 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:16:56 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-mmc commit 71f95cfbcfc31ba0d002ddb6e37ca5a0b5eaf02c tree 8eef93b2aa7d811d8407fb359ba75c16e814b5f3 parent e56367fe70955beb82e5e7c71ccfa064add42c21 author Martin Waitz Sun, 13 Nov 2005 16:08:15 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:21 -0800 [PATCH] DocBook: revert xmlto use for .ps and .pdf documentation As xmlto doesn't work for print documentation, we need docbook-utils again for these targets. This patch allows the user to choose the method he wants to use. (I'm still hoping that someone will fix passivetex ;-) Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e56367fe70955beb82e5e7c71ccfa064add42c21 tree 2b95b29a1ba1dd022fa0a60c75944d068a5f0355 parent ddad86c2d6f660112c6ce8aabae6ffd346e25b9b author Martin Waitz Sun, 13 Nov 2005 16:08:15 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:21 -0800 [PATCH] DocBook: comment about paper type Add a comment showing how to change paper type. Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddad86c2d6f660112c6ce8aabae6ffd346e25b9b tree f11cca30f8c67631b5b2d51d5ab45398bedfe6ff parent aeec46b97a7975fd983219177980c58ed4fd607c author Martin Waitz Sun, 13 Nov 2005 16:08:14 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:21 -0800 [PATCH] DocBook: include printk documentation Add printk documentation to kernel-api. Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aeec46b97a7975fd983219177980c58ed4fd607c tree 9ed1f67d86585c096afe12b944182c7e7c41ec39 parent f5f4917c92a9a3814eda9c947fda8afabbd1812d author Martin Waitz Sun, 13 Nov 2005 16:08:13 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:21 -0800 [PATCH] DocBook: allow to mark structure members private Many structures contain both an internal part and one which is part of the API to other modules. With this patch it is possible to only include these public members in the kernel documentation. Signed-off-by: Martin Waitz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5f4917c92a9a3814eda9c947fda8afabbd1812d tree 73dcf87719320a4e1bd87146241f69718181aa6b parent 60f6c464d14b177778334344c86f15616899735a author Jan Beulich Sun, 13 Nov 2005 16:08:12 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:21 -0800 [PATCH] make vesafb build without CONFIG_MTRR vesafb did not build without CONFIG_MTRR. Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60f6c464d14b177778334344c86f15616899735a tree 688132b3e6b6c6bb75699ff277d0421834993566 parent c3e63002433d9a3de763b6cb49dc2c75a74d8604 author Hans Verkuil Sun, 13 Nov 2005 16:08:12 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:21 -0800 [PATCH] v4l: 976: ensure consistent v4l firmware prefixes Ensure consistent v4l firmware prefixes. Signed-off-by: Hans Verkuil Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3e63002433d9a3de763b6cb49dc2c75a74d8604 tree 4cbf336587246fd11c6770a39973b17b6c59143f parent d5ee43afc9fdde8f853346d32f5ca5c00e8ed886 author Mauro Carvalho Chehab Sun, 13 Nov 2005 16:08:11 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:20 -0800 [PATCH] v4l: 977: fix broken dependency needed for sa7134 module Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d5ee43afc9fdde8f853346d32f5ca5c00e8ed886 tree 47bc8712fc8650058e614774ff9e8cc25653e988 parent c01ee851d3e64753877017e8fb19f2e23a1945bc author Ricardo Cerqueira Sun, 13 Nov 2005 16:08:10 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:20 -0800 [PATCH] v4l: 975: apply saa7134-alsa fixes Merged parts of a patch from Takashi Iwai for an older version of the module. This patch was adapted and tested by Ricardo Cerqueira. Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c01ee851d3e64753877017e8fb19f2e23a1945bc tree 67f0ee3300eb7016d792471dbdda4112bbe9d0f7 parent 93067f387e104e48e616436fe1804911f90402e3 author Michael Krufky Sun, 13 Nov 2005 16:08:09 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:20 -0800 [PATCH] v4l: 974: saa7134 shouldn't DEPEND on SND_PCM_OSS. Instead, SELECT it. saa7134 shouldn't DEPEND on SND_PCM_OSS. Instead, SELECT it. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93067f387e104e48e616436fe1804911f90402e3 tree 1daebbbbc5f391ab5dfe08b7f35a945154bb6f6e parent 24b59258eb987c26c5813d7768c516422830db35 author Dave Jones Sun, 13 Nov 2005 16:08:09 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:20 -0800 [PATCH] v4l: saa711x driver doesn't need segment.h This breaks compilation on non-x86 architectures, and isn't even used. Signed-off-by: Dave Jones Acked-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24b59258eb987c26c5813d7768c516422830db35 tree 614420d99090ffdf43479350432ffde4445f0c50 parent e77f34d6948af83db75ece2e1bc0c73087d7cf69 author Mike Krufky Sun, 13 Nov 2005 16:08:08 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:20 -0800 [PATCH] v4l: prevent saa7134 alsa undefined warnings Prevent the following build warnings: *** Warning: "snd_card_free" *** Warning: "snd_card_register" *** Warning: "snd_device_new" *** Warning: "snd_card_new" *** Warning: "snd_ctl_add" *** Warning: "snd_ctl_new1" *** Warning: "snd_pcm_set_ops" *** Warning: "snd_pcm_new" *** Warning: "snd_pcm_lib_ioctl" *** Warning: "snd_pcm_hw_constraint_integer" *** Warning: "snd_pcm_stop" *** Warning: "snd_pcm_period_elapsed" [drivers/media/video/saa7134/saa7134-alsa.ko] undefined! Signed-off-by: Michael Krufky Acked-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e77f34d6948af83db75ece2e1bc0c73087d7cf69 tree a143bac222668bc935d7663745eb933671dd754d parent 1f4b33651cfb18caac6b6a0d664b0750074b14f4 author Mauro Carvalho Chehab Sun, 13 Nov 2005 16:08:06 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:20 -0800 [PATCH] v4l: (966.1) Removes Obsoleted i2c-compat.h from newer drivers Removed obsoleted i2c-compat.h file from cx25840, saa7115 and saa7127 drivers. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f4b33651cfb18caac6b6a0d664b0750074b14f4 tree c8304d5cb2de23ebde994f45f050643f1b3f1d80 parent e19b2fcccde976621560c26373c7fba29b0d0f29 author Hans Verkuil Sun, 13 Nov 2005 16:08:05 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:20 -0800 [PATCH] v4l: (966) Authorship fixes for new Modules Fixes Module Author macros Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e19b2fcccde976621560c26373c7fba29b0d0f29 tree ed6a0ed34c8a238fb7a1d0293051fb6cfc6cc556 parent 9e1e28da4059ce293334a8e820955a0ce320b07b author Hans Verkuil Sun, 13 Nov 2005 16:08:04 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:20 -0800 [PATCH] v4l: (948) adds support for saa7115 video decoder - Adds support for saa7115 video decoder. Driver Authors: Hans Verkuil, Chris Kennedy, Kevin Thayer Signed-off-by: Hans Verkuil Signed-off-by: Chris Kennedy Signed-off-by: Kevin Thayer Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e1e28da4059ce293334a8e820955a0ce320b07b tree 93414b7dd29e77754bf9fc3f9dc553482be11ab2 parent 6555f4322f5c8dc03047eb566d8519ba348e02de author Michael Krufky Sun, 13 Nov 2005 16:08:03 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:20 -0800 [PATCH] v4l: (963.1) hybrid v4l/dvb: remove duplicated code The following patch caused some duplicated code in cx88-dvb.c: [PATCH] v4l: 634: implemented tuner set standby on cx88 init The cx88-dvb.c portion of this patch was already applied in an earlier patch, entitled: [PATCH] v4l: fixup on cx88_dvb for Dvico HDTV5 Gold I love quilt and all, but AFAIK, no tool is 100% perfect for catching oversights like this. The non-overlapping portions of each of these patches are still needed, and must not be discarded, so rather than reverting old patches, please just apply this fixup patch to remove the duplicated code. Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6555f4322f5c8dc03047eb566d8519ba348e02de tree 19f070a66260ae2ffc45f32cf5d0d11e513c7ccf parent 80d2ad9259b04bc46556c1cd8cec558a02460a2d author Mauro Carvalho Chehab Sun, 13 Nov 2005 16:08:02 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:19 -0800 [PATCH] v4l: (963) em28xx IR fixup Removed the code that avoids repeating events when pressing IR keys. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 80d2ad9259b04bc46556c1cd8cec558a02460a2d tree e88e5136a93aa7b7676365635959dff41a9a1f61 parent 3717e170e1585d79a8ceced9161f18ceb796411e author Ricardo Cerqueira Sun, 13 Nov 2005 16:08:01 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:19 -0800 [PATCH] v4l: (962) Added new saa7134 card (MSI TV@anywhere plus) Added new saa7134 card (MSI TV@anywhere plus) Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3717e170e1585d79a8ceced9161f18ceb796411e tree 71127c3da4c4a138c95bee0ff094700e49924458 parent 4aabf6331f89c18a46e7f083ca0b27f15ca85422 author Tyler Trafford Sun, 13 Nov 2005 16:08:00 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:19 -0800 [PATCH] v4l: (958) Make cx25840 use firmware image named 'cx25840.fw' Change default filename of firmware image to 'cx25840.fw' Signed-off-by: Tyler Trafford Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4aabf6331f89c18a46e7f083ca0b27f15ca85422 tree 2a512246717df6fb37f6dd6c3444972b43aea51b parent 714a095abfa22dfe2accf641118a65796e966a98 author Ricardo Cerqueira Sun, 13 Nov 2005 16:08:00 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:19 -0800 [PATCH] v4l: (951) Make saa7134-oss as a stand-alone module - saa7134-oss is now a standalone module as well - remaining DMA sound code has been removed from core the module - Lots of small cleanups and variable renames to get more consistency between the OSS and ALSA drivers - Fixed saa7134-alsa spinlock bug - Added missing #include in saa7134-oss Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 714a095abfa22dfe2accf641118a65796e966a98 tree e8936ba9edc3ad0b5c6d69dd032133551a2a2d5e parent 70146cfc84dca917ac27cdc754deae63c1282844 author Mauro Carvalho Chehab Sun, 13 Nov 2005 16:07:59 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:19 -0800 [PATCH] v4l: (950) Added compiler options for cx25840 saa7115 and saa7127 Added compiler options for cx25840, saa7115 and saa7127 Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70146cfc84dca917ac27cdc754deae63c1282844 tree a33be52c5783eb3628d80062d7323e52854c2c6f parent bd985160a9f4623fdb24fcfeb36fe59e1b8f7b57 author Hartmut Hackmann Sun, 13 Nov 2005 16:07:58 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:19 -0800 [PATCH] v4l: (949) Added support for secam l' Added support for SECAM L' Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd985160a9f4623fdb24fcfeb36fe59e1b8f7b57 tree a674501ba55b0d06c88f86ac07949d3fd8338165 parent b2f0648ffda862d53f04f0a05979f3fa530d63c9 author Hans Verkuil Sun, 13 Nov 2005 16:07:56 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:19 -0800 [PATCH] v4l: (946) adds support for cx25840 video decoder Adds support for cx25840 video decoder. Driver authors: Hans Verkuil, Chris Kennedy, Tyler Trafford, Ulf Eklund. Signed-off-by: Hans Verkuil Signed-off-by: Chris Kennedy Signed-off-by: Tyler Trafford Thanks-to: Ulf Eklund . Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2f0648ffda862d53f04f0a05979f3fa530d63c9 tree a8c92c46604becc46a49ac267aecc69e3575a9e8 parent 419d4e753a5dbd6e19ad45cb4045ac213f15eac4 author Hans Verkuil Sun, 13 Nov 2005 16:07:55 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:19 -0800 [PATCH] v4l: (945) adds a new include for internal v4l2 ioctls and api Adds a new include for internal V4L2 ioctls and API Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 419d4e753a5dbd6e19ad45cb4045ac213f15eac4 tree 86a3aeff1dbabb79192537877b18c63934ffb458 parent cfbb5b8cb059609696ba38a9a87eafb93b3de43c author Andrew Morton Sun, 13 Nov 2005 16:07:55 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:19 -0800 [PATCH] v4l-944-added-driver-for-saa7127-video-tidy Remove unneeded (and undesirable) casts. Cc: Hans Verkuil Cc: Chris Kennedy Cc: Kevin Thayer Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfbb5b8cb059609696ba38a9a87eafb93b3de43c tree aaabafd0fb2f08714a7fb0393c8d7290b39498f9 parent 6c6c0b2c27e70c3593e023882fabb1cebcbd077e author Hans Verkuil Sun, 13 Nov 2005 16:07:53 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:18 -0800 [PATCH] v4l: (944) added driver for saa7127 video decoder - Added driver for saa7127 video decoder. Driver authors:Hans Verkuil, Chris Kennedy, Kevin Thayer Signed-off-by: Hans Verkuil Signed-off-by: Chris Kennedy Signed-off-by: Kevin Thayer Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c6c0b2c27e70c3593e023882fabb1cebcbd077e tree 30b0969ef62e3094362e4057663bac872bd0a44f parent 871242b93e75b24c99687249c2812aed026b40af author Mark Weaver Sun, 13 Nov 2005 16:07:52 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:18 -0800 [PATCH] v4l: (939) Support for nebula rc5 based gpio remote Support for Nebula rc5-based gpio remote. Signed-off-by: Mark Weaver Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 871242b93e75b24c99687249c2812aed026b40af tree c19bb8dfad2aa4166a8c483d250e5f935a89cf19 parent 633323ffffae91c3f22a08e0185fbfd3fae2a825 author Nickolay V. Shmyrev Sun, 13 Nov 2005 16:07:51 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:18 -0800 [PATCH] v4l: (937) Included missing interrupt.h at saa7134-alsa.c Included missing interrupt.h at saa7134-alsa.c Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 633323ffffae91c3f22a08e0185fbfd3fae2a825 tree 086f2767deefcd011aceffdd966c39ea0ea1aa18 parent 8069695c9e7da7ab7cd8ee749e8d5aa9e6e0660b author Bill Pechter Sun, 13 Nov 2005 16:07:50 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:18 -0800 [PATCH] v4l:: (936) Support for sabrent bt848 version Support for Sabrent bt848 version. Signed-off-by: Bill Pechter Signed-off-by: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8069695c9e7da7ab7cd8ee749e8d5aa9e6e0660b tree f5e7208c2b9fd261d12424816388a736d500c987 parent 800d3c6f90b61cc82b09db635b59c00b1c460728 author Ricardo Cerqueira Sun, 13 Nov 2005 16:07:49 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:18 -0800 [PATCH] v4l: (935) Moved common IR stuff to ir-common.c - The pinnacle handler & remote are common to saa7134 PCI boards and em28xx USB boards, so the keymap was moved to ir-common and the keyhandler is back to ir-kbd-i2c - request_module("ir-kbd-i2c") is no longer necessary at saa7134-core since saa7134.ko now depends on ir-kbd-i2c.ko to get the keyhandler Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 800d3c6f90b61cc82b09db635b59c00b1c460728 tree e8b59694c3b0560c65da4e5984b5ef1a92cbae82 parent c817e7634260b298fc03b856ddb53d9aa77326b5 author Mauro Carvalho Chehab Sun, 13 Nov 2005 16:07:48 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:18 -0800 [PATCH] v4l: (943) added secam l video standard - Added SECAM L' video standard - SECAM L' is a Secam variant that requires special config. This patch adds support on V4L core. Requires aditional patches on tuners to support. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c817e7634260b298fc03b856ddb53d9aa77326b5 tree 6e0259424ddf11f10e18a3e7b939d66ccf955f36 parent 770599d07564f049234d0a5eb0ef3d607d747878 author Ricardo Cerqueira Sun, 13 Nov 2005 16:07:47 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:18 -0800 [PATCH] v4l: (930) Alsa fixes and improvements - Fix nasty IRQ hook bug. - Fix multiple board support in saa7134-alsa - Minor comment updates - SAA7134/ALSA IRQ management improvements - Removed superfluous stop_dma() from saa7134-alsa IRQ handler Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 770599d07564f049234d0a5eb0ef3d607d747878 tree a29a489c43a5a5631606d51d330cf76a8a8338c8 parent 6ad44229ec85b3938a313a325f0449e23eac8aac author Mauro Carvalho Chehab Sun, 13 Nov 2005 16:07:45 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:18 -0800 [PATCH] v4l: (926.1) Added compiling options for wm8775 and cs53l32a chips Added compiling options for wm8775 and cs53l32a chips. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ad44229ec85b3938a313a325f0449e23eac8aac tree a873ea0b48a047824d277efa77411dee3575ab20 parent 3f39894d1b5c253b10fcb8fbbbcf65a330f6cdc7 author Jesper Juhl Sun, 13 Nov 2005 16:07:44 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:17 -0800 [PATCH] README: add info about -stable to README and point at applying-patches.txt Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f39894d1b5c253b10fcb8fbbbcf65a330f6cdc7 tree 6d166da37e874f2c0b891d4cf61b5f4b9bf5a71f parent 09e12f9f6bcd9af516d901223cebdbae58b32c9f author George Anzinger Sun, 13 Nov 2005 16:07:44 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:17 -0800 [PATCH] timespec: normalize off by one errors It would appear that the timespec normalize code has an off by one error. Found in three places. Thanks to Ben for spotting. Signed-off-by: George Anzinger Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09e12f9f6bcd9af516d901223cebdbae58b32c9f tree e6f56aea2eb1b3aefe483475291580d862fb00e7 parent f6a2382cec3ed9b67b01febfa85d7d72b254844a author Kylene Jo Hall Sun, 13 Nov 2005 16:07:43 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:17 -0800 [PATCH] tpm: locking fix Use schedule_work() to avoid down()-in-timer-handler problem. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6a2382cec3ed9b67b01febfa85d7d72b254844a tree a15ab118ad15a6392c7b41cb56094e9f938d25fc parent ad5ea3cc5f745aef243ade0dafc8cf6f7f0bfea7 author Kylene Jo Hall Sun, 13 Nov 2005 16:07:42 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:17 -0800 [PATCH] tpm: dev_mask handling fix - Use ~, not ! - Remove unneeded cast Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad5ea3cc5f745aef243ade0dafc8cf6f7f0bfea7 tree f4d2e4b39df27db5120bef6187d344d2edc05d37 parent c0131c143204ee0ba00592c016f20ce6fc67827d author Kylene Jo Hall Sun, 13 Nov 2005 16:07:41 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:17 -0800 [PATCH] tpm: updates for new hardware This is the patch to support TPMs on power ppc hardware. It has been reworked as requested to remove the need for messing with the io page mask by just using ioremap. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c0131c143204ee0ba00592c016f20ce6fc67827d tree 088be5ed10bbe142c78d1d30a5f6c5b6a94b2985 parent 36174494b64ec0f6c2593af12d1cec97c9754192 author Kylene Jo Hall Sun, 13 Nov 2005 16:07:41 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:17 -0800 [PATCH] tpm: necessary PPC64 function exports Some work is needed in the tpm device driver to discover the TPM out of the device tree rather than based on set address on Power PPC. This patch exports a couple of functions for the parsing. Signed-off-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 36174494b64ec0f6c2593af12d1cec97c9754192 tree 849707fda27c41466eabae0119d6386826ddb7dc parent 113fab1386f0093602d9f48b424b945cafd3db23 author Diego Calleja Sun, 13 Nov 2005 16:07:40 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:17 -0800 [PATCH] oops-tracing: mention digital photos Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 113fab1386f0093602d9f48b424b945cafd3db23 tree 3d9f0853c2ce8ff846b5156ac91307f4107f3e8d parent ff6ed4063da39e6a30ce904005e4ed17385e2739 author matthieu castet Sun, 13 Nov 2005 16:07:39 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:17 -0800 [PATCH] fix leaks in request_firmware_nowait Wasn't checking return error and forgot to free in some case. Signed-off-by: Matthieu CASTET Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff6ed4063da39e6a30ce904005e4ed17385e2739 tree 92b9f86e02708f2c5ba3c7f5507a4a404d966f63 parent ec63f22dc31de19b273b7aca66e73ae85cc2418e author Andrew Morton Sun, 13 Nov 2005 16:07:38 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:17 -0800 [PATCH] acct.h needs jiffies.h allnoconfig: In file included from fs/super.c:28: include/linux/acct.h:173: warning: `TICK_NSEC' is not defined Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec63f22dc31de19b273b7aca66e73ae85cc2418e tree 5a699bebc15b1feab998cec131ec419ccb8db072 parent 5ef1c49f8f9f0d6b5b8d57bb4b66c605a3d65876 author Johann Lombardi Sun, 13 Nov 2005 16:07:36 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:17 -0800 [PATCH] ext2: remove duplicate newlines in ext2_fill_super ext2_warning() already adds a newline. Signed-off-by: Johann Lombardi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ef1c49f8f9f0d6b5b8d57bb4b66c605a3d65876 tree 8431e60b0f5ebb4f22b0f4bffbc6f0ebb0faf601 parent d00689af6b3b6ba9e1fdefec3bd62edc860c385d author Zach Brown Sun, 13 Nov 2005 16:07:35 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:16 -0800 [PATCH] aio: don't ref kioctx after decref in put_ioctx put_ioctx's refcount debugging was doing an atomic_read after dropping its reference when it wasn't the last ref, leaving a tiny race for another freeing thread to sneak into. This shifts the debugging before the ops, uses BUG_ON, and reformats the defines a little. Sadly, moving to inlines increased the code size but this change decreases the code size by a whole 9 bytes :) Signed-off-by: Zach Brown Cc: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d00689af6b3b6ba9e1fdefec3bd62edc860c385d tree 823a0998010a3074f8ae3cd0874de0cb91be719c parent 20dcae32439384b6863c626bb3b2a09bed65b33e author Zach Brown Sun, 13 Nov 2005 16:07:34 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:16 -0800 [PATCH] aio: replace locking comments with assert_spin_locked() aio: replace locking comments with assert_spin_locked() Signed-off-by: Zach Brown Acked-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20dcae32439384b6863c626bb3b2a09bed65b33e tree 9750c39119447fb32963448bf1935e1ba22b2f9d parent 4557398f8cbaf9f254cff747534b4724c7f75c4f author Zach Brown Sun, 13 Nov 2005 16:07:33 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:16 -0800 [PATCH] aio: remove kioctx from mm_struct Sync iocbs have a life cycle that don't need a kioctx. Their retrying, if any, is done in the context of their owner who has allocated them on the stack. The sole user of a sync iocb's ctx reference was aio_complete() checking for an elevated iocb ref count that could never happen. No path which grabs an iocb ref has access to sync iocbs. If we were to implement sync iocb cancelation it would be done by the owner of the iocb using its on-stack reference. Removing this chunk from aio_complete allows us to remove the entire kioctx instance from mm_struct, reducing its size by a third. On a i386 testing box the slab size went from 768 to 504 bytes and from 5 to 8 per page. Signed-off-by: Zach Brown Acked-by: Benjamin LaHaise Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4557398f8cbaf9f254cff747534b4724c7f75c4f tree 052b59279b1312a4fde83a76feb4a7a0c5cf7df1 parent c5b609797b8e212dbfaf23944da8bf8c53233d5c author Kirill Korotaev Sun, 13 Nov 2005 16:07:30 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:16 -0800 [PATCH] stop_machine() vs. synchronous IPI send deadlock This fixes deadlock of stop_machine() vs. synchronous IPI send. The problem is that stop_machine() disables interrupts before disabling preemption on other CPUs. So if another CPU is preempted and then calls something like flush_tlb_all() it will deadlock with CPU doing stop_machine() and which can't process IPI due to disabled IRQs. I changed stop_machine() to do the same things exactly as it does on other CPUs, i.e. it should disable preemption first on _all_ CPUs including itself and only after that disable IRQs. Signed-off-by: Kirill Korotaev Cc: Rusty Russell Cc: "Andrey Savochkin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5b609797b8e212dbfaf23944da8bf8c53233d5c tree dfebd49ff8f1545bb2609c4d6f649e416a3f8a9f parent 8426e1f6af0fd7f44d040af7263750c5a52f3cc3 author Clemens Buchacher Sun, 13 Nov 2005 16:07:26 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:16 -0800 [PATCH] arch/mips/au1000/common/usbdev.c: don't concatenate __FUNCTION__ with strings It's deprecated. Use "%s", __FUNCTION__ instead. Signed-off-by: Clemens Buchacher Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8426e1f6af0fd7f44d040af7263750c5a52f3cc3 tree 827bd2588c2b73d11cea6869de8ff42dba134375 parent 4a6dae6d382e9edf3ff440b819e554ed706359bc author Nick Piggin Sun, 13 Nov 2005 16:07:25 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:16 -0800 [PATCH] atomic: inc_not_zero Introduce an atomic_inc_not_zero operation. Make this a special case of atomic_add_unless because lockless pagecache actually wants atomic_inc_not_negativeone due to its offset refcount. Signed-off-by: Nick Piggin Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a6dae6d382e9edf3ff440b819e554ed706359bc tree 2945a5095973e2ecf05b503d6deb859083045b8e parent 53e86b91b7ae66d4c2757195cbd42e00d9199cf2 author Nick Piggin Sun, 13 Nov 2005 16:07:24 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:16 -0800 [PATCH] atomic: cmpxchg Introduce an atomic_cmpxchg operation. Signed-off-by: Nick Piggin Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53e86b91b7ae66d4c2757195cbd42e00d9199cf2 tree 80c44aeb046ac91a5bc7465da91a7b2519c53096 parent dbdf65b1b7f8ec48bda1604cfea7ac09ce583d6b author Nick Piggin Sun, 13 Nov 2005 16:07:23 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:15 -0800 [PATCH] i386: generic cmpxchg - Make cmpxchg generally available on the i386 platform. - Provide emulation of cmpxchg suitable for uniprocessor if built and run on 386. From: Christoph Lameter - Cut down patch and small style changes. Signed-off-by: Nick Piggin Signed-off-by: Christoph Lameter Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbdf65b1b7f8ec48bda1604cfea7ac09ce583d6b tree f6a278d3e0353beb777d4ed2414cae1d00a31602 parent 66341a905ef5b3e7aea65b5d9bd1b0361b0ccc61 author Ingo Molnar Sun, 13 Nov 2005 16:07:22 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:15 -0800 [PATCH] rcutorture: renice to low priority Make the box usable for interactive work when running the RCU torture test, by renicing the RCU torture-test threads to +19 by default. Kthreads run at nice -5 by default. Signed-off-by: Ingo Molnar Acked-by: Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66341a905ef5b3e7aea65b5d9bd1b0361b0ccc61 tree e993af70651ea563a3d960b2297301ddeb2616bd parent 0f5c79f2920cbc21c718daeb0b12d69acf4de163 author Paul Mundt Sun, 13 Nov 2005 16:07:21 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:15 -0800 [PATCH] Shut up per_cpu_ptr() on UP Currently per_cpu_ptr() doesn't really do anything with 'cpu' in the UP case. This is problematic in the cases where this is the only place the variable is referenced: CC kernel/workqueue.o kernel/workqueue.c: In function `current_is_keventd': kernel/workqueue.c:460: warning: unused variable `cpu' Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f5c79f2920cbc21c718daeb0b12d69acf4de163 tree 7262b881bedb68c7732adbc5254ecbede04891ac parent 0ff1b2c8ceaf92197f756be569afefd593c56f68 author Luiz Fernando Capitulino Sun, 13 Nov 2005 16:07:20 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:15 -0800 [PATCH] Fix sparse warning in proc/task_mmu.c fs/proc/task_mmu.c:198:33: warning: Using plain integer as NULL pointer Signed-off-by: Luiz Capitulino Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ff1b2c8ceaf92197f756be569afefd593c56f68 tree 39b7dbd20533193ae2bd79cc3187fe52d15104a1 parent ab4eb43ce759559d7b15c5dde4a1562f202539f6 author Paul Fulghum Sun, 13 Nov 2005 16:07:19 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:15 -0800 [PATCH] synclink: update to use DMA mapping API Update synclink to use DMA mapping API. This removes warning about isa_virt_to_bus() usage on architectures other than i386 Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab4eb43ce759559d7b15c5dde4a1562f202539f6 tree c0aa2996c8c2c85652a440c3e64884d8d355a4d6 parent b17b0421d70f5b85a791afe145a16d5ca5f849aa author Denis Lunev Sun, 13 Nov 2005 16:07:17 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:15 -0800 [PATCH] ext3: journal handling on error path in ext3_journalled_writepage() This patch fixes lost referrence on ext3 current handle in ext3_journalled_writepage(). Signed-Off-By: Denis Lunev Cc: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b17b0421d70f5b85a791afe145a16d5ca5f849aa tree 0aca6753added9c76681d6eb63294a1943597dd9 parent ba260e23efbabcff975f60401475c2bdd693f872 author Heiko Carstens Sun, 13 Nov 2005 16:07:14 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:15 -0800 [PATCH] signal handling: revert sigkill priority fix This patch reverts commit c33880aaddbbab1ccf36f4457ed1090621f2e39a since it's not needed anymore. As pointed out by Roland McGrath the real fix is to deliver all signals before returning to user space. See http://www.ussg.iu.edu/hypermail/linux/kernel/0509.2/0683.html A fix for s390 has been merged. Signed-off-by: Heiko Carstens Cc: Roland McGrath Cc: Ingo Molnar Cc: Linus Torvalds Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba260e23efbabcff975f60401475c2bdd693f872 tree 61b78237e116abd22d15b4886c0e08f6bc63d243 parent 7a590611c0f1e1302c58fdfdc958f2d6bdddd78a author Paolo 'Blaisorblade' Giarrusso Sun, 13 Nov 2005 16:07:14 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:15 -0800 [PATCH] uml: fix daemon transport exit path bug Fix some exit path bugs in the daemon driver. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a590611c0f1e1302c58fdfdc958f2d6bdddd78a tree ad57f5bda5245af1d03ba10e15308487b1aae9c7 parent 55c033c1f6cdedc350c79c3198b542e3ab496899 author Paolo 'Blaisorblade' Giarrusso Sun, 13 Nov 2005 16:07:13 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:15 -0800 [PATCH] uml: fix access_ok The access_ok_tt() macro is bogus, in that a read access is unconditionally considered valid. I couldn't find in SCM logs the introduction of this check, but I went back to 2.4.20-1um and the definition was the same. Possibly this was done to avoid problems with missing set_fs() calls, but there can't be any I think because they would fail with SKAS mode. TT-specific code is still to check. Also, this patch joins common code together, and makes the "address range wrapping" check happen for all cases, rather than for only some. This may, possibly, be reoptimized at some time, but the current code doesn't seem clever, just confused. * Important: I've also had to change references to access_ok_{tt,skas} back to access_ok - the kernel wasn't that happy otherwise. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55c033c1f6cdedc350c79c3198b542e3ab496899 tree 9353452b17a4000a4bccb3746789e32f9dc6dddd parent fd9bc53b99a77aefe89d810d889aa6385565959b author Paolo 'Blaisorblade' Giarrusso Sun, 13 Nov 2005 16:07:11 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:14 -0800 [PATCH] uml console channels: fix the API of console_write Since the 4th param is unused, remove it altogether. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd9bc53b99a77aefe89d810d889aa6385565959b tree 4708580ff00b6c0acce085e3c402f6cd7fd8f311 parent c50d2c4d6685db9b45cf6521046296df5bc42592 author Paolo 'Blaisorblade' Giarrusso Sun, 13 Nov 2005 16:07:10 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:14 -0800 [PATCH] uml console channels: remove console_write wrappers We were using a long series of (stupid) wrappers which all call generic_console_write(). Since the wrappers only change the 4th param, which is unused by the called proc, remove them and call generic_console_write() directly. If needed at any time in the future to reintroduce this stuff, the member could be moved to a generic struct, to avoid this duplicated handling. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c50d2c4d6685db9b45cf6521046296df5bc42592 tree f02d30dff1e3ca9793c69bf6ba2b0ee01c4e1a6b parent 85977376c73b7712ed3618888ade126075888c06 author Paolo 'Blaisorblade' Giarrusso Sun, 13 Nov 2005 16:07:07 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:14 -0800 [PATCH] uml: fix mcast network driver error handling printk clears the host errno (I verified this in debugging and it's reasonable enough, given that it ends via a write call on some fd, especially since printk() goes on /dev/tty0 which is often the host stdout). So save errno earlier. There's no reason to change the printk calls to use -err rather than errno - the assignment can't clear errno. And in the first failure path, we used to return 0 too (and this time more clearly), which is totally wrong. 0 is a success fd, which is then registered and gives a "registering fd twice" warning. Finally, fix up some whitespace. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85977376c73b7712ed3618888ade126075888c06 tree cf59a0f056d6fcabdf16a67e3c915824f0f66001 parent 3b8d108a6e7992a53e0736abefac1b2e07ce98de author Paolo 'Blaisorblade' Giarrusso Sun, 13 Nov 2005 16:07:06 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:14 -0800 [PATCH] uml: fixups for "reuse i386 cpu-specific tuning" A few fixups - show the new submenu only for x86 subarchitecture (it does not make sense to show it for x86_64 users) and remove X86_CMPXCHG, which is now a duplicate of Kconfig.i386, even though Kconfig doesn't complain (we also miss the dependency on !M386 CPU). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b8d108a6e7992a53e0736abefac1b2e07ce98de tree 0822d1738e680c21d2b8388d31750823c5f7272d parent cbc24afa82106b67df804cb434739e4382eecd9a author Paolo 'Blaisorblade' Giarrusso Sun, 13 Nov 2005 16:07:04 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:14 -0800 [PATCH] uml: micro fixups to arch Kconfig Remove a stone-age comment (UM *does* have a MMU, i.e. the host), and fix a dependency (introduced in commit 02edeb586ae4cdd17778923674700edb732a4741) to do what was intended. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cbc24afa82106b67df804cb434739e4382eecd9a tree e89a253539f50ea324754af3f75515d19413b48f parent 2ab23c95a0b77d45dc764dd4aed48fe6e8906e59 author Paolo 'Blaisorblade' Giarrusso Sun, 13 Nov 2005 16:07:04 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:14 -0800 [PATCH] uml: remove bogus WARN_ON, triggerable harmlessly on a page fault race The below warning was added in place of pte_mkyoung(); if (is_write) pte_mkdirty(); In fact, if the PTE is not marked young/dirty, our dirty/accessed bit emulation would cause the TLB permission not to be changed, and so we'd loop, and given we don't support preemption yet, we'd busy-hang here. However, I've seen this warning trigger without crashes during a loop of concurrent kernel builds, at random times (i.e. like a race condition), and I realized that two concurrent faults on the same page, one on read and one on write, can trigger it. The read fault gets serviced and the PTE gets marked writable but clean (it's possible on a shared-writable mapping), while the generic code sees the PTE was already installed and returns without action. In this case, we'll see another fault and service it normally. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ab23c95a0b77d45dc764dd4aed48fe6e8906e59 tree 025735a1a35238ca2e2045b68322d350ad6d81b5 parent 3b66a1edb01b82269a668a478625765b1fa4936f author Paolo 'Blaisorblade' Giarrusso Sun, 13 Nov 2005 16:07:00 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:14 -0800 [PATCH] Kbuild: index asm-$(SUBARCH) headers for UML In Uml, many definitions are borrowed from underlying subarch headers (with #include ). And it has become annoying to keep switching tag files all time, so by default index the underlying subarch headers too. Btw, it adds negligible space to the tags file (less than 1M surely, IIRC it was around 500k over 40M). Finally, preserve the ALLSOURCE_ARCHS command line option (I hope) - if it is set, it is used for headers too as before. But check my construct please, I didn't test this. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Acked-by: Jeff Dike Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b66a1edb01b82269a668a478625765b1fa4936f tree 417ead0264e34fdd1ec345a26d8670427be4829c parent abd03753bd1532c05eb13231569a5257b007e29c author Roman Zippel Sun, 13 Nov 2005 16:06:59 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:14 -0800 [PATCH] m68k: convert thread flags to use bit fields Remove task_work structure, use the standard thread flags functions and use shifts in entry.S to test the thread flags. Add a few local labels to entry.S to allow gas to generate short jumps. Finally it changes a number of inline functions in thread_info.h to macros to delay the current_thread_info() usage, which requires on m68k a structure (task_struct) not yet defined at this point. Signed-off-by: Roman Zippel Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit abd03753bd1532c05eb13231569a5257b007e29c tree 339e8c12169a2d04ba209f0bc8902859e6596bbf parent f037360f2ed111fe89a8f5cb6ba351f4e9934e53 author Al Viro Sun, 13 Nov 2005 16:06:58 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:14 -0800 [PATCH] m68k: m68k-specific thread_info changes a) added embedded thread_info [m68k processor.h] b) added missing symbols in asm-offsets.c c) task_thread_info() and friends in asm-m68k/thread_info.h d) made m68k thread_info.h included by m68k processor.h, not the other way round. Signed-off-by: Al Viro Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f037360f2ed111fe89a8f5cb6ba351f4e9934e53 tree 5978627d4252a7faf6d4fb9577fe8aa55e5db648 parent 10ebffde3d3916026974352b7900e44afe2b243f author Al Viro Sun, 13 Nov 2005 16:06:57 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:13 -0800 [PATCH] m68k: thread_info header cleanup a) in smp_lock.h #include of sched.h and spinlock.h moved under #ifdef CONFIG_LOCK_KERNEL. b) interrupt.h now explicitly pulls sched.h (not via smp_lock.h from hardirq.h as it used to) c) in three more places we need changes to compensate for (a) - one place in arch/sparc needs string.h now, hardirq.h needs forward declaration of task_struct and preempt.h needs direct include of thread_info.h. d) thread_info-related helpers in sched.h and thread_info.h put under ifndef __HAVE_THREAD_FUNCTIONS. Obviously safe. Signed-off-by: Al Viro Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10ebffde3d3916026974352b7900e44afe2b243f tree ac88fa33694f5bea1b6958e1e56bcd4c9b95b002 parent a1261f54611ec4ad6a7ab7080f86747e3ac3685b author Al Viro Sun, 13 Nov 2005 16:06:56 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:13 -0800 [PATCH] m68k: introduce setup_thread_stack() and end_of_stack() encapsulates the rest of arch-dependent operations with thread_info access. Two new helpers - setup_thread_stack() and end_of_stack(). For normal case the former consists of copying thread_info of parent to new thread_info and the latter returns pointer immediately past the end of thread_info. Signed-off-by: Al Viro Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1261f54611ec4ad6a7ab7080f86747e3ac3685b tree 8a65c419da590e3712543f69284fb5f8cd613a37 parent 7feacd53347c04aee789ba5d632eda0c3fc421c4 author Al Viro Sun, 13 Nov 2005 16:06:55 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:13 -0800 [PATCH] m68k: introduce task_thread_info new helper - task_thread_info(task). On platforms that have thread_info allocated separately (i.e. in default case) it simply returns task->thread_info. m68k wants (and for good reasons) to embed its thread_info into task_struct. So it will (in later patch) have task_thread_info() of its own. For now we just add a macro for generic case and convert existing instances of its body in core kernel to uses of new macro. Obviously safe - all normal architectures get the same preprocessor output they used to get. Signed-off-by: Al Viro Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7feacd53347c04aee789ba5d632eda0c3fc421c4 tree 87050958ebdacb288dac2c1939e08149a0623b23 parent e27182088e607880713d9c286a3d92d861c280e4 author Tim Mann Sun, 13 Nov 2005 16:06:54 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:13 -0800 [PATCH] x86: fix cpu_khz with clock=pit Fix http://bugzilla.kernel.org/show_bug.cgi?id=5546 The cpu_khz global is not initialized and remains 0 if you boot with clock=pit, even if the processor does have a TSC. This may have bad ramifications since the variable is used in various places scattered around the kernel, though I didn't check them all to see if they can tolerate cpu_khz = 0. You can observe the problem by doing "cat /proc/cpuinfo"; the cpu MHz line says 0.000. The fix is trivial; call init_cpu_khz() from init_pit(), just as it's called from the timers/timer_foo.c:init_foo() for other values of foo. Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e27182088e607880713d9c286a3d92d861c280e4 tree 2d2f43b45e377c3bfe093c2c0ca037d930f20176 parent 27d99f7ead8cd6d2231798bff0d4c38814afea22 author Jan Beulich Sun, 13 Nov 2005 16:06:52 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:13 -0800 [PATCH] i386: NMI pointer comparison fix Instruction pointer comparisons for the NMI on debug stack check/fixup were incorrect. From: Jan Beulich Cc: "Eric W. Biederman" Cc: Zwane Mwaikambo Acked-by: "Seth, Rohit" Cc: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27d99f7ead8cd6d2231798bff0d4c38814afea22 tree 877a80b0183dc5eab275163f120cd18bb3d222c2 parent 4694ca02d19f42f5fd0b62cc2d0c7d3e5a0eef47 author Adrian Bunk Sun, 13 Nov 2005 16:06:51 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:13 -0800 [PATCH] arch/i386/mm/init.c: small cleanups This patch contains the following cleanups: - make a needlessly global function static - every file should include the headers containing the prototypes for it's global functions Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4694ca02d19f42f5fd0b62cc2d0c7d3e5a0eef47 tree 7277e5a8f66c0816b353a833fad097950736103f parent 647422868e48c9abd8ab85ad2a7de9161170ec89 author Andrew Morton Sun, 13 Nov 2005 16:06:50 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:13 -0800 [PATCH] powerpc-xmon-build-fix arch/powerpc/xmon/xmon.c:525: error: syntax error before "xmon_irq" arch/powerpc/xmon/xmon.c:526: warning: return type defaults to `int' arch/powerpc/xmon/xmon.c: In function `xmon_irq': arch/powerpc/xmon/xmon.c:532: error: `IRQ_HANDLED' undeclared (first use in this function) arch/powerpc/xmon/xmon.c:532: error: (Each undeclared identifier is reported only once arch/powerpc/xmon/xmon.c:532: error: for each function it appears in.) Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 647422868e48c9abd8ab85ad2a7de9161170ec89 tree 8792808d399cf186e7906f04277b964b4e31ef2e parent 7fce260a6bf75080ef61408504add5618f90e41b author Kumar Gala Sun, 13 Nov 2005 16:06:49 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:13 -0800 [PATCH] ppc32: Add support for handling PCI interrupts on MPC834x PCI expansion card The MPC8349 PIBs system has a expansion board with 6 PCI slots. We needed to update the IDSEL interrupt mapping for it to work properly. However, only PCI1 is supported as the first revision of this expansion board doesn't function properly for PCI2. For the time being we have zero'd out the entries for the IDSELs related to PCI2. When a functioning expansion board exists we can fix the table. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fce260a6bf75080ef61408504add5618f90e41b tree 358032ca46888df92641bd32d0b88d5d2a1213d2 parent 50c85a19e7b3928b5b5188524c44ffcbacdd4e35 author Olof Johansson Sun, 13 Nov 2005 16:06:48 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:13 -0800 [PATCH] ppc: add support for new powerbooks Enablement patch for the new PowerBooks (late 2005 edition). This enables the ATA controller, Gigabit ethernet and basic AGP setup. Bluetooth works out-of-the box after running hid2hci. Still remaining is to get the touchpad to work, the simple change of just adding the new USB ids isn't enough. Signed-off-by: Olof Johansson Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50c85a19e7b3928b5b5188524c44ffcbacdd4e35 tree a886792eba2e11615c3846bc6b1c77c41ce6dda0 parent 065d41cb269e9debb18c6d5052e4de1088ae3d8f author Christoph Lameter Sun, 13 Nov 2005 16:06:47 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:12 -0800 [PATCH] slab: remove alloc_pages() calls The slab allocator never uses alloc_pages since kmem_getpages() is always called with a valid nodeid. Remove the branch and the code from kmem_getpages() Signed-off-by: Christoph Lameter Cc: Manfred Spraul Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 065d41cb269e9debb18c6d5052e4de1088ae3d8f tree db3fbad420fc3dec144c76ecc51cc1d72e31aef9 parent 669ed17521b9b78cdbeac8a53c30599aca9527ce author Pekka Enberg Sun, 13 Nov 2005 16:06:46 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:12 -0800 [PATCH] slab: convert cache to page mapping macros This patch converts object cache <-> page mapping macros to static inline functions to make the more explicit and readable. Signed-off-by: Pekka Enberg Cc: Manfred Spraul Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 669ed17521b9b78cdbeac8a53c30599aca9527ce tree 9a4c037120b7a85943c37115be9f4a6eacb28874 parent 2d6c666e8704cf06267f29a4fa3d2cf823469c38 author Nick Piggin Sun, 13 Nov 2005 16:06:45 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:12 -0800 [PATCH] mm: highmem watermarks The pages_high - pages_low and pages_low - pages_min deltas are the asynch reclaim watermarks. As such, the should be in the same ratios as any other zone for highmem zones. It is the pages_min - 0 delta which is the PF_MEMALLOC reserve, and this is the region that isn't very useful for highmem. This patch ensures highmem systems have similar characteristics as non highmem ones with the same amount of memory, and also that highmem zones get similar reclaim pressures to other zones. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d6c666e8704cf06267f29a4fa3d2cf823469c38 tree c53db43c6e936ae44f232ab5f04dfc6900230190 parent 7fb1d9fca5c6e3b06773b69165a73f3fb786b8ee author Paul Jackson Sun, 13 Nov 2005 16:06:44 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:12 -0800 [PATCH] mm: gfp_noreclaim cleanup Remove last remnant of the defunct early reclaim page logic, the no longer used __GFP_NORECLAIM flag bit. Signed-off-by: Paul Jackson Acked-by: Martin Hicks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fb1d9fca5c6e3b06773b69165a73f3fb786b8ee tree 21f8b7deeb8a7e1197edfccc610365a12d60322e parent 51c6f666fceb3184eeff045dad4432b602cd648e author Rohit Seth Sun, 13 Nov 2005 16:06:43 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:12 -0800 [PATCH] mm: __alloc_pages cleanup Clean up of __alloc_pages. Restoration of previous behaviour, plus further cleanups by introducing an 'alloc_flags', removing the last of should_reclaim_zone. Signed-off-by: Rohit Seth Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51c6f666fceb3184eeff045dad4432b602cd648e tree 33e29916e0fea872ba6f29eba698219a740b078f parent 885036d32f5d3c427c3e2b385b5a5503805e3e52 author Robin Holt Sun, 13 Nov 2005 16:06:42 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:12 -0800 [PATCH] mm: ZAP_BLOCK causes redundant work The address based work estimate for unmapping (for lockbreak) is and always was horribly inefficient for sparse mappings. The problem is most simply explained with an example: If we find a pgd is clear, we still have to call into unmap_page_range PGDIR_SIZE / ZAP_BLOCK_SIZE times, each time checking the clear pgd, in order to progress the working address to the next pgd. The fundamental way to solve the problem is to keep track of the end address we've processed and pass it back to the higher layers. From: Nick Piggin Modification to completely get away from address based work estimate and instead use an abstract count, with a very small cost for empty entries as opposed to present pages. On 2.6.14-git2, ppc64, and CONFIG_PREEMPT=y, mapping and unmapping 1TB of virtual address space takes 1.69s; with the following patch applied, this operation can be done 1000 times in less than 0.01s From: Andrew Morton With CONFIG_HUTETLB_PAGE=n: mm/memory.c: In function `unmap_vmas': mm/memory.c:779: warning: division by zero Due to zap_work -= (end - start) / (HPAGE_SIZE / PAGE_SIZE); So make the dummy HPAGE_SIZE non-zero Signed-off-by: Robin Holt Signed-off-by: Nick Piggin Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 885036d32f5d3c427c3e2b385b5a5503805e3e52 tree 7f442b309a749d8cbe0f2ac5c38531eeff8bfcd8 parent d4d28dd4b12649d02a89d19e6bd12ab92a6fcd4e author Kirill Korotaev Sun, 13 Nov 2005 16:06:41 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:12 -0800 [PATCH] mm: __GFP_NOFAIL fix In __alloc_pages(): if ((p->flags & (PF_MEMALLOC | PF_MEMDIE)) && !in_interrupt()) { /* go through the zonelist yet again, ignoring mins */ for (i = 0; zones[i] != NULL; i++) { struct zone *z = zones[i]; page = buffered_rmqueue(z, order, gfp_mask); if (page) { zone_statistics(zonelist, z); goto got_pg; } } goto nopage; <<<< HERE!!! FAIL... } kswapd (which has PF_MEMALLOC flag) can fail to allocate memory even when it allocates it with __GFP_NOFAIL flag. Signed-Off-By: Pavel Emelianov Signed-Off-By: Denis Lunev Signed-Off-By: Kirill Korotaev Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4d28dd4b12649d02a89d19e6bd12ab92a6fcd4e tree 36701174ef8a7b17b28800d20b9eb05e183ea6af parent 5d1b8c9ef6edbe5feea1439c428b9388b8dec6f8 author Andrew Morton Sun, 13 Nov 2005 16:06:40 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:12 -0800 [PATCH] shpchp_hpc build fix Missing include. Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d1b8c9ef6edbe5feea1439c428b9388b8dec6f8 tree da1c89491451ccde135b489f3803ed9080425e06 parent afdd3b3c8ee63c662bafc9194c182610b254c59b author Andrew Morton Sun, 13 Nov 2005 16:06:39 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:11 -0800 [PATCH] pciehp_hpc build fix drivers/pci/hotplug/pciehp_hpc.c:221: parse error before "pcie_isr" drivers/pci/hotplug/pciehp_hpc.c:221: warning: type defaults to `int' in declaration of `pcie_isr' drivers/pci/hotplug/pciehp_hpc.c:221: warning: data definition has no type or storage class drivers/pci/hotplug/pciehp_hpc.c: In function `hpc_release_ctlr': drivers/pci/hotplug/pciehp_hpc.c:715: implicit declaration of function `free_irq' drivers/pci/hotplug/pciehp_hpc.c: At top level: drivers/pci/hotplug/pciehp_hpc.c:839: parse error before "pcie_isr" drivers/pci/hotplug/pciehp_hpc.c:840: warning: return type defaults to `int' drivers/pci/hotplug/pciehp_hpc.c: In function `pcie_isr': drivers/pci/hotplug/pciehp_hpc.c:850: `IRQ_NONE' undeclared (first use in this function) drivers/pci/hotplug/pciehp_hpc.c:850: (Each undeclared identifier is reported only once drivers/pci/hotplug/pciehp_hpc.c:850: for each function it appears in.) drivers/pci/hotplug/pciehp_hpc.c:979: `IRQ_HANDLED' undeclared (first use in this function) drivers/pci/hotplug/pciehp_hpc.c: In function `pcie_init': drivers/pci/hotplug/pciehp_hpc.c:1362: implicit declaration of function `request_irq' Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afdd3b3c8ee63c662bafc9194c182610b254c59b tree 727bdffb6e06ac0af28219d78c6f5e0a020962e9 parent ae7642bb05623988d8ca82b332dad1ed7bdb8ceb author Richard Purdie Sun, 13 Nov 2005 16:06:38 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:11 -0800 [PATCH] w100fb: platform device conversion fixup Fix an error in w100fb after the platform device conversion. Signed-off-by: Richard Purdie Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae7642bb05623988d8ca82b332dad1ed7bdb8ceb tree 43c1c2f9c8144f8c8ac2974f878fdc448693c4f5 parent 5563e77078d85c4f107a0a673500c43ce57cf702 author Peter Osterlund Sun, 13 Nov 2005 16:06:36 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:11 -0800 [PATCH] packet writing oops fix There is an old bug in the pkt_count_states() function that causes stack corruption. When compiling with gcc 3.x or 2.x it is harmless, but gcc 4 allocates local variables differently, which makes the bug visible. Signed-off-by: Peter Osterlund Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5563e77078d85c4f107a0a673500c43ce57cf702 tree b9cacaa2f6ad595d6ade9e69f8a84d7c9b063048 parent 3c8d61bcf2d762fb84dbf741df400c833cada18a author Bob Picco Sun, 13 Nov 2005 16:06:35 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:11 -0800 [PATCH] cpuset: fix return without releasing semaphore It is wrong to acquire the semaphore and then return from cpuset_zone_allowed without releasing it. Signed-off-by: Bob Picco Acked-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c8d61bcf2d762fb84dbf741df400c833cada18a tree f09533e1da3af9d06cae0b2358d52f20a0e8b5e6 parent 89a071b80767c3a7ed56e13ae5e810f751b19eeb author Antonino A. Daplas Sun, 13 Nov 2005 16:06:34 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:11 -0800 [PATCH] nvidiafb: Fix bug in nvidiafb_pan_display nvidiafb_pan_display() is incorrectly using the fields in info->var instead of var passed to the function. Signed-off-by: Antonino Daplas Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89a071b80767c3a7ed56e13ae5e810f751b19eeb tree 22fb64641f13926ac2b66bc7078b3a280b6dca03 parent 005f18dfd0ed86c39716277b61dfb4bd2af91059 author akpm@osdl.org Sun, 13 Nov 2005 16:06:33 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:11 -0800 [PATCH] rpaphp_pci build fix (akpm: _machine is some ppc64 thing - this is a powerpc-only driver) Signed-off-by: Serge Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 005f18dfd0ed86c39716277b61dfb4bd2af91059 tree 8425228dc52bb38a5fe85d52afaecacca2f3a6fd parent ab767201881fec073157986c314485ab26caa4a0 author Christoph Hellwig Sun, 13 Nov 2005 16:06:33 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:11 -0800 [PATCH] fix task_struct leak in ptrace When ptrace_attach fails we need to drop the task_struct reference. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab767201881fec073157986c314485ab26caa4a0 tree 55620e21ee2f04193ed7f4a0da3a8a9e1fd6697a parent c53ca784dc3e72a17dc210bee0361e13ad83d4cd author Antonino A. Daplas Sun, 13 Nov 2005 16:06:32 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:10 -0800 [PATCH] fbdev: fix module dependency loop Exporting struct fb_display produces this warning error on depmod: WARNING: Module /lib/modules/2.6.14-mm2/kernel/drivers/video/console/fbcon_ud.ko ignored, due to loop WARNING: Module /lib/modules/2.6.14-mm2/kernel/drivers/video/console/fbcon_rotate.ko ignored, due to loop WARNING: Module /lib/modules/2.6.14-mm2/kernel/drivers/video/console/fbcon_cw.ko ignored, due to loop WARNING: Module /lib/modules/2.6.14-mm2/kernel/drivers/video/console/fbcon_ccw.ko ignored, due to loop WARNING: Module /lib/modules/2.6.14-mm2/kernel/drivers/video/console/fbcon.ko ignored, due to loop WARNING: Loop detected: /lib/modules/2.6.14-mm2/kernel/drivers/video/console/bitblit.ko needs Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c53ca784dc3e72a17dc210bee0361e13ad83d4cd tree 287609492338e589c0abd584ed6b6488ef65c0ed parent 4c8d3d997ef3c0594350fba716529905b314287e author Andrew Morton Sun, 13 Nov 2005 16:06:31 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:10 -0800 [PATCH] nv_of.c build fix drivers/video/nvidia/nv_of.c:33: error: redefinition of `nvidia_probe_of_connector' drivers/video/nvidia/nv_proto.h:51: error: `nvidia_probe_of_connector' previously defined here Because the inline version depends on !CONFIG_FB_OF and the out-of-line version depends on CONFIG_PPC_OF. Ben said: "Yes, CONFIG_PPC_OF is the right one, must be a typo." Cc: Benjamin Herrenschmidt C: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c8d3d997ef3c0594350fba716529905b314287e tree 8439efcf2aa645a0e9bebd9e40d138c95d279671 parent c1986ee9bea3d880bcf0d3f1a31e055778f306c7 author Kumar Gala Sun, 13 Nov 2005 16:06:30 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:10 -0800 [PATCH] Update email address for Kumar Changed jobs and the Freescale address is no longer valid. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1986ee9bea3d880bcf0d3f1a31e055778f306c7 tree 3263955bb33dd3efa0a34aaae5f160c2598a4706 parent 77c44ab1d8e9da31bf927223e1579b44f772b579 author Harald Welte Sun, 13 Nov 2005 16:06:29 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:10 -0800 [PATCH] New Omnikey Cardman 4000 driver Add new Omnikey Cardman 4000 smartcard reader driver Signed-off-by: Harald Welte Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77c44ab1d8e9da31bf927223e1579b44f772b579 tree 41d3ca7805c13e8f7b1c0f4d9f2c6e4e5f8b09c5 parent bca73e4bf8563d83f7856164caa44d5f42e44cca author Harald Welte Sun, 13 Nov 2005 16:06:26 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:10 -0800 [PATCH] New Omnikey Cardman 4040 driver Add new Omnikey Cardman 4040 smartcard reader driver Signed-off-by: Harald Welte Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bca73e4bf8563d83f7856164caa44d5f42e44cca tree ea8c50adca509c8012aed715d578b6c927f9e284 parent 95e861db3eaba7bc99f8605db70103ec3d078203 author Jeff Garzik Sun, 13 Nov 2005 16:06:25 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:10 -0800 [PATCH] move pm_register/etc. to CONFIG_PM_LEGACY, pm_legacy.h Since few people need the support anymore, this moves the legacy pm_xxx functions to CONFIG_PM_LEGACY, and include/linux/pm_legacy.h. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 95e861db3eaba7bc99f8605db70103ec3d078203 tree 70f86b1acf1c8b1fb49f8bd11aaf5d81c39d0e97 parent d6c7ac081bf6cafcf780b919ee97978f1d01a0d7 author Eric Dumazet Sun, 13 Nov 2005 16:06:24 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:10 -0800 [PATCH] reorder struct files_struct The file_lock spinlock sits close to mostly read fields of 'struct files_struct' In SMP (and NUMA) environments, each time a thread wants to open or close a file, it has to acquire the spinlock, thus invalidating the cache line containing this spinlock on other CPUS. So other threads doing read()/write()/... calls that use RCU to access the file table are going to ask further memory (possibly NUMA) transactions to read again this memory line. Move the spinlock to another cache line, so that concurrent threads can share the cache line containing 'count' and 'fdt' fields. It's worth up to 9% on a microbenchmark using a 4-thread 2-package x86 machine. See http://marc.theaimsgroup.com/?l=linux-kernel&m=112680448713342&w=2 Signed-off-by: Eric Dumazet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6c7ac081bf6cafcf780b919ee97978f1d01a0d7 tree ad8fb06018e2f89ae81e6bdc4b38f75aa546d379 parent 47936357c0d14809c3c9547e532511f6625654b2 author Karsten Wiese Sun, 13 Nov 2005 16:06:22 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:10 -0800 [PATCH] x86_64 two timer entries in /sys attached patch renames one instance of /sys/devices/system/timer to /sys/devices/system/timer_pit to avoid a name clash with another instance created in time.c. Acked-by: Andi Kleen Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47936357c0d14809c3c9547e532511f6625654b2 tree a0b05cdc13fa9192ed9d167b5597eafab998ffaf parent 4ba529a8a39e15688b6a3d31b11930d1f8a1edad author Siddha, Suresh B Sun, 13 Nov 2005 16:06:21 -0800 committer Linus Torvalds Sun, 13 Nov 2005 18:14:09 -0800 [PATCH] x86_64: fix tss limit Fix the x86_64 TSS limit in TSS descriptor. Signed-off-by: Suresh Siddha Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c9d39130123238ac18478a42e25cb7996eacfcc0 tree 7aaae5b14ebfb42f160fe3035ea28f1ba3475106 parent 2a47ce06d534692f9bd2bf4e90a20fc9b1054c39 author Jeff Garzik Sun, 13 Nov 2005 17:47:51 -0500 committer Jeff Garzik Sun, 13 Nov 2005 17:47:51 -0500 [libata sata_mv] fix tons of 50XX bugs commit 4ba529a8a39e15688b6a3d31b11930d1f8a1edad tree 4a57f09fd8b96f1eb5f87f52fd0862db49f29e31 parent 41866a56cc4e676240b94ed8eaeca375aaef7496 parent dcc2d1e7f0acf7d3f7ae632a73cd5f828ef9de20 author Linus Torvalds Sun, 13 Nov 2005 13:45:00 -0800 committer Linus Torvalds Sun, 13 Nov 2005 13:45:00 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit dcc2d1e7f0acf7d3f7ae632a73cd5f828ef9de20 tree f1c557e34750a76b0e6489c6a0638709d8ff48a7 parent e12a1be6e8fa47ae6cdc4127a1b4640e19c288eb author Mark Lord Sun, 13 Nov 2005 16:22:06 -0500 committer Jeff Garzik Sun, 13 Nov 2005 16:22:06 -0500 [libata passthru] address slave devices correctly commit e12a1be6e8fa47ae6cdc4127a1b4640e19c288eb tree a92513a9fe7c3023961e537888a620cf7525c68d parent e9c05afa80ba9368ec5f78d493b17a8f836ef508 author Mark Lord Sat, 12 Nov 2005 18:55:45 -0500 committer Jeff Garzik Sun, 13 Nov 2005 16:19:26 -0500 [PATCH] libata: fix comments on ata_tf_from_fis() Fix description on comments for ata_tf_from_fis(). Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit 41866a56cc4e676240b94ed8eaeca375aaef7496 tree c389af72c041d4f105654ed28aacc6e582cb79e5 parent f3a9388e4ebea57583272007311fffa26ebbb305 parent 5b9d1f19a7d6f13a97ac3eea9a1caea011ebd0ae author Linus Torvalds Sun, 13 Nov 2005 12:30:14 -0800 committer Linus Torvalds Sun, 13 Nov 2005 12:30:14 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6 commit 5b9d1f19a7d6f13a97ac3eea9a1caea011ebd0ae tree 8cb9166cee468317077382318de2ca8d43eab369 parent ef63d0049a28008c133e83743681c66e8b0872be author Thomas Gleixner Sun, 13 Nov 2005 19:33:24 +0100 committer Thomas Gleixner Sun, 13 Nov 2005 19:33:24 +0100 [JFFS2] Remove broken and useless debug code Signed-off-by: Thomas Gleixner commit ef63d0049a28008c133e83743681c66e8b0872be tree fc8aedc24d043e8e71c81fda615fbd1ab7457ace parent 9e6c67fd2716720d9029d38ea25884efcfdedeb6 author Sean Young Wed, 09 Nov 2005 00:12:50 +0000 committer Thomas Gleixner Sun, 13 Nov 2005 19:30:44 +0100 [MTD] maps: Replace dependency on non existing config option CONFIG_ELAN doesn't exist any more; CONFIG_X86_ELAN is too specific so make ts-5500 memory map dependant on CONFIG_X86. Signed-off-by: Sean Young Signed-off-by: Thomas Gleixner commit f3a9388e4ebea57583272007311fffa26ebbb305 tree c37a25e923505c9a62855b1e0ef822f7231e1a5a parent dc15ae14e97ee9d5ed740cbb0b94996076d8b37e author Chris Wright Fri, 11 Nov 2005 17:20:14 -0800 committer Trond Myklebust Sun, 13 Nov 2005 12:29:58 -0500 [PATCH] VFS: local denial-of-service with file leases Remove time_out_leases() printk that's easily triggered by users. Signed-off-by: Chris Wright Signed-off-by: Trond Myklebust commit dc15ae14e97ee9d5ed740cbb0b94996076d8b37e tree a159edc76dedf81d73f17d844fbf965d5ded9f39 parent 9e6c67fd2716720d9029d38ea25884efcfdedeb6 author J. Bruce Fields Thu, 10 Nov 2005 19:08:00 -0500 committer Trond Myklebust Sun, 13 Nov 2005 12:29:54 -0500 [PATCH] VFS: Fix memory leak with file leases The patch http://linux.bkbits.net:8080/linux-2.6/diffs/fs/locks.c@1.70??nav=index.html introduced a pretty nasty memory leak in the lease code. When freeing the lease, the code in locks_delete_lock() will correctly clean up the fasync queue, but when we return to fcntl_setlease(), the freed fasync entry will be reinstated. This patch ensures that we skip the call to fasync_helper() when we're freeing up the lease. Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit e9c05afa80ba9368ec5f78d493b17a8f836ef508 tree 294ea4be14e6ad608d5e354d81605514858ca600 parent 9e6c67fd2716720d9029d38ea25884efcfdedeb6 author Tejun Heo Mon, 14 Nov 2005 00:24:18 +0900 committer Jeff Garzik Sun, 13 Nov 2005 10:31:43 -0500 [PATCH] sil24: add missing ata_pad_free() sil24_port_stop() is missing call to ata_pad_free() thus leaking pad buffer when a port is stopped. This patch adds it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ee31b337852ca8a65840702544ff5c64d37740f5 tree c3da8df25c4084c321e6a96888f7179272a78eaa parent 270c7a721548d116d9e054f48469e75cb0f35288 author Russell King Sun, 13 Nov 2005 15:28:51 +0000 committer Russell King Sun, 13 Nov 2005 15:28:51 +0000 [SERIAL] Fix Bug 4900: S3 resume oops with irattach - Thinkpad A21m If we fail to re-startup a serial port on resume, shut it down immediately and mark it as an error condition. Signed-off-by: Russell King commit bd5d080ab99642e3245ef7cfa54490384c01d878 tree f3a6c1a55d9ecf9e6fcecc4e57fe36a1240c0ce4 parent e8b6f7f437a624fc2e2a2ec92fbeffdcf6f0e11e author Richard Purdie Sun, 13 Nov 2005 10:07:48 +0000 committer Russell King Sun, 13 Nov 2005 10:07:48 +0000 [ARM] 3160/1: SharpSL: Add driver for Akita specific GPIOs Patch from Richard Purdie Add a driver for the extra GPIOs found on the Sharp SL-C1000 (Akita). These GPIOs are found on a Maxim MAX7310 I2C i/o expander chip. A generic GPIO driver for the MAX7310 was attempted but this mini driver is a much simpler and much more effective solution avoiding several issues and complexity the generic driver had (as discussed on LKML). The platform device is required so the device parent can be set correctly which ensures the device is one of the last to suspend and first to resume. Whilst the i2c suspend/resume calls can be influenced, nothing guarantees this is easlier/later than the subsystems the gpios are used on which are all independent of i2c (sound, irda, video/backlight etc.). Signed-off-by: Richard Purdie Signed-off-by: Russell King commit e8b6f7f437a624fc2e2a2ec92fbeffdcf6f0e11e tree 2b80123b811f59c733b6a77615bc4a236863be8d parent d72f25b0dfb0807bd758da56a7ed88c0eb6e70d8 author Richard Purdie Sun, 13 Nov 2005 10:07:47 +0000 committer Russell King Sun, 13 Nov 2005 10:07:47 +0000 [ARM] 3159/1: SharpSL: Add PM device driver for the SL-Cx00 machines. Patch from Richard Purdie Add a SharpSL PM device driver for the SL-Cxx00 machines. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit d72f25b0dfb0807bd758da56a7ed88c0eb6e70d8 tree 0e65a1e0dcfd8a374e9e7a2560f086ce77d3e0bf parent 865052fd51a4f95a9c61961198695877ddc3dc9e author Richard Purdie Sun, 13 Nov 2005 10:07:46 +0000 committer Russell King Sun, 13 Nov 2005 10:07:46 +0000 [ARM] 3158/1: SharpSL: Add PM device driver for the SL-C7x0 machines. Patch from Richard Purdie Add a SharpSL PM device driver for the SL-C7x0 machines. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 865052fd51a4f95a9c61961198695877ddc3dc9e tree 41fbd08bc2f9b3863855b3b7cbd19974ac29460c parent 1cf99be560e471a868e14b12c08b0ae383966cec author Russell King Sun, 13 Nov 2005 09:53:34 +0000 committer Russell King Sun, 13 Nov 2005 09:53:34 +0000 [ARM] Re-fix footbridge That's __phys_to_pfn, not __phy_to_pfn. Signed-off-by: Russell King commit 2a47ce06d534692f9bd2bf4e90a20fc9b1054c39 tree 5fb73a701184acc117509dbe20cd59c62e7034ec parent 101ffae26c23ea928fce6d31a8b4901327d91a15 author Jeff Garzik Sat, 12 Nov 2005 23:05:14 -0500 committer Jeff Garzik Sat, 12 Nov 2005 23:05:14 -0500 [libata sata_mv] call phy fixups during init, as well as phy reset commit 101ffae26c23ea928fce6d31a8b4901327d91a15 tree 1ca01659b0786b3d6968a2aa335a99890917522f parent 522479fb98c6667f081e75f87e298e413c0b1db8 author Jeff Garzik Sat, 12 Nov 2005 22:17:49 -0500 committer Jeff Garzik Sat, 12 Nov 2005 22:17:49 -0500 [libata sata_mv] move code around No content changes. Move 60xx code to be closer to other 60xx code. commit 522479fb98c6667f081e75f87e298e413c0b1db8 tree 2a2b52371dd840e054374f23ae607e4476db0ac0 parent 47c2b677daeed9c79ecb7167c211ff36876ea611 author Jeff Garzik Sat, 12 Nov 2005 22:14:02 -0500 committer Jeff Garzik Sat, 12 Nov 2005 22:14:02 -0500 [libata sata_mv] hardware initialization work Implement flash reset and PCI reset on 50xx and 60xx. Implement LED enable on 50xx. commit 47c2b677daeed9c79ecb7167c211ff36876ea611 tree 36bafb9418bde1aebb305560ca6c574ba49783b9 parent ba3fe8fb6a469390a14379519915f3c39a973d99 author Jeff Garzik Sat, 12 Nov 2005 21:13:17 -0500 committer Jeff Garzik Sat, 12 Nov 2005 21:13:17 -0500 [libata sata_mv] mv_hw_ops for hardware families; new errata - eliminate a bunch of redundant tests by creating a per-chip-family set of hooks, mv_hw_ops - implement more errata, from newer Marvell GPL'd driver commit ba3fe8fb6a469390a14379519915f3c39a973d99 tree c71db8064e18ea641015053444fb5c2cb87b7195 parent bca1c4eb9411533d613123618c0d127fae532595 author Jeff Garzik Sat, 12 Nov 2005 19:08:48 -0500 committer Jeff Garzik Sat, 12 Nov 2005 19:08:48 -0500 [libata sata_mv] move code around No content change, just prepping up future mv_hw_ops modularization. commit 807277cbf9a240b133ee378a53b65375088ef62a tree e908475eb7cd340b58946e2ab8b55b2573944dbc parent dfb279c97510da659816f4f055146bb1f9f0a870 author Dominik Brodowski Sat, 12 Nov 2005 23:34:06 +0100 committer Dominik Brodowski Sat, 12 Nov 2005 23:35:34 +0100 [PCMCIA] inform user of insertion and ejection events Print out minimal information in dmesg whnever a CardBus or PCMCIA card is inserted into or ejected from a slot. This will make debugging certain types of bugs much easier, and is similar to output produced by other hotpluggable buses. Signed-off-by: Dominik Brodowski commit 270c7a721548d116d9e054f48469e75cb0f35288 tree 48bbdab0e66424b8faa1ad95190e2315261e936a parent fa609435a6edaaca14a646d470d7e10abebc8604 author Florin Malita Sat, 12 Nov 2005 22:09:22 +0000 committer Russell King Sat, 12 Nov 2005 22:09:22 +0000 [SERIAL] sa1100_start_tx spinlock recursion The serial core aquires the port spinlock before calling port->ops->start_tx(), so sa1100_start_tx() shouldn't try to lock it again. BUG: spinlock recursion on CPU#0, init/1 lock: c0205f20, .magic: dead4ead, .owner: init/1, .owner_cpu: 0 [] (dump_stack+0x0/0x14) [] (spin_bug+0x0/0xbc) [] (_raw_spin_lock+0x0/0x170) r8 = 00000007 r7 = C02FE0070 [] (_spin_lock_irqsave+0x0/0x24) r4 = C0205F20 [] (sa1100_start_tx+0x0/0x40) r4 = C038C000 [] (__uart_start+0x0/0x5c) [] (uart_start+0x0/0x3 [] (uart_write+0x0/0xdc) [] (write_chan+0x0/0x370 Signed-off-by: Florin Malita Signed-off-by: Russell King commit fa609435a6edaaca14a646d470d7e10abebc8604 tree b7cb3600fc4f55f94bb87109974482c867d1ee9c parent 38801e2e54308ec52fc580c0fcdee98fe8696195 author Bjorn Helgaas Sat, 12 Nov 2005 22:06:31 +0000 committer Russell King Sat, 12 Nov 2005 22:06:31 +0000 [SERIAL] Claim Wacom tablet device on HP tc1100 tablet Claim the WACF005 device. This is the pen display pointing device on the HP Compaq tc1100 Tablet PC. More information about using this device, including using it as an X pointer device: http://www.theory.bham.ac.uk/staff/schofield/linux/tc1100/ Christopher Kemp did the legwork of determining that the WACF005 is really just a plain old UART and doing an initial ACPI driver (before we had PNPACPI), and David Ludlow confirmed that PNPACPI + the attached patch is now sufficient: pnp: Device 00:05 activated. ttyS4 at I/O 0x300 (irq = 4) is a 16550A Signed-off-by: Bjorn Helgaas Signed-off-by: Russell King commit 38801e2e54308ec52fc580c0fcdee98fe8696195 tree 8a9380d9aa5e5e5c824b1efc263773f6b70a42da parent 46677736bec5c44601987e8780e55bc242e0aa46 author Andrey Volkov Sat, 12 Nov 2005 22:04:06 +0000 committer Russell King Sat, 12 Nov 2005 22:04:06 +0000 [SERIAL] Fix mpc52xx_uart.c Fix copy-paste bug in mpc52xx_uart.c (pdev<->dev) Signed-off-by: Andrey Volkov Signed-off-by: Russell King commit 46677736bec5c44601987e8780e55bc242e0aa46 tree 09fe8cbf09d9aa6411177c9007ce2f7c2e6da920 parent fd8c597214f868df7c0055c54e27baaae8df9e70 author Ralf Baechle Sat, 12 Nov 2005 22:00:27 +0000 committer Russell King Sat, 12 Nov 2005 22:00:27 +0000 [SERIAL] dz: Use CKSEG1ADDR to setup mappings. Use physical addresses at the interface level, letting drivers remap them as appropriate. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ralf Baechle Signed-off-by: Russell King commit fd8c597214f868df7c0055c54e27baaae8df9e70 tree 8acdd232c7b5663768a8a1724caf9050fb37e1db parent 5c8c755ce508a9d41d8a8d80fff387cb4e2929fc author Ralf Baechle Sat, 12 Nov 2005 21:59:59 +0000 committer Russell King Sat, 12 Nov 2005 21:59:59 +0000 [SERIAL] dz: Nuke trailing whitespace Signed-off-by: Ralf Baechle Signed-off-by: Russell King commit 5c8c755ce508a9d41d8a8d80fff387cb4e2929fc tree 6db5a7e195068fc4ca20651a23f20a2b0350295e parent cd52d1ee9a92587b242d946a2300a3245d3b885a author Lennert Buytenhek Sat, 12 Nov 2005 21:58:05 +0000 committer Russell King Sat, 12 Nov 2005 21:58:05 +0000 [SERIAL] don't disable xscale serial ports after autoconfig xscale-type UARTs have an extra bit (UUE) in the IER register that has to be written as 1 to enable the UART. At the end of autoconfig() in drivers/serial/8250.c, the IER register is unconditionally written as zero, which turns off the UART, and makes any subsequent printch() hang the box. Since other 8250-type UARTs don't have this enable bit and are thus always 'enabled' in this sense, it can't hurt to enable xscale-type serial ports all the time as well. The attached patch changes the autoconfig() exit path to see if the port has an UUE enable bit, and if yes, to write UUE=1 instead of just putting a zero into IER, using the same test as is used at the beginning of serial8250_console_write(). Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 1cf99be560e471a868e14b12c08b0ae383966cec tree 369c50892ca80f92b7124dd16d3dbc93d61c72f3 parent c35bf4a593631850ab437b37ddcded4e05548e9e author Russell King Sat, 12 Nov 2005 21:49:36 +0000 committer Russell King Sat, 12 Nov 2005 21:49:36 +0000 [ARM] Use correct IO operations for Pleb Use read/write IO operations rather than in/out, as per other SA1100 platforms. Signed-off-by: Russell King commit dfb279c97510da659816f4f055146bb1f9f0a870 tree 0331d92f42f0d6746b85727b278ee799326853ff parent 9e6c67fd2716720d9029d38ea25884efcfdedeb6 author Dominik Brodowski Thu, 10 Nov 2005 16:26:13 +0100 committer Dominik Brodowski Sat, 12 Nov 2005 22:46:38 +0100 [PCMCIA] i82365: use new platform_device helpers Use the new platform_device helpers in the i82365 driver to get rid of the "device 'i823650' does not have a release() function" warning, and to solve bug #3676. Signed-off-by: Dominik Brodowski commit c35bf4a593631850ab437b37ddcded4e05548e9e tree 3eddeb74c817185935ae676d978d663dd95ee77f parent c5e1ae9729d97d3c543cc70d7865df1e724da0d0 author Pavel Machek Sat, 12 Nov 2005 20:25:25 +0000 committer Russell King Sat, 12 Nov 2005 20:25:25 +0000 [ARM] Fix collie for -rc1 This fixes compilation for collie after -rc1 platform_device changes. And yes, it even boots. Signed-off-by: Pavel Machek Signed-off-by: Russell King commit 9e6c67fd2716720d9029d38ea25884efcfdedeb6 tree 590d07900b52f148036fd99e1313a222b52cca51 parent 8225ccbaf01b459cf1e462047a51b2851e756bc1 parent 9ffb83bcc5c5337f980dc0576bf13ac9bd4fd33d author Linus Torvalds Sat, 12 Nov 2005 12:23:25 -0800 committer Linus Torvalds Sat, 12 Nov 2005 12:23:25 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 8225ccbaf01b459cf1e462047a51b2851e756bc1 tree a8949f6a3596a77370b5a698ff927674b830b511 parent a2d7222f0f5861ce13b9308c30bd18f28ebeb583 author Thomas Graf Sat, 12 Nov 2005 12:15:16 -0800 committer David S. Miller Sat, 12 Nov 2005 12:15:16 -0800 [IPV6]: Fix unnecessary GFP_ATOMIC allocation in fib6 dump Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit a2d7222f0f5861ce13b9308c30bd18f28ebeb583 tree 09d4dafe35b9cd4de344c4a8a63ef7d922466c2a parent efacfbcb6c88677809f44a574fbcd9824835dccb author Vlad Drukker Sat, 12 Nov 2005 12:13:14 -0800 committer David S. Miller Sat, 12 Nov 2005 12:13:14 -0800 [NETFILTER] {ip,nf}_conntrack TCP: Accept SYN+PUSH like SYN Some devices (e.g. Qlogic iSCSI HBA hardware like QLA4010 up to firmware 3.0.0.4) initiates TCP with SYN and PUSH flags set. The Linux TCP/IP stack deals fine with that, but the connection tracking code doesn't. This patch alters TCP connection tracking to accept SYN+PUSH as a valid flag combination. Signed-off-by: Vlad Drukker Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit efacfbcb6c88677809f44a574fbcd9824835dccb tree 6fea7fcaf7c979a0be6c370c3bb99736753e4ada parent 4f005551a8fac21b6fec8d10d57cd12d373d79e1 author Herbert Xu Sat, 12 Nov 2005 12:12:05 -0800 committer David S. Miller Sat, 12 Nov 2005 12:12:05 -0800 [IPV6]: Fix rtnetlink dump infinite loop The recent change to netlink dump "done" callback handling broke IPv6 which played dirty tricks with the "done" callback. This causes an infinite loop during a dump. The following patch fixes it. This bug was reported by Jeff Garzik. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 9ffb83bcc5c5337f980dc0576bf13ac9bd4fd33d tree 51d71d16b65077943284408cd80b290f8c6596df parent 535f8d65d808421a6e1730990e39d41885b1f951 author Christoph Hellwig Sat, 12 Nov 2005 12:11:12 -0800 committer David S. Miller Sat, 12 Nov 2005 12:11:12 -0800 [SBUSFB]: implement ->compat_ioctl This patch adds a new function, sbusfb_compat_ioctl() to drivers/video/sbuslib.c and uses it as compat_ioctl in all sbus fb drivers This remove the last per-arch compat ioctl bits in arch/sparc64/kernel/ioctl32.c so it would be nice if people could test if this actually copiles and works and if yes apply it :) Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 535f8d65d808421a6e1730990e39d41885b1f951 tree abfa0474dc3442e0584a8173cc6a5b1969556cb1 parent 4f005551a8fac21b6fec8d10d57cd12d373d79e1 author Christoph Hellwig Sat, 12 Nov 2005 12:10:54 -0800 committer David S. Miller Sat, 12 Nov 2005 12:10:54 -0800 [SPARC]: Fix RTC compat ioctl kernel log spam. On Fri, Nov 11, 2005 at 12:58:40PM -0800, David S. Miller wrote: > > This change: > > diff-tree 8ca2bdc7a98b9584ac5f640761501405154171c7 (from feee207e44d3643d19e648aAuthor: Christoph Hellwig > Date: Wed Nov 9 12:07:18 2005 -0800 > > [SPARC] sbus rtc: implement ->compat_ioctl > > Signed-off-by: Christoph Hellwig > Signed-off-by: David S. Miller > > results in the console now getting spewed on sparc64 systems > with messages like: > > [ 11.968298] ioctl32(hwclock:464): Unknown cmd fd(3) cmd(401c7014){00} arg(efc > What's happening is hwclock tries first the SBUS rtc device ioctls > then the normal rtc driver ones. > > So things actually worked better when we had the SBUS rtc compat ioctl > directly handled via the generic compat ioctl code. > > There are _so_ many rtc drivers in the kernel implementing the > generic rtc ioctls that I don't think putting a ->compat_ioctl > into all of them to fix this problem is feasible. Unless we > write a single rtc_compat_ioctl(), export it to modules, and hook > it into all of those somehow. > > But even that doesn't appear to have any pretty implementation. > > Any better ideas? We had similar problems with other ioctls where userspace did things like that. What we did there was to put the compat handler to generic code. The patch below does that, adding a big comment about what's going on and removing the COMPAT_IOCTL entires for these on powerpc that not only weren't ever useful but are duplicated now aswell. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 4f005551a8fac21b6fec8d10d57cd12d373d79e1 tree da64987344a6d30a80a3bb8fe559ba42951d43b4 parent 44e6f84e3597905816a0440e7218d2ed072120da author Dmitry Torokhov Sat, 12 Nov 2005 00:55:15 -0500 committer Linus Torvalds Sat, 12 Nov 2005 11:42:32 -0800 [PATCH] I8K: fix /proc reporting of blank service tags Make /proc/i8k display '?' when service tag is blank in BIOS. This fixes segfault in i8k gkrellm plugin. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit c5e1ae9729d97d3c543cc70d7865df1e724da0d0 tree c10757499cdc717b4b06166cb6dae2aa196239ce parent 94cabd003e989556d8bf84027d96284dc2d99c76 author Richard Purdie Sat, 12 Nov 2005 18:53:48 +0000 committer Russell King Sat, 12 Nov 2005 18:53:48 +0000 [ARM] 3154/1: SharpSL PM Driver updates Patch from Richard Purdie Updates to the SharpSL PM driver including cleanups from both Pavel Machek and myself and updates after the platform device changes to make it compile again. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 94cabd003e989556d8bf84027d96284dc2d99c76 tree f4f1d6ba9a6389c83f8d028c4a8c8aa6890c128b parent a1510210c45c9af5784d64596c7025997e1add7d author Richard Purdie Sat, 12 Nov 2005 18:53:48 +0000 committer Russell King Sat, 12 Nov 2005 18:53:48 +0000 [ARM] 3149/1: SharpSL: Add Akita (SL-C1000) machine support Patch from Richard Purdie Add the core machine support for the Sharp SL-C1000 (Akita) and enable the Kconfig selection for it. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 44e6f84e3597905816a0440e7218d2ed072120da tree cc39924c84f2b2fb4412af5786c304d93ace2824 parent ae5684ceb478bfbb7c3c5a49970e20f4701dbdf7 author Prakash Punnoor Sat, 12 Nov 2005 09:17:38 +0100 committer Linus Torvalds Sat, 12 Nov 2005 10:52:30 -0800 [PATCH] fix b2c2 dvb undefined symbol This fixes drivers/built-in.o: In function `flexcop_frontend_init': : undefined reference to `lgdt330x_attach' [ Side note: I really dislike that dvb people want to include every possible frontend into the kernel - I only need the mt312 one for my Skystar2 card. I'd highly appreciate it this would be made selectable again... ] Signed-off-by: Prakash Punnoor Signed-off-by: Linus Torvalds commit ae5684ceb478bfbb7c3c5a49970e20f4701dbdf7 tree 75a3fb196cc0c6d345fefcd49d304eb13d77a4ac parent 0fde7f591860e48dd210144ff24c061da03bfa39 parent 02eaa66629a29cd5712fe81a360c3ab5b1fc9531 author Linus Torvalds Sat, 12 Nov 2005 10:39:03 -0800 committer Linus Torvalds Sat, 12 Nov 2005 10:39:03 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 0fde7f591860e48dd210144ff24c061da03bfa39 tree b91c008b335a8fb252c636fd9ebc95f948556174 parent 3beb2077125d8457118140653e75efc998ac6630 author Linus Torvalds Sat, 12 Nov 2005 10:14:02 -0800 committer Linus Torvalds Sat, 12 Nov 2005 10:14:02 -0800 Revert "[PATCH] fbcon: Add rl (Roman Large) font" This reverts 998e6d51162707685336ff99c029c8911b270d32 commit. commit bca1c4eb9411533d613123618c0d127fae532595 tree d673342d82a88ac099bb71f38ec9015b335541a9 parent 9a68c1b9580886a2ff07a42733adb7583ee3d9ac author Jeff Garzik Sat, 12 Nov 2005 12:48:15 -0500 committer Jeff Garzik Sat, 12 Nov 2005 12:48:15 -0500 [libata sata_mv] implement a bunch of errata workarounds Based largely on the GPL'd Marvell vendor driver. commit a1510210c45c9af5784d64596c7025997e1add7d tree 74e6e944ec26b62a61c159934f4425604c57123d parent da2660d2c40496b1699c4de652f6d0cfd13937c0 author Russell King Sat, 12 Nov 2005 17:45:45 +0000 committer Russell King Sat, 12 Nov 2005 17:45:45 +0000 [ARM] Ensure sl82c105 IDE interfaces are serialized when using DMA We don't want to reset the DMA state machine while the other channel is in use. Signed-off-by: Russell King commit 9a68c1b9580886a2ff07a42733adb7583ee3d9ac tree 51ad4ed7ad9c4f95faab0bb743f58c116696ef57 parent 8b260248d9e0e8b64bb72fd4dee03ad86984c344 author Jeff Garzik Sat, 12 Nov 2005 12:40:41 -0500 committer Jeff Garzik Sat, 12 Nov 2005 12:40:41 -0500 [libata sata_mv] note driver is "HIGHLY EXPERIMENTAL" in Kconfig commit 8b260248d9e0e8b64bb72fd4dee03ad86984c344 tree c22783d6ca7df7efb03f0f3811afeaf51931b64e parent 095fec887eaa1c38d17c0c929a6733c744a9fa1f author Jeff Garzik Sat, 12 Nov 2005 12:32:50 -0500 committer Jeff Garzik Sat, 12 Nov 2005 12:32:50 -0500 [libata sata_mv] trim trailing whitespace commit 69177e890cd43e781c3aa9eed98ea091c4cb0788 tree 6c8c006a5d4d43d4c3e65cf240ba2b15435a563e parent cd52d1ee9a92587b242d946a2300a3245d3b885a author Russell King Sat, 12 Nov 2005 17:26:21 +0000 committer Russell King Sat, 12 Nov 2005 17:26:21 +0000 [MMC] mmci doesn't need asm/irq.h Signed-off-by: Russell King commit da2660d2c40496b1699c4de652f6d0cfd13937c0 tree 166088d0292c9f27d5d49eb0131cef34d605e2c4 parent 9648f552f9e08548a3979643b99f14c21c7d8f5b author Russell King Sat, 12 Nov 2005 17:21:47 +0000 committer Russell King Sat, 12 Nov 2005 17:21:47 +0000 [ARM] Restore apparant pointless change in arch/arm/kernel/smp.c Restore smp.c back to how it used to be. Signed-off-by: Russell King commit 9648f552f9e08548a3979643b99f14c21c7d8f5b tree 56ad9baae4679e1fecdb9ba5a754a57b79332b56 parent 6460177f42358a744e110cc583adbe8a36f6aa08 author Russell King Sat, 12 Nov 2005 16:57:29 +0000 committer Russell King Sat, 12 Nov 2005 16:57:29 +0000 [ARM] Fix broken sl82c105 DMA prevention We must _never_ _ever_ on pain of death enable IDE DMA on SL82C105 chipsets where the southbridge revision is <= 5, otherwise data corruption will occur. Strangely this used to work, but something has changed in the upper echelons of the IDE layer to break the hosts decision to deny DMA. Let's make it crystal clear to the IDE layer that we know best. Signed-off-by: Russell King commit 6460177f42358a744e110cc583adbe8a36f6aa08 tree c25e2413528c8435193b48db3b234df95d0268af parent cd52d1ee9a92587b242d946a2300a3245d3b885a author Russell King Sat, 12 Nov 2005 16:49:37 +0000 committer Russell King Sat, 12 Nov 2005 16:49:37 +0000 [ARM] Fix Footbridge-based machines Unfortunately, all these machines got broken when the PFN memory setup changes happened. Signed-off-by: Russell King commit 095fec887eaa1c38d17c0c929a6733c744a9fa1f tree 514d030ed343eab5c8aea18efea472b7ca6d393c parent 02eaa66629a29cd5712fe81a360c3ab5b1fc9531 author Jeff Garzik Sat, 12 Nov 2005 09:50:49 -0500 committer Jeff Garzik Sat, 12 Nov 2005 09:50:49 -0500 [libata sata_mv] minor fixes - clear SError and EDMA irq cause registers, after re-init'ing the phy - move enums with type suffix 'U' to their own enum commit 3beb2077125d8457118140653e75efc998ac6630 tree 130dd33c810471790554d21eab32f5f859715fd7 parent 5a7c47eefb31f6b4982add7473ef3e551b058ea4 author Tejun Heo Thu, 10 Nov 2005 18:22:36 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:57:05 +0100 [BLOCK] elevator: elv_latter/former_request update With generic dispatch queue update, implicit former/latter request handling using rq->queuelist.prev/next doesn't work as expected anymore. Also, the only iosched dependent on this feature was noop-iosched and it has been reimplemented to have its own latter/former methods. This patch removes implicit former/latter handling. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 5a7c47eefb31f6b4982add7473ef3e551b058ea4 tree 6bff2f1ab58080d759c8788680e05359ba0d5f69 parent b740d98f5614e34b4cff2e1e67826f007c8d4f30 author Tejun Heo Thu, 10 Nov 2005 18:21:30 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:56:52 +0100 [BLOCK] noop-iosched: reimplementation of request dispatching The original implementation directly used dispatch queue. As new generic dispatch queue imposes stricter rules over ioscheds and dispatch queue usage, this direct use becomes somewhat problematic. This patch reimplements noop-iosched such that it complies to generic iosched model better. Request merging with q->last_merge and rq->queuelist.prev/next work again now. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe Thu, 10 Nov 2005 18:20:16 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:56:36 +0100 [BLOCK] cfq-iosched: fix slice_left calculation When cfq slice expires, remainder of slice is calculated and stored in cfqq->slice_left. Current code calculates the opposite of remainder - how many jiffies the cfqq has used past slice end. This patch fixes the bug. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit be56123568072d223263a6a70a087d1e7faabb83 tree e6044bff3c9dba3392dfe1a4b172d87081d55334 parent 15853af9f07673680439b224519c692f1352b959 author Tejun Heo Thu, 10 Nov 2005 08:55:01 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:56:21 +0100 [BLOCK] fix string handling in elv_iosched_store elv_iosched_store doesn't terminate string passed from userspace if it's too long. Also, if the written length is zero (probably not possible), it accesses elevator_name[-1]. This patch fixes both bugs. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 15853af9f07673680439b224519c692f1352b959 tree e6a8fc1cd34dec568883cd62102e1e626d9241d9 parent 1b5ed5e1f1315e37380e55102f58bcae3344d2a7 author Tejun Heo Thu, 10 Nov 2005 08:52:05 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:56:06 +0100 [BLOCK] Implement elv_drain_elevator for improved switch error detection This patch adds request_queue->nr_sorted which keeps the number of requests in the iosched and implement elv_drain_elevator which performs forced dispatching. elv_drain_elevator checks whether iosched actually dispatches all requests it has and prints error message if it doesn't. As buggy forced dispatching can result in wrong barrier operations, I think this extra check is worthwhile. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 1b5ed5e1f1315e37380e55102f58bcae3344d2a7 tree 785dc9675e2f22b60017030063ba103740c72f16 parent 407df2aa29a33fe16f6ee4bac8cdfa414783b9f1 author Tejun Heo Thu, 10 Nov 2005 08:49:19 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:55:51 +0100 [BLOCK] cfq-iosched: cfq forced dispatching fix cfq forced dispatching might not return all requests on the queue. This bug can hang elevator switchinig and corrupt request ordering during flush sequence. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 407df2aa29a33fe16f6ee4bac8cdfa414783b9f1 tree 137e536d79e9fc777adc8c5bde842fea8b53d88a parent 47a004103d663bbba8c7c433a710a86f44351cf3 author Tejun Heo Thu, 10 Nov 2005 08:48:21 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:55:37 +0100 [BLOCK] elevator: run queue in elevator_switch elevator_dispatch needs to run queue after forced dispatching; otherwise, the queue might stall. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 47a004103d663bbba8c7c433a710a86f44351cf3 tree 91bf9479fa43e7a13b02b2f6b957373b5b28b5ef parent cff3ba2204a0797b05150a4b2b7f40a55023d952 author Jens Axboe Wed, 09 Nov 2005 13:38:47 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:55:21 +0100 [BLOCK] Document the READ/WRITE splitup of the disk stats Use the symbolic name where appropriate and add a comment to the disk_stats structure. Signed-off-by: Jens Axboe commit cff3ba2204a0797b05150a4b2b7f40a55023d952 tree 56d3527958ec1aee1f2c0b185134883095175012 parent b8ea2cb5120a92fe63053a2896be42abbb919a76 author Zachary Amsden Wed, 09 Nov 2005 13:24:20 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:55:05 +0100 [BLOCK] elevator init fixes #2 In addition to the first patch, which is probably goodness, I found the cause of my panic - applying this patch fixes it and now I am booting. If the chosen_elevator[] is not found, fall back to noop. Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit b8ea2cb5120a92fe63053a2896be42abbb919a76 tree edbe103c6c5c2fe971ee270d8b0e3ae7dab8af83 parent cd52d1ee9a92587b242d946a2300a3245d3b885a author Zachary Amsden Wed, 09 Nov 2005 13:23:01 +0100 committer Jens Axboe Sat, 12 Nov 2005 10:54:48 +0100 [BLOCK] elevator init fixes I got a panic in the elevator code, backtrace : Unable to handle kernel NULL pointer dereference at virtual address 00000060 .. EIP is at elevator_put+0x0/0x30 (null elevator_type passed) .. elevator_init+0x38 blk_init_queu_node+0xc9 floppy_init+0xdb do_initcalls+0x23 init+0x10a init+0x0 Clearly if the kmalloc here fails, e->elevator_type is not yet set; this appears to be the correct fix, but I think I probably hit the second case due to a race condition. Someone more familiar with the elevator code should look at this more closely until I can determine if I can reproduce. Signed-off-by: Zachary Amsden Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit 02eaa66629a29cd5712fe81a360c3ab5b1fc9531 tree 3223957cc38c553155b80435d946f828ecb38f6b parent 828d09de4a6c922517f533093583b9fe8cbf5808 author Jeff Garzik Sat, 12 Nov 2005 01:32:19 -0500 committer Jeff Garzik Sat, 12 Nov 2005 01:32:19 -0500 [libata ahci] set port ATAPI bit correctly Although according to the documentation this largely only affects desktop LED control, let's make sure we set the ATAPI bit when we have an ATAPI device attached to the port. commit 828d09de4a6c922517f533093583b9fe8cbf5808 tree 44ceae8c3ead9f534a0c31b03038dc253658ad9c parent cd52d1ee9a92587b242d946a2300a3245d3b885a author Jeff Garzik Sat, 12 Nov 2005 01:27:07 -0500 committer Jeff Garzik Sat, 12 Nov 2005 01:27:07 -0500 [libata ahci, qstor] fix miscount of scatter/gather entries Don't directly reference qc->n_elem, as that might cause an off-by-one error for misaligned (padded) ATAPI transfers.