linux-next: rr tree build failure

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1036 bytes --]

Hi Rusty,

Today's linux-next build (powerpc allnoconfig) failed like this:

lib/extable.c: In function 'trim_init_extable':
lib/extable.c:50: error: dereferencing pointer to incomplete type
lib/extable.c:50: error: implicit declaration of function 'within_module_init'
lib/extable.c:50: error: dereferencing pointer to incomplete type
lib/extable.c:51: error: dereferencing pointer to incomplete type
lib/extable.c:52: error: dereferencing pointer to incomplete type
lib/extable.c:55: error: dereferencing pointer to incomplete type
lib/extable.c:56: error: dereferencing pointer to incomplete type
lib/extable.c:56: error: dereferencing pointer to incomplete type
lib/extable.c:57: error: dereferencing pointer to incomplete type

Caused by commit 07c674557e43c27d4e7243a35b9ea030b09e3c3d ("module: trim
exception table on init free") which I have reverted for today.

This is a build without CONFIG_MODULE.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: rr tree build failure

[Rusty Russell]

On Tue, 9 Jun 2009 07:42:05 pm Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next build (powerpc allnoconfig) failed like this:
>
> lib/extable.c: In function 'trim_init_extable':
> lib/extable.c:50: error: dereferencing pointer to incomplete type
> lib/extable.c:50: error: implicit declaration of function
..
> This is a build without CONFIG_MODULE.

Ah, my bad.  I'll wrap this and test this config too.

Thanks,
Rusty.

Re: linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

Hi Rusty,

On Wed, 10 Jun 2009 16:56:46 +0930 Rusty Russell <rusty@rustcorp.com.au> wrote:
>
> Ah, my bad.  I'll wrap this and test this config too.

Thanks.  I will revert that commit from today's linux-next as well.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]

Hi Rusty,

On Tue, 15 Dec 2009 14:22:29 +1030 Rusty Russell <rusty@rustcorp.com.au> wrote:
>
> On Mon, 14 Dec 2009 03:05:28 pm Stephen Rothwell wrote:
> > 
> > On Fri, 11 Dec 2009 12:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > > 
> > > arch/x86/kernel/cpu/cpufreq/powernow-k8.c: In function 'powernowk8_target':
> > > arch/x86/kernel/cpu/cpufreq/powernow-k8.c:1139: error: implicit declaration of function 'tsk_cpumask'
> > > arch/x86/kernel/cpu/cpufreq/powernow-k8.c:1139: warning: passing argument 2 of 'cpumask_copy' makes pointer from integer without a cast
> > > include/linux/cpumask.h:466: note: expected 'const struct cpumask *' but argument is of type 'int'
> > > 
> > > Caused by commit 9dd4c5ab546fcac98cfb9ca24ed5cc1bf7f08334
> > > ("cpumask:tsk_cpus_allowed-not-tsk_cpumask") from the rr tree interacting
> > > with commit b8cbe7e82ec8b55d7bbdde66fc69e788fde00dc6 ("[CPUFREQ] cpumask:
> > > don't put a cpumask on the stack in x86...cpufreq/powernow-k8.c") from
> > > the cpufreq tree.
> > 
> > The cpufreq patch above is now in Linus' tree, so You should add the
> > patch below to your tree (or squash it into the affected patch).
> 
> Thanks, done and rebased.

But not exported/uploaded ... :-(
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 466 bytes --]

Hi Rusty,

On Tue, 15 Dec 2009 14:22:29 +1030 Rusty Russell <rusty@rustcorp.com.au> wrote:
>
> On Mon, 14 Dec 2009 03:05:28 pm Stephen Rothwell wrote:
> > 
> > The cpufreq patch above is now in Linus' tree, so You should add the
> > patch below to your tree (or squash it into the affected patch).
> 
> Thanks, done and rebased.

Great, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: rr tree build failure

[Rusty Russell]

On Mon, 14 Dec 2009 03:05:28 pm Stephen Rothwell wrote:
> Hi Rusty,
> 
> On Fri, 11 Dec 2009 12:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > 
> > arch/x86/kernel/cpu/cpufreq/powernow-k8.c: In function 'powernowk8_target':
> > arch/x86/kernel/cpu/cpufreq/powernow-k8.c:1139: error: implicit declaration of function 'tsk_cpumask'
> > arch/x86/kernel/cpu/cpufreq/powernow-k8.c:1139: warning: passing argument 2 of 'cpumask_copy' makes pointer from integer without a cast
> > include/linux/cpumask.h:466: note: expected 'const struct cpumask *' but argument is of type 'int'
> > 
> > Caused by commit 9dd4c5ab546fcac98cfb9ca24ed5cc1bf7f08334
> > ("cpumask:tsk_cpus_allowed-not-tsk_cpumask") from the rr tree interacting
> > with commit b8cbe7e82ec8b55d7bbdde66fc69e788fde00dc6 ("[CPUFREQ] cpumask:
> > don't put a cpumask on the stack in x86...cpufreq/powernow-k8.c") from
> > the cpufreq tree.
> 
> The cpufreq patch above is now in Linus' tree, so You should add the
> patch below to your tree (or squash it into the affected patch).

Thanks, done and rebased.

Cheers,
Rusty.

Re: linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2176 bytes --]

Hi Rusty,

On Fri, 11 Dec 2009 12:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> arch/x86/kernel/cpu/cpufreq/powernow-k8.c: In function 'powernowk8_target':
> arch/x86/kernel/cpu/cpufreq/powernow-k8.c:1139: error: implicit declaration of function 'tsk_cpumask'
> arch/x86/kernel/cpu/cpufreq/powernow-k8.c:1139: warning: passing argument 2 of 'cpumask_copy' makes pointer from integer without a cast
> include/linux/cpumask.h:466: note: expected 'const struct cpumask *' but argument is of type 'int'
> 
> Caused by commit 9dd4c5ab546fcac98cfb9ca24ed5cc1bf7f08334
> ("cpumask:tsk_cpus_allowed-not-tsk_cpumask") from the rr tree interacting
> with commit b8cbe7e82ec8b55d7bbdde66fc69e788fde00dc6 ("[CPUFREQ] cpumask:
> don't put a cpumask on the stack in x86...cpufreq/powernow-k8.c") from
> the cpufreq tree.

The cpufreq patch above is now in Linus' tree, so You should add the
patch below to your tree (or squash it into the affected patch).

> I have applied this merge fix up patch and can carry it as necessary:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 11 Dec 2009 12:21:00 +1100
> Subject: [PATCH] rr: cpufreq: fix up for api name change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/x86/kernel/cpu/cpufreq/powernow-k8.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
> index a9df944..f125e5c 100644
> --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
> +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
> @@ -1136,7 +1136,7 @@ static int powernowk8_target(struct cpufreq_policy *pol,
>  	if (!alloc_cpumask_var(&oldmask, GFP_KERNEL))
>  		return -ENOMEM;
>  
> -	cpumask_copy(oldmask, tsk_cpumask(current));
> +	cpumask_copy(oldmask, tsk_cpus_allowed(current));
>  	set_cpus_allowed_ptr(current, cpumask_of(pol->cpu));
>  
>  	if (smp_processor_id() != pol->cpu) {

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

linux-next: rr tree build failure

[Stephen Rothwell]

Hi Rusty,

Today's linux-next build (x86_64 allmodconfig) failed like this:

arch/x86/kernel/cpu/cpufreq/powernow-k8.c: In function 'powernowk8_target':
arch/x86/kernel/cpu/cpufreq/powernow-k8.c:1139: error: implicit declaration of function 'tsk_cpumask'
arch/x86/kernel/cpu/cpufreq/powernow-k8.c:1139: warning: passing argument 2 of 'cpumask_copy' makes pointer from integer without a cast
include/linux/cpumask.h:466: note: expected 'const struct cpumask *' but argument is of type 'int'

Caused by commit 9dd4c5ab546fcac98cfb9ca24ed5cc1bf7f08334
("cpumask:tsk_cpus_allowed-not-tsk_cpumask") from the rr tree interacting
with commit b8cbe7e82ec8b55d7bbdde66fc69e788fde00dc6 ("[CPUFREQ] cpumask:
don't put a cpumask on the stack in x86...cpufreq/powernow-k8.c") from
the cpufreq tree.

I have applied this merge fix up patch and can carry it as necessary:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 11 Dec 2009 12:21:00 +1100
Subject: [PATCH] rr: cpufreq: fix up for api name change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/x86/kernel/cpu/cpufreq/powernow-k8.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
index a9df944..f125e5c 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
@@ -1136,7 +1136,7 @@ static int powernowk8_target(struct cpufreq_policy *pol,
 	if (!alloc_cpumask_var(&oldmask, GFP_KERNEL))
 		return -ENOMEM;
 
-	cpumask_copy(oldmask, tsk_cpumask(current));
+	cpumask_copy(oldmask, tsk_cpus_allowed(current));
 	set_cpus_allowed_ptr(current, cpumask_of(pol->cpu));
 
 	if (smp_processor_id() != pol->cpu) {
-- 
1.6.5.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 410 bytes --]

Hi Ben,

On Thu, 12 Nov 2009 20:02:00 +1100 Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
>
> Thanks. Our EXPORTs are bogus (probably leftovers) it seems. I'll dbl
> check tomorrow but that looks like a patch I should pickup in powerpc
> -next anyways.

That was the idea, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: rr tree build failure

[Benjamin Herrenschmidt]

On Thu, 2009-11-12 at 19:03 +1100, Stephen Rothwell wrote:
> Hi Rusty,
> 
> Today's linux-next build (powerpc ppc44x_defconfig) failed like this:
> 
> .tmp_exports-asm.o: In function `__ksymtab_pci_alloc_consistent':
> (__ksymtab_sorted+0x2a30): undefined reference to `pci_alloc_consistent'
> .tmp_exports-asm.o: In function `__ksymtab_pci_free_consistent':
> (__ksymtab_sorted+0x2b70): undefined reference to `pci_free_consistent'
> 
> Caused by the powerpc architecture EXPORTing static inlines (for 32 bit
> builds) interacting with changes in the rr tree.
> 
> I have applied this patch for today:

Thanks. Our EXPORTs are bogus (probably leftovers) it seems. I'll dbl
check tomorrow but that looks like a patch I should pickup in powerpc
-next anyways.

Cheers,
Ben.

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 12 Nov 2009 18:54:13 +1100
> Subject: [PATCH] powerpc: do not export pci_alloc/free_consistent
> 
> Since they are static inline functions.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/powerpc/kernel/ppc_ksyms.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
> index 07115d6..4254514 100644
> --- a/arch/powerpc/kernel/ppc_ksyms.c
> +++ b/arch/powerpc/kernel/ppc_ksyms.c
> @@ -96,8 +96,6 @@ EXPORT_SYMBOL(copy_4K_page);
>  EXPORT_SYMBOL(isa_io_base);
>  EXPORT_SYMBOL(isa_mem_base);
>  EXPORT_SYMBOL(pci_dram_offset);
> -EXPORT_SYMBOL(pci_alloc_consistent);
> -EXPORT_SYMBOL(pci_free_consistent);
>  #endif /* CONFIG_PCI */
>  
>  EXPORT_SYMBOL(start_thread);
> -- 
> 1.6.5.2
> 

linux-next: rr tree build failure

[Stephen Rothwell]

Hi Rusty,

Today's linux-next build (powerpc ppc44x_defconfig) failed like this:

.tmp_exports-asm.o: In function `__ksymtab_pci_alloc_consistent':
(__ksymtab_sorted+0x2a30): undefined reference to `pci_alloc_consistent'
.tmp_exports-asm.o: In function `__ksymtab_pci_free_consistent':
(__ksymtab_sorted+0x2b70): undefined reference to `pci_free_consistent'

Caused by the powerpc architecture EXPORTing static inlines (for 32 bit
builds) interacting with changes in the rr tree.

I have applied this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 Nov 2009 18:54:13 +1100
Subject: [PATCH] powerpc: do not export pci_alloc/free_consistent

Since they are static inline functions.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/kernel/ppc_ksyms.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index 07115d6..4254514 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -96,8 +96,6 @@ EXPORT_SYMBOL(copy_4K_page);
 EXPORT_SYMBOL(isa_io_base);
 EXPORT_SYMBOL(isa_mem_base);
 EXPORT_SYMBOL(pci_dram_offset);
-EXPORT_SYMBOL(pci_alloc_consistent);
-EXPORT_SYMBOL(pci_free_consistent);
 #endif /* CONFIG_PCI */
 
 EXPORT_SYMBOL(start_thread);
-- 
1.6.5.2

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

linux-next: rr tree build failure

[Stephen Rothwell]

Hi Rusty,

Today's linux-next build (powerpc allnoconfig) failed like this:

scripts/mod/modpost.c:18:42: error: ../../include/linux/autoconf.h: No such file or directory

Caused by commit acd9e0c7d0b4a1cc02c27088a2b2322acc6d0793 ("module: make
MODULE_SYMBOL_PREFIX into a CONFIG option") interacting with commit
cf1320106e706875e6e14db8d5299f1d552f565e ("kbuild: move autoconf.h to
include/generated") from the kbuild tree.

I have applied the following patch for today (and will continue to use
it):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 Nov 2009 18:33:17 +1100
Subject: [PATCH] modpost: autoconf.h has moved to include/generated

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 scripts/mod/modpost.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index f6be2e9..769ea95 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include "modpost.h"
-#include "../../include/linux/autoconf.h"
+#include "../../include/generated/autoconf.h"
 #include "../../include/linux/license.h"
 
 /* Some toolchains use a `_' prefix for all user symbols. */
-- 
1.6.5.2

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: rr tree build failure

[Rusty Russell]

On Wed, 11 Nov 2009 01:31:26 pm Stephen Rothwell wrote:
> Hi Rusty,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> .tmp_exports-asm.o: In function `__ksymtab_load_gs_index':
> (__ksymtab_sorted+0x5b40): undefined reference to `load_gs_index'
> 
> I have used the version of the rr tree from next-20091110 for today.

It's inline and exported when CONFIG_PARAVIRT=y.  Which is wrong.

Here's the patch I've put in my series for tomorrow's linux-next:

Subject: x86: don't export inline function

For CONFIG_PARAVIRT, load_gs_index is an inline function (it's #defined
to native_load_gs_index otherwise).

Exporting an inline function breaks the new assembler-based alphabetical
sorted symbol list:

Today's linux-next build (x86_64 allmodconfig) failed like this:

	.tmp_exports-asm.o: In function `__ksymtab_load_gs_index':
	(__ksymtab_sorted+0x5b40): undefined reference to `load_gs_index'

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
To: x86@kernel.org
Cc: alan-jenkins@tuffmail.co.uk

diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
--- a/arch/x86/kernel/x8664_ksyms_64.c
+++ b/arch/x86/kernel/x8664_ksyms_64.c
@@ -57,4 +57,6 @@ EXPORT_SYMBOL(__memcpy);
 
 EXPORT_SYMBOL(empty_zero_page);
 EXPORT_SYMBOL(init_level4_pgt);
-EXPORT_SYMBOL(load_gs_index);
+#ifndef CONFIG_PARAVIRT
+EXPORT_SYMBOL(native_load_gs_index);
+#endif

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 387 bytes --]

Hi Rusty,

Today's linux-next build (x86_64 allmodconfig) failed like this:

.tmp_exports-asm.o: In function `__ksymtab_load_gs_index':
(__ksymtab_sorted+0x5b40): undefined reference to `load_gs_index'

I have used the version of the rr tree from next-20091110 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: rr tree build failure

[Rusty Russell]

On Tue, 15 Sep 2009 12:57:48 pm Stephen Rothwell wrote:
> Hi Rusty,
> 
> On Wed, 9 Sep 2009 13:47:52 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:.
> 
> Still happening ... Siarhei posted a replacement patch on Sept 11.

Sorry, was on leave for 3 weeks.  I hope Linus will be flexible; many of these
patches have been in linux-next for months now, it'd be nice to unload.

Thanks,
Rusty.

Re: linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 938 bytes --]

Hi Rusty,

On Wed, 9 Sep 2009 13:47:52 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> kernel/module.c: In function 'set_section_ro_nx':
> kernel/module.c:1549: error: implicit declaration of function 'set_memory_ro'
> kernel/module.c:1560: error: implicit declaration of function 'set_memory_nx'
> kernel/module.c: In function 'unset_section_ro_nx':
> kernel/module.c:1575: error: implicit declaration of function 'set_memory_rw'
> 
> Caused by commit 25306e21864c2a220d6fa2e0632425028aa9626c
> ("module:ro-nx-protection") which uses these interfaces that are only
> defined on x86 ...
> 
> I have used the version of the rr tree from next-20090908 for today.

Still happening ... Siarhei posted a replacement patch on Sept 11.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: rr tree build failure

[Siarhei Liakh]

On Tue, Sep 8, 2009 at 11:47 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Rusty,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> kernel/module.c: In function 'set_section_ro_nx':
> kernel/module.c:1549: error: implicit declaration of function 'set_memory_ro'
> kernel/module.c:1560: error: implicit declaration of function 'set_memory_nx'
> kernel/module.c: In function 'unset_section_ro_nx':
> kernel/module.c:1575: error: implicit declaration of function 'set_memory_rw'
>
> Caused by commit 25306e21864c2a220d6fa2e0632425028aa9626c
> ("module:ro-nx-protection") which uses these interfaces that are only
> defined on x86 ...
>
> I have used the version of the rr tree from next-20090908 for today.

I have posted a replacement patch for that commit: "[PATCH v6] RO/NX
protection for loadable kernel modules"
Please let me know if you would rather see a short "patch patch"
rather than complete patch replacement. The fix, essentially, is to
encapsulate entire bodies of unset_section_ro_nx() and
set_section_ro_nx() inside #ifdef CONFIG_X86 ... #endif. This way
set_memory_* will be called only on x86.

Thanks.

Re: linux-next: rr tree build failure

[Siarhei Liakh]

On Tue, Sep 8, 2009 at 11:47 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Rusty,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> kernel/module.c: In function 'set_section_ro_nx':
> kernel/module.c:1549: error: implicit declaration of function 'set_memory_ro'
> kernel/module.c:1560: error: implicit declaration of function 'set_memory_nx'
> kernel/module.c: In function 'unset_section_ro_nx':
> kernel/module.c:1575: error: implicit declaration of function 'set_memory_rw'
>
> Caused by commit 25306e21864c2a220d6fa2e0632425028aa9626c
> ("module:ro-nx-protection") which uses these interfaces that are only
> defined on x86 ...

Looks like I have made some bad assumptions. I will re-write the
original patch to be x86-only.

Sorry for breaking the build.

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 757 bytes --]

Hi Rusty,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

kernel/module.c: In function 'set_section_ro_nx':
kernel/module.c:1549: error: implicit declaration of function 'set_memory_ro'
kernel/module.c:1560: error: implicit declaration of function 'set_memory_nx'
kernel/module.c: In function 'unset_section_ro_nx':
kernel/module.c:1575: error: implicit declaration of function 'set_memory_rw'

Caused by commit 25306e21864c2a220d6fa2e0632425028aa9626c
("module:ro-nx-protection") which uses these interfaces that are only
defined on x86 ...

I have used the version of the rr tree from next-20090908 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1017 bytes --]

On Mon, 10 Aug 2009 13:55:46 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 4 Aug 2009 08:48:26 +0930 Rusty Russell <rusty@rustcorp.com.au> wrote:
> >
> > On Tue, 4 Aug 2009 05:52:27 am Bjorn Helgaas wrote:
> > > On Sunday 02 August 2009 09:32:03 pm Stephen Rothwell wrote:
> > > > Hi Rusty,
> > > > 
> > > > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > > > 
> > > > drivers/acpi/osl.c: In function 'bind_to_cpu0':
> > > > drivers/acpi/osl.c:194: error: implicit declaration of function 'set_cpus_allowed'
> 
> Still getting this ...
> 
> > > Here's a patch to fix this.  Since Linus' tree still contains instances
> > > of set_cpus_allowed(), I'm guessing this patch should be added to the rr
> > > tree?
> 
> Since set_cpus_allowed_ptr() aleeady exists in Linus' tree, you could put
> that patch in your tree, Bjorn.

Actually "Len", sorry.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1026 bytes --]

Hi Guys,

On Tue, 4 Aug 2009 08:48:26 +0930 Rusty Russell <rusty@rustcorp.com.au> wrote:
>
> On Tue, 4 Aug 2009 05:52:27 am Bjorn Helgaas wrote:
> > On Sunday 02 August 2009 09:32:03 pm Stephen Rothwell wrote:
> > > Hi Rusty,
> > > 
> > > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > > 
> > > drivers/acpi/osl.c: In function 'bind_to_cpu0':
> > > drivers/acpi/osl.c:194: error: implicit declaration of function 'set_cpus_allowed'

Still getting this ...

> > Here's a patch to fix this.  Since Linus' tree still contains instances
> > of set_cpus_allowed(), I'm guessing this patch should be added to the rr
> > tree?

Since set_cpus_allowed_ptr() aleeady exists in Linus' tree, you could put
that patch in your tree, Bjorn.

> Yep, my series removes it, at least for CONFIG_CPUMASK_OFFSTACK=y.

So one of you (at least) should apply that patch to your tree!  Please?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: rr tree build failure

[Rusty Russell]

On Tue, 4 Aug 2009 05:52:27 am Bjorn Helgaas wrote:
> On Sunday 02 August 2009 09:32:03 pm Stephen Rothwell wrote:
> > Hi Rusty,
> > 
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > 
> > drivers/acpi/osl.c: In function 'bind_to_cpu0':
> > drivers/acpi/osl.c:194: error: implicit declaration of function 'set_cpus_allowed'
> > 
> > Caused by commit 74b5820808215f65b70b05a099d6d3c969b82689 ("ACPI: bind
> > workqueues to CPU 0 to avoid SMI corruption") (from the acpi tree but now
> > in Linus' tree) interacting with commit
> > 17e249fb40c814a72f08c1356cb47ec9f87f81a8
> > ("cpumask:remove-set_cpus_allowed") from the rr tree.
> > 
> > I have reverted that rr tree commit for today.
> 
> Here's a patch to fix this.  Since Linus' tree still contains instances
> of set_cpus_allowed(), I'm guessing this patch should be added to the rr
> tree?
> 
> Bjorn

Yep, my series removes it, at least for CONFIG_CPUMASK_OFFSTACK=y.

Thanks!
Rusty.

Re: linux-next: rr tree build failure

[Bjorn Helgaas]

On Sunday 02 August 2009 09:32:03 pm Stephen Rothwell wrote:
> Hi Rusty,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> drivers/acpi/osl.c: In function 'bind_to_cpu0':
> drivers/acpi/osl.c:194: error: implicit declaration of function 'set_cpus_allowed'
> 
> Caused by commit 74b5820808215f65b70b05a099d6d3c969b82689 ("ACPI: bind
> workqueues to CPU 0 to avoid SMI corruption") (from the acpi tree but now
> in Linus' tree) interacting with commit
> 17e249fb40c814a72f08c1356cb47ec9f87f81a8
> ("cpumask:remove-set_cpus_allowed") from the rr tree.
> 
> I have reverted that rr tree commit for today.

Here's a patch to fix this.  Since Linus' tree still contains instances
of set_cpus_allowed(), I'm guessing this patch should be added to the rr
tree?

Bjorn



ACPI: remove cpumask_t usage

set_cpus_allowed() is on the way out; replace it with
set_cpus_allowed_ptr().

Reference: http://lkml.org/lkml/2008/11/6/448

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
CC: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 5691f16..e196a75 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -191,7 +191,7 @@ acpi_status __init acpi_os_initialize(void)
 
 static void bind_to_cpu0(struct work_struct *work)
 {
-	set_cpus_allowed(current, cpumask_of_cpu(0));
+	set_cpus_allowed_ptr(current, cpumask_of(0));
 	kfree(work);
 }
 

Re: linux-next: rr tree build failure

[Bjorn Helgaas]

On Sunday 02 August 2009 09:32:03 pm Stephen Rothwell wrote:
> Hi Rusty,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> drivers/acpi/osl.c: In function 'bind_to_cpu0':
> drivers/acpi/osl.c:194: error: implicit declaration of function 'set_cpus_allowed'
> 
> Caused by commit 74b5820808215f65b70b05a099d6d3c969b82689 ("ACPI: bind
> workqueues to CPU 0 to avoid SMI corruption") (from the acpi tree but now
> in Linus' tree) interacting with commit
> 17e249fb40c814a72f08c1356cb47ec9f87f81a8
> ("cpumask:remove-set_cpus_allowed") from the rr tree.
> 
> I have reverted that rr tree commit for today.

Looks like I'm doing this the wrong way (by passing a cpumask on the
stack).  I'll try to figure out the approved way of doing this and
send a followup patch.

Bjorn

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 658 bytes --]

Hi Rusty,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/acpi/osl.c: In function 'bind_to_cpu0':
drivers/acpi/osl.c:194: error: implicit declaration of function 'set_cpus_allowed'

Caused by commit 74b5820808215f65b70b05a099d6d3c969b82689 ("ACPI: bind
workqueues to CPU 0 to avoid SMI corruption") (from the acpi tree but now
in Linus' tree) interacting with commit
17e249fb40c814a72f08c1356cb47ec9f87f81a8
("cpumask:remove-set_cpus_allowed") from the rr tree.

I have reverted that rr tree commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 346 bytes --]

Hi Rusty,

On Wed, 24 Jun 2009 12:54:24 +0930 Rusty Russell <rusty@rustcorp.com.au> wrote:
>
> Dumb typo + cut & paste.
> 
> Fixed,

Thanks, I will pick it up tomorrow.  For today, I have reverted
"cpumask:use-mm_cpumask-arm".

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: rr tree build failure

[Rusty Russell]

On Tue, 23 Jun 2009 03:44:16 pm Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next build (arm realview-smp_defconfig) failed like this:
>
> arch/arm/kernel/smp.c: In function 'flush_tlb_mm':
> arch/arm/kernel/smp.c:646: error: lvalue required as unary '&' operand
> arch/arm/kernel/smp.c: In function 'flush_tlb_page':
> arch/arm/kernel/smp.c:657: error: lvalue required as unary '&' operand
> arch/arm/kernel/smp.c: In function 'flush_tlb_range':
> arch/arm/kernel/smp.c:680: error: lvalue required as unary '&' operand

Dumb typo + cut & paste.

Fixed,
Rusty.

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 668 bytes --]

Hi Rusty,

Today's linux-next build (arm realview-smp_defconfig) failed like this:

arch/arm/kernel/smp.c: In function 'flush_tlb_mm':
arch/arm/kernel/smp.c:646: error: lvalue required as unary '&' operand
arch/arm/kernel/smp.c: In function 'flush_tlb_page':
arch/arm/kernel/smp.c:657: error: lvalue required as unary '&' operand
arch/arm/kernel/smp.c: In function 'flush_tlb_range':
arch/arm/kernel/smp.c:680: error: lvalue required as unary '&' operand

Caused by commit e97df8b735e20500a1d6a3743bef153869c472d3
("cpumask:use-mm_cpumask-arm").

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: rr tree build failure

[Rusty Russell]

On Mon, 15 Jun 2009 04:10:22 pm Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next build (sparc64 defconfig) failed like this:
>
> arch/sparc/mm/init_64.c: In function 'paging_init':
> arch/sparc/mm/init_64.c:1802: error: 'CPU_MASK_ALL_PTR' undeclared (first
> use in this function) arch/sparc/kernel/smp_64.c: In function
> 'setup_per_cpu_areas':
> arch/sparc/kernel/smp_64.c:1541: error: 'CPU_MASK_ALL_PTR' undeclared
> (first use in this function)
>
...
> Rusty, I assume that there is something that Dave can use in the sparc
> tree already instead of CPU_MASK_ALL_PTR (cpu_all_mask?).

cpu_all_mask, yes.

I have this great patch someone sent me :)

Thanks,
Rusty.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 12 Jun 2009 18:43:54 +1000
Subject: [PATCH] sparc: replace uses of CPU_MASK_ALL_PTR

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/sparc/kernel/smp_64.c |    2 +-
 arch/sparc/mm/init_64.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index 1de47d2..f3a83b0 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -1538,5 +1538,5 @@ void __init setup_per_cpu_areas(void)
 
 	of_fill_in_cpu_data();
 	if (tlb_type == hypervisor)
-		mdesc_fill_in_cpu_data(CPU_MASK_ALL_PTR);
+		mdesc_fill_in_cpu_data(cpu_all_mask);
 }
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index b5a5932..ca92e2f 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1799,7 +1799,7 @@ void __init paging_init(void)
 
 	if (tlb_type == hypervisor) {
 		sun4v_mdesc_init();
-		mdesc_populate_present_mask(CPU_MASK_ALL_PTR);
+		mdesc_populate_present_mask(cpu_all_mask);
 	}
 
 	/* Once the OF device tree and MDESC have been setup, we know
-- 
1.6.3.1

Re: linux-next: rr tree build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 15 Jun 2009 17:26:40 +1000

> OK, senility is definitely setting in! :-)  This is the same failure we
> had on Friday for which I sent a patch ...  Dave, can you apply that to
> the sparc tree?

Sorry, slipped through the cracks.  Could you please send me
a fresh copy of that patch?

Thanks!

Re: linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1318 bytes --]

Hi Rusty, Dave,

On Mon, 15 Jun 2009 16:40:22 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (sparc64 defconfig) failed like this:
> 
> arch/sparc/mm/init_64.c: In function 'paging_init':
> arch/sparc/mm/init_64.c:1802: error: 'CPU_MASK_ALL_PTR' undeclared (first use in this function)
> arch/sparc/kernel/smp_64.c: In function 'setup_per_cpu_areas':
> arch/sparc/kernel/smp_64.c:1541: error: 'CPU_MASK_ALL_PTR' undeclared (first use in this function)
> 
> Caused by commit 3360ebad15b16eac7b0205595d6fe561716725c5
> ("cpumask:remove-CPU_MASK_ALL_PTR") from the rr tree interacting with
> commits 21bc149d59288fe43d1ba18a59d874ba6a5f1db9 ("sparc64: Make
> mdesc_fill_in_cpu_data take a cpumask_t pointer") and
> 63750a3dc53a87a1f5ca42101ea88578b934ab52 ("sparc64: Defer cpu_data()
> setup until end of per-cpu data initialization") from the sparc tree.
> 
> Rusty, I assume that there is something that Dave can use in the sparc
> tree already instead of CPU_MASK_ALL_PTR (cpu_all_mask?).

OK, senility is definitely setting in! :-)  This is the same failure we
had on Friday for which I sent a patch ...  Dave, can you apply that to
the sparc tree?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]

Hi Rusty,

Today's linux-next build (sparc64 defconfig) failed like this:

arch/sparc/mm/init_64.c: In function 'paging_init':
arch/sparc/mm/init_64.c:1802: error: 'CPU_MASK_ALL_PTR' undeclared (first use in this function)
arch/sparc/kernel/smp_64.c: In function 'setup_per_cpu_areas':
arch/sparc/kernel/smp_64.c:1541: error: 'CPU_MASK_ALL_PTR' undeclared (first use in this function)

Caused by commit 3360ebad15b16eac7b0205595d6fe561716725c5
("cpumask:remove-CPU_MASK_ALL_PTR") from the rr tree interacting with
commits 21bc149d59288fe43d1ba18a59d874ba6a5f1db9 ("sparc64: Make
mdesc_fill_in_cpu_data take a cpumask_t pointer") and
63750a3dc53a87a1f5ca42101ea88578b934ab52 ("sparc64: Defer cpu_data()
setup until end of per-cpu data initialization") from the sparc tree.

Rusty, I assume that there is something that Dave can use in the sparc
tree already instead of CPU_MASK_ALL_PTR (cpu_all_mask?).

I have reverted the rr tree patch for today - after reverting these other
patches as well:

cpumask:move-obsolete-functions-to-end-of-header
cpumask:remove-unused-deprecated-functions
cpumask:remove-cpu_mask_all

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: rr tree build failure

[Rusty Russell]

On Thu, 11 Jun 2009 06:37:28 pm Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next build (sparc defconfig) failed like this:
>
> arch/sparc/mm/extable.c: In function 'trim_init_extable':
> arch/sparc/mm/extable.c:78: error: too few arguments to function
> 'within_module_init'

Thanks, I've applied your fix.

Thanks,
Rusty.

linux-next: rr tree build failure

[Stephen Rothwell]

Hi Rusty,

Today's linux-next build (sparc defconfig) failed like this:

arch/sparc/mm/extable.c: In function 'trim_init_extable':
arch/sparc/mm/extable.c:78: error: too few arguments to function 'within_module_init'

Caused by commit 2ac595c3960b80139e895c4e13e851ed6dfd127a ("module: trim
exception table on init free").

I applied the following patch (because I did not want to have to rebuild
everything again).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 11 Jun 2009 18:53:13 +1000
Subject: [PATCH] rr: fix up for sparc32 extable

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/sparc/mm/extable.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/sparc/mm/extable.c b/arch/sparc/mm/extable.c
index 6b5c373..a61c349 100644
--- a/arch/sparc/mm/extable.c
+++ b/arch/sparc/mm/extable.c
@@ -75,7 +75,7 @@ void trim_init_extable(struct module *m)
 	for (i = 0; i < m->num_exentries; i += range ? 2 : 1) {
 		range = m->extable[i].fixup == 0;
 
-		if (within_module_init(m->extable[i].insn)) {
+		if (within_module_init(m->extable[i].insn, m)) {
 			m->extable[i].fixup = -1;
 			if (range)
 				m->extable[i+1].fixup = -1;
-- 
1.6.3.1

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 7256 bytes --]

Hi Rusty,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

arch/powerpc/kernel/sysfs.c: In function 'read_mmcr0':
arch/powerpc/kernel/sysfs.c:186: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c:186: error: (Each undeclared identifier is reported only once
arch/powerpc/kernel/sysfs.c:186: error: for each function it appears in.)
arch/powerpc/kernel/sysfs.c: In function 'read_mmcr1':
arch/powerpc/kernel/sysfs.c:187: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_pmc1':
arch/powerpc/kernel/sysfs.c:188: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_pmc2':
arch/powerpc/kernel/sysfs.c:189: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_pmc3':
arch/powerpc/kernel/sysfs.c:190: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_pmc4':
arch/powerpc/kernel/sysfs.c:191: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_pmc5':
arch/powerpc/kernel/sysfs.c:192: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_pmc6':
arch/powerpc/kernel/sysfs.c:193: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_pmc7':
arch/powerpc/kernel/sysfs.c:200: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_pmc8':
arch/powerpc/kernel/sysfs.c:201: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_mmcra':
arch/powerpc/kernel/sysfs.c:203: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_purr':
arch/powerpc/kernel/sysfs.c:204: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_spurr':
arch/powerpc/kernel/sysfs.c:205: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_dscr':
arch/powerpc/kernel/sysfs.c:206: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_pa6t_pmc0':
arch/powerpc/kernel/sysfs.c:215: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_pa6t_pmc1':
arch/powerpc/kernel/sysfs.c:216: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_pa6t_pmc2':
arch/powerpc/kernel/sysfs.c:217: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_pa6t_pmc3':
arch/powerpc/kernel/sysfs.c:218: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_pa6t_pmc4':
arch/powerpc/kernel/sysfs.c:219: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_pa6t_pmc5':
arch/powerpc/kernel/sysfs.c:220: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_hid0':
arch/powerpc/kernel/sysfs.c:222: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_hid1':
arch/powerpc/kernel/sysfs.c:223: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_hid4':
arch/powerpc/kernel/sysfs.c:224: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_hid5':
arch/powerpc/kernel/sysfs.c:225: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_ima0':
arch/powerpc/kernel/sysfs.c:226: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_ima1':
arch/powerpc/kernel/sysfs.c:227: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_ima2':
arch/powerpc/kernel/sysfs.c:228: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_ima3':
arch/powerpc/kernel/sysfs.c:229: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_ima4':
arch/powerpc/kernel/sysfs.c:230: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_ima5':
arch/powerpc/kernel/sysfs.c:231: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_ima6':
arch/powerpc/kernel/sysfs.c:232: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_ima7':
arch/powerpc/kernel/sysfs.c:233: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_ima8':
arch/powerpc/kernel/sysfs.c:234: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_ima9':
arch/powerpc/kernel/sysfs.c:235: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_imaat':
arch/powerpc/kernel/sysfs.c:236: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_btcr':
arch/powerpc/kernel/sysfs.c:237: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_pccr':
arch/powerpc/kernel/sysfs.c:238: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_rpccr':
arch/powerpc/kernel/sysfs.c:239: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_der':
arch/powerpc/kernel/sysfs.c:240: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_mer':
arch/powerpc/kernel/sysfs.c:241: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_ber':
arch/powerpc/kernel/sysfs.c:242: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_ier':
arch/powerpc/kernel/sysfs.c:243: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_sier':
arch/powerpc/kernel/sysfs.c:244: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_siar':
arch/powerpc/kernel/sysfs.c:245: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_tsr0':
arch/powerpc/kernel/sysfs.c:246: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_tsr1':
arch/powerpc/kernel/sysfs.c:247: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_tsr2':
arch/powerpc/kernel/sysfs.c:248: error: 'val' undeclared (first use in this function)
arch/powerpc/kernel/sysfs.c: In function 'read_tsr3':
arch/powerpc/kernel/sysfs.c:249: error: 'val' undeclared (first use in this function)

I will use yesterday's version of the rr tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: rr tree build failure

[Rusty Russell]

On Thursday 05 March 2009 19:03:52 Stephen Rothwell wrote:
> Hi Rusty,
> 
> Today's linux-next build (sparc64 defconfig) failed like this:
> 
> drivers/pci/probe.c: In function 'pci_bus_show_cpuaffinity':
> drivers/pci/probe.c:56: error: 'CPU_MASK_ALL_PTR' undeclared (first use in this function)
> 
> Caused by commit 66ec53ceff39a3daf3b1a3628bca1198bd88c7b3
> ("cpumask:remove-CPU_MASK_ALL_PTR"). 2.6.29-rc2 added cpumask_of_pcibus()
> (which references CPU_MASK_ALL_PTR) to
> arch/sparc/include/asm/topology_64.h .

Hmm, I *did* get that, but somehow lost it from the series file in the patch
shuffle.

cpumask:remove-address-of-CPU_MASK_ALL-sparc.patch

cpumask: remove dangerous CPU_MASK_ALL_PTR, &CPU_MASK_ALL.: sparc

Impact: cleanup

(Thanks to Al Viro for reminding me of this, via Ingo)

CPU_MASK_ALL is the (deprecated) "all bits set" cpumask, defined as so:

	#define CPU_MASK_ALL (cpumask_t) { { ... } }

Taking the address of such a temporary is questionable at best,
unfortunately 321a8e9d (cpumask: add CPU_MASK_ALL_PTR macro) added
CPU_MASK_ALL_PTR:

	#define CPU_MASK_ALL_PTR (&CPU_MASK_ALL)

Which formalizes this practice.  One day gcc could bite us over this
usage (though we seem to have gotten away with it so far).

So replace everywhere which used &CPU_MASK_ALL or CPU_MASK_ALL_PTR
with the modern "cpu_all_mask" (a real struct cpumask *), and remove
CPU_MASK_ALL_PTR altogether.

Also remove the confusing and deprecated large-NR_CPUS-only
"cpu_mask_all".

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Ingo Molnar <mingo@elte.hu>
Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Mike Travis <travis@sgi.com>
---
 arch/mips/alchemy/common/time.c      |    2 +-
 arch/sparc/include/asm/topology_64.h |    2 +-
 arch/x86/include/asm/es7000/apic.h   |    2 +-
 arch/x86/include/asm/numaq/apic.h    |    2 +-
 include/linux/cpumask.h              |    6 ------
 init/main.c                          |    7 +------
 kernel/kmod.c                        |    2 +-
 kernel/kthread.c                     |    4 ++--
 mm/pdflush.c                         |    2 +-
 9 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h
--- a/arch/sparc/include/asm/topology_64.h
+++ b/arch/sparc/include/asm/topology_64.h
@@ -45,7 +45,7 @@ static inline int pcibus_to_node(struct 
 
 #define cpumask_of_pcibus(bus)	\
 	(pcibus_to_node(bus) == -1 ? \
-	 CPU_MASK_ALL_PTR : \
+	 cpu_all_mask : \
 	 cpumask_of_node(pcibus_to_node(bus)))
 
 #define SD_NODE_INIT (struct sched_domain) {		\

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 702 bytes --]

Hi Rusty,

Today's linux-next build (sparc64 defconfig) failed like this:

drivers/pci/probe.c: In function 'pci_bus_show_cpuaffinity':
drivers/pci/probe.c:56: error: 'CPU_MASK_ALL_PTR' undeclared (first use in this function)

Caused by commit 66ec53ceff39a3daf3b1a3628bca1198bd88c7b3
("cpumask:remove-CPU_MASK_ALL_PTR"). 2.6.29-rc2 added cpumask_of_pcibus()
(which references CPU_MASK_ALL_PTR) to
arch/sparc/include/asm/topology_64.h .

I have reverted that commit (as well as commit
ba5eb00621351d4f16270cf2db0932fe2c7067f3 ("cpumask:remove-cpu_mask_all")
that depended on it).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 811 bytes --]

Hi Rusty,

Today's linux-next build (x86_64 allmodconfig) failed like this:

arch/x86/kernel/dumpstack_64.c: In function 'in_exception_stack':
arch/x86/kernel/dumpstack_64.c:43: error: 'orig_ist' undeclared (first use in this function)
arch/x86/kernel/dumpstack_64.c:43: warning: type defaults to 'int' in declaration of 'type name'
arch/x86/kernel/dumpstack_64.c:43: warning: type defaults to 'int' in declaration of 'type name'
arch/x86/kernel/dumpstack_64.c:43: warning: cast to pointer from integer of different size
arch/x86/kernel/dumpstack_64.c:43: error: request for member 'ist' in something not a structure or union

per_cpu() strikes again :-(

I have dropped the rr tree again.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 504 bytes --]

Hi Rusty,

Today's linux-next build (x86_64 allmodconfig) failed like this:

kernel/sched.c:7206: error: 'sched_group_cpus' redeclared as different kind of symbol
include/linux/sched.h:822: error: previous definition of 'sched_group_cpus' was here

Caused by commit efec6469ba966f25081fdf85c3127a171c87435a
("cpualloc:remove-per_cpu__-prefix").

I have dropped the rr tree for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: rr tree build failure

[Rusty Russell]

On Monday 29 December 2008 18:42:53 Stephen Rothwell wrote:
> Hi Rusty,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> In file included from include/linux/smp.h:33,
>                  from include/linux/topology.h:33,
>                  from include/linux/mmzone.h:763,
>                  from include/linux/gfp.h:4,
>                  from include/linux/kmod.h:22,
>                  from include/linux/module.h:13,
>                  from include/linux/crypto.h:21,
>                  from arch/x86/kernel/asm-offsets_64.c:7,
>                  from arch/x86/kernel/asm-offsets.c:4:
> arch/x86/include/asm/smp.h: In function 'num_booting_cpus':
> arch/x86/include/asm/smp.h:152: error: implicit declaration of function 'cpus_weight'

Oh, fun.  We added a config option to disable the deprecated cpus_* functions;
it's mainly for those interested in helping with the conversion.

Of course, allmodconfig turns it on.  I made it depend on CONFIG_BROKEN for now.

Thanks,
Rusty.

Re: linux-next: rr tree build failure

[Mike Travis]

Stephen Rothwell wrote:
> Hi Rusty,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> In file included from include/linux/smp.h:33,
>                  from include/linux/topology.h:33,
>                  from include/linux/mmzone.h:763,
>                  from include/linux/gfp.h:4,
>                  from include/linux/kmod.h:22,
>                  from include/linux/module.h:13,
>                  from include/linux/crypto.h:21,
>                  from arch/x86/kernel/asm-offsets_64.c:7,
>                  from arch/x86/kernel/asm-offsets.c:4:
> arch/x86/include/asm/smp.h: In function 'num_booting_cpus':
> arch/x86/include/asm/smp.h:152: error: implicit declaration of function 'cpus_weight'
> 
> I have dropped the rr tree for today.
> 

Hi Stephen,

I have this fixed in:


commit 3b656ce6c3d7ea2a36c1ebe77d436d5550980baa
Author: Mike Travis <travis@sgi.com>
Date:   Sat Dec 27 01:45:56 2008 -0800

    x86: cleanup remaining cpumask_t ops in smpboot code

which was pushed via tip/cpus4096.  It includes many other
updates so I'm not exactly sure how this merges into
linux-next.

Thanks,
Mike

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 838 bytes --]

Hi Rusty,

Today's linux-next build (x86_64 allmodconfig) failed like this:

In file included from include/linux/smp.h:33,
                 from include/linux/topology.h:33,
                 from include/linux/mmzone.h:763,
                 from include/linux/gfp.h:4,
                 from include/linux/kmod.h:22,
                 from include/linux/module.h:13,
                 from include/linux/crypto.h:21,
                 from arch/x86/kernel/asm-offsets_64.c:7,
                 from arch/x86/kernel/asm-offsets.c:4:
arch/x86/include/asm/smp.h: In function 'num_booting_cpus':
arch/x86/include/asm/smp.h:152: error: implicit declaration of function 'cpus_weight'

I have dropped the rr tree for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: rr tree build failure

[Rusty Russell]

On Tuesday 25 November 2008 23:06:26 Christian Borntraeger wrote:
> Am Dienstag, 25. November 2008 schrieb Rusty Russell:
> > > Also, the x86_64 allmodconfig build failed like this:
> > >
> > > ERROR: "hvc_resize" [drivers/char/virtio_console.ko] undefined!
> > >
> > > hvc_resize is currently not exported to modules.
> > >
> > > I have dropped the rr tree again.
> >
> > OK, I've dropped Christian's patch for the moment until he fixes this. 
> > I'm travelling to Sydney for the day so I won't get a chance to fix this
> > if it breaks tomorrow :(
>
> Ok. Sorry about that. allmodconfig on s390 and i386 select VIRTIO_CONSOLE
> as (y) and not as (m), therefore my tests did not trigger this problem. I
> will try to get an x86_64 box to test on in the future.

Thanks, applied.

For future reference I've taken to preferring fixup patches, which I can fold 
later.

Cheers,
Rusty.

Re: linux-next: rr tree build failure

[Christian Borntraeger]

Am Dienstag, 25. November 2008 schrieb Rusty Russell:
> > Also, the x86_64 allmodconfig build failed like this:
> >
> > ERROR: "hvc_resize" [drivers/char/virtio_console.ko] undefined!
> >
> > hvc_resize is currently not exported to modules.
> >
> > I have dropped the rr tree again.
> 
> OK, I've dropped Christian's patch for the moment until he fixes this.  I'm 
> travelling to Sydney for the day so I won't get a chance to fix this if it 
> breaks tomorrow :(

Ok. Sorry about that. allmodconfig on s390 and i386 select VIRTIO_CONSOLE as 
(y) and not as (m), therefore my tests did not trigger this problem. I will 
try to get an x86_64 box to test on in the future.

This version of the patch adds an EXPORT_SYMBOL_GPL. Feel free to add it 
whenever it fits your schedule. 

[PATCH 1/2]: virtio_console: support console resizing

From: Christian Borntraeger <borntraeger@de.ibm.com>

this patch uses the new hvc callback hvc_resize to set the window site 
which allows to change the tty size of hvc_console via a hvc_resize 
function.

I have added a new feature bit VIRTIO_CONSOLE_F_SIZE. The driver will 
change the window size on tty open and via the config_changed callback
of the transport. Currently lguest and kvm_s390 have not implemented this
callback, but the callback can be implemented at a later point in time.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 drivers/char/hvc_console.c     |    1 +
 drivers/char/virtio_console.c  |   30 +++++++++++++++++++++++++++++-
 include/linux/virtio_console.h |   11 +++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

Index: kvm/drivers/char/hvc_console.c
===================================================================
--- kvm.orig/drivers/char/hvc_console.c
+++ kvm/drivers/char/hvc_console.c
@@ -694,6 +694,7 @@ void hvc_resize(struct hvc_struct *hp, s
 		schedule_work(&hp->tty_resize);
 	}
 }
+EXPORT_SYMBOL_GPL(hvc_resize);
 
 /*
  * This kthread is either polling or interrupt driven.  This is determined by
Index: kvm/drivers/char/virtio_console.c
===================================================================
--- kvm.orig/drivers/char/virtio_console.c
+++ kvm/drivers/char/virtio_console.c
@@ -138,12 +138,33 @@ int __init virtio_cons_early_init(int (*
 }
 
 /*
+ * virtio console configuration. This supports:
+ * - console resize
+ */
+static void virtcons_apply_config(struct virtio_device *dev)
+{
+	struct winsize ws;
+
+	if (virtio_has_feature(dev, VIRTIO_CONSOLE_F_SIZE)) {
+		dev->config->get(dev,
+				 offsetof(struct virtio_console_config, cols),
+				 &ws.ws_col, sizeof(u16));
+		dev->config->get(dev,
+				 offsetof(struct virtio_console_config, rows),
+				 &ws.ws_row, sizeof(u16));
+		hvc_resize(hvc, ws);
+	}
+}
+
+/*
  * we support only one console, the hvc struct is a global var
- * There is no need to do anything
+ * We set the configuration at this point, since we now have a tty
  */
 static int notifier_add_vio(struct hvc_struct *hp, int data)
 {
 	hp->irq_requested = 1;
+	virtcons_apply_config(vdev);
+
 	return 0;
 }
 
@@ -234,11 +255,18 @@ static struct virtio_device_id id_table[
 	{ 0 },
 };
 
+static unsigned int features[] = {
+	VIRTIO_CONSOLE_F_SIZE,
+};
+
 static struct virtio_driver virtio_console = {
+	.feature_table = features,
+	.feature_table_size = ARRAY_SIZE(features),
 	.driver.name =	KBUILD_MODNAME,
 	.driver.owner =	THIS_MODULE,
 	.id_table =	id_table,
 	.probe =	virtcons_probe,
+	.config_changed = virtcons_apply_config,
 };
 
 static int __init init(void)
Index: kvm/include/linux/virtio_console.h
===================================================================
--- kvm.orig/include/linux/virtio_console.h
+++ kvm/include/linux/virtio_console.h
@@ -7,6 +7,17 @@
 /* The ID for virtio console */
 #define VIRTIO_ID_CONSOLE	3
 
+/* Feature bits */
+#define VIRTIO_CONSOLE_F_SIZE	0	/* Does host provide console size? */
+
+struct virtio_console_config {
+	/* colums of the screens */
+	__u16 cols;
+	/* rows of the screens */
+	__u16 rows;
+} __attribute__((packed));
+
+
 #ifdef __KERNEL__
 int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int));
 #endif /* __KERNEL__ */

