aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-06-02of/rtc: rtc-mpc5121.c: Fix build failuresGrant Likely1-6/+8
Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Grant Likely <[email protected]> CC: Paul Gortmaker <[email protected]> CC: Alessandro Zummo <[email protected]> CC: Wolfgang Denk <[email protected]> CC: Tejun Heo <[email protected]> CC: Anatolij Gustschin <[email protected]> CC: [email protected] CC: [email protected]
2010-06-02of/dma: mpc512x_dma.c: Fix build failuresAnatolij Gustschin1-5/+5
Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Anatolij Gustschin <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-06-02of/mtd/nand: mpc5121_nfc.c: Fix build failuresAnatolij Gustschin1-4/+4
Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Anatolij Gustschin <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-06-02of/spi: mpc512x_psc_spi.c: Fix build failuresAnatolij Gustschin1-6/+6
Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Anatolij Gustschin <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-06-02watchdog: Fix build failure with OF changesMichael Guntsche1-1/+1
commit 61c7a080a5a061c976988fd4b844dfb468dda255 ( of: Always use 'struct device.of_node' to get device node pointer.) missed drivers/watchdog/mpc8xxx_wdt.c. This patch fixes it Signed-off-by: Michael Guntsche <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-06-02of/spi: Fix build failure on spi_ppc4xx.cGrant Likely1-1/+1
This patch fixes a build error caused by the OF device_node pointer being moved into struct device. Fixes bug introduced by commit 61c7a080a5a061c976988fd4b844dfb468dda255 (of: Always use 'struct device.of_node' to get device node pointer) Signed-off-by: Grant Likely <[email protected]> CC: Sean MacLennan <[email protected]> CC: [email protected] CC: [email protected]
2010-06-02of/usb: fix build error due to of_node pointer moveGrant Likely1-1/+1
Fix driver to use new location of of_node pointer (introduced by commit use new location of of_node pointer (introduced by commit 61c7a080a5a061c976988fd4b844dfb468dda255; of: Always use 'struct device.of_node' to get device node pointer) Signed-off-by: Grant Likely <[email protected]> Reported-by: John Linn <[email protected]> CC: Greg Kroah-Hartman <[email protected]> CC: Alan Stern <[email protected]> CC: [email protected] CC: [email protected]
2010-06-02libata: implement on-demand HPA unlockingTejun Heo3-0/+32
Implement ata_scsi_unlock_native_capacity() which will be called through SCSI layer when block layer notices that partitions on a device extend beyond the end of the device. It requests EH to unlock HPA, waits for completion and returns the current device capacity. This allows libata to unlock HPA on demand instead of having to decide whether to unlock upfront. Unlocking on demand is safer than unlocking by upfront because some BIOSes write private data to the area beyond HPA limit. This was suggested by Ben Hutchings. Signed-off-by: Tejun Heo <[email protected]> Suggested-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2010-06-02libata: use the enlarged capacity after late HPA unlockTejun Heo1-3/+2
After late HPA unlock, libata kept using the original capacity ignoring the new larger native capacity. Enlarging device on the fly doesn't cause any harm. Use the larger native capacity instead. This will enable on-demand HPA unlocking. Signed-off-by: Tejun Heo <[email protected]> Cc: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2010-06-02SCSI: implement sd_unlock_native_capacity()Tejun Heo2-0/+30
Implement sd_unlock_native_capacity() method which calls into hostt->unlock_native_capacity() if implemented. This will be invoked by block layer if partitions extend beyond the end of the device and can be used to implement, for example, on-demand ATA host protected area unlocking. Signed-off-by: Tejun Heo <[email protected]> Cc: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2010-06-02libata-sff: trivial corrections to Kconfig help textStefan Richter1-3/+3
Signed-off-by: Stefan Richter <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2010-06-02sata_nv: don't diddle with nIEN on mcp55Tejun Heo1-2/+0
On mcp55, nIEN gets stuck once set and liteon blueray rom iHOS104-08 violates ATA specification and fails to set I on D2H Reg FIS if nIEN is set when the command was issued. When the other party is following the spec, both devices can work fine but when the two flaws are put together, they can't talk to each other. mcp55 has its own IRQ masking mechanism and there's no reason to mess with nIEN in the first place. Fix it by dropping nIEN diddling from nv_mcp55_freeze/thaw(). This was originally reported by Cengiz. Although Cengiz hasn't verified the fix yet, I could reproduce this problem and verfiy the fix. Even if Cengiz is experiencing different or additional problems, this patch is needed. Signed-off-by: Tejun Heo <[email protected]> Reported-by: Cengiz Günay <[email protected]> Cc: [email protected] Signed-off-by: Jeff Garzik <[email protected]>
2010-06-02sata_via: magic vt6421 fix for transmission problems w/ WD drivesTejun Heo1-0/+13
vt6421 has problems talking to recent WD drives. It causes a lot of transmission errors while high bandwidth transfer as reported in the following bugzilla entry. https://bugzilla.kernel.org/show_bug.cgi?id=15173 Joseph Chan provided the following fix. I don't have any idea what it does but I can verify the issue is gone with the patch applied. Signed-off-by: Tejun Heo <[email protected]> Originally-from: Joseph Chan <[email protected]> Reported-by: Jorrit Tijben <[email protected]> Cc: [email protected] Signed-off-by: Jeff Garzik <[email protected]>
2010-06-02cls_u32: use skb_header_pointer() to dereference data safelyChangli Gao1-13/+36
use skb_header_pointer() to dereference data safely the original skb->data dereference isn't safe, as there isn't any skb->len or skb_is_nonlinear() check. skb_header_pointer() is used instead in this patch. And when the skb isn't long enough, we terminate the function u32_classify() immediately with -1. Signed-off-by: Changli Gao <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-06-02TCP: tcp_hybla: Fix integer overflow in slow start incrementDaniele Lacamera1-2/+2
For large values of rtt, 2^rho operation may overflow u32. Clamp down the increment to 2^16. Signed-off-by: Daniele Lacamera <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-06-02act_nat: fix the wrong checksum when addr isn't in old_addr/maskChangli Gao1-0/+4
fix the wrong checksum when addr isn't in old_addr/mask For TCP and UDP packets, when addr isn't in old_addr/mask we don't do SNAT or DNAT, and we should not update layer 4 checksum. Signed-off-by: Changli Gao <[email protected]> ---- net/sched/act_nat.c | 4 ++++ 1 file changed, 4 insertions(+) Signed-off-by: David S. Miller <[email protected]>
2010-06-02net/fec: fix pm to survive to suspend/resumeEric Bénard1-8/+8
* in the actual driver, calling fec_stop and fec_enet_init doesn't allow to have a working network interface at resume (where a ifconfig down and up is required to recover the interface) * by using fec_enet_close and fec_enet_open, this patch solves this problem and handle the case where the link changed between suspend and resume * this patch also disable clock at suspend and reenable it at resume Signed-off-by: Eric Bénard <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-06-02korina: count RX DMA OVR as rx_fifo_errorPhil Sutter1-1/+1
This way, RX DMA overruns (actually being caused by overrun of the 512byte input FIFO) show up in ifconfig output. The rx_fifo_errors counter is unused otherwise. Signed-off-by: Phil Sutter <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-06-02korina: use netdev_alloc_skb_ip_align() here, tooPhil Sutter1-2/+1
This patch completes commit 89d71a66c40d629e3b1285def543ab1425558cd5 which missed this spot, as it seems. Signed-off-by: Phil Sutter <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-06-02korina: fix deadlock on RX FIFO overrunPhil Sutter1-14/+13
By calling korina_restart(), the IRQ handler tries to disable the interrupt it's currently serving. This leads to a deadlock since disable_irq() waits for any running IRQ handlers to finish before returning. This patch addresses the issue by turning korina_restart() into a workqueue task, which is then scheduled when needed. Reproducing the deadlock is easily done using e.g. GNU netcat to send large amounts of UDP data to the host running this driver. Note that the same problem (and fix) applies to TX FIFO underruns, but apparently these are less easy to trigger. Signed-off-by: Phil Sutter <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-06-02Merge branch 'fix/asoc' into for-linusTakashi Iwai1-1/+10
2010-06-02Merge branch 'fix/hda' into for-linusTakashi Iwai211-2101/+9618
2010-06-02Merge branch 'for-2.6.35' of ↵Takashi Iwai1-1/+10
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
2010-06-02Merge branch 'master' of git.alsa-project.org:alsa-kernel into fix/hdaTakashi Iwai211-2101/+9618
2010-06-02ALSA: hda-intel - fix wallclk variable update and conditionJaroslav Kysela1-2/+2
This patch fixes thinko introduced in "last minutes" before commiting of the last wallclk patch. It also fixes the condition checking if the first period after last wallclk update is processed. There is a little rounding error in period_wallclk. Signed-off-by: Jaroslav Kysela <[email protected]>
2010-06-02net: fix conflict between null_or_orig and null_or_bondJohn Fastabend1-4/+4
If a skb is received on an inactive bond that does not meet the special cases checked for by skb_bond_should_drop it should only be delivered to exact matches as the comment in netif_receive_skb() says. However because null_or_bond could also be null this is not always true. This patch renames null_or_bond to orig_or_bond and initializes it to orig_dev. This keeps the intent of null_or_bond to pass frames received on VLAN interfaces stacked on bonding interfaces without invalidating the statement for null_or_orig. Signed-off-by: John Fastabend <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-06-02net: init_vlan should not copy slave or master flagsJohn Fastabend1-1/+2
The vlan device should not copy the slave or master flags from the real device. It is not in the bond until added nor is it a master. Signed-off-by: John Fastabend <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-06-02Merge branch 'fix/hda' into for-linusTakashi Iwai2-0/+4
2010-06-02ALSA: asihpi - Fix uninitialized variableTakashi Iwai1-0/+3
Initialize prev_ctl properly before reference: sound/pci/asihpi/asihpi.c: In function ‘snd_card_asihpi_mixer_new’: sound/pci/asihpi/asihpi.c:2568:30: warning: ‘prev_ctl.dst_node_index’ may be used uninitialized in this function Signed-off-by: Takashi Iwai <[email protected]>
2010-06-02enic: bug fix: make the set/get netlink VF_PORT support symmetricalScott Feldman2-103/+104
To make get/set netlink VF_PORT truly symmetrical, we need to keep track of what items are set and only return those items on get. Previously, the driver wasn't differentiating between a set of attr with a NULL string, for example, and not setting the attr at all. We only want to return the NULL string if the attr was actually set with a NULL string. Otherwise, don't return the attr. Signed-off-by: Scott Feldman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-06-02bnx2: Fix hang during rmmod bnx2.Michael Chan1-1/+13
The regression is caused by: commit 4327ba435a56ada13eedf3eb332e583c7a0586a9 bnx2: Fix netpoll crash. If ->open() and ->close() are called multiple times, the same napi structs will be added to dev->napi_list multiple times, corrupting the dev->napi_list. This causes free_netdev() to hang during rmmod. We fix this by calling netif_napi_del() during ->close(). Also, bnx2_init_napi() must not be in the __devinit section since it is called by ->open(). Signed-off-by: Michael Chan <[email protected]> Signed-off-by: Benjamin Li <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-06-02xfrm: force a dst reference in __xfrm_route_forward()Eric Dumazet1-0/+1
Packets going through __xfrm_route_forward() have a not refcounted dst entry, since we enabled a noref forwarding path. xfrm_lookup() might incorrectly release this dst entry. It's a bit late to make invasive changes in xfrm_lookup(), so lets force a refcount in this path. Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-06-02sh: Make intc messages consistent via pr_fmt.Paul Mundt1-5/+7
Wrapping pr_fmt to the KBUILD_MODNAME prefix seems to be the trendy thing to do these days, so just do that instead of manually tidying up the stragglers. Signed-off-by: Paul Mundt <[email protected]>
2010-06-02sh: make sure static declaration on ms7724seKuninori Morimoto1-4/+4
Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2010-06-02sh: make sure static declaration on mach-migorKuninori Morimoto1-1/+1
Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2010-06-02sh: make sure static declaration on mach-ecovec24Kuninori Morimoto1-8/+8
Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2010-06-02sh: make sure static declaration on mach-ap325rxaKuninori Morimoto1-1/+1
Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2010-06-02clocksource: sh_cmt: compute mult and shift before registrationPaul Mundt1-9/+13
Based on the sh_tmu change in 66f49121ffa41a19c59965b31b046d8368fec3c7 ("clocksource: sh_tmu: compute mult and shift before registration"). The same issues impact the sh_cmt driver, so we take the same approach here. Cc: [email protected] Signed-off-by: Paul Mundt <[email protected]>
2010-06-02clocksource: sh_tmu: compute mult and shift before registrationAurelien Jarno1-9/+11
Since commit 98962465ed9e6ea99c38e0af63fe1dcb5a79dc25 ("nohz: Prevent clocksource wrapping during idle"), the CPU of an R2D board never goes to idle. This commit assumes that mult and shift are assigned before the clocksource is registered. As a consequence the safe maximum sleep time is negative and the CPU never goes into idle. This patch fixes the problem by moving mult and shift initialization from sh_tmu_clocksource_enable() to sh_tmu_register_clocksource(). Signed-off-by: Aurelien Jarno <[email protected]> Cc: [email protected] Signed-off-by: Paul Mundt <[email protected]>
2010-06-02powerpc/macio: Fix probing of macio devices by using the right of match tableBenjamin Herrenschmidt14-34/+58
Grant patches added an of mach table to struct device_driver. However, while he changed the macio device code to use that, he left the match table pointer in struct macio_driver and didn't update drivers to use the "new" one, thus breaking the probing. This completes the change by moving all drivers to setup the "new" one, removing all traces of the old one, and while at it (since it changes the exact same locations), I also remove two other duplicates from struct driver which are the name and owner fields. Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-06-02agp/uninorth: Fix oops caused by flushing too muchPaul Mackerras1-1/+1
This fixes a sporadic oops at boot on G5 Power Macs. The table_end variable has the address of the last byte of the table. Adding on PAGE_SIZE means we flush too much, and if the page after the table is not mapped for any reason, the kernel will oops. Instead we add on 1 because flush_dcache_range() interprets its second argument as the first byte past the range to be flushed. Signed-off-by: Paul Mackerras <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-06-02powerpc/pasemi: Update MAINTAINERS fileOlof Johansson1-2/+1
PWRficient platform work is definitely in maintenance mode these days, update MAINTAINERS file to reflect reality. Website is long gone as well. Signed-off-by: Olof Johansson <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-06-02powerpc/cell: Fix integer constant warningDenis Kirjanov1-1/+1
Fix smatch warning: warning: constant 0x800000000 is so big it is long Signed-off-by: Denis Kirjanov <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-06-02powerpc/kprobes: Remove resume_execution() in kprobesAnanth N Mavinakayanahalli1-12/+2
emulate_step() in kprobe_handler() would've already determined if the probed instruction can be emulated. We single-step in hardware only if the instruction couldn't be emulated. resume_execution() therefore is superfluous -- all we need is to fix up the instruction pointer after single-stepping. Thanks to Paul Mackerras for catching this. Signed-off-by: Ananth N Mavinakayanahalli <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-06-02powerpc/macio: Don't dereference pointer before null checkAndreas Schwab1-3/+4
Signed-off-by: Andreas Schwab <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-06-02of/powerpc: fix 85xx RapidIO device node pointerAlexandre Bounine1-1/+1
Fixes bug introduced by commit 61c7a080a5a061c976988fd4b844dfb468dda255 (of: Always use 'struct device.of_node' to get device node pointer) Signed-off-by: Alexandre Bounine <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-06-02Input: ads7846 - fix compiler warning in ads7846_probe()Dmitry Torokhov1-1/+1
This patch fixes the follwing warning introduced by commit 067fb2f648543894ce775082c5636f4c32b99e4f ("Input: ads7846 - return error on regulator_get() failure"): drivers/input/touchscreen/ads7846.c: In function 'ads7846_probe': drivers/input/touchscreen/ads7846.c:1167: warning: format '%ld' expects type 'long int', but argument 4 has type 'int' Signed-off-by: Dmitry Torokhov <[email protected]>
2010-06-02x86, smpboot: Fix cores per node printing on bootBorislav Petkov1-1/+1
Percpu initialization happens now after booting the cores on the machine and this causes them all to be displayed as belonging to node 0: Jun 8 05:57:21 kepek kernel: [ 0.106999] Booting Node 0, Processors #1 #2 #3 #4 #5 #6 #7 #8 #9 #10 #11 #12 #13 #14 #15 #16 #17 #18 #19 #20 #21 #22 #23 Ok. Use early_cpu_to_node() to get the correct node of each core instead. Signed-off-by: Borislav Petkov <[email protected]> Cc: Mike Travis <[email protected]> LKML-Reference: <20100601190455.GA14237@aftab> Signed-off-by: Ingo Molnar <[email protected]>
2010-06-02Merge branch 'sh/iomap'Paul Mundt15-75/+99
2010-06-02sh: PIO disabling for x3proto and urquell.Paul Mundt1-0/+2
urquell only provides PIO in the PCI case, while the x3proto board never had a working PCIe controller, so it can simply disable it outright. Signed-off-by: Paul Mundt <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.