Stephen Rothwell | 1 Apr 02:37 2009
Picon
Picon

linux-next: manual merge of the tracing tree with the parisc tree

Hi all,

Today's linux-next merge of the tracing tree got a conflict in
arch/parisc/include/asm/ftrace.h between commit
d75f054a2cf0614ff63d534ff21ca8eaab41e713 ("parisc: add ftrace (function
and graph tracer) functionality") from the parisc tree and commit
c79a61f55773d2519fd0525bf58385f7d20752d3 ("tracing: make CALLER_ADDRx
overwriteable") from the tracing tree.

The former adds a non-trivial version of the file, so I used that.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Alexander Beregalov | 1 Apr 04:03 2009
Picon

[PATCH] cx231xx: fix wrong usage of select in kconfig

VIDEO_CX231XX_ALSA depends on SND && SND_PCM,
but if we select it from VIDEO_CX231XX entry
it does not automatically select SND_PCM.
It causes build error:
ERROR: "snd_pcm_period_elapsed" [drivers/media/video/cx231xx/cx231xx-alsa.ko] undefined!

Documentation/kbuild/kconfig-language.txt:
Note:
        select should be used with care. select will force
        a symbol to a value without visiting the dependencies.
        By abusing select you are able to select a symbol FOO even
        if FOO depends on BAR that is not set.

Signed-off-by: Alexander Beregalov <a.beregalov <at> gmail.com>
---

 drivers/media/video/cx231xx/Kconfig |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/cx231xx/Kconfig b/drivers/media/video/cx231xx/Kconfig
index 9115654..85ae751 100644
--- a/drivers/media/video/cx231xx/Kconfig
+++ b/drivers/media/video/cx231xx/Kconfig
 <at>  <at>  -6,7 +6,6  <at>  <at>  config VIDEO_CX231XX
        select VIDEO_IR
        select VIDEOBUF_VMALLOC
        select VIDEO_CX25840
-       select VIDEO_CX231XX_ALSA

 	---help---
(Continue reading)

Stephen Rothwell | 1 Apr 07:44 2009
Picon
Picon

linux-next: Tree for April 1

Hi all,

Changes since 20090331:

Various conflicts have moved around due to some trees being merged into
Linus' tree.

The cpus4096 tree inherited 2 conflicts from the rr tree.

The tracing tree gained a conflict against the parisc tree.

The rr tree lost 5 conflicts.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
(Continue reading)

Uwe Kleine-König | 1 Apr 08:54 2009
Picon

Re: linux-next: manual merge of the tracing tree with the parisc tree

Hi Steven,

On Wed, Apr 01, 2009 at 11:37:40AM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the tracing tree got a conflict in
> arch/parisc/include/asm/ftrace.h between commit
> d75f054a2cf0614ff63d534ff21ca8eaab41e713 ("parisc: add ftrace (function
> and graph tracer) functionality") from the parisc tree and commit
> c79a61f55773d2519fd0525bf58385f7d20752d3 ("tracing: make CALLER_ADDRx
> overwriteable") from the tracing tree.
Whatever you have done---I didn't check---as long as
arch/parisc/include/asm/ftrace.h exists, it's OK for
c79a61f55773d2519fd0525bf58385f7d20752d3.

Best regards and thanks
Uwe

--

-- 
Pengutronix e.K.                              | Uwe Kleine-König            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |
Catalin Marinas | 1 Apr 11:30 2009

Re: linux-next: Tree for March 30: [BUG] kmemleak page fault

On Mon, 2009-03-30 at 14:24 +0200, Matthias Kaehlcke wrote:
> linux-next 20090330 causes the following page fault on an edb9302
> (ARM) like board:
> 
> # Unable to handle kernel paging request at virtual address 00535447
> pgd = c56b0000
> [00535447] *pgd=00000000
> Internal error: Oops: 3 [#1] PREEMPT
> Modules linked in:
> CPU: 0    Not tainted  (2.6.29-next-20090330 #6)
> PC is at kmemleak_scan+0x158/0x3ac
> LR is at find_and_get_object+0xe0/0x104
> pc : [<c00aa5cc>]    lr : [<c00a99d8>]    psr: 00000013
> sp : c55bff78  ip : c55bff28  fp : c55bffa4
> r10: c0322718  r9 : c035fa6c  r8 : c035f048
> r7 : c035f044  r6 : 00005800  r5 : 00004981  r4 : 00093020
> r3 : 00535443  r2 : 414f4c5f  r1 : 00000001  r0 : c0400020
> Flags: nzcv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment kernel
> Control: 0000717f  Table: 0567c000  DAC: 00000017
> Process kmemleak (pid: 343, stack limit = 0xc55be268)
[...]
> the fault is reproducible and happens some seconds after having
> finished the boot process. please tell me if you need more information
> (like the .config, ...) in order to track this down

Yes, the .config would be useful. I'm mainly interested in which slab
allocator you are using. I'm testing kmemleak mainly on ARM and haven't
seen any issues.

Thanks.
(Continue reading)

Alexander Beregalov | 1 Apr 11:44 2009
Picon

[PATCH next] parisc: asm/pdc.h should include asm/page.h

Fixes this build error:
arch/parisc/kernel/pdc_cons.c:117: error: '__PAGE_OFFSET' undeclared
(first use in this function)

Signed-off-by: Alexander Beregalov <a.beregalov <at> gmail.com>
---

 arch/parisc/include/asm/pdc.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/parisc/include/asm/pdc.h b/arch/parisc/include/asm/pdc.h
index a26e98d..fde8045 100644
--- a/arch/parisc/include/asm/pdc.h
+++ b/arch/parisc/include/asm/pdc.h
 <at>  <at>  -340,6 +340,7  <at>  <at> 
 #if !defined(__ASSEMBLY__)

 #include <linux/types.h>
+#include <asm/page.h>

 #ifdef __KERNEL__
--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Matthias Kaehlcke | 1 Apr 11:52 2009
Picon

Re: linux-next: Tree for March 30: [BUG] kmemleak page fault

El Wed, Apr 01, 2009 at 10:30:08AM +0100 Catalin Marinas ha dit:

> On Mon, 2009-03-30 at 14:24 +0200, Matthias Kaehlcke wrote:
> > linux-next 20090330 causes the following page fault on an edb9302
> > (ARM) like board:
> > 
> > # Unable to handle kernel paging request at virtual address 00535447
> > pgd = c56b0000
> > [00535447] *pgd=00000000
> > Internal error: Oops: 3 [#1] PREEMPT
> > Modules linked in:
> > CPU: 0    Not tainted  (2.6.29-next-20090330 #6)
> > PC is at kmemleak_scan+0x158/0x3ac
> > LR is at find_and_get_object+0xe0/0x104
> > pc : [<c00aa5cc>]    lr : [<c00a99d8>]    psr: 00000013
> > sp : c55bff78  ip : c55bff28  fp : c55bffa4
> > r10: c0322718  r9 : c035fa6c  r8 : c035f048
> > r7 : c035f044  r6 : 00005800  r5 : 00004981  r4 : 00093020
> > r3 : 00535443  r2 : 414f4c5f  r1 : 00000001  r0 : c0400020
> > Flags: nzcv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment kernel
> > Control: 0000717f  Table: 0567c000  DAC: 00000017
> > Process kmemleak (pid: 343, stack limit = 0xc55be268)
> [...]
> > the fault is reproducible and happens some seconds after having
> > finished the boot process. please tell me if you need more information
> > (like the .config, ...) in order to track this down
> 
> Yes, the .config would be useful. I'm mainly interested in which slab
> allocator you are using. I'm testing kmemleak mainly on ARM and haven't
> seen any issues.
(Continue reading)

Sachin Sant | 1 Apr 12:27 2009
Picon

[Patch next] powerpc: pseries/dtl.c should include asm/firmware.h

randconfig build on powerpc failed with :

arch/powerpc/platforms/pseries/dtl.c: In function ‘dtl_init’:
arch/powerpc/platforms/pseries/dtl.c:238: error: implicit declaration of function ‘firmware_has_feature’
arch/powerpc/platforms/pseries/dtl.c:238: error: ‘FW_FEATURE_SPLPAR’ undeclared (first use
in this function)
arch/powerpc/platforms/pseries/dtl.c:238: error: (Each undeclared identifier is reported only once
arch/powerpc/platforms/pseries/dtl.c:238: error: for each function it appears in.)

Signed-off-by : Sachin Sant <sachinp <at> in.ibm.com>
---

Attachment (fix-dtl-build-break.patch): text/x-patch, 1005 bytes
Uwe Kleine-König | 1 Apr 13:10 2009
Picon

Re: linux-next: manual merge of the tracing tree with the parisc tree

Hello Ingo,

On Wed, Apr 01, 2009 at 01:05:12PM +0200, Ingo Molnar wrote:
> 
> * Stephen Rothwell <sfr <at> canb.auug.org.au> wrote:
> 
> > Hi all,
> > 
> > Today's linux-next merge of the tracing tree got a conflict in
> > arch/parisc/include/asm/ftrace.h between commit
> > d75f054a2cf0614ff63d534ff21ca8eaab41e713 ("parisc: add ftrace (function
> > and graph tracer) functionality") from the parisc tree and commit
> > c79a61f55773d2519fd0525bf58385f7d20752d3 ("tracing: make CALLER_ADDRx
> > overwriteable") from the tracing tree.
> > 
> > The former adds a non-trivial version of the file, so I used that.
> 
> You need to be careful, the two trees likely cannot be combined like 
> that, ftrace will likely stop working on parisc because you combine 
> old-parisc with new-ftrace.
> 
> If the two trees are integrated without forward-porting the parisc 
> ftrace port to the new facilities, then it's safer to do a trivial 
> patch that disables the ftrace bits on parisc.
I'm not sure that they really conflict.  My change ("tracing: make
CALLER_ADDRx overwriteable") only created the empty include file that I
can unconditionally include <asm/ftrace.h>.

But I don't know for sure.

(Continue reading)


Gmane