Re: linux-next: rr tree build failure

[Rusty Russell]

On Tuesday 25 November 2008 17:15:54 Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> arch/powerpc/sysdev/mpic.c:809: error: conflicting types for
> 'mpic_set_affinity' arch/powerpc/sysdev/mpic.h:39: error: previous
> declaration of 'mpic_set_affinity' was here

Thanks, fixed.  Grepping found some more sparc ones, too.

> The declaration in the header file was missed.
>
> Also, the x86_64 allmodconfig build failed like this:
>
> ERROR: "hvc_resize" [drivers/char/virtio_console.ko] undefined!
>
> hvc_resize is currently not exported to modules.
>
> I have dropped the rr tree again.

OK, I've dropped Christian's patch for the moment until he fixes this.  I'm 
travelling to Sydney for the day so I won't get a chance to fix this if it 
breaks tomorrow :(

Rusty.

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 629 bytes --]

Hi Rusty,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

arch/powerpc/sysdev/mpic.c:809: error: conflicting types for 'mpic_set_affinity'
arch/powerpc/sysdev/mpic.h:39: error: previous declaration of 'mpic_set_affinity' was here

The declaration in the header file was missed.

Also, the x86_64 allmodconfig build failed like this:

ERROR: "hvc_resize" [drivers/char/virtio_console.ko] undefined!

