]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/log
linux-2.6-omap-h63xx.git
16 years agoARM: OMAP: No need to include board-nokia.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:38 +0000 (18:07 -0700)]
ARM: OMAP: No need to include board-nokia.h from hardware.h

Move the defines to the associated board file and remove
the now unnecessary header file.

Signed-off-by: Tony Lindgren <tony@atomide.com>
16 years agoARM: OMAP: No need to include board-overo.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:38 +0000 (18:07 -0700)]
ARM: OMAP: No need to include board-overo.h from hardware.h

Move the defines to the associated board file and remove
the now unnecessary header file.

Signed-off-by: Tony Lindgren <tony@atomide.com>
16 years agoARM: OMAP: No need to include board-ldp.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:37 +0000 (18:07 -0700)]
ARM: OMAP: No need to include board-ldp.h from hardware.h

Move the defines to the associated board file and remove
the now unnecessary header file. Also rename
OMAP34XX_ETHR_START to LDP_ETHR_START.

Signed-off-by: Tony Lindgren <tony@atomide.com>
16 years agoARM: OMAP: No need to include board-h4.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:36 +0000 (18:07 -0700)]
ARM: OMAP: No need to include board-h4.h from hardware.h

Move the defines to the associated board file and remove
the now unnecessary header file. Also rename
OMAP24XX_ETHR_GPIO_IRQ to H4_ETHR_GPIO_IRQ.

Signed-off-by: Tony Lindgren <tony@atomide.com>
16 years agoARM: OMAP: No need to include board-apollon.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:35 +0000 (18:07 -0700)]
ARM: OMAP: No need to include board-apollon.h from hardware.h

Move the defines to the associated board file and remove
the now unnecessary header file.

Signed-off-by: Tony Lindgren <tony@atomide.com>
16 years agoARM: OMAP: No need to include board-omap2430sdp.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:35 +0000 (18:07 -0700)]
ARM: OMAP: No need to include board-omap2430sdp.h from hardware.h

Move the defines to the associated board file and remove
the now unnecessary header file. Also rename
SDP2430_ETHR_GPIO_IRQ to SDP2430_ETHR_GPIO_IRQ.

Signed-off-by: Tony Lindgren <tony@atomide.com>
16 years agoARM: OMAP: No need to include board-palm*.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:35 +0000 (18:07 -0700)]
ARM: OMAP: No need to include board-palm*.h from hardware.h

Move the defines to the associated board file and remove
the now unnecessary header files.

Signed-off-by: Tony Lindgren <tony@atomide.com>
16 years agoARM: OMAP: No need to include board-osk.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:34 +0000 (18:07 -0700)]
ARM: OMAP: No need to include board-osk.h from hardware.h

Move the defines to the board file and remove the now unnecessary
header file.

Signed-off-by: Tony Lindgren <tony@atomide.com>
16 years agoARM: OMAP: No need to include board-innovator.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:34 +0000 (18:07 -0700)]
ARM: OMAP: No need to include board-innovator.h from hardware.h

Move the defines to the board file and remove the now unnecessary
header file.

Signed-off-by: Tony Lindgren <tony@atomide.com>
16 years agoARM: OMAP: No need to include board-h3.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:33 +0000 (18:07 -0700)]
ARM: OMAP: No need to include board-h3.h from hardware.h

Also move board-h3.h to mach-omap1.

Signed-off-by: Tony Lindgren <tony@atomide.com>
16 years agoARM: OMAP: No need to include board-h2.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:33 +0000 (18:07 -0700)]
ARM: OMAP: No need to include board-h2.h from hardware.h

Also move board-h2.h to mach-omap1.

Signed-off-by: Tony Lindgren <tony@atomide.com>
16 years agoARM: OMAP: No need to include board-perseus2.h or board-fsample.h from hardware.h
Tony Lindgren [Tue, 24 Mar 2009 01:07:32 +0000 (18:07 -0700)]
ARM: OMAP: No need to include board-perseus2.h or board-fsample.h from hardware.h

Move defines to the board file and remove the now
unnecessary headers.

Signed-off-by: Tony Lindgren <tony@atomide.com>
16 years agoomap mailbox: remove unnecessary header file inclusion
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:32 +0000 (18:07 -0700)]
omap mailbox: remove unnecessary header file inclusion

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
16 years agoomap mailbox: convert sequence bit checking to module paramter
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:31 +0000 (18:07 -0700)]
omap mailbox: convert sequence bit checking to module paramter

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
16 years agoomap mailbox: move mailbox.h into mailbox.c
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:26 +0000 (18:07 -0700)]
omap mailbox: move mailbox.h into mailbox.c

no need to keep mailbox.h separately.

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
16 years agoomap mailbox: add save_/restore_ctx() for PM
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:26 +0000 (18:07 -0700)]
omap mailbox: add save_/restore_ctx() for PM

