aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-10-07Merge branch 'pxa-trizeps' into pxa-machinesRussell King10-383/+680
Conflicts: drivers/pcmcia/Makefile
2008-10-07Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', ↵Russell King979-12474/+40260
'pxa-mitac', 'pxa-mp900', 'pxa-zylonite' and 'pxa-zaurus' into pxa-machines Conflicts: arch/arm/mach-pxa/poodle.c
2008-10-07Revert "V4L/DVB (8904): cx88: add missing unlock_kernel"Linus Torvalds1-1/+0
This reverts commit 135aedc38e812b922aa56096f36a3d72ffbcf2fb, as requested by Hans Verkuil. It was a patch for 2.6.28 where the BKL was pushed down from v4l core to the drivers, not for 2.6.27! Requested-by: Hans Verkuil <[email protected]> Cc: Mauro Carvalho Chehab <[email protected]> Signed-of-by: Linus Torvalds <[email protected]>
2008-10-07[ARM] pxa: trizeps4: remove unused variableRussell King1-1/+0
Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] 5285/1: pxa: update xm_x2xx_defconfigMike Rapoport1-86/+151
Signed-off-by: Russ Dill <[email protected]> Signed-off-by: Mike Rapoport <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] 5284/1: pxa: cm-x255: add NOR and NAND flash supportMike Rapoport1-0/+116
This patch adds support for NOR and NAND flashes on CM-X255. The NAND flash support uses not yet merged GPIO NAND driver. Signed-off-by: Russ Dill <[email protected]> Signed-off-by: Mike Rapoport <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] 5283/1: pxa: add CM-X255 pcmcia supportMike Rapoport4-13/+206
Signed-off-by: Russ Dill <[email protected]> Signed-off-by: Mike Rapoport <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] 5282/1: pxa: add CM-X255 supportMike Rapoport6-9/+199
Signed-off-by: Russ Dill <[email protected]> Signed-off-by: Mike Rapoport <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] 5281/1: pxa: split cm-x2xx.c to cm-x2xx.c and cm-x270.cMike Rapoport3-331/+356
Signed-off-by: Russ Dill <[email protected]> Signed-off-by: Mike Rapoport <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] 5280/1: pxa: prepare cm-x2xx.c and cm-x2xx-pci.[ch] for addition of ↵Mike Rapoport4-117/+126
CM-X255 - Change CM-X255 and CM-X270 common function prefix from cmx270 to cmx2xx - Split cmx2xx_init to common and CM-X270-specific parts - Use dynamic assignement for DM9000 resources and led GPIOs. Signed-off-by: Russ Dill <[email protected]> Signed-off-by: Mike Rapoport <[email protected]> Acked-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] 5286/2: pxa: rename cm-x270* to cm-x2xx* to allow addition of cm-x255 ↵Mike Rapoport5-3/+3
support Signed-off-by: Russ Dill <[email protected]> Signed-off-by: Mike Rapoport <[email protected]> Acked-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] 5294/1: Trizeps4 PCMCIA supportJürgen Schindele3-1/+259
Support for Trizeps4 SOM PCMCIA with ConXS or other baseboards. with double GPIO-free fixed (sorry!) replaces 5279/1 Signed-off-by: Jurgen Schindele <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-07[ARM] 5293/1: ep93xx: add defines for external chipselectsHartley Sweeten1-0/+34
This patch adds defines for the external chipselect physical base addresses available with the EP93xx. These are meant to be used in the platform init code. In addition, documentation about the synchronous/asynchronous boot modes for the EP93xx and a reference to errata about issues with synchronous booting has been added. Signed-off-by: <H Hartley Sweeten <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-06Linux 2.6.27-rc9Linus Torvalds1-1/+1
2008-10-06mac80211: avoid "Wireless Event too big" message for assoc responseJohn W. Linville1-3/+5
The association response IEs are sent to userland with an IWEVCUSTOM event, which unfortunately is limited to a little more than 100 bytes of IE information with the encoding used. Many APs send so much IE information that this message overflows. When the IWEVCUSTOM event is too large, the kernel doesn't send it to userland anyway -- better just not to send it. An attempt was made by Jouni Malinen to correct this issue by converting to use IWEVASSOCREQIE and IWEVASSOCRESPIE messages instead ("mac80211: Use IWEVASSOCREQIE instead of IWEVCUSTOM"). Unfortunately, that caused a problem due to 32-/64-bit interactions on some systems and was reverted after the 'userland ABI' rule was invoked. That leaves us with this option instead of a proper fix, at least until we move to a cfg80211-based solution. Signed-off-by: John W. Linville <[email protected]>
2008-10-06Marker depmod fix core kernel listMathieu Desnoyers1-2/+4
* Theodore Ts'o ([email protected]) wrote: > > I've been playing with adding some markers into ext4 to see if they > could be useful in solving some problems along with Systemtap. It > appears, though, that as of 2.6.27-rc8, markers defined in code which is > compiled directly into the kernel (i.e., not as modules) don't show up > in Module.markers: > > kvm_trace_entryexit arch/x86/kvm/kvm-intel %u %p %u %u %u %u %u %u > kvm_trace_handler arch/x86/kvm/kvm-intel %u %p %u %u %u %u %u %u > kvm_trace_entryexit arch/x86/kvm/kvm-amd %u %p %u %u %u %u %u %u > kvm_trace_handler arch/x86/kvm/kvm-amd %u %p %u %u %u %u %u %u > > (Note the lack of any of the kernel_sched_* markers, and the markers I > added for ext4_* and jbd2_* are missing as wel.) > > Systemtap apparently depends on in-kernel trace_mark being recorded in > Module.markers, and apparently it's been claimed that it used to be > there. Is this a bug in systemtap, or in how Module.markers is getting > built? And is there a file that contains the equivalent information > for markers located in non-modules code? I think the problem comes from "markers: fix duplicate modpost entry" (commit d35cb360c29956510b2fe1a953bd4968536f7216) Especially : - add_marker(mod, marker, fmt); + if (!mod->skip) + add_marker(mod, marker, fmt); } return; fail: Here is a fix that should take care if this problem. Thanks for the bug report! Signed-off-by: Mathieu Desnoyers <[email protected]> Tested-by: "Theodore Ts'o" <[email protected]> CC: Greg KH <[email protected]> CC: David Smith <[email protected]> CC: Roland McGrath <[email protected]> CC: Sam Ravnborg <[email protected]> CC: Wenji Huang <[email protected]> CC: Takashi Nishiie <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-10-06iwlwifi: remove STATUS_CONF_PENDING in scanningTomas Winkler3-32/+22
This patch removes STATUS_CONF_PENDING usage that called from iwl4965_mac_config internally after scan completed. It's called anyway from the mac80211 ieee80211_scan_completed(): if (local->hw_scanning) { local->hw_scanning = false; if (ieee80211_hw_config(local)) ... } Signed-off-by: Tomas Winkler <[email protected]> Signed-off-by: Zhu Yi <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2008-10-06iwlwifi: scan fix commentTomas Winkler1-1/+2
This patch moves comment to proper line, it has moved during code shuffling. Signed-off-by: Tomas Winkler <[email protected]> Signed-off-by: Zhu Yi <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2008-10-06iwlwifi: scan correct setting of valid rx_chainsTomas Winkler1-1/+1
This patch sets rx_chain bitmap correctly according hw configuration. Signed-off-by: Tomas Winkler <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2008-10-06mac80211: add the 'minstrel' rate control algorithmFelix Fietkau7-0/+868
Signed-off-by: Felix Fietkau <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2008-10-06ath5k: implement multi-rate retry support, fix tx status reportingFelix Fietkau3-26/+95
Clean up the tx status reporting, fix retry counters (short retries are virtual collisions, not actual retries). Implement multi-rate retry support. This also fixes strong throughput fluctuations with rc80211_pid Signed-off-by: Felix Fietkau <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2008-10-06mac80211: add multi-rate retry supportFelix Fietkau7-14/+39
This patch adjusts the rate control API to allow multi-rate retry if supported by the driver. The ieee80211_hw struct specifies how many alternate rate selections the driver supports. Signed-off-by: Felix Fietkau <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2008-10-06mac80211: free up 2 bytes in skb->cbFelix Fietkau10-21/+29
Free up 2 bytes in skb->cb to be used for multi-rate retry later. Move iv_len and icv_len initialization into key alloc. Signed-off-by: Felix Fietkau <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2008-10-06rfkill: update LEDs for all state changesHenrique de Moraes Holschuh1-3/+2
The LED state was not being updated by rfkill_force_state(), which will cause regressions in wireless drivers that had old-style rfkill support and are updated to use rfkill_force_state(). The LED state was not being updated when a change was detected through the rfkill->get_state() hook, either. Move the LED trigger update calls into notify_rfkill_state_change(), where it should have been in the first place. This takes care of both issues above. Signed-off-by: Henrique de Moraes Holschuh <[email protected]> Acked-by: Ivo van Doorn <[email protected]> Cc: [email protected] Signed-off-by: John W. Linville <[email protected]>
2008-10-06rt2x00: Fix rfkill structure initialization to prevent rfkill WARN_ON.Gertjan van Wingerde1-2/+7
The state field of the rfkill structure was incorrectly initialized to -1, which results in rfkill issueing a WARN_ON. Fix this by initializing the state field to the proper value as indicated by the driver. Signed-off-by: Gertjan van Wingerde <[email protected]> Signed-off-by: Ivo van Doorn <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2008-10-06mac80211: remove redundant check in ieee80211_master_start_xmit ↵Rami Rosen1-10/+8
(net/mac80211/tx.c) - This patch (against the linux-wireless-next git tree) removes a redundant check in ieee80211_master_start_xmit (net/mac80211/tx.c) and adjust indentation in this method accordingly. In this method, there is no need to call again the ieee80211_is_data() method; this is checked immediately before, in the "if" command (we will not enter this block unless ieee80211_is_data() is true, so that the "and" (&&) condition in that "if" command will be fullfilled ). Signed-off-by: Rami Rosen <[email protected]> Acked-by: Johannes Berg <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2008-10-06p54: report appropriate rate and band values for 802.11aChristian Lamparter1-2/+3
This patch adds the a few lines that went missing in "p54: 802.11a 5GHz phy support" Essentially: the rx-code wasn't updated and therefore reported the wrong band, but more importantly the rate index was off as well, since 802.11a doesn't allow the "four" 802.11b rates... Signed-off-by: Christian Lamparter <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2008-10-06wireless: fix typo in Kconfig.Davide Pesavento1-1/+1
Signed-off-by: Davide Pesavento <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2008-10-06ath9k: enable ANI to help with noisy environmentsLuis R. Rodriguez6-25/+197
This enables Adaptive Noise Immunity (ANI) on ath9k. ANI is as algorithm designed to minimize the detrimental effects of time-varying interferences. This should help with throughput in noisy environments. To use ANI we re-enable the MIB interrupt. Since ANI works on a timer and updates the noise floor we take advantage of this and also report a non-static noise floor now to mac80211. Signed-off-by: Sujith Manoharan <[email protected]> Signed-off-by: Jouni Malinen <[email protected]> Signed-off-by: Luis R. Rodriguez <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2008-10-06ath9k: fix oops on trying to hold the wrong spinlockLuis R. Rodriguez1-1/+1
We were trying to hold the wrong spinlock due to a typo on IEEE80211_BAR_CTL_TID_S's definition. We use this to compute the tid number and then hold this this tid number's spinlock. Signed-off-by: Vasanthakumar Thiagarajan <[email protected]> Signed-off-by: Sujith <[email protected]> Signed-off-by: Luis R. Rodriguez <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2008-10-06ath9k: kill ath9k's memzero() and use memset() insteadLuis R. Rodriguez5-22/+19
Part of the cleanup on ath9k -- this was also causing some annoying compile time warnings. Signed-off-by: Luis R. Rodriguez <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2008-10-06mac80211: remove shadowed variables in ieee80211_master_start_xmitTomas Winkler1-4/+1
This patch removes doubly defined variables in ieee80211_master_start_xmit Signed-off-by: Tomas Winkler <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2008-10-06wireless: restore revert lost to merge damageLinus Torvalds1-8/+39
Restore revert "mac80211: Use IWEVASSOCREQIE instead of IWEVCUSTOM", originally reverted in commit bf7394ccc13fe291d9258f01113b4c61214ddeae. Signed-off-by: John W. Linville <[email protected]>
2008-10-06[CIFS] fix some settings of cifsAttrs after calling SetFileInfo and SetPathInfoJeff Layton1-6/+18
We only need to set them when we call SetFileInfo or SetPathInfo directly, and as soon as possible after then. We had one place setting it where it didn't need to be, and another place where it was missing. Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: Steve French <[email protected]>
2008-10-07Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into ↵Simon Horman636-9928/+14959
lvs-next-2.6
2008-10-07IPVS: Move IPVS to net/netfilter/ipvsJulius Volz29-3/+266
Since IPVS now has partial IPv6 support, this patch moves IPVS from net/ipv4/ipvs to net/netfilter/ipvs. It's a result of: $ git mv net/ipv4/ipvs net/netfilter and adapting the relevant Kconfigs/Makefiles to the new path. Signed-off-by: Julius Volz <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2008-10-06Merge branch 'for_linus' of ↵Linus Torvalds2-6/+4
git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb: kgdb: call touch_softlockup_watchdog on resume kgdb, x86: Avoid invoking kgdb_nmicallback twice per NMI
2008-10-06Merge branch 'x86-fixes-for-linus' of ↵Linus Torvalds1-9/+11
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: gart iommu have direct mapping when agp is present too
2008-10-06Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds9-207/+93
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide: workaround for bogus gcc warning in ide_sysfs_register_port() ide-cd: Optiarc DVD RW AD-7200A does play audio IDE: Fix platform device registration in Swarm IDE driver (v2) ide-dma: fix ide_build_dmatable() for TRM290 ide-cd: temporary tray close fix
2008-10-06Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds3-15/+21
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] IP27: Fix build errors if CONFIG_MAPPED_KERNEL=y [MIPS] Fix CMP Kconfig configuration and mark as broken.
2008-10-06Merge branch 'fixes' of ↵Linus Torvalds31-86/+130
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (33 commits) V4L/DVB (9103): em28xx: HVR-900 B3C0 - fix audio clicking issue V4L/DVB (9099): em28xx: Add detection for K-WORLD DVB-T 310U V4L/DVB (9092): gspca: Bad init values for sonixj ov7660. V4L/DVB (9080): gspca: Add a delay after writing to the sonixj sensors. V4L/DVB (9075): gspca: Bad check of returned status in i2c_read() spca561. V4L/DVB (9053): fix buffer overflow in uvc-video V4L/DVB (9043): S5H1420: Fix size of shadow-array to avoid overflow V4L/DVB (9037): Fix support for Hauppauge Nova-S SE V4L/DVB (9029): Fix deadlock in demux code V4L/DVB (8979): sms1xxx: Add new USB product ID for Hauppauge WinTV MiniStick V4L/DVB (8978): sms1xxx: fix product name for Hauppauge WinTV MiniStick V4L/DVB (8967): Use correct XC3028L firmware for AMD ATI TV Wonder 600 V4L/DVB (8963): s2255drv field count fix V4L/DVB (8961): zr36067: Fix RGBR pixel format V4L/DVB (8960): drivers/media/video/cafe_ccic.c needs mm.h V4L/DVB (8958): zr36067: Return proper bytes-per-line value V4L/DVB (8957): zr36067: Restore the default pixel format V4L/DVB (8955): bttv: Prevent NULL pointer dereference in radio_open V4L/DVB (8935): em28xx-cards: Remove duplicate entry (EM2800_BOARD_KWORLD_USB2800) V4L/DVB (8933): gspca: Disable light frquency for zc3xx cs2102 Kokom. ...
2008-10-06atmel-mci: Initialize BLKR before sending data transfer commandHaavard Skinnemoen1-2/+4
The atmel-mci driver sometimes fails data transfers like this: mmcblk0: error -5 transferring data end_request: I/O error, dev mmcblk0, sector 2749769 end_request: I/O error, dev mmcblk0, sector 2749777 It turns out that this might be caused by the BLKR register (which contains the block size and the number of blocks being transfered) being initialized too late. This patch moves the initialization of BLKR so that it contains the correct value before the block transfer command is sent. This error is difficult to reproduce, but if you insert a long delay (mdelay(10) or thereabouts) between the calls to atmci_start_command() and atmci_submit_data(), all transfers seem to fail without this patch, while I haven't seen any failures with this patch. Reported-by: Hein_Tibosch <[email protected]> Signed-off-by: Haavard Skinnemoen <[email protected]> Signed-off-by: Pierre Ossman <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-10-06ath9k: fixup some merge damageJohn W. Linville1-2/+0
This hunk was originally removed as part of "ath9k: Fix IRQ nobody cared issue with ath9k". Signed-off-by: John W. Linville <[email protected]>
2008-10-06netrom: Fix sock_orphan() use in nr_releaseJarek Poplawski1-1/+1
While debugging another bug it was found that NetRom socks are sometimes seen unorphaned in sk_free(). This patch moves sock_orphan() in nr_release() to the beginning (like in ax25, or rose). Reported-and-tested-by: Bernard Pidoux f6bvp <[email protected]> Signed-off-by: Jarek Poplawski <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-10-06ax25: Quick fix for making sure unaccepted sockets get destroyed.David S. Miller1-0/+3
Since we reverted 30902dc3cb0ea1cfc7ac2b17bcf478ff98420d74 ("ax25: Fix std timer socket destroy handling.") we have to put some kind of fix in to cure the issue whereby unaccepted connections do not get destroyed. The approach used here is from Tihomir Heidelberg - 9a4gl Signed-off-by: David S. Miller <[email protected]>
2008-10-06Revert "ax25: Fix std timer socket destroy handling."David S. Miller1-3/+5
This reverts commit 30902dc3cb0ea1cfc7ac2b17bcf478ff98420d74. It causes all kinds of problems, based upon a report by Bernard (f6bvp) and analysis by Jarek Poplawski. Signed-off-by: David S. Miller <[email protected]>
2008-10-06kgdb: call touch_softlockup_watchdog on resumeJason Wessel1-0/+3
The softlockup watchdog needs to be touched when resuming the from the kgdb stopped state to avoid the printk that a CPU is stuck if the debugger was active for longer than the softlockup threshold. Signed-off-by: Jason Wessel <[email protected]>
2008-10-06kgdb, x86: Avoid invoking kgdb_nmicallback twice per NMIJan Kiszka1-6/+1
Stress-testing KVM's latest NMI support with kgdbts inside an SMP guest, I came across spurious unhandled NMIs while running the singlestep test. Looking closer at the code path each NMI takes when KGDB is enabled, I noticed that kgdb_nmicallback is called twice per event: One time via DIE_NMI_IPI notification, the second time on DIE_NMI. Removing the first invocation cures the unhandled NMIs here. Signed-off-by: Jan Kiszka <[email protected]> Signed-off-by: Jason Wessel <[email protected]>
2008-10-06tcp: Respect SO_RCVLOWAT in tcp_poll().David S. Miller1-4/+8
Based upon a report by Vito Caputo. Signed-off-by: David S. Miller <[email protected]>
2008-10-06pkt_sched: Simplify dev_requeue_skb and dequeue_skbJarek Poplawski1-16/+5
qdisc->requeue was planned to universally replace all requeuing code, but at the top level we never requeue more than one skb, so qdisc-> gso_skb is enough for this. qdisc->requeue would be used on the lower levels only for one level deep requeuing (like in sch_hfsc) after finishing all the changes. Signed-off-by: Jarek Poplawski <[email protected]> Signed-off-by: David S. Miller <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.