hvc_resize is currently not exported to modules.

I have dropped the rr tree again.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: rr tree build failure

[Rusty Russell]

On Monday 24 November 2008 14:01:58 Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> arch/powerpc/kernel/irq.c: In function 'fixup_irqs':
> arch/powerpc/kernel/irq.c:240: error: incompatible type for argument 2 of
> 'irq_desc[irq].chip->set_affinity' arch/powerpc/sysdev/mpic.c: In function
> 'mpic_alloc':

Not sure how these got through.  I did another sweep.

Thanks,
Rusty.

linux-next: rr tree build failure

[Stephen Rothwell]

Hi Rusty,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

arch/powerpc/kernel/irq.c: In function 'fixup_irqs':
arch/powerpc/kernel/irq.c:240: error: incompatible type for argument 2 of 'irq_desc[irq].chip->set_affinity'
arch/powerpc/sysdev/mpic.c: In function 'mpic_alloc':
arch/powerpc/sysdev/mpic.c:1069: warning: assignment from incompatible pointer type
arch/powerpc/sysdev/mpic.c:1074: warning: assignment from incompatible pointer type
arch/powerpc/platforms/pseries/xics.c:385: warning: initialization from incompatible pointer type
arch/powerpc/platforms/pseries/xics.c:394: warning: initialization from incompatible pointer type
arch/powerpc/platforms/pseries/xics.c: In function 'xics_migrate_irqs_away':
arch/powerpc/platforms/pseries/xics.c:864: error: incompatible type for argument 2 of 'desc->chip->set_affinity'