To preserve the registers during off-mode

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
16 years agoomap mailbox: fix empty struct device for omap2
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:25 +0000 (18:07 -0700)]
omap mailbox: fix empty struct device for omap2

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
16 years agoomap mailbox: fix empty struct device for omap1
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:25 +0000 (18:07 -0700)]
omap mailbox: fix empty struct device for omap1

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
16 years agoomap mailbox: fix empty struct device for omap_mbox
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:24 +0000 (18:07 -0700)]
omap mailbox: fix empty struct device for omap_mbox

Since "mbox->dev" doesn't exist and isn't created either at
registration, this patch will create "struct device", which belongs to
"omap-mailbox" class and set this pointer for the member of
"struct omap_mbox".

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
16 years agoomap mailbox: print hardware revision at startup
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:24 +0000 (18:07 -0700)]
omap mailbox: print hardware revision at startup

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
16 years agoomap mailbox: add initial omap3 support
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:23 +0000 (18:07 -0700)]
omap mailbox: add initial omap3 support

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
16 years agoomap mailbox: cleanup omap2 register definition with macro
Hiroshi DOYU [Tue, 24 Mar 2009 01:07:23 +0000 (18:07 -0700)]
omap mailbox: cleanup omap2 register definition with macro

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
16 years agoMerge current mainline tree into linux-omap tree
Tony Lindgren [Tue, 24 Mar 2009 01:02:12 +0000 (18:02 -0700)]
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/plat-omap/include/mach/common.h
arch/arm/plat-omap/include/mach/pm.h

16 years agoMerge branch 'master' into next
James Morris [Mon, 23 Mar 2009 23:52:46 +0000 (10:52 +1100)]
Merge branch 'master' into next

16 years agoMerge branch 'topic/usb-caiaq' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:23 +0000 (00:36 +0100)]
Merge branch 'topic/usb-caiaq' into for-linus

16 years agoMerge branch 'topic/usb-audio' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:22 +0000 (00:36 +0100)]
Merge branch 'topic/usb-audio' into for-linus

16 years agoMerge branch 'topic/sscape-fix' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:21 +0000 (00:36 +0100)]
Merge branch 'topic/sscape-fix' into for-linus

16 years agoMerge branch 'topic/powermac' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:20 +0000 (00:36 +0100)]
Merge branch 'topic/powermac' into for-linus

16 years agoMerge branch 'topic/pcxhr' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:19 +0000 (00:36 +0100)]
Merge branch 'topic/pcxhr' into for-linus

16 years agoMerge branch 'topic/oxygen' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:17 +0000 (00:36 +0100)]
Merge branch 'topic/oxygen' into for-linus

16 years agoMerge branch 'topic/oss-fix' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:16 +0000 (00:36 +0100)]
Merge branch 'topic/oss-fix' into for-linus

16 years agoMerge branch 'topic/msnd' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:15 +0000 (00:36 +0100)]
Merge branch 'topic/msnd' into for-linus

16 years agoMerge branch 'topic/isa-misc' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:13 +0000 (00:36 +0100)]
Merge branch 'topic/isa-misc' into for-linus

16 years agoMerge branch 'topic/intel8x0' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:13 +0000 (00:36 +0100)]
Merge branch 'topic/intel8x0' into for-linus

16 years agoMerge branch 'topic/ice' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:12 +0000 (00:36 +0100)]
Merge branch 'topic/ice' into for-linus

16 years agoMerge branch 'topic/hdsp' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:10 +0000 (00:36 +0100)]
Merge branch 'topic/hdsp' into for-linus

16 years agoMerge branch 'topic/hda' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:09 +0000 (00:36 +0100)]
Merge branch 'topic/hda' into for-linus

16 years agoMerge branch 'topic/emu10k1' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:08 +0000 (00:36 +0100)]
Merge branch 'topic/emu10k1' into for-linus

16 years agoMerge branch 'topic/echoaudio' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:07 +0000 (00:36 +0100)]
Merge branch 'topic/echoaudio' into for-linus

16 years agoMerge branch 'topic/drop-l3' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:05 +0000 (00:36 +0100)]
Merge branch 'topic/drop-l3' into for-linus

16 years agoMerge branch 'topic/docbook-fix' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:02 +0000 (00:36 +0100)]
Merge branch 'topic/docbook-fix' into for-linus

16 years agoMerge branch 'topic/cs423x-merge' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:59 +0000 (00:35 +0100)]
Merge branch 'topic/cs423x-merge' into for-linus

16 years agoMerge branch 'topic/ca0106' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:58 +0000 (00:35 +0100)]
Merge branch 'topic/ca0106' into for-linus

