commit c010b2f76c3032e48097a6eef291d8593d5d79a6 Merge: 6069fb2... 521c4d9... Author: Linus Torvalds Date: Tue Jul 22 19:09:51 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (82 commits) ipw2200: Call netif_*_queue() interfaces properly. netxen: Needs to include linux/vmalloc.h [netdrvr] atl1d: fix !CONFIG_PM build r6040: rework init_one error handling r6040: bump release number to 0.18 r6040: handle RX fifo full and no descriptor interrupts r6040: change the default waiting time r6040: use definitions for magic values in descriptor status r6040: completely rework the RX path r6040: call napi_disable when puting down the interface and set lp->dev accordingly. mv643xx_eth: fix NETPOLL build r6040: rework the RX buffers allocation routine r6040: fix scheduling while atomic in r6040_tx_timeout r6040: fix null pointer access and tx timeouts r6040: prefix all functions with r6040 rndis_host: support WM6 devices as modems at91_ether: use netstats in net_device structure sfc: Create one RX queue and interrupt per CPU package by default sfc: Use a separate workqueue for resets sfc: I2C adapter initialisation fixes ... commit 6069fb2ef5d4f47432359c97f350e0cfcc4d208e Author: Linus Torvalds Date: Tue Jul 22 19:06:00 2008 -0700 Re-delete zombie 'drivers/usb/serial/airprime.c' file Stephen Rothwell points out that this file got deleted (on purpose) by commit 640c1bce86d1e11ee6a1263fdf6170d3210b1684 ("USB: delete airprime driver"), but then almost immediately incorrectly resurrected by commit 95da310e66ee8090119596c70ca8432e57f9a97f ("usb_serial: API all change"). Delete it again. If it comes back, we'll need to drive a stake through its heart. Reported-by: Stephen Rothwell Acked-by: Greg KH Cc: Alan Cox Cc: Andrew Morton Signed-off-by: Linus Torvalds commit e9dd54da0ba494bd86c45bdf574a6fd6ff8f2210 Merge: 0988c37... 4a0a088... Author: Linus Torvalds Date: Tue Jul 22 19:04:22 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc32: pass -m32 when building vmlinux.lds sparc: Fixes the DRM layer build on sparc. ide: merge with ide: : use __raw_{read,write}w() ide: : use __raw_{read,write}w() ide: : use %r0 for outw_be() sparc64: Do not define BIO_VMERGE_BOUNDARY. commit 521c4d96e0840ecce25b956e00f416ed499ef2ba Author: David S. Miller Date: Tue Jul 22 18:32:47 2008 -0700 ipw2200: Call netif_*_queue() interfaces properly. netif_carrier_{on,off}() handles starting and stopping packet flow into the driver. So there is no reason to invoke netif_stop_queue() and netif_wake_queue() in response to link status events. Signed-off-by: David S. Miller commit 4255589293b78c4dab324323e12857876b154863 Author: David S. Miller Date: Tue Jul 22 18:29:10 2008 -0700 netxen: Needs to include linux/vmalloc.h Signed-off-by: David S. Miller commit 380bab10de09c22c813ae83f8e148f5a46c1de40 Merge: 7cf7526... d6f8aa8... Author: David S. Miller Date: Tue Jul 22 18:19:22 2008 -0700 Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit d6f8aa8586dabe605454f3c98a5c1a577c3e0cfb Author: Jeff Garzik Date: Tue Jul 22 21:17:38 2008 -0400 [netdrvr] atl1d: fix !CONFIG_PM build Signed-off-by: Jeff Garzik commit 7cf75262a4aafe1483349e897bf905e121314dff Merge: c8f1568... b0e4539... Author: David S. Miller Date: Tue Jul 22 17:54:47 2008 -0700 Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit b0e453902ad53580a77c2b1baddcc0b2d8ce8acc Author: Florian Fainelli Date: Mon Jul 21 12:32:29 2008 +0200 r6040: rework init_one error handling This patch reworks the error handling in r6040_init_one in order not to leak resources and correcly unmap and release PCI regions of the MAC. Also prefix printk's with the driver name for clarity. Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit 1de95294f16cab0e924e1b4cd9b554a6eca65e6e Author: Florian Fainelli Date: Sun Jul 13 14:36:04 2008 +0200 r6040: bump release number to 0.18 This patch bumps the release of the r6040 driver. There has been quite some versions of it out there, but this one is the one people should report bugs against. Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit e24ddf3aa8a2c4c14df1136e762c315c436488e7 Author: Florian Fainelli Date: Sun Jul 13 14:35:32 2008 +0200 r6040: handle RX fifo full and no descriptor interrupts This patch allows the MAC to handle the RX FIFO full and no descriptor available interrupts. While we are at it replace the TX interrupt with its corresponding definition. Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit 31718dedf62fd62e807001138ab5ac76e9b11064 Author: Florian Fainelli Date: Sun Jul 13 14:35:00 2008 +0200 r6040: change the default waiting time This patch changes the default waiting time of a packet, which along with our previous r6040_rx path, was causing huge delays with another host (160 to 230 ms). Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit 32f565df9ba451a24117db67003ed2ae21bab88c Author: Florian Fainelli Date: Sun Jul 13 14:34:15 2008 +0200 r6040: use definitions for magic values in descriptor status Define all the descriptor status the MAC can set. Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit 9ca28dc4c75f018201e21b10e34b8161bcb0ffb2 Author: Florian Fainelli Date: Sun Jul 13 14:33:36 2008 +0200 r6040: completely rework the RX path This patch completely reworks the RX path in order to be more accurate about what is going on with the MAC. We no longer read the error from the MLSR register instead read the descriptor status register which reflects, the error per descriptor. We now allocate skbs on the fly in r6040_rx, and we handle allocation failure instead of simply dropping the packet. Remove the rx_free_desc counter of r6040_private structure since we allocate skbs in the RX path. r6040_rx_buf_alloc is now removed and becomes unuseless. Signed-Off-By: Joerg Albert Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit 129cf9a7028fc50b226b8021bc0b76fb38efa81d Author: Florian Fainelli Date: Sun Jul 13 14:32:45 2008 +0200 r6040: call napi_disable when puting down the interface and set lp->dev accordingly. We did not call napi_disabled when putting down the interface which should be done. Finally initialize lp->dev when everything is set. Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit f2ca60f2067958e45f949e74abd580715c6c4b33 Author: Lennert Buytenhek Date: Mon Jul 7 00:03:00 2008 +0200 mv643xx_eth: fix NETPOLL build Joseph Fannin and Takashi Iwai noticed that commit 073a345c04b01da0cc5b79ac7be0c7c8b1691ef5 ("mv643xx_eth: clarify irq masking and unmasking") broke the mv643xx_eth build when NETPOLL is enabled, due to it not renaming one instance of INT_CAUSE_EXT in mv643xx_eth_netpoll(). This patch takes care of that instance as well. Signed-off-by: Lennert Buytenhek Cc: Dale Farnsworth Cc: Joseph Fannin Cc: Takashi Iwai Signed-off-by: Jeff Garzik commit 3d4634193aa95a6d04a786fc12b190d0e4295685 Author: Florian Fainelli Date: Sun Jul 13 14:32:18 2008 +0200 r6040: rework the RX buffers allocation routine Rework the RX buffers allocation function so that we do not leak memory in the case we could not allocate skbs for the RX path. Propagate the errors to the r6040_up function where we call the RX buffers allocation function. Also rename the r6040_alloc_txbufs function to r6040_init_txbufs, to reflect what it really does. Signed-Off-By: Joerg Albert Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit fec3a23be0daceeb0695f8296aea07ea1ad073d8 Author: Florian Fainelli Date: Sun Jul 13 14:29:20 2008 +0200 r6040: fix scheduling while atomic in r6040_tx_timeout Add a helper function which only modifies R6040 MAC registers use it when we timeout, and on adapter initialization. Fix the scheduling while atomic but in the timeout routine due to the reallocation of rx/tx buffers. Signed-Off-By: Joerg Albert Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit 3d25434816356e8d1e3167c5f7a56d3d81aeb239 Author: Florian Fainelli Date: Sun Jul 13 14:28:27 2008 +0200 r6040: fix null pointer access and tx timeouts This patch fixes a null pointer access in r6040_rx due to lp->dev not being initialized. Fix the TX timeouts, TX irq was not re-enabled on RX irq Signed-Off-By: Joerg Albert Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit c6e69bb92ed6e22a0931e29daff6539f2bac29b9 Author: Florian Fainelli Date: Sun Jul 13 13:39:32 2008 +0200 r6040: prefix all functions with r6040 Prefix all functions inside the r6040 driver with r6040 to avoid namespace clashing. Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik commit 7e99eeddb35cdaafb820676a57517b5e58685e4c Author: Thomas Backlund Date: Tue Jul 22 13:55:58 2008 -0700 rndis_host: support WM6 devices as modems This patch allows Windows Mobile 6 devices to be used for tethering -- that is, used as modems. It was requested by AdamW in kernel bugzilla: http://bugzilla.kernel.org/show_bug.cgi?id=11119 and Mandriva kernel-discuss list. It is tested and confirmed to work by Peterl: http://forum.eeeuser.com/viewtopic.php?pid=323543#p323543 This patch is based on the patch in the above kernel bugzilla, which is from the usb-rndis-lite tree. [ dbrownell@users.sourceforge.net: misc fixes ] Signed-off-by: Thomas Backlund Signed-off-by: David Brownell Signed-off-by: Jeff Garzik commit 7a2f53ee0b56ff7e1c0c24404575cb62935d37d9 Author: Paulius Zaleckas Date: Thu Jul 17 11:01:26 2008 +0300 at91_ether: use netstats in net_device structure Use net_device_stats from net_device structure instead of local. Signed-off-by: Paulius Zaleckas Tested-by: Marc Pignat Acked-by: Andrew Victor Signed-off-by: Jeff Garzik commit aa6ef27ea906e74bd23d14f43f095c012469d9c7 Author: Ben Hutchings Date: Fri Jul 18 19:03:10 2008 +0100 sfc: Create one RX queue and interrupt per CPU package by default Using multiple cores in the same package to handle received traffic does not appear to provide a performance benefit. Therefore use CPU topology information to count CPU packages and use that as the default number of RX queues and interrupts. We rely on interrupt balancing to spread the interrupts across packages. Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 8d9853d911b9d3fb767c3886066530c0e39b78ba Author: Ben Hutchings Date: Fri Jul 18 19:01:20 2008 +0100 sfc: Use a separate workqueue for resets This avoids deadlock in case a reset is triggered during self-test. Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 9dadae686fce02a02982fc9c0563f6b917217a66 Author: Ben Hutchings Date: Fri Jul 18 18:59:12 2008 +0100 sfc: I2C adapter initialisation fixes As recommended by Jean Delvare: - Increase timeout to 50 ms - Leave adapter class clear so that unwanted drivers do not probe our bus - Use strlcpy() for name initialisation Signed-off-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 81250297d85b26eb4e9de5decf752dce430277f9 Author: Taku Izumi Date: Fri Jul 11 15:17:44 2008 -0700 e1000: make ioport free This patch makes e1000 driver ioport-free. This corrects behavior in probe function so as not to request ioport resources as long as they are not really needed. This is based on the ioport-free patch of e1000 driver from Auke Kok and Tomohiro Kusumi. Signed-off-by: Tomohiro Kusumi Signed-off-by: Auke Kok Signed-off-by: Taku Izumi Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit c3570acb53c885f8accb8c85eda195781d30632f Author: Francois Romieu Date: Fri Jul 11 15:17:38 2008 -0700 e1000: delete non NAPI code from the driver Compile-tested only. Signed-off-by: Francois Romieu Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 63cd31f60716c4a9f1b5b6ffd804326dc766d2d2 Author: Jeff Kirsher Date: Fri Jul 11 15:17:33 2008 -0700 e1000: remove email reference The email linux-nics@intel.com is no longer available, remove all references. Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit c7be73bc9bfc8a650fe646f484dea5bad3cf92d5 Author: Joe Perches Date: Fri Jul 11 15:17:28 2008 -0700 e1000: Move assignments in tests before test Signed-off-by: Joe Perches Signed-off-by: Auke Kok Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit b11840204f36f9a1e3027033227e17d167e04377 Author: Joe Perches Date: Fri Jul 11 15:17:23 2008 -0700 e1000: checkpatch clean Redefine DPRINTK macro using do while(0) __FUNCTION__ to __func__ structs {} on separate lines Surround negative constants with () Signed-off-by: Joe Perches Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit e982f17c87488a98df6bc4f5454a176646b4d00b Author: Joe Perches Date: Fri Jul 11 15:17:18 2008 -0700 e1000: Remove spaces after casts and function names Signed-off-by: Joe Perches Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit c03e83b0351f8a9464d32f31302ec75ba88518dc Author: Joe Perches Date: Fri Jul 11 15:17:13 2008 -0700 e1000: Move extern function definitions to e1000.h Signed-off-by: Joe Perches Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 1dc329180fe22ff8651e0ef550ba17ca1cc7bf22 Author: Joe Perches Date: Fri Jul 11 15:17:08 2008 -0700 e1000: Use hw, er32, and ew32 Use struct e1000_hw *hw = adapter->hw; where necessary Change macros E1000_READ_REG and E1000_WRITE_REG to er32 and ew32 Signed-off-by: Auke Kok Signed-off-by: Joe Perches Signed-off-by: Jeff Garzik commit 6479884509e6cd30c6708fbf05fafc0d1fc85f7a Author: Joe Perches Date: Fri Jul 11 15:17:02 2008 -0700 e1000: neaten function declarations Signed-off-by: Joe Perches Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit cdc18a670923d01a762d66be582bfe763772d441 Author: Christoph Lameter Date: Fri Jul 11 16:12:34 2008 -0500 Fix typo in meth driver An | in an if statement to check a bit? I think this needs to be a &. As a result of this typo meth will always operate in promiscuous mode. Signed-off-by: Christoph Lameter Signed-off-by: Jeff Garzik commit a6a5325239c20202e18e21e94291bccc659fbf9e Author: Jie Yang Date: Fri Jul 18 11:37:13 2008 +0800 atl1e: Atheros L1E Gigabit Ethernet driver Full patch for the Atheros L1E Gigabit Ethernet driver. Supportring AR8121, AR8113 and AR8114 Signed-off-by: Jie Yang Signed-off-by: Jeff Garzik commit bb5d10ac8cc315d53306963001fe650d88a1cbb2 Author: Jesse Brandeburg Date: Fri Jul 11 17:34:58 2008 -0700 ixgbe: remove device ID for unsupported device The ixgbe driver was untested with device ID 8086:10c8 but still advertises support. Currently if this device is present in the system when the driver is loaded, the system will panic. Remove this device ID until full support can be tested with available hardware. This patch is necessary for 2.6.24, 2.6.25 and 2.6.26 Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: Jeff Garzik commit 4a0a088970a553e9f89d23eec688932f689d57f9 Author: Stephen Rothwell Date: Tue Jul 22 15:47:17 2008 -0700 sparc32: pass -m32 when building vmlinux.lds Otherwise it breaks since we merged asm/page.h Signed-off-by: Stephen Rothwell Signed-off-by: David S. Miller commit c8f15686a4b3345e3e81e09cfe191df58bbedd45 Author: Anton Vorontsov Date: Tue Jul 22 15:41:24 2008 -0700 netdev: bunch of drivers: avoid WARN at net/core/dev.c:1328 The drivers were touching net queue before it has been started, so without this patch, the drivers will potentially WARN at net/core/dev.c:1328. I don't have the hardware for the drivers below, so this patch is untested, and thus should be carefully peer reviewed. tc35815.c au1000_eth.c bfin_mac.c macb.c ^ The four drivers are using phylib, they're calling netif_start_queue() in open() callback. So trivially remove netif_tx_schedule_all(). Phylib will handle netif_carrier_*(). cpmac.c fec_mpc52xx.c fs_enet/fs_enet-main.c sh_eth.c ^ The same as above, but these were also needlessly calling netif_carrier_*() functions. So removed queue calls and also remove carrier calls, since phylib will handle it. fs_enet-main.c also didn't call netif_start_queue() at open(), this is fixed now. Signed-off-by: Anton Vorontsov Signed-off-by: David S. Miller commit 1a4dc68b31fd04573ab3c554702372941a4fd46f Author: Dave Jones Date: Tue Jul 15 19:54:52 2008 -0400 8139too: Fall back to PIO when MMIO fails. Signed-off-by: Dave Jones Signed-off-by: Jeff Garzik commit 152151daece9d5dfd86e652b95846072c0d2b566 Author: Dave Jones Date: Tue Jul 15 19:54:53 2008 -0400 8139too: Force usage of PIO on OQO2 The OQO model 2 has an RTL8139 from Atheros that doesn't like MMIO. It fails on modprobe, with a 'PCI Bus error' message. Force it to always use polled IO. Signed-off-by: Dave Jones Signed-off-by: Jeff Garzik commit eb5813481a97582c80c8d402ecb371149c77b4e0 Author: Dave Jones Date: Tue Jul 15 19:54:53 2008 -0400 8139too: Make PIO/MMIO a runtime decision through a module parameter. This is needed to support devices that only work with PIO without penalising devices that work fine with MMIO in distro kernels. It also allows us to eventually use PIO as a fallback when setting up MMIO fails. Signed-off-by: Dave Jones Signed-off-by: Jeff Garzik commit 7239016d52c6d568d069f083bdcd17f35ab79fd8 Author: Wang Jian Date: Wed Jul 16 21:46:20 2008 +0800 net/phy: Fix 88e1111 copper/fiber selection in RGMII mode MII_M1111_HWCFG_FIBER_COPPER_RES is a bit of MII_M1111_PHY_EXT_SR, not MII_M1111_PHY_EXT_CR. Signed-off-by: Wang Jian Signed-off-by: Jeff Garzik commit 9cf8fa4334e60f27b4a392f432c292f3af268215 Author: Wang Jian Date: Wed Jul 16 21:46:17 2008 +0800 net/phy: Fix copper/fiber auto-selection for 88e1111 The 27.15 bit (MII_M1111_HWCFG_FIBER_COPPER_AUTO) is disable bit. When set to 1, copper/fiber auto selection is disabled. The current code to enable but actually disable auto selection. Signed-off-by: Wang Jian Signed-off-by: Jeff Garzik commit c0e5a8c21bb9bb222917c36eba503ae88af52c34 Author: Harvey Harrison Date: Wed Jul 16 12:45:34 2008 -0700 net: tun.c fix cast Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit 25ac3c24839002298e9329a5fda305e5383b1dc7 Author: Harvey Harrison Date: Wed Jul 16 12:45:27 2008 -0700 net: igb_main.c fix sparse integer as NULL pointer warning drivers/net/igb/igb_main.c:388:20: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison Signed-off-by: Jeff Garzik commit f8e5e776a3ac29705b1a357b23cad0920ef1a1d2 Author: Ben Dooks Date: Thu Jul 17 20:29:13 2008 +0100 DM9000: Remove magic numbers Remove magic numbers for items that we already have defined in the register header file. Signed-off-by: Ben Dooks Signed-off-by: Jeff Garzik commit 23fcc8d991c7f7bf3eaa64c296217103ab59f5dc Author: Ursula Braun Date: Fri Jul 18 15:24:58 2008 +0200 MAINTAINERS: Update email address of Ursula Braun Signed-off-by: Ursula Braun Signed-off-by: Jeff Garzik commit aa3f2cb63086e474a2ac3836d01fc6d9db393846 Author: Peter Tiedemann Date: Fri Jul 18 15:24:57 2008 +0200 s390/net/ctcm: message cleanup Cc: Martin Schwidefsky Signed-off-by: Peter Tiedemann Signed-off-by: Ursula Braun Signed-off-by: Jeff Garzik commit b805da74dee3a8de8a29654078c5198f2fb0e15b Author: Andy Richter Date: Fri Jul 18 15:24:56 2008 +0200 s390/net: Cleanup claw printk messages. Cc: Martin Schwidefsky Cc: Heiko Carstens Signed-off-by: Andy Richter Signed-off-by: Ursula Braun Signed-off-by: Jeff Garzik commit 58735567b6de3034c9d0d7e1dcf31614b66de986 Author: Dhananjay Phadke Date: Mon Jul 21 19:44:10 2008 -0700 netxen: update driver version Change driver version to 4.0.0. Netxen firmwares as old as v3.4.216 are supported. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit cd1f8160e015cd1538701b7de216cbeaefc6b0a8 Author: Dhananjay Phadke Date: Mon Jul 21 19:44:09 2008 -0700 netxen: enable tso6, intr coalescing. Enable tso6 and ipv6 checksum, interrupt coalescing for NX3031. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit d9e651bc06690c5a5326e8d019fa7668409bc819 Author: Dhananjay Phadke Date: Mon Jul 21 19:44:08 2008 -0700 netxen: cut-through rx changes NX3031 supports cut-through operation where ingress packets are directly dma'ed into host buffers to reduce latency. This requires larger dma buffers (2kb) and different alignemnt. The buffer posting logic is changed a bit. The free rx buffers are maintained in linked list, since the received reference handles can be out of order. However rx descriptors are still posted sequentially, indexed by producer. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit c9fc891f86c062449116fde8826a0ead650e17ac Author: Dhananjay Phadke Date: Mon Jul 21 19:44:07 2008 -0700 netxen: mtu, mac, link status changes MAC addr, multicast filters, mtu are set through firmware commands in firmware v4.0.0+ because of virtualization of physical ports. Link status is also read from registers allocated by firmware for each virtual port. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 48bfd1e0fc66b27254ec742b014e689ef218e76c Author: Dhananjay Phadke Date: Mon Jul 21 19:44:06 2008 -0700 netxen: add netxen_nic_ctx.c Contains rx and tx ring context management and certain firmware commands for netxen firmware v4.0.0+. This patch gathers all HW context management code into netxen_nic_ctx.c. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit a97342f9790f14ac20bd5f8b16ed661411fa2e3e Author: Dhananjay Phadke Date: Mon Jul 21 19:44:05 2008 -0700 netxen: remove netxen_nic_isr.c It had only couple of functions which are moved to main.c Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 2956640d4aaaecd42bd8ba800cc8c33bfe206b7e Author: Dhananjay Phadke Date: Mon Jul 21 19:44:04 2008 -0700 netxen: pci probe and firmware init changes Add initialization code in pci probe for new chip and retain compatibility with old revisions. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 3ce06a320f8d5a3f16960e63021cc372283efffb Author: Dhananjay Phadke Date: Mon Jul 21 19:44:03 2008 -0700 netxen: add 2MB PCI memory support New revision of netxen chip has 2MB PCI memory. Older chips had 128MB addressable PCI memory. To retain compatibility, this patch adds function pointers based on pci bar0 size. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit e4c93c817ce650401db42db6c869cf7688217ff4 Author: Dhananjay Phadke Date: Mon Jul 21 19:44:02 2008 -0700 netxen: add defs for new chip/boards Add macros for new chip revision and board configurations. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 623621b07ebc5b72e0bdfa4a50bbb28f4587de0c Author: Dhananjay Phadke Date: Mon Jul 21 19:44:01 2008 -0700 netxen: hw multicast filtering Enable multicast address filtering capabilities in the hardware. Upto 16 multicast addresses can be programmed for each physical port. Support "allmulti" mode, if enabled. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit 7830b22cbc5f5e804469b74a3fe0d3a8ed88ca31 Author: Dhananjay Phadke Date: Mon Jul 21 19:44:00 2008 -0700 netxen: cleanup unused variables/functions o Reduce access to global arrays in data path. o Remove duplicate/unused variables, unecessary alignment constraints. o Use correct pci_dev instead of fallback device for consistent allocations. o Disable ethtool set_eeprom functionality for now, it was only used for flashing firmware. Signed-off-by: Dhananjay Phadke Signed-off-by: Jeff Garzik commit f0084a36d4d799c024a5211555334d56c91d236d Author: Ingo Molnar Date: Tue Jul 22 09:23:34 2008 +0200 net 8390p: fix interface usage various drivers were using the wrong APIs: drivers/built-in.o: In function `hp_probe1': hp.c:(.init.text+0xa280): undefined reference to `NS8390_init' fixed via: cd drivers/net/; sed -i 's/NS8390_/NS8390p_/g' \ $(grep -l NS8390_ $(grep 8390p.o Makefile | cut -d' ' -f3 | \ sed 's/.o$/.c/g')) Signed-off-by: Ingo Molnar Signed-off-by: Jeff Garzik commit 3d0f24a74e7957593a5622eb5c04ed6860dd8391 Author: Stephen Hemminger Date: Tue Jul 22 14:35:50 2008 -0700 ipv6: icmp6_dst_gc return change Change icmp6_dst_gc to return the one value the caller cares about rather than using call by reference. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 75307c0fe7fcb3b52a92fe32384fc33f50622654 Author: Stephen Hemminger Date: Tue Jul 22 14:35:07 2008 -0700 ipv6: use kcalloc Th fib_table_hash is an array, so use kcalloc. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a76d7345a3f92bb8352f200e7b2e380dddcd7e36 Author: Stephen Hemminger Date: Tue Jul 22 14:34:35 2008 -0700 ipv6: use spin_trylock_bh Now there is spin_trylock_bh, use it rather than open coding. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c8a4522245e9931a53a98d5160bb4c00d3f73921 Author: Stephen Hemminger Date: Tue Jul 22 14:34:09 2008 -0700 ipv6: use round_jiffies This timer normally happens once a minute, there is no need to cause an early wakeup for it, so align it to next second boundary to safe power. It can't be deferred because then it could take too long on cleanup or DoS. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 417f28bb340725544c36b35465444d2fd57232b8 Author: Stephen Hemminger Date: Tue Jul 22 14:33:45 2008 -0700 netns: dont alloc ipv6 fib timer list FIB timer list is a trivial size structure, avoid indirection and just put it in existing ns. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 428695b89831d781ba203d97ee07da68150ea40d Author: David S. Miller Date: Tue Jul 22 14:30:55 2008 -0700 sparc: Fixes the DRM layer build on sparc. By providing an ioremap_wc(). Signed-off-by: David S. Miller commit 888c848ed34bd5f8cb56567624c0d951ab35174e Author: Adrian Bunk Date: Tue Jul 22 14:21:58 2008 -0700 ipv6: make struct ipv6_devconf static struct ipv6_devconf can now become static. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 4d6971e909e904be60218739fc961188471fc4f4 Author: Adrian Bunk Date: Tue Jul 22 14:21:30 2008 -0700 sctp: remove sctp_assoc_proc_exit() Commit 20c2c1fd6c842caf70dcb1d94b9d58861949fd3d (sctp: add sctp/remaddr table to complete RFC remote address table OID) added an unused sctp_assoc_proc_exit() function that seems to have been unintentionally created when copying the assocs code. Signed-off-by: Adrian Bunk Acked-by: Neil Horman Signed-off-by: David S. Miller commit abd0b198ea699578c3c3476d646c91842e19dbd2 Author: Adrian Bunk Date: Tue Jul 22 14:20:45 2008 -0700 sctp: make sctp_outq_flush() static sctp_outq_flush() can now become static. Signed-off-by: Adrian Bunk Acked-by: Neil Horman Signed-off-by: David S. Miller commit a94f779f9d82eb2d758a8715eaae5df98e8dcb21 Author: Adrian Bunk Date: Tue Jul 22 14:20:11 2008 -0700 pkt_sched: make qdisc_class_hash_alloc() static This patch makes the needlessly global qdisc_class_hash_alloc() static. Signed-off-by: Adrian Bunk Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 8086cd451f08f4c0f9693fc66d87754bbd18cfba Author: Adrian Bunk Date: Tue Jul 22 14:19:19 2008 -0700 netns: make get_proc_net() static get_proc_net() can now become static. Signed-off-by: Adrian Bunk Acked-by: Pavel Emelyanov Signed-off-by: David S. Miller commit cf508b1211dbe576778ff445ea1b4b0bcfa5c4ea Author: David S. Miller Date: Tue Jul 22 14:16:42 2008 -0700 netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep. The new address list lock needs to handle the same device layering issues that the _xmit_lock one does. This integrates work done by Patrick McHardy. Signed-off-by: David S. Miller commit d29f749e252bcdbfe7a75a58f0ee92da16f127c0 Author: Dave Jones Date: Tue Jul 22 14:09:06 2008 -0700 net: Fix build failure with 'make mandocs'. The function header comments have to go with the functions they are documenting, or things go horribly wrong when we try to process them with the docbook tools. Warning(include/linux/netdevice.h:1006): No description found for parameter 'dev_queue' Warning(include/linux/netdevice.h:1033): No description found for parameter 'dev_queue' Warning(include/linux/netdevice.h:1067): No description found for parameter 'dev_queue' Warning(include/linux/netdevice.h:1093): No description found for parameter 'dev_queue' Warning(include/linux/netdevice.h:1474): No description found for parameter 'txq' Error(net/core/dev.c:1674): cannot understand prototype: 'u32 simple_tx_hashrnd; ' Signed-off-by: Dave Jones Acked-by: Randy Dunlap Signed-off-by: David S. Miller commit 0988c37c248e824953d95a11412696c348dbca91 Merge: 6eaaaac... d536b1f... Author: Linus Torvalds Date: Tue Jul 22 13:40:24 2008 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix crash due to missing debugctlmsr on AMD K6-3 x86: add PTE_FLAGS_MASK x86: rename PTE_MASK to PTE_PFN_MASK x86: fix pte_flags() to only return flags, fix lguest (updated) x86: use setup_clear_cpu_cap with disable_apic, fix x86: move the last Dprintk instance to pr_debug() commit 6eaaaac97433575894570a990aa27310040a8177 Merge: 06b8147... a1ef5ad... Author: Linus Torvalds Date: Tue Jul 22 13:17:15 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: remove CONFIG_KMOD from core kernel code remove CONFIG_KMOD from lib remove CONFIG_KMOD from sparc64 rework try_then_request_module to do less in non-modular kernels remove mention of CONFIG_KMOD from documentation make CONFIG_KMOD invisible modules: Take a shortcut for checking if an address is in a module module: turn longs into ints for module sizes Shrink struct module: CONFIG_UNUSED_SYMBOLS ifdefs module: reorder struct module to save space on 64 bit builds module: generic each_symbol iterator function module: don't use stop_machine for waiting rmmod commit 06b8147c5dbd385b5b97ca74e19f6f3951ebc1cb Merge: 53baaaa... 8725f25... Author: Linus Torvalds Date: Tue Jul 22 13:16:01 2008 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (49 commits) powerpc: Fix build bug with binutils < 2.18 and GCC < 4.2 powerpc/eeh: Don't panic when EEH_MAX_FAILS is exceeded fbdev: Teaches offb about palette on radeon r5xx/r6xx powerpc/cell/edac: Log a syndrome code in case of correctable error powerpc/cell: Add DMA_ATTR_WEAK_ORDERING dma attribute and use in Cell IOMMU code powerpc: Indicate which oprofile counters to use while in compat mode powerpc/boot: Change spaces to tabs powerpc: Remove duplicate 6xx option in Kconfig powerpc: Use PPC_LONG and PPC_LONG_ALIGN in lib/string.S powerpc: Use PPC_LONG_ALIGN in uaccess.h powerpc: Add a #define for aligning to a long-sized boundary powerpc: Fix OF parsing of 64 bits PCI addresses powerpc: Use WARN_ON(1) instead of __WARN() powerpc: Fix support for latencytop powerpc/ps3: Update ps3_defconfig powerpc/ps3: Add a sub-match id to ps3_system_bus powerpc: Add a 6xx defconfig powerpc/dma: Use the struct dma_attrs in iommu code powerpc/cell: Add support for power button of future IBM cell blades powerpc/cell: Cleanup sysreset_hack for IBM cell blades ... commit 53baaaa9682c230410a057263d1ce2922f43ddc4 Merge: f10140f... 3f97870... Author: Linus Torvalds Date: Tue Jul 22 13:13:47 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (79 commits) arm: bus_id -> dev_name() and dev_set_name() conversions sparc64: fix up bus_id changes in sparc core code 3c59x: handle pci_name() being const MTD: handle pci_name() being const HP iLO driver sysdev: Convert the x86 mce tolerant sysdev attribute to generic attribute sysdev: Add utility functions for simple int/ulong variable sysdev attributes sysdev: Pass the attribute to the low level sysdev show/store function driver core: Suppress sysfs warnings for device_rename(). kobject: Transmit return value of call_usermodehelper() to caller sysfs-rules.txt: reword API stability statement debugfs: Implement debugfs_remove_recursive() HOWTO: change email addresses of James in HOWTO always enable FW_LOADER unless EMBEDDED=y uio-howto.tmpl: use unique output names uio-howto.tmpl: use standard copyright/legal markings sysfs: don't call notify_change sysdev: fix debugging statements in registration code. kobject: should use kobject_put() in kset-example kobject: reorder kobject to save space on 64 bit builds ... commit c7f80993a38f0354a8ad821bcd9335b47a464357 Author: Brice Goglin Date: Mon Jul 21 10:26:25 2008 +0200 myri10ge: use ioremap_wc Switch to ioremap_wc(). We keep the MTRR code since ioremap_wc() will use UC_MINUS when falling back to uncachable, and thus let the MTRR WC take precedence. Also rename the error path better. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit e454e7e2e3afbcdc002ed55a087a14e8b057519d Author: Brice Goglin Date: Mon Jul 21 10:25:50 2008 +0200 myri10ge: remove wcfifo Remove the wcfifo since it never gave any performance improvement. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit b57f9cae8724e4822fedfcc12530f868dcf6ea94 Author: Wang Chen Date: Tue Jul 22 13:13:18 2008 +0800 de4x5: Remove developer debug feature about set/clear promisc IFF_PROMISC flag shouldn't be set or cleared by drivers, because whether device be promisc mode is decided by how many upper layer callers being referenced to it. And the promisc changing feature of de4x5 ioctl is developer debug feature, we can remove it now. Signed-off-by: Wang Chen Acked-by: Grant Grundler Signed-off-by: Jeff Garzik commit 2b4ff112a0b3fe90de561a77f2e66000c028ca54 Author: frank.blaschka@de.ibm.com Date: Tue Jul 22 09:39:25 2008 +0200 qeth: fix build error caused by VLAN changes Adrian Bunk reports this build error: CC drivers/s390/net/qeth_l3_main.o /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_hard_start_xmit': /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/s390/net/qeth_l3_main.c: 2654: error: implicit declaration of function 'VLAN_TX_SKB_CB' /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/s390/net/qeth_l3_main.c: 2654: error: invalid type argument of '->' (have 'int') make[3]: *** [drivers/s390/net/qeth_l3_main.o] Error 1 The intention of the driver appears to be to invalidate the VLAN tag. Change it to set skb->vlan_tci to zero, which has the same effect. Signed-off-by: Patrick McHardy Signed-off-by: Frank Blaschka Signed-off-by: Jeff Garzik commit 217d5a51953143046cf2972eebdefe2b2db05718 Author: Laurent Pinchart Date: Tue Jul 22 17:43:42 2008 +0200 fs_enet: Remove unused fields in the fs_mii_bb_platform_info structure. The mdio_port, mdio_bit, mdc_port and mdc_bit fields in the fs_mii_bb_platform_info structure are left-overs from the move to the Phy Abstraction Layer subsystem. They are not used anymore and can be safely removed. Signed-off-by: Laurent Pinchart Signed-off-by: Jeff Garzik commit d999597349dcfd3b11205705c31a2f8e00688dd3 Merge: b32d131... 7733289... Author: Jeff Garzik Date: Tue Jul 22 16:07:11 2008 -0400 Merge branch 'r8169-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream-fixes commit f10140fbe5f97ecfeda986a12d0f1bad75642779 Author: Alan Cox Date: Tue Jul 22 15:25:07 2008 +0100 port_fixups: Fix ups for tty port changes I missed the cpm_uart one. Thanks to Kumar Gala for reporting it. A double check found samsung also needed fixing up. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit ed569bfb8e5d0725db11018130e44eb567d829c1 Author: Alan Cox Date: Tue Jul 22 13:44:14 2008 +0100 istallion: Use helpers The ldisc needs to be referenced properly when used. The tty layer has a helper for this which should have been used but this driver got missed originally. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit c68a99cda87a8356ea0e56cc5111043ac8402ffd Author: Paul Fulghum Date: Tue Jul 22 11:23:24 2008 +0100 synclink_gt fix locking in error path of rx enable Fix locking in error path of rx_enable() introduced by synclink_gt-add-rx-dma-buffer-fill-level-control patch. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 814dae031d08d40d34c0403a54d6e659baf0ae71 Author: Paul Fulghum Date: Tue Jul 22 11:22:14 2008 +0100 synclink_gt: add rx DMA buffer fill level control Add run time control for receive DMA buffer fill level to allow application to control receive latency when using stream oriented serial protocols that pass receive data to application only after a DMA buffer fills. This was previously a compile time option, but run time control is needed when application changes data rate (and latency requirements) or uses different data rates on different ports. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 993456cdc853a52e1042ebf93fc6e1a12d1216f7 Author: Paul Fulghum Date: Tue Jul 22 11:22:04 2008 +0100 synclink_gt: leave transmitter in reset state after configuration Leave the transmitter in reset state after configuration so that transmit signal is held at mark until transmitter is explicitly enabled by application, otherwise transmitter sends idle pattern. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 403214d0ad9b2b9e46c89a5b4b513c910c89068d Author: Paul Fulghum Date: Tue Jul 22 11:21:55 2008 +0100 synclink_gt: improve TIOCOUTQ accuracy Improve the accuracy of TIOCOUTQ value as implemented in chars_in_buffer() method by walking and counting tx DMA buffers, reading controller tx FIFO level and accounting for controller tx shift register. The greatly improves application control of transmit latency at lower data rates. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e5590717afd5fb6f494323206a1a35ea25610c2d Author: Paul Fulghum Date: Tue Jul 22 11:21:39 2008 +0100 synclink_gt: add serial bit order control Add control of hardware serial bit order between LSB first (default/standard) and MSB first. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 8a38c2851d6950502252982af712ac65ef6784ed Author: Paul Fulghum Date: Tue Jul 22 11:21:28 2008 +0100 synclink_gt: improve and simplify write method Improve write method by allowing multiple HDLC frames to be loaded into tx DMA buffer ring for continuous frame transmission. This simplifies the transmit code by using the common procedures for all serial protocols. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit c72f527c104cae8e767e714574238b5550879e0c Author: Paul Fulghum Date: Tue Jul 22 11:21:19 2008 +0100 n_hdlc: honor O_NONBLOCK on write Make n_hdlc line discipline honor the O_NONBLOCK file flag on write. Signed-off-by: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 768aec0b5bccbd460bcf6e9131f19b5a26f3862d Author: Anton Vorontsov Date: Tue Jul 22 11:21:07 2008 +0100 serial: 8250: fix shared interrupts issues with SMP and RT kernels With SMP kernels _irqsave spinlock disables only local interrupts, while the shared serial interrupt could be assigned to the CPU that is not currently starting up the serial port. This might cause issues because serial8250_startup() routine issues IRQ-triggering operations before registering the port in the IRQ chain (though, this is fine to do and done explicitly because we don't want to process any interrupts on the port startup). With RT kernels and preemptable hardirqs, _irqsave spinlock does not disable local hardirqs, and the bug could be reproduced much easily: $ cat /dev/ttyS0 & $ cat /dev/ttyS1 irq 42: nobody cared (try booting with the "irqpoll" option) Call Trace: [C0475EB0] [C0008A98] show_stack+0x4c/0x1ac (unreliable) [C0475EF0] [C004BBD4] __report_bad_irq+0x34/0xb8 [C0475F10] [C004BD38] note_interrupt+0xe0/0x308 [C0475F50] [C004B09C] thread_simple_irq+0xdc/0x104 [C0475F70] [C004B3FC] do_irqd+0x338/0x3c8 [C0475FC0] [C00398E0] kthread+0xf8/0x100 [C0475FF0] [C0011FE0] original_kernel_thread+0x44/0x60 handlers: [] (serial8250_interrupt+0x0/0x138) Disabling IRQ #42 After this, all serial ports on the given IRQ are non-functional. To fix the issue we should explicitly disable shared IRQ before issuing any IRQ-triggering operations. I also changed spin_lock_irqsave to the ordinary spin_lock, since it seems to be safe: chain does not contain new port (yet), thus nobody will interfere us from the ISRs. Signed-off-by: Anton Vorontsov Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 88e882497d154dfb7c341902c079c9daeca1626f Author: David Howells Date: Tue Jul 22 11:20:45 2008 +0100 Fix the epca driver to permit epca_setup() to be invoked from the kernel cmdline Fix the epca driver to call epca_setup() if digiepca=xxx is included on the command line and the epca driver is built in. epca_setup() used to be called from init/main.c in 2.2 kernels, but somewhere along the way that call was removed but not replaced. Signed-off-by: David Howells Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e129deff3d979df1ad3d0a6756c90932c0a0a102 Author: Jiri Slaby Date: Tue Jul 22 11:20:34 2008 +0100 Char: mxser, add CP-102UF support Add support for CP-102UF moxa card (update to 1.12 original driver) and increment this driver version. (Somewhat reworked by alan@redhat.com to merge in with other patches) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit faa7612c09ae4519ad4659c8417aaaba81183833 Author: Alan Cox Date: Tue Jul 22 11:19:05 2008 +0100 specialix: restore driver using new break functionality Use the hardware break support on the specialix driver Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 4a56122297ac7a4a3bf09fb66c0a365a13abe707 Author: David Howells Date: Tue Jul 22 11:18:43 2008 +0100 Fix the (i)Stallion driver's putchar() and break_ctl() ops Fix the Stallion driver's putchar() and break_ctl() ops and iStallion's putchar() to return values. Is it actually possible for putchar() or break_ctl() to be called with tty == NULL or can the check be discarded? Should stl_write() be returning 0 if tty->driver_data is NULL or tx.buf is NULL? Is this even possible? I've made Stallion's functions return -EINVAL as stli_breakctl() if the checks fail. Signed-off-by: David Howells Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 781cff5cb2bc8d714270accf88db23a855de9816 Author: Alan Cox Date: Tue Jul 22 11:18:30 2008 +0100 riscom8: Restore driver using new break functionality Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 6d889724332e875ac07b6c88e08d9564c180824d Author: Alan Cox Date: Tue Jul 22 11:18:21 2008 +0100 isicom: restore using hardware break support Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit dcbf1280796be7c0b74c4231f0ac9dd8aa1e2591 Author: Alan Cox Date: Tue Jul 22 11:18:12 2008 +0100 epca: Restore driver Convert the driver to use the added hardware break support Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 9e98966c7bb94355689478bc84cc3e0c190f977e Author: Alan Cox Date: Tue Jul 22 11:18:03 2008 +0100 tty: rework break handling Some hardware needs to do break handling itself and may have partial support only. Make break_ctl return an error code. Add a tty driver flag so you can indicate driver hardware side break support. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit abbe629ae4011d2020047f41bea9f9e4b0ec4361 Author: Alan Cox Date: Tue Jul 22 11:17:53 2008 +0100 tty: Mark unconverted drivers as BROKEN Nobody seems to use these drivers anyway so if they want them they can fix them up. I don't have the needed info to add break_ctl support to them. Send patches if you don't like it. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 8ca8b9005a742edf8d82749d4ad4e616405fbdc4 Author: Alan Cox Date: Tue Jul 22 11:17:43 2008 +0100 mxser: remove dead code Old style ioctl break code can go Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 30252ec958897d61925a4baf79cd9411a6be0486 Author: Alan Cox Date: Tue Jul 22 11:17:32 2008 +0100 epca: Fix comments and move break The ioctls it talks about are midlayer provided. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit d2fbd0f2f9f5a34831a0b8fe6b16c6e1afba1200 Author: Alan Cox Date: Tue Jul 22 11:17:16 2008 +0100 specialix: Code cleanups Go through the inlines and other oddments that are iffy. Remove various bits of dead code and bogus debug. Turn the crtsdts compile time option into a runtime switch. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit a72492bd8a8d4326fd78b2142bf7cae779d5d4c2 Author: Alan Cox Date: Tue Jul 22 11:17:05 2008 +0100 specialix: Tidy up coding style Preparation for doing some real work on the driver. Do this first so we can easily identify if the cleanups accidentally broke something Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 01e1abb2c27e43339b8829a2e3b1c6f53806b77a Author: Alan Cox Date: Tue Jul 22 11:16:55 2008 +0100 tty: Split ldisc code into its own file Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d76f2f4462bbb2cf7bc83a35c5278177aa627e89 Author: Alan Cox Date: Tue Jul 22 11:16:42 2008 +0100 io_edgeport: Fix various bogus returns to the tty layer The edgeport reports negative error codes to functions that do not expect them. This can cause ports to jam forever Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 03f0dbf74c7a117c270e63d62d5e4927af6f295b Author: Alan Cox Date: Tue Jul 22 11:16:34 2008 +0100 tty-usb-io_edgeport: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 4da1a17dbc5211ac90264cfc4f0e076c8bdc1732 Author: Alan Cox Date: Tue Jul 22 11:16:21 2008 +0100 tty-usb-mos7720: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 880af9db2c35c5fedaef0de89473f202329934db Author: Alan Cox Date: Tue Jul 22 11:16:12 2008 +0100 mos7840: remove loads of bogus assignments to status Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 4944d40054d73b2f8d7d546f55c206eb3baf2710 Author: Alan Cox Date: Tue Jul 22 11:16:03 2008 +0100 omninet: Use string flip functions Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit f89d0dff2507b6bd486b7db59a5f6a733fbfaa12 Author: Alan Cox Date: Tue Jul 22 11:15:54 2008 +0100 tty-usb-omninet: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 19e58fae0c8f197d80fcea338b94fb5740369bc1 Author: Alan Cox Date: Tue Jul 22 11:15:45 2008 +0100 tty-usb-option: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 2a77c8144992e21367cc15956b0ff295f1112c85 Author: Alan Cox Date: Tue Jul 22 11:15:36 2008 +0100 tty-usb-oti6858: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 43c8f435b2ca39f12ad89d91d9ee2be04a196f93 Author: Alan Cox Date: Tue Jul 22 11:15:26 2008 +0100 tty-usb-safe-serial: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit a30fa793f35b9a72fdb9ea90a539c8c9cf7bee94 Author: Alan Cox Date: Tue Jul 22 11:15:17 2008 +0100 tty-usb-ti-usb: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 0487b583f268ea43ededd7897dbf519bdcb395ee Author: Alan Cox Date: Tue Jul 22 11:15:08 2008 +0100 tty-usb-spcp8x5: Minor coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9660ea36bdcd4c33174e912a3e649c048d22a3d6 Author: Alan Cox Date: Tue Jul 22 11:14:59 2008 +0100 tty-usb-sierra: Coding style - minor Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 3a0f43e9deffd9619ac34e3b6b9ba7089aa1e511 Author: Alan Cox Date: Tue Jul 22 11:14:49 2008 +0100 tty-usb-pl2303: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit acc80758abc91e5d91f3f4ceb8dd94da2aa7064d Author: Alan Cox Date: Tue Jul 22 11:14:40 2008 +0100 mct_u232: Use flip buffer functions Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit e19b2560be568301ec4cc486671361ef0471d839 Author: Alan Cox Date: Tue Jul 22 11:14:30 2008 +0100 tty-usb-mct-u232: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b31f658b0bb42b315c22ae2ef814e5fba36ac737 Author: Alan Cox Date: Tue Jul 22 11:14:22 2008 +0100 kobil_sct: Fix ioctls Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit dee0a7ccaa0bcdeebb590879d68739cce4ff1b07 Author: Alan Cox Date: Tue Jul 22 11:14:10 2008 +0100 tty-usb-kobil-sct: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 0c265f4e8598e251108759685dbb3789868086b2 Author: Alan Cox Date: Tue Jul 22 11:14:00 2008 +0100 tty-usb-kl5kusb105: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 8dd03a5b2b775b0932c1705dc19298ccda19167d Author: Alan Cox Date: Tue Jul 22 11:13:51 2008 +0100 keyspan_pda: Use string flip functions Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9e70f319d14ac4dd077de7fc835a391ece804500 Author: Alan Cox Date: Tue Jul 22 11:13:42 2008 +0100 tty-usb-keyspan-pda: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit f035a8ad158f0bdc94125004488b0ea8438edaa9 Author: Alan Cox Date: Tue Jul 22 11:13:32 2008 +0100 keyspan: Use string flip functions when possible Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit deb91685784fc0bc845c582f8b2bc229cb7bc9da Author: Alan Cox Date: Tue Jul 22 11:13:08 2008 +0100 tty-usb-keyspan: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 9e8e2d2ab58ee942b700a9453541d7539b704994 Author: Alan Cox Date: Tue Jul 22 11:12:59 2008 +0100 tty-usb-iuu-phoenix: Clean up to coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 6d1d1698966ab6a5ac7ddcb16602ffebcf97f887 Author: Alan Cox Date: Tue Jul 22 11:12:51 2008 +0100 tty-usb-ipw: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit eb6215ccd403153c6376f7eaa7b31eef19e488f5 Author: Alan Cox Date: Tue Jul 22 11:12:41 2008 +0100 ipaq: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 2e0ddd626d14f3b69d6c1bdd526721a65d52f93b Author: Alan Cox Date: Tue Jul 22 11:12:33 2008 +0100 io_ti: Minor coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit a8d6f0a9c4c9af0e478383d870e828693e983dfb Author: Alan Cox Date: Tue Jul 22 11:12:24 2008 +0100 usb-serial: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d60d43965e46674b9097b422336a55c6ca08559a Author: Alan Cox Date: Tue Jul 22 11:12:15 2008 +0100 tty-usb-visor: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 3a262b2ea7c0905026c0be3618dba1f825e5387a Author: Alan Cox Date: Tue Jul 22 11:12:05 2008 +0100 tty-usb-hp4x: Fix overlong line Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit ae64387a54fd519d68aa7d1aacba095140f1a647 Author: Alan Cox Date: Tue Jul 22 11:11:55 2008 +0100 tty-usb-generic: Code cleanup Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit af6d780b578778d442278ac4894ff10847bebae2 Author: Alan Cox Date: Tue Jul 22 11:11:44 2008 +0100 garmin_gps: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 64701e8122fff3605c674c056749864c97485de4 Author: Alan Cox Date: Tue Jul 22 11:11:34 2008 +0100 funsoft: Switch to linux/uaccess Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 464cbb24698ddb7bf24b2b73204e3dc121886211 Author: Alan Cox Date: Tue Jul 22 11:11:23 2008 +0100 ftdi_sio: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 93c467952ff6b5c3d92fddf4b1a609e68f6d08d1 Author: Alan Cox Date: Tue Jul 22 11:11:11 2008 +0100 empeg: Coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 41ad427da1f9303e2e34811398b31c999c3d39d1 Author: Alan Cox Date: Tue Jul 22 11:11:02 2008 +0100 digi_acceleport: coding style Code tidy Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 77336828c01933d37102c4bef6e2a2cf7e3243b3 Author: Alan Cox Date: Tue Jul 22 11:10:53 2008 +0100 usb-cypress: There is no 0 case to go with CS5/6/7/8 so remove the test Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 813a224fa5bff3e34309a6494e231d5ebfa0fb4e Author: Alan Cox Date: Tue Jul 22 11:10:36 2008 +0100 cypress_m8: coding style Coding style clean ups Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b9c52f155f86eca9c4625b254b5f41dc151431be Author: Alan Cox Date: Tue Jul 22 11:10:27 2008 +0100 cyberjack: Coding style Coding style fixups Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit ff7eb602605cc0100f089d57966fcd347e137137 Author: Alan Cox Date: Tue Jul 22 11:10:17 2008 +0100 cp2101: coding style Bring up to coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c17ee886976b64d29ea89ee5d87751438e26025b Author: Alan Cox Date: Tue Jul 22 11:10:08 2008 +0100 tty-usb-console: Fix termios Setting CFLAG bits is all well and good but you must sort out ispeed and ospeed properly. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 4dbd5a0961ff55cb8a7bce309dd5ef9b04090570 Author: Alan Cox Date: Tue Jul 22 11:09:57 2008 +0100 tty-usb-console: tidy the USB console code Code tidy Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit c97611c16d9b3c37fcf3c18cc442dfde3a8b5d43 Author: Alan Cox Date: Tue Jul 22 11:09:48 2008 +0100 usb-serial-bus: tidy coding style Tidy up Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b69c14992ecbff99d1b2b66d8ccbcffe131c6e38 Author: Alan Cox Date: Tue Jul 22 11:09:39 2008 +0100 belkin_sa: clean up code Coding style tidy up for belkin_sa Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 72e2741256e65f2adcc03754523d6a2fdb260e4a Author: Alan Cox Date: Tue Jul 22 11:09:29 2008 +0100 whiteheat: fix bugs found in the tidy and audit Termios tidy up, plus fix break and DTR. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 80359a9c5c03d585686e2596c9ee46703eb03047 Author: Alan Cox Date: Tue Jul 22 11:09:16 2008 +0100 whiteheat: coding style Bring ezusb and whiteheat into line with the coding style Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 95da310e66ee8090119596c70ca8432e57f9a97f Author: Alan Cox Date: Tue Jul 22 11:09:07 2008 +0100 usb_serial: API all change USB serial likes to use port->tty back pointers for the real work it does and to do so without any actual locking. Unfortunately when you consider hangup events, hangup/parallel reopen or even worse hangup followed by parallel close events the tty->port and port->tty pointers are not guaranteed to be the same as port->tty is the active tty while tty->port is the port the tty may or may not still be attached to. So rework the entire API to pass the tty struct. For console cases we need to pass both for now. This shows up multiple drivers that immediately crash with USB console some of which have been fixed in the process. Longer term we need a proper tty as console abstraction Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 1aa3692da57c773e5c76de55c5c4a953962d360e Author: Alan Cox Date: Tue Jul 22 11:08:53 2008 +0100 ttydev: Fix up compile failures in the PPC build Fix up a couple of reported merge problems Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit d35cb360c29956510b2fe1a953bd4968536f7216 Author: Mathieu Desnoyers Date: Mon Jul 21 14:21:38 2008 -0700 markers: fix duplicate modpost entry When a kernel was rebuilt, the previous Module.markers was not cleared. It caused markers with different format strings to appear as duplicates when a markers was changed. This problem is present since scripts/mod/modpost.c started to generate Module.markers, commit b2e3e658b344c6bcfb8fb694100ab2f2b5b2edb0 It therefore applies to 2.6.25, 2.6.26 and linux-next. I merely merged the patches from Roland, Wenji and Takashi here. Credits to Roland McGrath Wenji Huang and Takashi Nishiie for providing the individual fixes. - Changelog : - Integrated Takashi's Makefile modification to clear Module.markers upon make clean. Signed-off-by: Mathieu Desnoyers Cc: Roland McGrath Cc: Wenji Huang Cc: Takashi Nishiie Cc: [2.6.25.x, 2.6.26.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f17156fc55abac476d180e480bedb0f07f01b14 Author: Atsushi Nemoto Date: Mon Jul 21 14:21:37 2008 -0700 Fix build on COMPAT platforms when CONFIG_EPOLL is disabled Add missing cond_syscall() entry for compat_sys_epoll_pwait. Signed-off-by: Atsushi Nemoto Cc: Davide Libenzi Cc: [2.6.25.x, 2.6.26.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 141c024036dc8ee7b2b374c6645659f1a2fc4334 Author: Rajiv Andrade Date: Mon Jul 21 14:21:37 2008 -0700 tpm: MAINTAINERS whitespace fix and email addresses addition Signed-off-by: Rajiv Andrade Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee1e6ab6056a8b9c19377257002da98b83819531 Author: Alexey Dobriyan Date: Mon Jul 21 14:21:36 2008 -0700 proc: fix /proc/*/pagemap some more struct pagemap_walk was placed on stack, some hooks are initialized, the rest (->pgd_entry, ->pud_entry, ->pte_entry) are valid but junk. Reported-by: Eric Sesterhenn Signed-off-by: Alexey Dobriyan Cc: "Vegard Nossum" Cc: [2.6.25.x, 2.6.26.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91cd4d6ef0abb1f65e81f8fe37e7d3c10344e38c Author: Miao Xie Date: Mon Jul 21 14:21:35 2008 -0700 cpusets: fix wrong domain attr updates Fix wrong domain attr updates, or we will always update the first sched domain attr. Signed-off-by: Miao Xie Cc: Hidetoshi Seto Cc: Paul Jackson Cc: Nick Piggin Cc: Ingo Molnar Cc: [2.6.26.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1673ad52bd9a3c747e596a76e65c55981ea651e3 Author: David Brownell Date: Mon Jul 21 14:21:34 2008 -0700 gpio: pcf857x: add lock and handle more chips Two small updates to the pcf857x driver: (a) the max732[89] chips are also second sources for the pcf8574/a, and (b) add a mutex to prevent trashing the cached state. Adding the lock is effectively a bugfix, although it seems unlikely that anyone would have run into the issue it protects against. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c36ec31473593aa937ff04f3b3b630e81512734 Author: Juergen Beisert Date: Mon Jul 21 14:21:34 2008 -0700 gpio: gpio driver for max7301 SPI GPIO expander Maxim's MAX7301 is an SPI GPIO expander with 28 GPIOs. Note: MAX7301's interrupt feature is not supported yet. [akpm@linux-foundation.org: coding-style fixes] [g.liakhovetski@pengutronix.de: Fix inaccuracies in comments, check spi_setup() return code, mask off high byte in max7301_read()] Signed-off-by: Juergen Beisert Signed-off-by: Guennadi Liakhovetski Cc: Russell King Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 651910874633a75f4a726d44e449be0a56b4b2e0 Author: John Reiser Date: Mon Jul 21 14:21:32 2008 -0700 execve filename: document and export via auxiliary vector The Linux kernel puts the filename argument of execve() into the new address space. Many developers are surprised to learn this. Those who know and could use it, object "But it's not documented." Those who want to use it dislike the expression (char *)(1+ strlen(env[-1+ n_env]) + env[-1+ n_env]) because it requires locating the last original environment variable, and assumes that the filename follows the characters. This patch documents the insertion of the filename, and makes it easier to find by adding a new tag AT_EXECFN in the ElfXX_auxv_t; see . In many cases readlink("/proc/self/exe",) gives the same answer. But if all the original pages get unmapped, then the kernel erases the symlink for /proc/self/exe. This can happen when a program decompressor does a good job of cleaning up after uncompressing directly to memory, so that the address space of the target program looks the same as if compression had never happened. One example is http://upx.sourceforge.net . One notable use of the underlying concept (what path containED the executable) is glibc expanding $ORIGIN in DT_RUNPATH. In practice for the near term, it may be a good idea for user-mode code to use both /proc/self/exe and AT_EXECFN as fall-back methods for each other. /proc/self/exe can fail due to unmapping, AT_EXECFN can fail because it won't be present on non-new systems. The auxvec or {AT_EXECFN}.d_val also can get overwritten, although in nearly all cases this would be the result of a bug. The runtime cost is one NEW_AUX_ENT using two words of stack space. The underlying value is maintained already as bprm->exec; setup_arg_pages() in fs/exec.c slides it for stack_shift, etc. Signed-off-by: John Reiser Cc: Roland McGrath Cc: Jakub Jelinek Cc: Ulrich Drepper Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d536b1f86591fb081c7a56eab04e711eb4dab951 Author: Jan Kratochvil Date: Tue Jul 22 14:00:47 2008 +0200 x86: fix crash due to missing debugctlmsr on AMD K6-3 currently if you use PTRACE_SINGLEBLOCK on AMD K6-3 (i586) it will crash. Kernel now wrongly assumes existing DEBUGCTLMSR MSR register there. Removed the assumption also for some other non-K6 CPUs but I am not sure there (but it can only bring small inefficiency there if my assumption is wrong). Based on info from Roland McGrath, Chuck Ebbert and Mikulas Patocka. More info at: https://bugzilla.redhat.com/show_bug.cgi?id=456175 Signed-off-by: Jan Kratochvil Cc: Signed-off-by: Ingo Molnar commit a1ef5adb4cad43460ebba23c5a78cf4a55bb6a5b Author: Johannes Berg Date: Tue Jul 8 19:00:17 2008 +0200 remove CONFIG_KMOD from core kernel code Always compile request_module when the kernel allows modules. Signed-off-by: Johannes Berg Signed-off-by: Rusty Russell commit a00caa1fa954c734f4214a074727a329a9ba6568 Author: Johannes Berg Date: Tue Jul 8 19:00:24 2008 +0200 remove CONFIG_KMOD from lib textsearch algorithms can be loaded, make the code depend on CONFIG_MODULES instead of CONFIG_KMOD. Signed-off-by: Johannes Berg Signed-off-by: Rusty Russell commit 184b6c7682e484032e3f845eef5db26e72681d6f Author: Johannes Berg Date: Tue Jul 8 19:00:20 2008 +0200 remove CONFIG_KMOD from sparc64 One place is just a comment, the other a conditional, unused inclusion of linux/kmod.h. Signed-off-by: Johannes Berg Cc: David S. Miller Signed-off-by: Rusty Russell commit df648c9fbebb4de50e7a6e76cc253c7cb0421f9b Author: Johannes Berg Date: Tue Jul 8 19:00:18 2008 +0200 rework try_then_request_module to do less in non-modular kernels This reworks try_then_request_module to only invoke the "lookup" function "x" once when the kernel is not modular. Signed-off-by: Johannes Berg Signed-off-by: Rusty Russell commit a81792f668c20540c336af4242ba1400763eb14f Author: Johannes Berg Date: Tue Jul 8 19:00:25 2008 +0200 remove mention of CONFIG_KMOD from documentation Also includes a few Kconfig files (xtensa, blackfin) Signed-off-by: Johannes Berg Cc: Michael Kerrisk Cc: linux-doc@vger.kernel.org Signed-off-by: Rusty Russell Acked-by: Randy Dunlap commit baabaae98125fbd1a8dc258aa95333c01cd9e206 Author: Johannes Berg Date: Tue Jul 8 19:00:16 2008 +0200 make CONFIG_KMOD invisible ... as preparation for removing it completely, make it an invisible bool defaulting to yes. Signed-off-by: Johannes Berg Signed-off-by: Rusty Russell commit 3a642e99babe0617febb6f402e1e063479f489db Author: Rusty Russell Date: Tue Jul 22 19:24:28 2008 -0500 modules: Take a shortcut for checking if an address is in a module This patch keeps track of the boundaries of module allocation, in order to speed up module_text_address(). Inspired by Arjan's version, which required arch-specific defines: Various pieces of the kernel (lockdep, latencytop, etc) tend to store backtraces, sometimes at a relatively high frequency. In itself this isn't a big performance deal (after all you're using diagnostics features), but there have been some complaints from people who have over 100 modules loaded that this is a tad too slow. This is due to the new backtracer code which looks at every slot on the stack to see if it's a kernel/module text address, so that's 1024 slots. 1024 times 100 modules... that's a lot of list walking. Signed-off-by: Rusty Russell commit 2f0f2a334bc38b61a9afca951185cd3844ee709d Author: Denys Vlasenko Date: Tue Jul 22 19:24:27 2008 -0500 module: turn longs into ints for module sizes This shrinks module.o and each *.ko file. And finally, structure members which hold length of module code (four such members there) and count of symbols are converted from longs to ints. We cannot possibly have a module where 32 bits won't be enough to hold such counts. For one, module loading checks module size for sanity before loading, so such insanely big module will fail that test first. Signed-off-by: Denys Vlasenko Signed-off-by: Rusty Russell commit f7f5b67557eac1131ba6532522e3c50eced34238 Author: Denys Vlasenko Date: Tue Jul 22 19:24:26 2008 -0500 Shrink struct module: CONFIG_UNUSED_SYMBOLS ifdefs module.c and module.h conatains code for finding exported symbols which are declared with EXPORT_UNUSED_SYMBOL, and this code is compiled in even if CONFIG_UNUSED_SYMBOLS is not set and thus there can be no EXPORT_UNUSED_SYMBOLs in modules anyway (because EXPORT_UNUSED_SYMBOL(x) are compiled out to nothing then). This patch adds required #ifdefs. Signed-off-by: Denys Vlasenko Signed-off-by: Rusty Russell commit af5406895a05720a879dc33e2f4878fa503e81b3 Author: Richard Kennedy Date: Tue Jul 22 19:24:26 2008 -0500 module: reorder struct module to save space on 64 bit builds reorder struct module to save space on 64 bit builds. saves 1 cacheline_size (128 on default x86_64 & 64 on AMD Opteron/athlon) when CONFIG_MODULE_UNLOAD=y. Signed-off-by: Richard Kennedy Signed-off-by: Rusty Russell commit dafd0940c96fec67974a88ed8e6b8ba3160394cd Author: Rusty Russell Date: Tue Jul 22 19:24:25 2008 -0500 module: generic each_symbol iterator function Introduce an each_symbol() iterator to avoid duplicating the knowledge about the 5 different sections containing symbols. Currently only used by find_symbol(), but will be used by symbol_put_addr() too. (Includes NULL ptr deref fix by Jiri Kosina ) Signed-off-by: Rusty Russell Cc: Jiri Kosina commit da39ba5e1d65e997a98f6eb93ba6e6eb505f6e3c Author: Rusty Russell Date: Tue Jul 22 19:24:25 2008 -0500 module: don't use stop_machine for waiting rmmod rmmod has a little-used "-w" option, meaning that instead of failing if the module is in use, it should block until the module becomes unused. In this case, we don't need to use stop_machine: Max Krasnyansky indicated that would be useful for SystemTap which loads/unloads new modules frequently. Cc: Max Krasnyansky Signed-off-by: Rusty Russell commit 77be1fabd024b37423d12f832b1fbdb95dbdf494 Author: Jeremy Fitzhardinge Date: Mon Jul 21 22:59:56 2008 -0700 x86: add PTE_FLAGS_MASK PTE_PFN_MASK was getting lonely, so I made it a friend. Signed-off-by: Jeremy Fitzhardinge Cc: Rusty Russell Signed-off-by: Ingo Molnar commit 59438c9fc4f7a92c808c9049bc6b396f98bf954c Author: Jeremy Fitzhardinge Date: Mon Jul 21 22:59:42 2008 -0700 x86: rename PTE_MASK to PTE_PFN_MASK Rusty, in his peevish way, complained that macros defining constants should have a name which somewhat accurately reflects the actual purpose of the constant. Aside from the fact that PTE_MASK gives no clue as to what's actually being masked, and is misleadingly similar to the functionally entirely different PMD_MASK, PUD_MASK and PGD_MASK, I don't really see what the problem is. But if this patch silences the incessent noise, then it will have achieved its goal (TODO: write test-case). Signed-off-by: Jeremy Fitzhardinge Cc: Rusty Russell Signed-off-by: Ingo Molnar commit c2e3277f875b83e5adc34e96989d6d87ec5f80f7 Author: Rusty Russell Date: Tue Jul 22 15:40:46 2008 +1000 x86: fix pte_flags() to only return flags, fix lguest (updated) (Jeremy said: rusty: use PTE_MASK rusty: use PTE_MASK rusty: use PTE_MASK When I asked: jsgf: does that include the NX flag? He responded eloquently: rusty: use PTE_MASK rusty: use PTE_MASK yes, it's the official constant of masking flags out of ptes ) Change a15af1c9ea2750a9ff01e51615c45950bad8221b 'x86/paravirt: add pte_flags to just get pte flags' removed lguest's private pte_flags() in favor of a generic one. Unfortunately, the generic one doesn't filter out the non-flags bits: this results in lguest creating corrupt shadow page tables and blowing up host memory. Since noone is supposed to use the pfn part of pte_flags(), it seems safest to always do the filtering. Signed-off-by: Rusty Russell Acked-by: Jeremy Fitzhardinge Signed-off-and-morning-tea-spilled-by: Ingo Molnar commit 8725f25acc656c1522d48a6746055099efdaca4c Merge: c69cccc... 93ded9b... Author: Benjamin Herrenschmidt Date: Tue Jul 22 17:12:37 2008 +1000 Merge commit 'origin/master' Manually fixed up: drivers/net/fs_enet/fs_enet-main.c commit 988781dc3e1d9209192b04458d279815923f5e76 Author: Yinghai Lu Date: Mon Jul 21 11:21:43 2008 -0700 x86: use setup_clear_cpu_cap with disable_apic, fix beauty fix: /proc/cpuinfo will still show apic feature even if we booted up with it disabled. Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar commit 3f9787046ea37a26170dc4439efa21f8d23a9978 Author: Kay Sievers Date: Fri May 30 17:42:11 2008 +0200 arm: bus_id -> dev_name() and dev_set_name() conversions Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 2222c313e9371b6476787594bc5804c72cee2597 Author: Greg Kroah-Hartman Date: Fri May 2 06:02:41 2008 +0200 sparc64: fix up bus_id changes in sparc core code This converts all instances of bus_id in the sparc core kernel to use either dev_set_name(), or dev_name() depending on the need. This is done in anticipation of removing the bus_id field from struct driver. Cc: Kay Sievers Acked-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 361d5ee3c04c43c8fa0e277545ac5258dc310a5e Author: Greg Kroah-Hartman Date: Wed Jul 2 12:46:22 2008 -0700 3c59x: handle pci_name() being const This changes vortex_prob1() to handle pci_name() now returning a constant string. Cc: Steffen Klassert Signed-off-by: Greg Kroah-Hartman commit eadcf0d704a46979c29984fa05f1fc413c775bcb Author: Greg Kroah-Hartman Date: Wed Jul 2 12:46:22 2008 -0700 MTD: handle pci_name() being const This changes the MTD core to handle pci_name() now returning a constant string. Cc: David Woodhouse Signed-off-by: Greg Kroah-Hartman commit 89bcb05d9bbf8bd559988bca4f2579defd28d008 Author: David Altobelli Date: Wed Jul 2 09:38:53 2008 -0600 HP iLO driver A driver for the HP iLO/iLO2 management processor, which allows userspace programs to query the management processor. Programs can open a channel to the device (/dev/hpilo/dXccbN), and use this to send/receive queries. The O_EXCL open flag is used to indicate that a particular channel cannot be shared between processes. This driver will replace various packages HP has shipped, including hprsm and hp-ilo. Signed-off-by: David Altobelli Signed-off-by: Greg Kroah-Hartman commit d95d62c018209355c0dc998682ff792432aa870c Author: Andi Kleen Date: Tue Jul 1 18:48:43 2008 +0200 sysdev: Convert the x86 mce tolerant sysdev attribute to generic attribute Use the new generic int attribute accessors for the x86 mce tolerant attribute. Simple example to illustrate the new macros. There are much more places all over the tree that could be converted like this. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 9800794ac11d4646384b3a310dfd1fe2eed577bf Author: Andi Kleen Date: Tue Jul 1 18:48:42 2008 +0200 sysdev: Add utility functions for simple int/ulong variable sysdev attributes This adds a new sysdev_ext_attribute that stores a pointer to the variable it manages and some utility functions/macro to easily use them. Previously all users wrote custom macros to generate show/store functions for each variable, with this it is possible to avoid that in many cases. Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 4a0b2b4dbe1335b8b9886ba3dc85a145d5d938ed Author: Andi Kleen Date: Tue Jul 1 18:48:41 2008 +0200 sysdev: Pass the attribute to the low level sysdev show/store function This allow to dynamically generate attributes and share show/store functions between attributes. Right now most attributes are generated by special macros and lots of duplicated code. With the attribute passed it's instead possible to attach some data to the attribute and then use that in shared low level functions to do different things. I need this for the dynamically generated bank attributes in the x86 machine check code, but it'll allow some further cleanups. I converted all users in tree to the new show/store prototype. It's a single huge patch to avoid unbisectable sections. Runtime tested: x86-32, x86-64 Compiled only: ia64, powerpc Not compile tested/only grep converted: sh, arm, avr32 Signed-off-by: Andi Kleen Signed-off-by: Greg Kroah-Hartman commit 36ce6dad6e3cb3f050ed41e0beac0070d2062b25 Author: Cornelia Huck Date: Tue Jun 10 11:09:08 2008 +0200 driver core: Suppress sysfs warnings for device_rename(). driver core: Suppress sysfs warnings for device_rename(). Renaming network devices to an already existing name is not something we want sysfs to print a scary warning for, since the callers can deal with this correctly. So let's introduce sysfs_create_link_nowarn() which gets rid of the common warning. Signed-off-by: Cornelia Huck Signed-off-by: Greg Kroah-Hartman commit 0ad1d6f37cc3bb234c6e7ae30e40d1d40b9aa258 Author: Wang Chen Date: Tue Jun 24 16:59:02 2008 +0800 kobject: Transmit return value of call_usermodehelper() to caller kobject_uevent_env() drops the return value of call_usermodehelper(). It will make upper caller, such as dm_send_uevents(), to lose error information. BTW, Previously kobject_uevent_env() transmitted return of call_usermodehelper() to callers, but commit 5f123fbd80f4f788554636f02bf73e40f914e0d6 "[PATCH] merge kobject_uevent and kobject_hotplug" removed it. Signed-off-by: Wang Chen Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 83c79b55f0d929a0dcf2b0d347cd1875afc06f21 Author: Nathan Lynch Date: Wed Jul 2 10:21:30 2008 -0700 sysfs-rules.txt: reword API stability statement The first paragraph of this document implies that user space developers shouldn't use sysfs at all, but then it goes on to describe rules that developers should follow when accessing sysfs. Not only is this somewhat self-contradictory, it has been shown to discourage developers from using established sysfs interfaces. A note of caution is more appropriate than a blanket "sysfs will never be stable" assertion. Signed-off-by: Nathan Lynch Cc: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 9505e6375640fc61d92d36c8e9f25a6a218f3f57 Author: Haavard Skinnemoen Date: Tue Jul 1 15:14:51 2008 +0200 debugfs: Implement debugfs_remove_recursive() debugfs_remove_recursive() will remove a dentry and all its children. Drivers can use this to zap their whole debugfs tree so that they don't need to keep track of every single debugfs dentry they created. It may fail to remove the whole tree in certain cases: sh-3.2# rmmod atmel-mci < /sys/kernel/debug/mmc0/ios/clock mmc0: card b368 removed atmel_mci atmel_mci.0: Lost dma0chan1, falling back to PIO sh-3.2# ls /sys/kernel/debug/mmc0/ ios But I'm not sure if that case can be handled in any sane manner. Signed-off-by: Haavard Skinnemoen Cc: Pierre Ossman Signed-off-by: Greg Kroah-Hartman commit 43166141f73f969794bd7c850c89913631df99e4 Author: Tsugikazu Shibata Date: Fri Jun 20 10:59:52 2008 +0900 HOWTO: change email addresses of James in HOWTO Signed-off-by: Tsugikazu Shibata Signed-off-by: Greg Kroah-Hartman commit d9b19199e4894089456aaad295023263b5225c1a Author: Adrian Bunk Date: Tue Jun 10 19:04:08 2008 +0300 always enable FW_LOADER unless EMBEDDED=y James Bottomley recently discovered that we have {request,release}_firmware() dummies for the case of the actual functions not being available and has a fix for the bug that was actually causing build errors for built-in users with CONFIG_FW_LOADER=m. But now missing selects on FW_LOADER are no longer visible at compile-time at all and can become runtime problems. FW_LOADER is infrastructure with relatively small codesize we can safely enable for everyone, and only for people who really need small kernels (and can be expected to know what they are doing) it matters being able to disable it. This patch therefore always sets FW_LOADER=y and allows users only to disable it with EMBEDDED=y. As a bonus, we can then get rid of all "select FW_LOADER" plus the due to it required "depends on HOTPLUG" which removes some complexity from our Kconfig files. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 4f7e53096c93f0bdf2205134dfc541d0c3cc6e41 Author: Mike Frysinger Date: Tue Jun 24 14:25:00 2008 -0700 uio-howto.tmpl: use unique output names The Userspace I/O HOWTO template sets two different sections with the same html output name (about.html). This clearly won't work, so change the first one to a unique "aboutthis.html" to prevent clobbering. Signed-off-by: Mike Frysinger Acked-by: Hans J. Koch Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 17149d9fff18c4811349140934dc541f70c617df Author: Mike Frysinger Date: Tue Jun 24 14:24:57 2008 -0700 uio-howto.tmpl: use standard copyright/legal markings The Userspace I/O HOWTO document uses straight tags and plain text to describe copyright/legal information. It should instead use the and tags like all other documents in the kernel. Signed-off-by: Mike Frysinger Acked-by: Hans J. Koch Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 93265d13ea5c3ec5f61a8009407fbe046ce6b7c0 Author: Miklos Szeredi Date: Mon Jun 16 13:46:47 2008 +0200 sysfs: don't call notify_change sysfs_chmod_file() calls notify_change() to change the permission bits on a sysfs file. Replace with explicit call to sysfs_setattr() and fsnotify_change(). This is equivalent, except that security_inode_setattr() is not called. This function is called by drivers, so the security checks do not make any sense. Signed-off-by: Miklos Szeredi Signed-off-by: Greg Kroah-Hartman commit 838ea8e8dbfc8d907c7a55bbad507a44c1b81d57 Author: Ben Dooks Date: Thu Jun 12 19:00:34 2008 +0100 sysdev: fix debugging statements in registration code. The systdev_class_register() and sysdev_register() functions have pr_debug() statements which are enabled when the user selects the driver core debug. Both of these routines do not produce the correct output, as they make assumptions about data which has not been initialised. In sysdev_class_register() the code uses the kobject_name(&cls->kset.kobj) at the start of the function, but this is not setup until later in the same call. Change this to use cls->name which is passed in from the caller. The sysdev_register() function tries to get the name of the sysdev by kobject_name(&sysdev->kobj), but that isn't setup until later in the same function so change this message to use the name of the sysdev's class and add another message once the name is initialised. Signed-off-by: Ben Dooks Signed-off-by: Greg Kroah-Hartman commit 185000fc556372b7fb7f26516c325f212030dbd3 Author: Li Zefan Date: Fri Jun 13 11:09:16 2008 +0800 kobject: should use kobject_put() in kset-example We should call kobject_put() instead of kfree() if kobject_init_and_add() returns an error, shouldn't we? Don't set up a bad example ;) Signed-off-by: Li Zefan Signed-off-by: Greg Kroah-Hartman commit a231934bdf086a4fefc0df06e669499125a9db6f Author: Richard Kennedy Date: Mon Jun 2 11:07:25 2008 +0100 kobject: reorder kobject to save space on 64 bit builds reorder kobject to save space on 64 bit builds. shrinks from 72 to 64 bytes & moves allocated kobject to a smaller slab. Signed-off-by: Richard Kennedy Signed-off-by: Greg Kroah-Hartman commit 6d8333c24d41637f0f847f6e17032189dae08c02 Author: Uwe Kleine-König Date: Tue Jun 10 09:14:48 2008 +0200 UIO: minor style and comment fixes Signed-off-by: Uwe Kleine-König Signed-off-by: Hans J. Koch commit 4d80d59437247075029534adec8d69fce2cfb87a Author: Uwe Kleine-König Date: Sat May 31 11:37:27 2008 +0200 UIO: add generic UIO platform driver This patch adds a generic UIO platform driver. It eliminates the need for a dedicated kernel module for simple platform devices. Users only need to implement their irq handler in platform code and fill a struct uio_info there. This helps avoiding code duplication as UIO platform drivers often share a lot of common code. Signed-off-by: Uwe Kleine-König Signed-off-by: Hans J. Koch Signed-off-by: Greg Kroah-Hartman commit 328a14e70e7f46997cb50d4258dd93d5377f98c6 Author: Hans J. Koch Date: Fri May 23 13:50:14 2008 +0200 UIO: Add write function to allow irq masking Sometimes it is necessary to enable/disable the interrupt of a UIO device from the userspace part of the driver. With this patch, the UIO kernel driver can implement an "irqcontrol()" function that does this. Userspace can write an s32 value to /dev/uioX (usually 0 or 1 to turn the irq off or on). The UIO core will then call the driver's irqcontrol function. Signed-off-by: Hans J. Koch Acked-by: Uwe Kleine-König Acked-by: Magnus Damm Signed-off-by: Greg Kroah-Hartman commit 934da4766e5f72797118f7c014efaef567a812fc Author: Uwe Kleine-König Date: Sat May 31 11:37:27 2008 +0200 UIO: fix UIO Kconfig dependencies ae210f188614bb3d1ee3f19c64e28e3cdd44877c introduced a big "if UIO"/"endif" where all uio drivers are defined. So know there is no need for them to depend explicitly on UIO. Signed-off-by: Uwe Kleine-König Signed-off-by: Hans J. Koch Signed-off-by: Greg Kroah-Hartman commit 22454cb99fc39f2629ad06a7eccb3df312f8830e Author: Kay Sievers Date: Wed May 28 23:06:47 2008 +0200 pnp: add acpi:* modalias entries Along with the non-modalias conformant "pnp:*" aliases, we add "acpi:*" entries to PNP drivers, to allow module autoloading by ACPI PNP device entries, which export proper modalias information, without any specific userspace modprobe mangling. Cc: Adam Belay Cc: Thomas Renninger Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit fc3a8828b139c24aade3f9d608775e36c248f8f5 Author: Greg Kroah-Hartman Date: Fri May 2 06:02:41 2008 +0200 driver core: fix a lot of printk usages of bus_id We have the dev_printk() variants for this kind of thing, use them instead of directly trying to access the bus_id field of struct device. This is done in order to remove bus_id entirely. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit b98cb4b7fe0e83238501b48489e46b3e0dce9aaf Author: Greg Kroah-Hartman Date: Fri May 2 06:02:41 2008 +0200 driver core: remove DEVICE_ID_SIZE define There is no such thing as a "device id size" in the driver core, so remove the define and fix up any users of this odd define in the rest of the kernel. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit ca52a49846f1451163c0dc14c40cd06ff808df3e Author: Kay Sievers Date: Fri May 2 06:02:41 2008 +0200 driver core: remove DEVICE_NAME_SIZE define There is no such thing as a "device name size" in the driver core, so remove the define and fix up any users of this odd define in the rest of the kernel. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit aab0de245150c09e61c30962feb16aacde508dc3 Author: Kay Sievers Date: Fri May 2 06:02:41 2008 +0200 driver core: remove KOBJ_NAME_LEN define Kobjects do not have a limit in name size since a while, so stop pretending that they do. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit f75b1c60fc1e53c4004a79ea0be071aa3318cdcc Author: Dave Young Date: Wed May 28 09:28:39 2008 -0700 class: change internal semaphore to a mutex Now that the lockdep infrastructure in the class core is in place, we should be able to properly change the internal class semaphore to be a mutex. David wrote the original patch, and Greg fixed it up to apply properly due to all of the recent changes in this area. From: Dave Young Cc: Matthew Wilcox Cc: Kay Sievers Cc: Andrew Morton Cc: James Bottomley Signed-off-by: Greg Kroah-Hartman commit d2a3b9146e4f40c2e872d7567c996ef95083d802 Author: Matthew Wilcox Date: Wed May 28 09:28:39 2008 -0700 class: add lockdep infrastructure This adds the infrastructure to properly handle lockdep issues when the internal class semaphore is changed to a mutex. Matthew wrote the original patch, and Greg fixed it up to work properly with the class_create() function. From: Matthew Wilcox Cc: Kay Sievers Cc: Dave Young Cc: Andrew Morton Cc: James Bottomley Cc: Peter Zijlstra Cc: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 1e41250863cd4de5ffa0678c405d001ca5b62796 Author: Greg Kroah-Hartman Date: Wed May 28 09:28:39 2008 -0700 class: fix docbook comments for class_private structure Removes a field that has been deleted, and adds a description fo the class_dirs field which was previously undocumented. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit d9a0157328507c5f563e16a583cd0a063854aebb Author: Greg Kroah-Hartman Date: Wed May 28 09:28:39 2008 -0700 class: rename "sem" to "class_sem" in internal class structure This renames the struct class "sem" field to be "class_sem" to make things easier when struct bus_type and struct class merge in the future. It also makes grepping for fields easier as well. Based on an idea from Kay. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 1fbfee6c6dc0f4a4c587b6b163ee79643fc9aaa7 Author: Greg Kroah-Hartman Date: Wed May 28 09:28:39 2008 -0700 class: rename "subsys" to "class_subsys" in internal class structure This renames the struct class "subsys" field to be "class_subsys" to make things easier when struct bus_type and struct class merge in the future. It also makes grepping for fields easier as well. Based on an idea from Kay. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 184f1f779d5a2e62de4a0b34842ddf8546beca8f Author: Greg Kroah-Hartman Date: Wed May 28 09:28:39 2008 -0700 class: rename "interfaces" to "class_interfaces" in internal class structure This renames the struct class "interfaces" field to be "class_interfaces" to make things easier when struct bus_type and struct class merge in the future. It also makes grepping for fields easier as well. Based on an idea from Kay. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 97ae69fdbaa71a8f7dbc20bf10fb349d1759152f Author: Greg Kroah-Hartman Date: Wed May 28 09:28:39 2008 -0700 class: rename "devices" to "class_devices" in internal class structure This renames the struct class "devices" field to be "class_devices" to make things easier when struct bus_type and struct class merge in the future. It also makes grepping for fields easier as well. Based on an idea from Kay. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 7c71448b8aa80123fc521563d5f7c63a099d97ab Author: Greg Kroah-Hartman Date: Tue Jan 22 18:17:41 2008 -0500 class: move driver core specific parts to a private structure This moves the portions of struct class that are dynamic (kobject and lock and lists) out of the main structure and into a dynamic, private, structure. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 16be63fd1670000b96b76cb55b6f1bead21b4c4b Author: Greg Kroah-Hartman Date: Tue May 27 11:50:16 2008 -0700 bluetooth: remove improper bluetooth class symlinks. Don't create symlinks in a class to a device that is not owned by the class. If the bluetooth subsystem really wants to point to all of the devices it controls, it needs to create real devices, not fake symlinks. Cc: Maxim Krasnyansky Cc: Kay Sievers Acked-by: Marcel Holtmann Signed-off-by: Greg Kroah-Hartman commit 110cf374a809817d5c080c0ac82d65d029820a66 Author: Greg Kroah-Hartman Date: Tue May 27 10:17:53 2008 +0300 infiniband: make cm_device use a struct device and not a kobject. This object really should be a struct device, or at least contain a pointer to a struct device, as it is trying to create a separate device tree outside of the main device tree. This patch fixes this problem. It is needed for the class core rework that is being done in the driver core. Cc: Kay Sievers Cc: Roland Dreier Cc: Sean Hefty Cc: Hal Rosenstock Signed-off-by: Greg Kroah-Hartman commit d4c4196f24ade5f336882587480652efde2c739c Author: Greg Kroah-Hartman Date: Tue May 27 10:17:53 2008 +0300 infiniband: rename "device" to "ib_device" in cm_device This pointer really is a struct ib_device, not a struct device, so name it properly to help prevent confusion. This makes the followon patch in this series much smaller and easier to understand as well. Cc: Kay Sievers Cc: Roland Dreier Cc: Hal Rosenstock Acked-by: Sean Hefty Signed-off-by: Greg Kroah-Hartman commit 27f302519148f311307637d4c9a6d0fd87d07e4c Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 block: make /proc/partitions and /proc/diskstats use class_find_device() Use the proper class iterator function instead of mucking around in the internals of the class structures. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 66c64afec16a7b46212ecb2fa99998923bbeea3f Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 block: move header for /proc/partitions to seq_start The seq_start call is the better place for the header for the file, that way we don't have to be mucking in the class structure to try to figure out if this is the first partition or not. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 68c4d4a7875c59f2e4b72901ab11ba978e75bde0 Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 block: make proc files seq_start use the class_find_device() Use the proper class iterator function instead of mucking around in the internals of the class structures. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit a6e2ba88774bc5870ab3d9664cb86d70415f7402 Author: Randy Dunlap Date: Fri May 23 09:44:11 2008 -0700 block: make /proc/diskstats only build if CONFIG_PROC_FS is enabled These functions are only needed if CONFIG_PROC_FS is enabled, so save the space when it is not. This also makes it easier for a patch later in this series to work properly if CONFIG_PROC_FS is not enabled. Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit a142be856f060ae8106512c0e81a8d6f8746ab0b Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 block: make blk_lookup_devt use the class iterator function Use the proper class iterator function instead of mucking around in the internals of the class structures. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 5c6f35c5ece8f130cd8ec9ba0d71dc146b46a0f1 Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 block: make printk_partition use the class iterator function Use the proper class iterator function instead of mucking around in the internals of the class structures. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 6ffeea77ff014f1456fcd0564eac84b34e9535ca Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 block: fix compiler warning in genhd.c Warn if something really bad happens if we can't create this link. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 695794ae0c5bdd9bd06e35b118801e2e9be04f9e Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 Driver Core: add ability for class_find_device to start in middle of list This mirrors the functionality that driver_find_device has as well. We add a start variable, and all callers of the function are fixed up at the same time. The block layer will be using this new functionality in a follow-on patch. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 93562b537659fc0f63920fd4d9d24f54e434f4c4 Author: Greg Kroah-Hartman Date: Thu May 22 17:21:08 2008 -0400 Driver Core: add ability for class_for_each_device to start in middle of list This mirrors the functionality that driver_for_each_device has as well. We add a start variable, and all callers of the function are fixed up at the same time. The block layer will be using this new functionality in a follow-on patch. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 4e10673944a5c386378ff9d692ae37e19993f9d5 Author: Greg Kroah-Hartman Date: Mon Jul 21 20:03:34 2008 -0700 device create: convert device_create_drvdata to device_create Now that device_create() has been audited, rename things back to the original call to be sane. Keep the device_create_drvdata macro around to make merges easier. Signed-off-by: Greg Kroah-Hartman commit ccea44fadca396b0f89aed5bdeb60e4abb212566 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 driver core: remove device_create() There are no more users of this, and it is racy. Use device_create_drvdata() or device_create_vargs() instead. Signed-off-by: Greg Kroah-Hartman commit 3bfd49c8ab1859ae0f5fa1df2b3781c99115f442 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: x86: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit bc00bc924295f02295fe5eeeba3618ba0d0db1ef Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: usb: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Signed-off-by: Greg Kroah-Hartman commit 3d81252ddb10f63ae4db713d9b32faabe641b850 Author: David Brownell Date: Fri Jun 6 15:48:07 2008 -0500 device create: spi: convert device_create to device_create_drvdata Switch over to use the shiny new device_create_drvdata() call instead of the original device_create() calls, so this continues to work after device_create() is removed. Note that this driver never had the race which motivated removing the original call; it locked correctly. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 89409211ff97bf82295d1fb98ab18302a03e9199 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: sound: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Jaroslav Kysela Signed-off-by: Greg Kroah-Hartman commit 9def0b9761ee096c3c539b427dfb1e52b373cdad Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: scsi: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: James E.J. Bottomley Signed-off-by: Greg Kroah-Hartman commit 05675de250c4efcefbd488e6a556639b63898af8 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: s390: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Martin Schwidefsky Cc: Heiko Carstens Signed-off-by: Greg Kroah-Hartman commit e17da9c4c5fc19e16ddcb0ae020ee4425ca0c96f Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: net: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit daea34bc6f67cf3872d1b52ba5ccf249f3ceb176 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: mtd: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: David Woodhouse Signed-off-by: Greg Kroah-Hartman commit 7da5a05dd7b95315af49f724f623bbfdab0f5e4d Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: misc: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Signed-off-by: Greg Kroah-Hartman commit 43f98747d48195d92c4102c17d7175bf24df1801 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: mips: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Ralf Baechle Signed-off-by: Greg Kroah-Hartman commit 97cd790e3a9cf2855676a461ac5c448f5843017d Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: macintosh: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Benjamin Herrenschmidt Signed-off-by: Greg Kroah-Hartman commit 24d0b416f988fcdfa2615a25c7c33c21cc2a65a9 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: isdn: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Karsten Keil Signed-off-by: Greg Kroah-Hartman commit c76d3d28c31a68f45d6b5acaa4813138dd7883b3 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: infiniband: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. Cc: Roland Dreier Cc: Sean Hefty Cc: Hal Rosenstock Signed-off-by: Greg Kroah-Hartman commit f71674a09f374bb0b5371b3e7b943029867477c5 Author: Greg Kroah-Hartman Date: Wed May 21 12:52:33 2008 -0700 device create: ieee1394: convert device_create to device_create_drvdata device_create(