caused by commit 5b03e170d524383a34a89fd73ec9d1bda0922d63
("cpumask:irq-functions-take-cpumask_t-ptr") which changed the
set_affinity callback but didn't update all the instances.

I have dropped the rr tree again today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: rr tree build failure

[Greg KH]

On Fri, Nov 21, 2008 at 09:28:51PM +1030, Rusty Russell wrote:
> On Friday 21 November 2008 13:49:13 Stephen Rothwell wrote:
> > Hi Rusty,
> >
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> >
> > drivers/usb/core/usb.c:958:76: error: macro "__module_param_call" requires
> > 7 arguments, but only 6 given
> >
> > Caused by commit 636c06e04b23e9dabf709c496cb9a28459f63eaa
> > ("param:core_param-really-really-early").
> >
> > I have dropped the rr tree again.
> 
> Yes, I didn't get a reply from Greg about whether he really needs "nousb" to
> be a module param, so I dropped my proposed USB fix.  I've restored it now.
> 
> Greg, here's the complete patch I have now:
> 
> Subject: USB: Use core_param.
> 
> Found this when I changed args to __module_param_call.  We now have
> core_param for exactly this.
> 
> This reverts to the 2005 (pre- aafbf24a) behaviour where "nousb" was
> not a module parameter, just a kernel command line parameter.  That's
> more sensible anyway.