16 years agoMerge branch 'topic/atmel' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:56 +0000 (00:35 +0100)]
Merge branch 'topic/atmel' into for-linus

16 years agoMerge branch 'topic/asoc' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:53 +0000 (00:35 +0100)]
Merge branch 'topic/asoc' into for-linus

16 years agoMerge branch 'topic/aoa' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:51 +0000 (00:35 +0100)]
Merge branch 'topic/aoa' into for-linus

16 years agoMerge branch 'topic/misc' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:50 +0000 (00:35 +0100)]
Merge branch 'topic/misc' into for-linus

16 years agoMerge branch 'topic/pcm-cleanup' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:49 +0000 (00:35 +0100)]
Merge branch 'topic/pcm-cleanup' into for-linus

16 years agoMerge branch 'topic/ioctl-use-define' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:48 +0000 (00:35 +0100)]
Merge branch 'topic/ioctl-use-define' into for-linus

16 years agoMerge branch 'topic/vmaster-update' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:47 +0000 (00:35 +0100)]
Merge branch 'topic/vmaster-update' into for-linus

16 years agoMerge branch 'topic/rawmidi-fix' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:46 +0000 (00:35 +0100)]
Merge branch 'topic/rawmidi-fix' into for-linus

16 years agoMerge branch 'topic/ctl-list-cleanup' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:45 +0000 (00:35 +0100)]
Merge branch 'topic/ctl-list-cleanup' into for-linus

16 years agoMerge branch 'topic/quirk-cleanup' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:44 +0000 (00:35 +0100)]
Merge branch 'topic/quirk-cleanup' into for-linus

16 years agoMerge branch 'topic/jack' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:43 +0000 (00:35 +0100)]
Merge branch 'topic/jack' into for-linus

16 years agoMerge branch 'topic/hwdep-cleanup' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:41 +0000 (00:35 +0100)]
Merge branch 'topic/hwdep-cleanup' into for-linus

16 years agoMerge branch 'topic/snd_card_new-err' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:35:35 +0000 (00:35 +0100)]
Merge branch 'topic/snd_card_new-err' into for-linus

16 years agoucc_geth: Fix merge error.
David S. Miller [Mon, 23 Mar 2009 23:21:16 +0000 (16:21 -0700)]
ucc_geth: Fix merge error.

I left a merge failure unresolved, noticed by Stephen
Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 years agoLinux 2.6.29
Linus Torvalds [Mon, 23 Mar 2009 23:12:14 +0000 (16:12 -0700)]
Linux 2.6.29

16 years agoMIPS: R2: Fix problem with code that incorrectly modifies ebase.
Chris Dearman [Fri, 20 Mar 2009 22:33:55 +0000 (15:33 -0700)]
MIPS: R2: Fix problem with code that incorrectly modifies ebase.

Commit 566f74f6b2f8b85d5b8d6caaf97e5672cecd3e3e had a change that
incorrectly modified ebase. This backs out the lines that modified
ebase.
In addition, the ebase exception vector is now allocated with correct
alignment and the ebase register updated according to the architecture
specification.

Based on original patch by David VomLehn <dvomlehn@cisco.com>.

Signed-off-by: David VomLehn <dvomlehn@cisco.com>
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years agoMIPS: Change {set,clear,change}_c0_<foo> to return old value.
Ralf Baechle [Mon, 23 Mar 2009 21:14:55 +0000 (22:14 +0100)]
MIPS: Change {set,clear,change}_c0_<foo> to return old value.

This is more standard and useful and need for the following fix to work
correctly.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years agoMIPS: compat: Remove duplicated #include
Huang Weiyi [Sat, 21 Mar 2009 05:50:48 +0000 (13:50 +0800)]
MIPS: compat: Remove duplicated #include

Remove duplicated #include in arch/mips/kernel/linux32.c.

Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years agoMIPS: VR5500: Enable prefetch
Shinya Kuribayashi [Wed, 18 Mar 2009 00:04:01 +0000 (09:04 +0900)]
MIPS: VR5500: Enable prefetch

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years agoMIPS: Fix oops in dma_unmap_page on not coherent mips platforms
Jan Nikitenko [Fri, 28 Nov 2008 07:52:58 +0000 (08:52 +0100)]
MIPS: Fix oops in dma_unmap_page on not coherent mips platforms

dma_cache_wback_inv() expects virtual address, but physical was provided
due to translation via plat_dma_addr_to_phys().
If replaced with dma_addr_to_virt(), page fault oops from dma_unmap_page()
is gone on au1550 platform.

Signed-off-by: Jan Nikitenko <jan.nikitenko@gmail.com>
Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years agofsl_pq_mdio: Use proper address translation
Anton Vorontsov [Thu, 19 Mar 2009 06:48:08 +0000 (06:48 +0000)]
fsl_pq_mdio: Use proper address translation

