aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-10-02fbcon: fix monochrome color value calculationDavid Winn1-1/+1
Commit 22af89aa0c0b4012a7431114a340efd3665a7617 ("fbcon: replace mono_col macro with static inline") changed the order of operations for computing monochrome color values. This generates 0xffff000f instead of 0x0000000f for a 4 bit monochrome color, leading to image corruption if it is passed to cfb_imageblit or other similar functions. Fix it up. Cc: Harvey Harrison <[email protected]> Cc: "Antonino A. Daplas" <[email protected]> Cc: Krzysztof Helt <[email protected]> Cc: <[email protected]> [2.6.26.x] Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-10-02[ARM] 5277/1: Add basic support for MobilePro 900/cKristoffer Ericson3-0/+105
This patch adds basic support for the Mobilepro 900/c mini-laptop. At present it won't do much more than build and boot. Signed-off-by: Kristoffer Ericson <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-02[ARM] 5248/1: wm97xx generic battery driverMarek Vašut6-203/+323
This patch adds generic battery driver for wm97xx chips. Signed-off-by: Marek Vasut <[email protected]> Acked-by: Anton Vorontsov <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-02[ARM] 5274/1: simplify request_standard_resources()Nicolas Pitre1-7/+2
There is no point converting memory bank addresses from physical to virtual just to convert them back to physical addresses. Furthermore this isn't "right" for highmem even if in this case the end result is the correct one. Signed-off-by: Nicolas Pitre <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-02Merge branch 'for-linus' of ↵Linus Torvalds2-14/+40
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: snd-powermac: HP detection for 1st iMac G3 SL ALSA: snd-powermac: mixers for PowerMac G4 AGP ASoC: Set correct name for WM8753 rec mixer output
2008-10-02Merge branch 'asoc-fixes' into for-linusTakashi Iwai1-2/+2
2008-10-02ALSA: snd-powermac: HP detection for 1st iMac G3 SLRisto Suominen1-9/+22
Correct headphone detection for 1st generation iMac G3 Slot-loading (Screamer). This patch fixes the regression in the recent snd-powermac which doesn't support some G3/G4 PowerMacs: http://lkml.org/lkml/2008/10/1/220 Signed-off-by: Risto Suominen <[email protected]> Tested-by: Mariusz Kozlowski <[email protected]> Cc: [email protected] Signed-off-by: Takashi Iwai <[email protected]>
2008-10-02ALSA: snd-powermac: mixers for PowerMac G4 AGPRisto Suominen1-3/+16
Add mixer controls for PowerMac G4 AGP (Screamer). This patch fixes the regression in the recent snd-powermac which doesn't support some G3/G4 PowerMacs: http://lkml.org/lkml/2008/10/1/220 Signed-off-by: Risto Suominen <[email protected]> Tested-by: Mariusz Kozlowski <[email protected]> Cc: [email protected] Signed-off-by: Takashi Iwai <[email protected]>
2008-10-02ASoC: Set correct name for WM8753 rec mixer outputRob Sims1-2/+2
Rob Sims wrote: "I can't seem to turn on register 0x17, bit 3 in the sound chip, except by codec_reg_write; the mixer lacks direct or indirect control. It seems there are two names for the output of the rec mixer: Capture ST Mixer Playback Mixer Would the following do the trick?" I confirm that this solves the audio problems I was having. Signed-off-by: Jonas Bonn <[email protected]> Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2008-10-02AMD IOMMU: use iommu_device_max_indexFUJITA Tomonori1-7/+3
AMD IOMMU can use iommu_device_max_index() instead of the homegrown function. Signed-off-by: FUJITA Tomonori <[email protected]> Acked-by: Joerg Roedel <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2008-10-02powerpc: Fix boot hang regression on MPC8544DSKumar Gala1-1/+11
Commit 00c5372d37a78990c1530184a9c792ee60a30067 caused the MPC8544DS board to hang at boot. The MPC8544DS is unique in that it doesn't use the PCI slots on the ULI (unlike the MPC8572DS or MPC8610HPCD). So the dummy read at the end of the address space causes us to hang. We can detect the situation by comparing the bridge's BARs versus the root complex. Signed-off-by: Kumar Gala <[email protected]>
2008-10-01e1000e: write protect ICHx NVM to prevent malicious write/eraseBruce Allan5-3/+100
Set the hardware to ignore all write/erase cycles to the GbE region in the ICHx NVM. This feature can be disabled by the WriteProtectNVM module parameter (enabled by default) only after a hardware reset, but the machine must be power cycled before trying to enable writes. Signed-off-by: Bruce Allan <[email protected]> Signed-off-by: Jesse Brandeburg <[email protected]> CC: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
2008-10-01[NET] 5268/1: cs89x0: add support for i.MX31ADS ARM board.Gilles Chanteperdrix2-3/+17
Add support for i.MX31ADS board to the cs89x0 ethernet driver. Rework Kconfig options for the cs89x0 driver to reduce the #ifdef clutter. Signed-off-by: Gilles Chanteperdrix <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] 5250/1: unbalanced enable_irq() for serial_ks8695.c fixDick Hollenbeck1-9/+52
The function ks8695uart_set_termios() would cause an unbalanced enable_irq() generated message to be printk()ed. This is because there was no book keeping support to remember if the calls to enable_irq() and disable_irq() were balanced for the modem control irq. Signed-off-by: Dick Hollenbeck <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] 5251/1: remove old LED support for Trizeps4 SOMJürgen Schindele4-138/+1
Remove the old led support in arch/arm/mach-pxa/leds... for TRIZEPS4 SOM. It is / will be replaced by generic led driver drivers/leds/... Signed-off-by: Jürgen Schindele <[email protected]> Acked-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] 5204/1: Trizeps4 SOM updateJürgen Schindele3-244/+421
- use MFP-API for GPIO - support TRIZEPS4WL module - cleanups Signed-off-by: Jrgen Schindele <[email protected]> Acked-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] 5270/1: Fix Formatting in mach-sa1100/ machine filesKristoffer Ericson3-34/+34
This patch fixes formatting issues in mach-sa1100/ machine files. More specificly badge4.c,generic.c and pleb.c. Signed-off-by: Kristoffer Ericson <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] 5256/1: Update jornada default configKristoffer Ericson1-445/+612
This patch updates the jornada default config (which was made for 2.6.12). Plenty of development has happend since then, most importantly the SSP driver and kbd/touchscr. This config has been tested to compile and bootup properly. Signed-off-by: Kristoffer Ericson <[email protected]> Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] mm: allow LH7A40x to use sparsememRussell King3-13/+14
Enable Sparsemem support for LH7A40x SoCs, while still allowing the existing discontig support for the time being. Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] mm: deprecate discontigmem on ARMRussell King1-1/+5
Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] mm: switch SA1100 to use sparsememRussell King2-11/+7
Tested on Assabet, and Assabet with Neponset's SDRAM at 3328M phys. Signed-off-by: Russell King <[email protected]>
2008-10-01pxa2xx_spi: fix build breakageMike Rapoport1-2/+2
This patch fixes a build error in the pxa2xx-spi driver, introduced by commit 7e96445533ac3f4f7964646a202ff3620602fab4 ("pxa2xx_spi: dma bugfixes") CC drivers/spi/pxa2xx_spi.o drivers/spi/pxa2xx_spi.c: In function 'map_dma_buffers': drivers/spi/pxa2xx_spi.c:331: error: invalid operands to binary & drivers/spi/pxa2xx_spi.c:331: error: invalid operands to binary & drivers/spi/pxa2xx_spi.c: In function 'pump_transfers': drivers/spi/pxa2xx_spi.c:897: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'unsigned int' [[email protected]: fix warning too ] Signed-off-by: Mike Rapoport <[email protected]> Acked-by: Eric Miao <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: David Brownell <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-10-01Merge branch 'x86-fixes-for-linus' of ↵Linus Torvalds1-1/+1
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, vmi: fix broken LDT access x86: fix typo in enable_mtrr_cleanup early parameter
2008-10-01MN10300: Fix IRQ handlingDavid Howells3-28/+47
Fix the IRQ handling on the MN10300 arch. This patch makes a number of significant changes: (1) It separates the irq_chip definition for edge-triggered interrupts from the one for level-triggered interrupts. This is necessary because the MN10300 PIC latches the IRQ channel's interrupt request bit (GxICR_REQUEST), even after the device has ceased to assert its interrupt line and the interrupt channel has been disabled in the PIC. So for level-triggered interrupts we need to clear this bit when we re-enable - which is achieved by setting GxICR_DETECT but not GxICR_REQUEST when writing to the register. Not doing this results in spurious interrupts occurring because calling mask_ack() at the start of handle_level_irq() is insufficient - it fails to clear the REQUEST latch because the device that caused the interrupt is still asserting its interrupt line at this point. (2) IRQ disablement [irq_chip::disable_irq()] shouldn't clear the interrupt request flag for edge-triggered interrupts lest it lose an interrupt. (3) IRQ unmasking [irq_chip::unmask_irq()] also shouldn't clear the interrupt request flag for edge-triggered interrupts lest it lose an interrupt. (4) The end() operation is now left to the default (no-operation) as __do_IRQ() is compiled out. This may affect misrouted_irq(), but according to Thomas Gleixner it's the correct thing to do. (5) handle_level_irq() is used for edge-triggered interrupts rather than handle_edge_irq() as the MN10300 PIC latches interrupt events even on masked IRQ channels, thus rendering IRQ_PENDING unnecessary. It is sufficient to call mask_ack() at the start and unmask() at the end. (6) For level-triggered interrupts, ack() is now NULL as it's not used, and there is no effective ACK function on the PIC. mask_ack() is now the same as mask() as the latch continues to latch, even when the channel is masked. Further, the patch discards the disable() op implementation as its now the same as the mask() op implementation, which is used instead. It also discards the enable() op implementations as they're now the same as the unmask() op implementations, which are used instead. Signed-off-by: David Howells <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-10-01Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dmLinus Torvalds2-5/+23
* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: dm mpath: add missing path switching locking dm: cope with access beyond end of device in dm_merge_bvec dm: always allow one page in dm_merge_bvec
2008-10-01Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds9-42/+97
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: af_key: Free dumping state on socket close XFRM,IPv6: initialize ip6_dst_blackhole_ops.kmem_cachep ipv6: NULL pointer dereferrence in tcp_v6_send_ack tcp: Fix NULL dereference in tcp_4_send_ack() sctp: Fix kernel panic while process protocol violation parameter iucv: Fix mismerge again. ipsec: Fix pskb_expand_head corruption in xfrm_state_check_space
2008-10-01[ARM] mm: enable sparsemem on clps7500 and RiscPCRussell King4-3/+35
Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] mm: finish ARM sparsemem supportRussell King1-29/+57
... including some comments about the ordering required to bring sparsemem up. You have to repeatedly guess, test, reguess, try again and again to work out what the right ordering is. Many hours later... Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] mm: provide helpers for accessing membanksRussell King2-31/+39
Provide helpers for getting physical addresses or pfns from the meminfo array, and use them. Move for_each_nodebank() to asm/setup.h alongside the meminfo structure definition. Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] Improve non-executable supportRussell King6-58/+145
Add support for detecting non-executable stack binaries, and adjust permissions to prevent execution from data and stack areas. Also, ensure that READ_IMPLIES_EXEC is enabled for older CPUs where that is true, and for any executable-stack binary. Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] Don't include asm/elf.h in asm codeRussell King23-26/+22
asm code really wants asm/hwcap.h, so include that instead. Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] Remove MT_NONSHARED_DEVICE aliasRussell King4-9/+7
Use MT_DEVICE_NONSHARED instead. Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] Remove MT_DEVICE_IXP2000 and associated definitionsRussell King10-49/+26
As of the previous commit, MT_DEVICE_IXP2000 encodes to the same PTE bit encoding as MT_DEVICE, so it's now redundant. Convert MT_DEVICE_IXP2000 to use MT_DEVICE instead, and remove its aliases. Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] Update Xscale and Xscale3 PTE mappingsRussell King2-9/+7
Use 'shared device' mappings for devices, and use the standard bit combinations for Xscale3. Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] remove 'prot_pte_ext' from memory type tableRussell King3-5/+2
This member is now redundant; the memory type is encoded in the Linux PTE bits. Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] Convert ARMv7 to use TEX remappingRussell King1-4/+33
Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] Convert ARMv6 and ARMv7 to use new memory typesRussell King7-18/+40
Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] Convert Xscale and Xscale3 to use new memory typesRussell King3-31/+55
Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] Introduce new PTE memory type bitsRussell King5-42/+68
Provide L_PTE_MT_xxx definitions to describe the memory types that we use in Linux/ARM. These definitions are carefully picked such that: 1. their LSBs match what is required for pre-ARMv6 CPUs. 2. they all have a unique encoding, including after modification by build_mem_type_table() (the result being that some have more than one combination.) Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] Re-jig Linux PTE bits to allow room for 4 memory type bitsRussell King1-4/+4
Signed-off-by: Russell King <[email protected]>
2008-10-01[ARM] Convert set_pte_ext implementions to macrosRussell King18-402/+177
There are actually only four separate implementations of set_pte_ext. Use assembler macros to insert code for these into the proc-*.S files. Signed-off-by: Russell King <[email protected]>
2008-10-01sctp: correctly save sctp_adaptation from parameter.Vlad Yasevich1-1/+1
The INIT perameter carries the adapatation value in network-byte order. We need to store it in host byte order as expected by data types and the user API. Signed-off-by: Vlad Yasevich <[email protected]>
2008-10-01sctp: enable cookie-echo retransmission transport switchVlad Yasevich2-34/+46
This patch enables cookie-echo retransmission transport switch feature. If COOKIE-ECHO retransmission happens, it will be sent to the address other than the one last sent to. Signed-off-by: Gui Jianfeng <[email protected]> Signed-off-by: Vlad Yasevich <[email protected]>
2008-10-01sctp: Fix the SNMP counter of SCTP_MIB_OUTOFBLUESWei Yongjun1-2/+8
RFC3873 defined SCTP_MIB_OUTOFBLUES: sctpOutOfBlues OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only STATUS current DESCRIPTION "The number of out of the blue packets received by the host. An out of the blue packet is an SCTP packet correctly formed, including the proper checksum, but for which the receiver was unable to identify an appropriate association." REFERENCE "Section 8.4 in RFC2960 deals with the Out-Of-The-Blue (OOTB) packet definition and procedures." But OOTB packet INIT, INIT-ACK and SHUTDOWN-ACK(COOKIE-WAIT or COOKIE-ECHOED state) are not counted by SCTP_MIB_OUTOFBLUES. Case 1(INIT): Endpoint A Endpoint B (CLOSED) (CLOSED) INIT ----------> <---------- ABORT Case 2(INIT-ACK): Endpoint A Endpoint B (CLOSED) (CLOSED) INIT-ACK ----------> <---------- ABORT Case 3(SHUTDOWN-ACK): Endpoint A Endpoint B (CLOSED) (CLOSED) <---------- INIT SHUTDOWN-ACK ----------> <---------- SHUTDOWN-COMPLETE Case 4(SHUTDOWN-ACK): Endpoint A Endpoint B (CLOSED) (COOKIE-ECHOED) SHUTDOWN-ACK ----------> <---------- SHUTDOWN-COMPLETE This patch fixed the problem. Signed-off-by: Wei Yongjun <[email protected]> Signed-off-by: Vlad Yasevich <[email protected]>
2008-10-01sctp: Fix to start T5-shutdown-guard timer while enter SHUTDOWN-SENT stateWei Yongjun2-18/+8
RFC 4960: Section 9.2 The sender of the SHUTDOWN MAY also start an overall guard timer 'T5-shutdown-guard' to bound the overall time for the shutdown sequence. At the expiration of this timer, the sender SHOULD abort the association by sending an ABORT chunk. If the 'T5-shutdown- guard' timer is used, it SHOULD be set to the recommended value of 5 times 'RTO.Max'. The timer 'T5-shutdown-guard' is used to counter the overall time for shutdown sequence, and it's start by the sender of the SHUTDOWN. So timer 'T5-shutdown-guard' should be start when we send the first SHUTDOWN chunk and enter the SHUTDOWN-SENT state, not start when we receipt of the SHUTDOWN primitive and enter SHUTDOWN-PENDING state. If 'T5-shutdown-guard' timer is start at SHUTDOWN-PENDING state, the association may be ABORT while data is still transmitting. Signed-off-by: Wei Yongjun <[email protected]> Signed-off-by: Vlad Yasevich <[email protected]>
2008-10-01sctp: try harder to figure out address family when checking wildcardsVlad Yasevich4-11/+22
sctp_is_any() function that is used to check for wildcard addresses only looks at the address itself to determine the address family. This function is used in the API to check the address passed in from the user. If the user simply zerroes out the sockaddr_storage and pass that in, we'll end up failing. So, let's try harder to determine the address family by also checking the socket if it's possible. Signed-off-by: Vlad Yasevich <[email protected]>
2008-10-01sctp: reduce memory footprint of sctp_chunk structureNeil Horman4-23/+26
sctp_chunks should be put on a diet. This is some of the low hanging fruit that we can strip out. Changes all the __s8/__u8 flags to bitfields. Saves 12 bytes per chunk. Signed-off-by: Neil Horman <[email protected]> Signed-off-by: Vlad Yasevich <[email protected]>
2008-10-01sctp: Retransmit list is ineligable for missing indicationsVlad Yasevich1-2/+0
Chunks placed on the retransmit list are marked as inelegible for fast retrasnmission. Since missing indications determine when fast reransmission is done, there is not point in calling sctp_mark_missing() on the retransmit list since those chunks will not be marked. Signed-off-by: Vlad Yasevich <[email protected]>
2008-10-01sctp: Optimize SFR-CACC transport list walking during SACK processingVlad Yasevich1-15/+19
There is a possibility of walking the transport list twice during SACK processing when doing SFR-CACC algorithm. We can restructure the code to only do this once. Signed-off-by: Vlad Yasevich <[email protected]>
2008-10-01sctp: Only mark chunks as missing when there are gapsVlad Yasevich1-9/+12
Frist small step in optimizing SACK processing. Do not call sctp_mark_missing() when there are no gaps reported and thus not missing chunks. Signed-off-by: Vlad Yasevich <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.