No, please stick with the post 2005 behavior :)

thanks,

greg k-h

Re: linux-next: rr tree build failure

[Rusty Russell]

On Friday 21 November 2008 13:49:13 Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> drivers/usb/core/usb.c:958:76: error: macro "__module_param_call" requires
> 7 arguments, but only 6 given
>
> Caused by commit 636c06e04b23e9dabf709c496cb9a28459f63eaa
> ("param:core_param-really-really-early").
>
> I have dropped the rr tree again.

Yes, I didn't get a reply from Greg about whether he really needs "nousb" to
be a module param, so I dropped my proposed USB fix.  I've restored it now.

Greg, here's the complete patch I have now:

Subject: USB: Use core_param.

Found this when I changed args to __module_param_call.  We now have
core_param for exactly this.

This reverts to the 2005 (pre- aafbf24a) behaviour where "nousb" was
not a module parameter, just a kernel command line parameter.  That's
more sensible anyway.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Pete Zaitcev <zaitcev@redhat.com>
---
 drivers/usb/core/usb.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- linux-2.6.orig/drivers/usb/core/usb.c
+++ linux-2.6/drivers/usb/core/usb.c
@@ -963,7 +963,9 @@ void usb_buffer_unmap_sg(const struct us
 EXPORT_SYMBOL_GPL(usb_buffer_unmap_sg);
 
 /* format to disable USB on kernel command line is: nousb */
-__module_param_call("", nousb, param_set_bool, param_get_bool, &nousb, 0444);
+#ifndef MODULE
+core_param(nousb, nousb, bool, 0444);
+#endif
 
 /*
  * for external read access to <nousb>
\0

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 439 bytes --]

Hi Rusty,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

drivers/usb/core/usb.c:958:76: error: macro "__module_param_call" requires 7 arguments, but only 6 given

Caused by commit 636c06e04b23e9dabf709c496cb9a28459f63eaa
("param:core_param-really-really-early").

I have dropped the rr tree again.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 410 bytes --]

Hi Rusty,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/usb/core/usb.c:958: error: expected ')' before 'bool'

line 958 is:
core_param(nousb, nousb, bool, 0444);

core_param is only defined for !MODULE in moduleparam.h ...

I have dropped the rr tree for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: rr tree build failure

[Rusty Russell]

On Thursday 23 October 2008 15:52:28 Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> arch/powerpc/platforms/cell/spu_base.c: In function
> 'mm_needs_global_tlbie': arch/powerpc/platforms/cell/spu_base.c:117: error:
> implicit declaration of function '__cpus_setall'

OK, after discussions with Arnd I applied two fixes.  One is similar to yours 
but neater, and the other then changes NR_CPUS to nr_cpu_ids once it becomes 
available for UP.

Thanks,
Rusty.

Re: linux-next: rr tree build failure

[Rusty Russell]

On Thursday 23 October 2008 15:51:59 Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> arch/x86/xen/smp.c: In function 'xen_smp_send_call_function_ipi':
> arch/x86/xen/smp.c:423: error: incompatible type for argument 1 of
> 'xen_send_IPI_mask' arch/x86/kernel/smp.c: In function
> 'native_send_call_func_ipi':
> arch/x86/kernel/smp.c:140: error: incompatible type for argument 1 of
> 'genapic->send_IPI_mask'
>
> Caused by a interaction between commit
> ae74da38ccdad1c0d724fc9343b917bc63ed6fc3 ("x86: reduce stack requirements
> for send_call_func_ipi") from the cpus4096 tree and commit
> b93ce7906b8546093696e03e9a3797da8cef2274 ("x86 smp: modify send_IPI_mask
> interface to accept cpumask_t pointers") from the rr tree.
>
> Fixed up in the patch below.

Yep, genuine conflict, fix is correct.

Thanks,
Rusty.

linux-next: rr tree build failure

[Stephen Rothwell]

Hi Rusty,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

arch/powerpc/platforms/cell/spu_base.c: In function 'mm_needs_global_tlbie':
arch/powerpc/platforms/cell/spu_base.c:117: error: implicit declaration of function '__cpus_setall'

Caused by commit 20ec1a8465bd6d2e7e68fa5a7b09309c920b4792
("cpumask:add-struct-cpumask") which removed __cpus_setall from
include/linux/cpumask.h.

I applied the hack patch below (which is probably not what we want).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 23 Oct 2008 15:36:21 +1100
Subject: [PATCH] powerpc/spu: cpumask updates fallout.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/platforms/cell/spu_base.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index a5bdb89..a876904 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -111,10 +111,13 @@ void spu_flush_all_slbs(struct mm_struct *mm)
  */
 static inline void mm_needs_global_tlbie(struct mm_struct *mm)
 {
-	int nr = (NR_CPUS > 1) ? NR_CPUS : NR_CPUS + 1;
-
 	/* Global TLBIE broadcast required with SPEs. */
-	__cpus_setall(&mm->cpu_vm_mask, nr);
+	if (NR_CPUS > 1)
+		cpumask_setall(&mm->cpu_vm_mask);
+	else {
+		cpumask_set_cpu(0, &mm->cpu_vm_mask);
+		cpumask_set_cpu(1, &mm->cpu_vm_mask);
+	}
 }
 
 void spu_associate_mm(struct spu *spu, struct mm_struct *mm)
-- 
1.5.6.5

linux-next: rr tree build failure

[Stephen Rothwell]

Hi Rusty,

Today's linux-next build (x86_64 allmodconfig) failed like this:

arch/x86/xen/smp.c: In function 'xen_smp_send_call_function_ipi':
arch/x86/xen/smp.c:423: error: incompatible type for argument 1 of 'xen_send_IPI_mask'
arch/x86/kernel/smp.c: In function 'native_send_call_func_ipi':
arch/x86/kernel/smp.c:140: error: incompatible type for argument 1 of 'genapic->send_IPI_mask'

Caused by a interaction between commit
ae74da38ccdad1c0d724fc9343b917bc63ed6fc3 ("x86: reduce stack requirements
for send_call_func_ipi") from the cpus4096 tree and commit
b93ce7906b8546093696e03e9a3797da8cef2274 ("x86 smp: modify send_IPI_mask
interface to accept cpumask_t pointers") from the rr tree.

Fixed up in the patch below.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 23 Oct 2008 15:50:43 +1100
Subject: [PATCH] x86: cpumask change fallout

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/x86/kernel/smp.c |    2 +-
 arch/x86/xen/smp.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
index 7c8a103..f1c7fa4 100644
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
@@ -137,7 +137,7 @@ void native_send_call_func_ipi(const cpumask_t *mask)
 	    cpus_equal(cpu_online_map, cpu_callout_map))
 		send_IPI_allbutself(CALL_FUNCTION_VECTOR);
 	else
-		send_IPI_mask(*mask, CALL_FUNCTION_VECTOR);
+		send_IPI_mask(mask, CALL_FUNCTION_VECTOR);
 }
 
 static void stop_this_cpu(void *dummy)
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index c866593..dae8110 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -420,7 +420,7 @@ static void xen_smp_send_call_function_ipi(const cpumask_t *mask)
 {
 	int cpu;
 
-	xen_send_IPI_mask(*mask, XEN_CALL_FUNCTION_VECTOR);
+	xen_send_IPI_mask(mask, XEN_CALL_FUNCTION_VECTOR);
 
 	/* Make sure other vcpus get a chance to run if they need to. */
 	for_each_cpu_mask_nr(cpu, *mask) {
-- 
1.5.6.5

Re: linux-next: rr tree build failure

[Rusty Russell]

On Thursday 26 June 2008 17:49:04 Christian Borntraeger wrote:
> Am Donnerstag, 26. Juni 2008 schrieb Stephen Rothwell:
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 26 Jun 2008 16:46:25 +1000
> > Subject: [PATCH] virtio: virtio console can be a module
> >
> > So it needs these symbols exported.
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Thanks.
>
> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>

Applied.

Thanks,
Rusty.

Re: linux-next: rr tree build failure

[Christian Borntraeger]

Am Donnerstag, 26. Juni 2008 schrieb Stephen Rothwell:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 26 Jun 2008 16:46:25 +1000
> Subject: [PATCH] virtio: virtio console can be a module
> 
> So it needs these symbols exported.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks.

Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>

linux-next: rr tree build failure

[Stephen Rothwell]

Hi Rusty,

Today's linux-next build (x86_64 allmodconfig) failed like this:

ERROR: "hvc_alloc" [drivers/char/virtio_console.ko] undefined!
ERROR: "hvc_kick" [drivers/char/virtio_console.ko] undefined!
ERROR: "hvc_poll" [drivers/char/virtio_console.ko] undefined!
ERROR: "hvc_instantiate" [drivers/char/virtio_console.ko] undefined!

I applied the patch below.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

>From 9b76babc511342dcd6b691caaf3af3840b60ee7d Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 26 Jun 2008 16:46:25 +1000
Subject: [PATCH] virtio: virtio console can be a module

So it needs these symbols exported.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/char/hvc_console.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index bf82a44..32f830a 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -281,6 +281,7 @@ int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops)
 
 	return 0;
 }
+EXPORT_SYMBOL_GPL(hvc_instantiate);
 
 /* Wake the sleeping khvcd */
 void hvc_kick(void)
@@ -288,6 +289,7 @@ void hvc_kick(void)
 	hvc_kicked = 1;
 	wake_up_process(hvc_task);
 }