Currently the driver just read "reg" property for constructing MDIO
bus IDs, but this won't work when we'll start using "ranges = <>" in
the device tree, so this will pop up:

Freescale PowerQUICC MII Bus: probed
sysfs: duplicate filename 'mdio@520' can not be created
------------[ cut here ]------------
Badness at c00cb6b8 [verbose debug info unavailable]
NIP: c00cb6b8 LR: c00cb6b8 CTR: c001271c
REGS: cf82fc10 TRAP: 0700   Not tainted  (2.6.29-rc7-03702-g7ccd10f)
MSR: 00029032 <EE,ME,CE,IR,DR>  CR: 42044022  XER: 20000000
TASK = cf81fbd0[1] 'swapper' THREAD: cf82e000
GPR00: c00cb6b8 cf82fcc0 cf81fbd0 0000003b 00000e42 ffffffff 00004000 00000e42
GPR08: c03cb0fc c03bfbdc 00000e42 c03cac50 22044022 1006a2bc 0ffcb000 00000000
GPR16: 0ffc04b0 0ffc5a40 00000000 0ffc79a8 0f7863a8 00000004 00000000 00000000
GPR24: c033a6a8 d1014520 cf85e840 cf82fd08 cf87cf2c cf82fcd8 cf85dea8 ffffffef
NIP [c00cb6b8] sysfs_add_one+0x4c/0x54
LR [c00cb6b8] sysfs_add_one+0x4c/0x54
Call Trace:
[cf82fcc0] [c00cb6b8] sysfs_add_one+0x4c/0x54 (unreliable)
[cf82fcd0] [c00cbc18] create_dir+0x58/0xc0
[cf82fd00] [c00cbcc0] sysfs_create_dir+0x40/0x70
[cf82fd20] [c0159388] create_dir+0x28/0x78
[cf82fd30] [c0159824] kobject_add_internal+0x98/0x13c
[cf82fd50] [c0159e98] kobject_add+0x60/0x98
[cf82fd80] [c018a480] device_add+0x98/0x2ac
[cf82fda0] [c01a2380] mdiobus_register+0xbc/0x1c0
[cf82fdc0] [c019f31c] fsl_pq_mdio_probe+0x284/0x2a0
[cf82fe00] [c0223814] of_platform_device_probe+0x5c/0x84
...

This patch fixes the issue by translating the "reg" property to a full
address, and thus avoids the duplicate names.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years agotracing/function-graph-tracer: fix functions call traces imbalance
Frederic Weisbecker [Mon, 23 Mar 2009 21:17:01 +0000 (22:17 +0100)]
tracing/function-graph-tracer: fix functions call traces imbalance

Impact: fix traces output

Sometimes one can observe an imbalance in the traces between function
calls and function return traces:

func1() {
    }
}

The curly brace inside func1() is the return of another function nested
inside func1. The return trace have been inserted in the buffer but not
the entry.
We are storing a return address on the function traces stack while we
haven't inserted its entry on the buffer, hence the imbalance on the
traces.

This is because the tracers doesn't check all failures that can happen
on buffer insertion.

This patch reports the tracing recursion failures and the ring buffer
failures. In such cases, we now restore the original return address for
the function, giving up its return trace.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <1237843021-11695-1-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
16 years agotracing: Fix TRACING_SUPPORT dependency for PPC32
Anton Vorontsov [Mon, 23 Mar 2009 22:07:24 +0000 (01:07 +0300)]
tracing: Fix TRACING_SUPPORT dependency for PPC32