+EXPORT_SYMBOL_GPL(hvc_kick);
 
 static void hvc_unthrottle(struct tty_struct *tty)
 {
@@ -630,6 +632,7 @@ int hvc_poll(struct hvc_struct *hp)
 
 	return poll_mask;
 }
+EXPORT_SYMBOL_GPL(hvc_poll);
 
 /*
  * This kthread is either polling or interrupt driven.  This is determined by
@@ -740,6 +743,7 @@ struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data,
 
 	return hp;
 }
+EXPORT_SYMBOL_GPL(hvc_alloc);
 
 int __devexit hvc_remove(struct hvc_struct *hp)
 {
-- 
1.5.6

Re: linux-next: rr tree build failure

[Christian Borntraeger]

Am Mittwoch, 25. Juni 2008 schrieb Rusty Russell:
> On Wednesday 25 June 2008 17:35:54 Christian Borntraeger wrote:
> > Am Mittwoch, 25. Juni 2008 schrieb Stephen Rothwell:
> > > Hi Rusty,
> > >
> > > Today's linux-next build (x86_64 allmodconfig (CONFIG_VIRTIO_CONSOLE=y,
> > > CONFIG_VIRTIO=m)) failed like this:
> >
> > That is interesting. VIRTIO_CONSOLE (=y) has a depends on VIRTIO(m). Seems
> > that Kconfig thinks that m is enough to fulfil a depends on.
> >
> > Rusty, what do you think about the following fixup patch? (please fold it
> > into the other one):
> 
> Hmm, prefer either tristate "Virtio console" or "depends on VIRTIO = y". 
> select has issues in that it ignores dependencies.

OK.

---
 drivers/char/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/drivers/char/Kconfig
===================================================================
--- linux-2.6.orig/drivers/char/Kconfig
+++ linux-2.6/drivers/char/Kconfig
@@ -634,7 +634,7 @@ config HVC_XEN
 	  Xen virtual console device driver
 
 config VIRTIO_CONSOLE
-	bool "Virtio console"
+	tristate "Virtio console"
 	depends on VIRTIO
 	select HVC_DRIVER
 	help

Re: linux-next: rr tree build failure

[Rusty Russell]

On Wednesday 25 June 2008 17:35:54 Christian Borntraeger wrote:
> Am Mittwoch, 25. Juni 2008 schrieb Stephen Rothwell:
> > Hi Rusty,
> >
> > Today's linux-next build (x86_64 allmodconfig (CONFIG_VIRTIO_CONSOLE=y,
> > CONFIG_VIRTIO=m)) failed like this:
>
> That is interesting. VIRTIO_CONSOLE (=y) has a depends on VIRTIO(m). Seems
> that Kconfig thinks that m is enough to fulfil a depends on.
>
> Rusty, what do you think about the following fixup patch? (please fold it
> into the other one):

Hmm, prefer either tristate "Virtio console" or "depends on VIRTIO = y". 
select has issues in that it ignores dependencies.

Rusty.

Re: linux-next: rr tree build failure

[Christian Borntraeger]

Am Mittwoch, 25. Juni 2008 schrieb Stephen Rothwell:
> Hi Rusty,
> 
> Today's linux-next build (x86_64 allmodconfig (CONFIG_VIRTIO_CONSOLE=y,
> CONFIG_VIRTIO=m)) failed like this:

That is interesting. VIRTIO_CONSOLE (=y) has a depends on VIRTIO(m). Seems 
that Kconfig thinks that m is enough to fulfil a depends on.

Rusty, what do you think about the following fixup patch? (please fold it into 
the other one):

---
 drivers/char/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/drivers/char/Kconfig
===================================================================
--- linux-2.6.orig/drivers/char/Kconfig
+++ linux-2.6/drivers/char/Kconfig
@@ -635,7 +635,7 @@ config HVC_XEN
 
 config VIRTIO_CONSOLE
 	bool "Virtio console"
-	depends on VIRTIO
+	select VIRTIO
 	select HVC_DRIVER
 	help
 	  Virtio console for use with lguest and other hypervisors.

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 534 bytes --]

Hi Rusty,

Today's linux-next build (x86_64 allmodconfig (CONFIG_VIRTIO_CONSOLE=y,
CONFIG_VIRTIO=m)) failed like this:

drivers/built-in.o: In function `init':
drivers/char/virtio_console.c:245: undefined reference to `register_virtio_driver'

I assume it is caused by commit 6588784e224baacbc209ce32bd82d92ab05ae0e8
("virtio_console: use virtqueue notification for hvc_console")  which I
have reverted for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: rr tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1597 bytes --]

Hi Rusty,

Today's linux-next build (powerpc ppc64_defconfig (CONFIG_UNUSED_SYMBOLS
is not set, but CONFIG_MODVERSIONS is set)) failed like this:

kernel/module.c: In function 'load_module':
kernel/module.c:2084: error: expected expression before ')' token

Caused by commit 29ec97e82935397e13e7e7f3db75111e9937931c
("module:shrink-struct-module") from the rr tree.

I applied the patch below which should be merged in with the above commit
if possible (or something like it).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

>From b790b16878f90c9ee23f8569bf6246c0ec258562 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 25 Jun 2008 16:40:44 +1000
Subject: [PATCH] rr fix patch 1

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

---
 kernel/module.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/module.c b/kernel/module.c
index a4bdd77..ceae92b 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2076,9 +2076,9 @@ static struct module *load_module(void __user *umod,
 #ifdef CONFIG_MODVERSIONS
 	if ((mod->num_syms && !crcindex) ||
 	    (mod->num_gpl_syms && !gplcrcindex) ||
-	    (mod->num_gpl_future_syms && !gplfuturecrcindex) ||
+	    (mod->num_gpl_future_syms && !gplfuturecrcindex)
 #ifdef CONFIG_UNUSED_SYMBOLS
-	    (mod->num_unused_syms && !unusedcrcindex) ||
+	    || (mod->num_unused_syms && !unusedcrcindex) ||
 	    (mod->num_unused_gpl_syms && !unusedgplcrcindex)
 #endif
 		) {
-- 
1.5.5.4


[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]