commit 40ada30f9621fbd831ac2437b9a2a399aa ("tracing: clean up menu"),
despite the "clean up" in its purpose, introduced a behavioural
change for Kconfig symbols: we no longer able to select tracing
support on PPC32 (because IRQFLAGS_SUPPORT isn't yet implemented).

The IRQFLAGS_SUPPORT is not mandatory for most tracers, tracing core
has a special case for platforms w/o irqflags (which, by the way, has
become useless as of the commit above).

Though according to Ingo Molnar, there was periodic build failures on
weird, unmaintained architectures that had no irqflags-tracing support
and hence didn't know the raw_irqs_save/restore primitives. Thus we'd
better not enable irqflags-less tracing for all architectures.

This patch restores the old behaviour for PPC32, and thus brings the
tracing back. Other architectures can either add themselves to the
exception list or (better) implement TRACE_IRQFLAGS_SUPPORT.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-b: Steven Rostedt <rostedt@goodmis.org>
Cc: linuxppc-dev@ozlabs.org
LKML-Reference: <20090323220724.GA9851@oksana.dev.rtsoft.ru>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
16 years agoudp: Wrong locking code in udp seq_file infrastructure
Vitaly Mayatskikh [Mon, 23 Mar 2009 22:22:33 +0000 (15:22 -0700)]
udp: Wrong locking code in udp seq_file infrastructure

Reading zero bytes from /proc/net/udp or other similar files which use
the same seq_file udp infrastructure panics kernel in that way:

=====================================
[ BUG: bad unlock balance detected! ]
-------------------------------------
read/1985 is trying to release lock (&table->hash[i].lock) at:
[<ffffffff81321d83>] udp_seq_stop+0x27/0x29
but there are no more locks to release!

other info that might help us debug this:
1 lock held by read/1985:
 #0:  (&p->lock){--..}, at: [<ffffffff810eefb6>] seq_read+0x38/0x348

stack backtrace:
Pid: 1985, comm: read Not tainted 2.6.29-rc8 #9
Call Trace:
 [<ffffffff81321d83>] ? udp_seq_stop+0x27/0x29
 [<ffffffff8106dab9>] print_unlock_inbalance_bug+0xd6/0xe1
 [<ffffffff8106db62>] lock_release_non_nested+0x9e/0x1c6
 [<ffffffff810ef030>] ? seq_read+0xb2/0x348
 [<ffffffff8106bdba>] ? mark_held_locks+0x68/0x86
 [<ffffffff81321d83>] ? udp_seq_stop+0x27/0x29
 [<ffffffff8106dde7>] lock_release+0x15d/0x189
 [<ffffffff8137163c>] _spin_unlock_bh+0x1e/0x34
 [<ffffffff81321d83>] udp_seq_stop+0x27/0x29
 [<ffffffff810ef239>] seq_read+0x2bb/0x348
 [<ffffffff810eef7e>] ? seq_read+0x0/0x348
 [<ffffffff8111aedd>] proc_reg_read+0x90/0xaf
 [<ffffffff810d878f>] vfs_read+0xa6/0x103
 [<ffffffff8106bfac>] ? trace_hardirqs_on_caller+0x12f/0x153
 [<ffffffff810d88a2>] sys_read+0x45/0x69
 [<ffffffff8101123a>] system_call_fastpath+0x16/0x1b
BUG: scheduling while atomic: read/1985/0xffffff00
INFO: lockdep is turned off.
Modules linked in: cpufreq_ondemand acpi_cpufreq freq_table dm_multipath kvm ppdev snd_hda_codec_analog snd_hda_intel snd_hda_codec snd_hwdep snd_seq_dummy snd_seq_oss snd_seq_midi_event arc4 snd_s
eq ecb thinkpad_acpi snd_seq_device iwl3945 hwmon sdhci_pci snd_pcm_oss sdhci rfkill mmc_core snd_mixer_oss i2c_i801 mac80211 yenta_socket ricoh_mmc i2c_core iTCO_wdt snd_pcm iTCO_vendor_support rs
rc_nonstatic snd_timer snd lib80211 cfg80211 soundcore snd_page_alloc video parport_pc output parport e1000e [last unloaded: scsi_wait_scan]
Pid: 1985, comm: read Not tainted 2.6.29-rc8 #9
Call Trace:
 [<ffffffff8106b456>] ? __debug_show_held_locks+0x1b/0x24
 [<ffffffff81043660>] __schedule_bug+0x7e/0x83
 [<ffffffff8136ede9>] schedule+0xce/0x838
 [<ffffffff810d7972>] ? fsnotify_access+0x5f/0x67
 [<ffffffff810112d0>] ? sysret_careful+0xb/0x37
 [<ffffffff8106be9c>] ? trace_hardirqs_on_caller+0x1f/0x153
 [<ffffffff8137127b>] ? trace_hardirqs_on_thunk+0x3a/0x3f
 [<ffffffff810112f6>] sysret_careful+0x31/0x37
read[1985]: segfault at 7fffc479bfe8 ip 0000003e7420a180 sp 00007fffc479bfa0 error 6
Kernel panic - not syncing: Aiee, killing interrupt handler!

udp_seq_stop() tries to unlock not yet locked spinlock. The lock was lost
during splitting global udp_hash_lock to subsequent spinlocks.

Signed-off by: Vitaly Mayatskikh <v.mayatskih@gmail.com>
Acked-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years agophy: add new LAN8710 and LAN8720 device ids to smsc phy driver
Steve Glendinning [Mon, 23 Mar 2009 22:17:31 +0000 (15:17 -0700)]
phy: add new LAN8710 and LAN8720 device ids to smsc phy driver

LAN8710 and LAN8720 are two new 10/100 ethernet PHY models. The two
share the same phy id, this patch adds it to the smsc phy driver.

Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years agoALSA: hda - Add quirk for Acer Ferrari 5000
Takashi Iwai [Mon, 23 Mar 2009 21:50:52 +0000 (22:50 +0100)]
ALSA: hda - Add quirk for Acer Ferrari 5000

Add a quirk model=acer-aspire for Acer Ferrari 5000 with ALC883 codec.
Note that model=auto doesn't work for this laptop because of broken BIOS
(that doesn't set the subsystem id properly).

Tested-by: Russ Dill <russ.dill@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years agospider_net: Add missing .ndo_validate_addr
David S. Miller [Mon, 23 Mar 2009 21:42:09 +0000 (14:42 -0700)]
spider_net: Add missing .ndo_validate_addr

Signed-off-by: David S. Miller <davem@davemloft.net>
16 years agomyri_sbus/sunbmac/sunlance/sunqe: Add missing net_device_ops entries.
David S. Miller [Mon, 23 Mar 2009 21:29:24 +0000 (14:29 -0700)]
myri_sbus/sunbmac/sunlance/sunqe: Add missing net_device_ops entries.

Noticed by Stephen Hemminger.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 years agoBuild with -fno-dwarf2-cfi-asm
Kyle McMartin [Mon, 23 Mar 2009 19:25:49 +0000 (15:25 -0400)]
Build with -fno-dwarf2-cfi-asm

With a sufficiently new compiler and binutils, code which wasn't
previously generating .eh_frame sections has begun to.  Certain
architectures (powerpc, in this case) may generate unexpected relocation
formats in response to this, preventing modules from loading.

While the new relocation types should probably be handled, revert to the
previous behaviour with regards to generation of .eh_frame sections.

(This was reported against Fedora, which appears to be the only distro
doing any building against gcc-4.4 at present: RH bz#486545.)

Signed-off-by: Kyle McMartin <kyle@redhat.com>
Acked-by: Roland McGrath <roland@redhat.com>
Cc: Alexandre Oliva <aoliva@redhat.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
16 years agotrivial: fix orphan dates in ext2 documentation
Jody McIntyre [Mon, 23 Mar 2009 17:13:34 +0000 (13:13 -0400)]
trivial: fix orphan dates in ext2 documentation

Revert the change to the orphan dates of Windows 95, DOS, compression.
Add a new orphan date for OS/2.

Signed-off-by: Jody McIntyre <scjody@sun.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
16 years ago[ARM] orion5x: update of FPGA ID's for the TS-78xx
Alexander Clouter [Sat, 21 Mar 2009 11:09:25 +0000 (11:09 +0000)]
[ARM] orion5x: update of FPGA ID's for the TS-78xx

Received official word finally from Technological Systems on which
FPGA ID's they have released unto the world.  Also an additional of
a dummy entry matching the FPGA ID of the Verilog template on our
wiki.

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
16 years agoMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Mon, 23 Mar 2009 20:35:04 +0000 (13:35 -0700)]
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/ucc_geth.c

16 years agosunqe: Convert to net_device_ops.
David S. Miller [Mon, 23 Mar 2009 20:33:37 +0000 (13:33 -0700)]
sunqe: Convert to net_device_ops.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 years agosunlance: Convert to net_device_ops.
David S. Miller [Mon, 23 Mar 2009 20:33:28 +0000 (13:33 -0700)]
sunlance: Convert to net_device_ops.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 years agosunbmac: Convert to net_device_ops.
David S. Miller [Mon, 23 Mar 2009 20:33:21 +0000 (13:33 -0700)]
sunbmac: Convert to net_device_ops.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 years agomyri_sbus: Convert to net_device_ops.
David S. Miller [Mon, 23 Mar 2009 20:33:11 +0000 (13:33 -0700)]
myri_sbus: Convert to net_device_ops.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 years agoMerge branch 'cpus4096' into irq/threaded
Thomas Gleixner [Mon, 23 Mar 2009 13:50:03 +0000 (14:50 +0100)]
Merge branch 'cpus4096' into irq/threaded

Conflicts:
arch/parisc/kernel/irq.c
kernel/irq/handle.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
16 years ago[ARM] Kirkwood: Add support for QNAP TS-119/TS-219 Turbo NAS
Martin Michlmayr [Sun, 22 Mar 2009 14:22:11 +0000 (15:22 +0100)]
[ARM] Kirkwood: Add support for QNAP TS-119/TS-219 Turbo NAS

Add support for the QNAP TS-119 and TS-219 Turbo NAS devices.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
16 years ago[ARM] update mach-types
Nicolas Pitre [Mon, 23 Mar 2009 20:10:36 +0000 (16:10 -0400)]
[ARM] update mach-types

Signed-off-by: Nicolas Pitre <nico@marvell.com>
16 years agoposix timers: fix RLIMIT_CPU && fork()
Oleg Nesterov [Mon, 23 Mar 2009 19:34:11 +0000 (20:34 +0100)]
posix timers: fix RLIMIT_CPU && fork()

See http://bugzilla.kernel.org/show_bug.cgi?id=12911

copy_signal() copies signal->rlim, but RLIMIT_CPU is "lost". Because
posix_cpu_timers_init_group() sets cputime_expires.prof_exp = 0 and thus
fastpath_timer_check() returns false unless we have other cpu timers.

This is the minimal fix for 2.6.29 (tested) and 2.6.28. The patch is not
optimal, we need further cleanups here. With this patch update_rlimit_cpu()
is not really needed, but I don't think it should be removed.

The proper fix (I think) is:

- set_process_cpu_timer() should just start the cputimer->running
  logic (it does), no need to change cputime_expires.xxx_exp

- posix_cpu_timers_init_group() should set ->running when needed

- fastpath_timer_check() can check ->running instead of
  task_cputime_zero(signal->cputime_expires)

Reported-by: Peter Lojkin <ia6432@inbox.ru>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Roland McGrath <roland@redhat.com>
Cc: <stable@kernel.org> [for 2.6.29.x]
LKML-Reference: <20090323193411.GA17514@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
16 years agoUpdates to the mmc-twl4030 code
David Brownell [Fri, 20 Mar 2009 22:33:24 +0000 (22:33 +0000)]
Updates to the mmc-twl4030 code

Updates to the mmc-twl4030 code:

 - Partial workaround for the bug fixed more comprehensively
   by f4223ec219313d631c3f620220ed23670c158a34 ... workaround
   applies only to MMC devs using this code.

 - Fix a cut'n'paste bug as noted by Adrian Hunter:  the intent
   was to "disable" not (re)"enable".

The reason to want this workaround is lack of faith that any
sane fix for that regulator framework bug will ever merge,
while still wanting to see things work in mainline.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
16 years agosdp regulator init updates
David Brownell [Fri, 20 Mar 2009 22:33:11 +0000 (22:33 +0000)]
sdp regulator init updates

Hook up VPLL2 regulator on 3430 SDP.  Link that and VDAC to the
framebuffer device, supporting eventual conversion to use the
regulator framework.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
16 years ago[ARM] Kirkwood: More consistency regarding MPP naming
Martin Michlmayr [Sun, 22 Mar 2009 14:21:25 +0000 (15:21 +0100)]
[ARM] Kirkwood: More consistency regarding MPP naming

With the exception of UART0, all MPP names are uppercase.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
16 years ago[ARM] Kirkwood: Hook up I2C
Martin Michlmayr [Mon, 23 Mar 2009 18:13:21 +0000 (19:13 +0100)]
[ARM] Kirkwood: Hook up I2C

Hook up I2C on Marvell Kirkwood.  Tested on a QNAP TS-219 which has
RTC connected through I2C.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
16 years agoARM: OMAP: Fix mmc_set_power GPIO usage
Ladislav Michl [Mon, 23 Mar 2009 18:37:21 +0000 (11:37 -0700)]
ARM: OMAP: Fix mmc_set_power GPIO usage

Simple simplification...

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
16 years agoMerge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Russell King [Mon, 23 Mar 2009 16:42:30 +0000 (16:42 +0000)]
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

16 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Mon, 23 Mar 2009 16:25:58 +0000 (09:25 -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: (32 commits)
  ucc_geth: Fix oops when using fixed-link support
  dm9000: locking bugfix
  net: update dnet.c for bus_id removal
  dnet: DNET should depend on HAS_IOMEM
  dca: add missing copyright/license headers
  nl80211: Check that function pointer != NULL before using it
  sungem: missing net_device_ops
  be2net: fix to restore vlan ids into BE2 during a IF DOWN->UP cycle
  be2net: replenish when posting to rx-queue is starved in out of mem conditions
  bas_gigaset: correctly allocate USB interrupt transfer buffer
  smsc911x: reset last known duplex and carrier on open
  sh_eth: Fix mistake of the address of SH7763
  sh_eth: Change handling of IRQ
  netns: oops in ip[6]_frag_reasm incrementing stats
  net: kfree(napi->skb) => kfree_skb
  net: fix sctp breakage
  ipv6: fix display of local and remote sit endpoints
  net: Document /proc/sys/net/core/netdev_budget
  tulip: fix crash on iface up with shirq debug
  virtio_net: Make virtio_net support carrier detection
  ...

16 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Mon, 23 Mar 2009 16:25:24 +0000 (09:25 -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:
  sparc64: Fix crash with /proc/iomem
  sparc64: Reschedule KGDB capture to a software interrupt.
  sbus: Auto-load openprom module when device opened.

16 years agofix ptrace slowness
Miklos Szeredi [Mon, 23 Mar 2009 15:07:24 +0000 (16:07 +0100)]
fix ptrace slowness

This patch fixes bug #12208:

  Bug-Entry       : http://bugzilla.kernel.org/show_bug.cgi?id=12208
  Subject         : uml is very slow on 2.6.28 host

This turned out to be not a scheduler regression, but an already
existing problem in ptrace being triggered by subtle scheduler
changes.

The problem is this:

 - task A is ptracing task B
 - task B stops on a trace event
 - task A is woken up and preempts task B
 - task A calls ptrace on task B, which does ptrace_check_attach()
 - this calls wait_task_inactive(), which sees that task B is still on the runq
 - task A goes to sleep for a jiffy
 - ...

Since UML does lots of the above sequences, those jiffies quickly add
up to make it slow as hell.

This patch solves this by not rescheduling in read_unlock() after
ptrace_stop() has woken up the tracer.

Thanks to Oleg Nesterov and Ingo Molnar for the feedback.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
CC: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
16 years agox86/dmi: fix dmi_alloc() section mismatches
Jeremy Fitzhardinge [Sun, 22 Mar 2009 21:48:44 +0000 (14:48 -0700)]
x86/dmi: fix dmi_alloc() section mismatches

Impact: section mismatch fix

Ingo reports these warnings:
> WARNING: vmlinux.o(.text+0x6a288e): Section mismatch in reference from
> the function dmi_alloc() to the function .init.text:extend_brk()
> The function dmi_alloc() references
> the function __init extend_brk().
> This is often because dmi_alloc lacks a __init annotation or the
> annotation of extend_brk is wrong.

dmi_alloc() is a static inline, and so should be immune to this
kind of error.  But force it to be inlined and make it __init
anyway, just to be extra sure.

All of dmi_alloc()'s callers are already __init.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <49C6B23C.2040308@goop.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
16 years agoMerge branches 'sched/debug' and 'linus' into sched/core
Ingo Molnar [Mon, 23 Mar 2009 15:53:20 +0000 (16:53 +0100)]
Merge branches 'sched/debug' and 'linus' into sched/core

16 years agoALSA: hda - Use cached calls to get widget caps and pin caps
Takashi Iwai [Mon, 23 Mar 2009 15:35:39 +0000 (16:35 +0100)]
ALSA: hda - Use cached calls to get widget caps and pin caps

Replace with the standard function calls to use caches for reading
the widget caps and pin caps.

hda_proc.c is still using the direct verbs to get raw values as
much as possible.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
16 years agotracing/ftrace: check if debugfs is registered before creating files
Frederic Weisbecker [Sun, 22 Mar 2009 22:10:45 +0000 (23:10 +0100)]
tracing/ftrace: check if debugfs is registered before creating files

Impact: fix a crash with ftrace={nop,boot} parameter

If the nop or initcall tracers are launched as boot tracers,
they will attempt to create their option directory and files.
But these tracers are registered very early and then assigned
as "boot tracers" very early if asked to.

Since they do this before debugfs has been registered (core initcall),
a crash is triggered.

Another early tracers could also come later. So we fix it by
checking if debugfs is initialized before creating the root
tracing directory.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <1237759847-21025-3-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
16 years agodebugfs: function to know if debugfs is initialized
Frederic Weisbecker [Sun, 22 Mar 2009 22:10:44 +0000 (23:10 +0100)]
debugfs: function to know if debugfs is initialized

Impact: add new debugfs API

With ftrace, some tracers are registered in early initcalls
and attempt to create files on the debugfs filesystem.
Depending on when they are activated, they can try to create their
file at any time. Some checks can be done on the tracing area
but providing a helper to know if debugfs is registered make it
really more easy.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <1237759847-21025-2-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
16 years ago[MTD] [OneNAND] Add write-while-program support
Kyungmin Park [Mon, 17 Nov 2008 08:54:28 +0000 (17:54 +0900)]
[MTD] [OneNAND] Add write-while-program support

OneNAND write-while-program method of writing improves performance,
compared with ordinary writes, by transferring data to OneNAND's
RAM buffers atthe same time as programming the NAND core.

When writing several NAND pages at a time, an improvement of
12% to 25% is seen.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
16 years agoMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
Linus Torvalds [Mon, 23 Mar 2009 15:03:09 +0000 (08:03 -0700)]
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc:
  powerpc/mm: Fix Respect _PAGE_COHERENT on classic ppc32 SW TLB load machines

16 years agoALSA: hda - Don't create empty/single-item input source
Takashi Iwai [Mon, 23 Mar 2009 14:21:36 +0000 (15:21 +0100)]
ALSA: hda - Don't create empty/single-item input source

In patch_realtek.c, don't create empty or single-item "Input Source"
control elements that are simply superfluous.

Signed-off-by: Takashi Iwai <tiwai@suse.de>