[PATCH] UML: Fix some apparent bitrot

[PATCH] UML: Fix some apparent bitrot

[Paul Menage]

UML: Fix some apparent bitrot

- migration of net_device methods into net_device_ops
- dma_sync_single() changes
- cpumask_clear() -> cpumask_clear_cpu()

Signed-off-by: Paul Menage <menage@google.com>

--

Fixes the following compile errors:

include/linux/dma-mapping.h:113: error: redefinition of 'dma_sync_single'
arch/um/include/asm/dma-mapping.h:84: error: previous definition of 'dma_sync_single' was here
include/linux/dma-mapping.h: In function 'dma_sync_single':
include/linux/dma-mapping.h:117: error: implicit declaration of function 'dma_sync_single_for_cpu'
include/linux/dma-mapping.h: At top level:
include/linux/dma-mapping.h:120: error: redefinition of 'dma_sync_sg'
arch/um/include/asm/dma-mapping.h:91: error: previous definition of 'dma_sync_sg' was here
include/linux/dma-mapping.h: In function 'dma_sync_sg':
include/linux/dma-mapping.h:124: error: implicit declaration of function 'dma_sync_sg_for_cpu'


arch/um/drivers/slirp_kern.c: In function 'slirp_init':
arch/um/drivers/slirp_kern.c:35: error: 'struct net_device' has no member named 'init'


arch/um/include/asm/mmu_context.h: In function 'switch_mm':
arch/um/include/asm/mmu_context.h:38: warning: passing argument 1 of 'cpumask_clear' makes pointer from integer without
a cast
arch/um/include/asm/mmu_context.h:38: error: too many arguments to function 'cpumask_clear'

---

 arch/um/drivers/slip_kern.c       |    1 -
 arch/um/drivers/slirp_kern.c      |    1 -
 arch/um/include/asm/dma-mapping.h |    4 ++--
 arch/um/include/asm/mmu_context.h |    2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c
index 5ec1756..dd2aadc 100644
--- a/arch/um/drivers/slip_kern.c
+++ b/arch/um/drivers/slip_kern.c
@@ -30,7 +30,6 @@ static void slip_init(struct net_device *dev, void *data)
 
 	slip_proto_init(&spri->slip);
 
-	dev->init = NULL;
 	dev->hard_header_len = 0;
 	dev->header_ops = NULL;
 	dev->addr_len = 0;
diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
index f15a6e7..e376284 100644
--- a/arch/um/drivers/slirp_kern.c
+++ b/arch/um/drivers/slirp_kern.c
@@ -32,7 +32,6 @@ void slirp_init(struct net_device *dev, void *data)
 
 	slip_proto_init(&spri->slip);
 
-	dev->init = NULL;
 	dev->hard_header_len = 0;
 	dev->header_ops = NULL;
 	dev->addr_len = 0;
diff --git a/arch/um/include/asm/dma-mapping.h b/arch/um/include/asm/dma-mapping.h
index 90fc708..378de4b 100644
--- a/arch/um/include/asm/dma-mapping.h
+++ b/arch/um/include/asm/dma-mapping.h
@@ -79,14 +79,14 @@ dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
 }
 
 static inline void
-dma_sync_single(struct device *dev, dma_addr_t dma_handle, size_t size,
+dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
 		enum dma_data_direction direction)
 {
 	BUG();
 }
 
 static inline void
-dma_sync_sg(struct device *dev, struct scatterlist *sg, int nelems,
+dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
 	    enum dma_data_direction direction)
 {
 	BUG();
diff --git a/arch/um/include/asm/mmu_context.h b/arch/um/include/asm/mmu_context.h
index edd719e..34d8130 100644
--- a/arch/um/include/asm/mmu_context.h
+++ b/arch/um/include/asm/mmu_context.h
@@ -35,7 +35,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
 	unsigned cpu = smp_processor_id();
 
 	if(prev != next){
-		cpumask_clear(cpu, mm_cpumask(prev));
+		cpumask_clear_cpu(cpu, mm_cpumask(prev));
 		cpumask_set_cpu(cpu, mm_cpumask(next));
 		if(next != &init_mm)
 			__switch_mm(&next->context.id);

Re: [PATCH] UML: Fix some apparent bitrot

[Amerigo Wang]

On Fri, Jun 19, 2009 at 05:55:24PM -0700, Paul Menage wrote:
>UML: Fix some apparent bitrot
>
>- migration of net_device methods into net_device_ops
>- dma_sync_single() changes
>- cpumask_clear() -> cpumask_clear_cpu()
>
>Signed-off-by: Paul Menage <menage@google.com>


Looks good.

Acked-by: WANG Cong <xiyou.wangcong@gmail.com>


>
>--
>
>Fixes the following compile errors:
>
>include/linux/dma-mapping.h:113: error: redefinition of 'dma_sync_single'
>arch/um/include/asm/dma-mapping.h:84: error: previous definition of 'dma_sync_single' was here
>include/linux/dma-mapping.h: In function 'dma_sync_single':
>include/linux/dma-mapping.h:117: error: implicit declaration of function 'dma_sync_single_for_cpu'
>include/linux/dma-mapping.h: At top level:
>include/linux/dma-mapping.h:120: error: redefinition of 'dma_sync_sg'
>arch/um/include/asm/dma-mapping.h:91: error: previous definition of 'dma_sync_sg' was here
>include/linux/dma-mapping.h: In function 'dma_sync_sg':
>include/linux/dma-mapping.h:124: error: implicit declaration of function 'dma_sync_sg_for_cpu'
>
>
>arch/um/drivers/slirp_kern.c: In function 'slirp_init':
>arch/um/drivers/slirp_kern.c:35: error: 'struct net_device' has no member named 'init'
>
>
>arch/um/include/asm/mmu_context.h: In function 'switch_mm':
>arch/um/include/asm/mmu_context.h:38: warning: passing argument 1 of 'cpumask_clear' makes pointer from integer without
>a cast
>arch/um/include/asm/mmu_context.h:38: error: too many arguments to function 'cpumask_clear'
>
>---
>
> arch/um/drivers/slip_kern.c       |    1 -
> arch/um/drivers/slirp_kern.c      |    1 -
> arch/um/include/asm/dma-mapping.h |    4 ++--
> arch/um/include/asm/mmu_context.h |    2 +-
> 4 files changed, 3 insertions(+), 5 deletions(-)
>
>diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c
>index 5ec1756..dd2aadc 100644
>--- a/arch/um/drivers/slip_kern.c
>+++ b/arch/um/drivers/slip_kern.c
>@@ -30,7 +30,6 @@ static void slip_init(struct net_device *dev, void *data)
> 
> 	slip_proto_init(&spri->slip);
> 
>-	dev->init = NULL;
> 	dev->hard_header_len = 0;
> 	dev->header_ops = NULL;
> 	dev->addr_len = 0;
>diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
>index f15a6e7..e376284 100644
>--- a/arch/um/drivers/slirp_kern.c
>+++ b/arch/um/drivers/slirp_kern.c
>@@ -32,7 +32,6 @@ void slirp_init(struct net_device *dev, void *data)
> 
> 	slip_proto_init(&spri->slip);
> 
>-	dev->init = NULL;
> 	dev->hard_header_len = 0;
> 	dev->header_ops = NULL;
> 	dev->addr_len = 0;
>diff --git a/arch/um/include/asm/dma-mapping.h b/arch/um/include/asm/dma-mapping.h
>index 90fc708..378de4b 100644
>--- a/arch/um/include/asm/dma-mapping.h
>+++ b/arch/um/include/asm/dma-mapping.h
>@@ -79,14 +79,14 @@ dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
> }
> 
> static inline void
>-dma_sync_single(struct device *dev, dma_addr_t dma_handle, size_t size,
>+dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
> 		enum dma_data_direction direction)
> {
> 	BUG();
> }
> 
> static inline void
>-dma_sync_sg(struct device *dev, struct scatterlist *sg, int nelems,
>+dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
> 	    enum dma_data_direction direction)
> {
> 	BUG();
>diff --git a/arch/um/include/asm/mmu_context.h b/arch/um/include/asm/mmu_context.h
>index edd719e..34d8130 100644
>--- a/arch/um/include/asm/mmu_context.h
>+++ b/arch/um/include/asm/mmu_context.h
>@@ -35,7 +35,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
> 	unsigned cpu = smp_processor_id();
> 
> 	if(prev != next){
>-		cpumask_clear(cpu, mm_cpumask(prev));
>+		cpumask_clear_cpu(cpu, mm_cpumask(prev));
> 		cpumask_set_cpu(cpu, mm_cpumask(next));
> 		if(next != &init_mm)
> 			__switch_mm(&next->context.id);
>
>--
>To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html
>Please read the FAQ at  http://www.tux.org/lkml/

Re: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Boaz Harrosh]

On 06/20/2009 03:55 AM, Paul Menage wrote:
> UML: Fix some apparent bitrot
> 
> - migration of net_device methods into net_device_ops
> - dma_sync_single() changes
> - cpumask_clear() -> cpumask_clear_cpu()
> 
> Signed-off-by: Paul Menage <menage@google.com>
> 
> --
> 
> Fixes the following compile errors:
> 
> include/linux/dma-mapping.h:113: error: redefinition of 'dma_sync_single'
> arch/um/include/asm/dma-mapping.h:84: error: previous definition of 'dma_sync_single' was here
> include/linux/dma-mapping.h: In function 'dma_sync_single':
> include/linux/dma-mapping.h:117: error: implicit declaration of function 'dma_sync_single_for_cpu'
> include/linux/dma-mapping.h: At top level:
> include/linux/dma-mapping.h:120: error: redefinition of 'dma_sync_sg'
> arch/um/include/asm/dma-mapping.h:91: error: previous definition of 'dma_sync_sg' was here
> include/linux/dma-mapping.h: In function 'dma_sync_sg':
> include/linux/dma-mapping.h:124: error: implicit declaration of function 'dma_sync_sg_for_cpu'
> 
> 
> arch/um/drivers/slirp_kern.c: In function 'slirp_init':
> arch/um/drivers/slirp_kern.c:35: error: 'struct net_device' has no member named 'init'
> 
> 
> arch/um/include/asm/mmu_context.h: In function 'switch_mm':
> arch/um/include/asm/mmu_context.h:38: warning: passing argument 1 of 'cpumask_clear' makes pointer from integer without
> a cast
> arch/um/include/asm/mmu_context.h:38: error: too many arguments to function 'cpumask_clear'
> 
> ---

Stephan hi.

The above breakage is the usual stuff we get every merge window. With people doing
cross arch work and neglecting UML.

Who is the person or people responsible for the large linux-next compilation rig?
Is it possible to also add a UML traget, at least for the x86_64/x86_32 sub-arch?

Thanks
Boaz

> 
>  arch/um/drivers/slip_kern.c       |    1 -
>  arch/um/drivers/slirp_kern.c      |    1 -
>  arch/um/include/asm/dma-mapping.h |    4 ++--
>  arch/um/include/asm/mmu_context.h |    2 +-
>  4 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c
> index 5ec1756..dd2aadc 100644
> --- a/arch/um/drivers/slip_kern.c
> +++ b/arch/um/drivers/slip_kern.c
> @@ -30,7 +30,6 @@ static void slip_init(struct net_device *dev, void *data)
>  
>  	slip_proto_init(&spri->slip);
>  
> -	dev->init = NULL;
>  	dev->hard_header_len = 0;
>  	dev->header_ops = NULL;
>  	dev->addr_len = 0;
> diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
> index f15a6e7..e376284 100644
> --- a/arch/um/drivers/slirp_kern.c
> +++ b/arch/um/drivers/slirp_kern.c
> @@ -32,7 +32,6 @@ void slirp_init(struct net_device *dev, void *data)
>  
>  	slip_proto_init(&spri->slip);
>  
> -	dev->init = NULL;
>  	dev->hard_header_len = 0;
>  	dev->header_ops = NULL;
>  	dev->addr_len = 0;
> diff --git a/arch/um/include/asm/dma-mapping.h b/arch/um/include/asm/dma-mapping.h
> index 90fc708..378de4b 100644
> --- a/arch/um/include/asm/dma-mapping.h
> +++ b/arch/um/include/asm/dma-mapping.h
> @@ -79,14 +79,14 @@ dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
>  }
>  
>  static inline void
> -dma_sync_single(struct device *dev, dma_addr_t dma_handle, size_t size,
> +dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
>  		enum dma_data_direction direction)
>  {
>  	BUG();
>  }
>  
>  static inline void
> -dma_sync_sg(struct device *dev, struct scatterlist *sg, int nelems,
> +dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
>  	    enum dma_data_direction direction)
>  {
>  	BUG();
> diff --git a/arch/um/include/asm/mmu_context.h b/arch/um/include/asm/mmu_context.h
> index edd719e..34d8130 100644
> --- a/arch/um/include/asm/mmu_context.h
> +++ b/arch/um/include/asm/mmu_context.h
> @@ -35,7 +35,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
>  	unsigned cpu = smp_processor_id();
>  
>  	if(prev != next){
> -		cpumask_clear(cpu, mm_cpumask(prev));
> +		cpumask_clear_cpu(cpu, mm_cpumask(prev));
>  		cpumask_set_cpu(cpu, mm_cpumask(next));
>  		if(next != &init_mm)
>  			__switch_mm(&next->context.id);
> 
> 

Re: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Amerigo Wang]

On Mon, Jun 22, 2009 at 11:43:52AM +0300, Boaz Harrosh wrote:
>
>Stephan hi.
>
>The above breakage is the usual stuff we get every merge window. With people doing
>cross arch work and neglecting UML.
>
>Who is the person or people responsible for the large linux-next compilation rig?
>Is it possible to also add a UML traget, at least for the x86_64/x86_32 sub-arch?

Agreed.

Stephan, could you please also do compiling tests for UML in your -next tree?

Thanks!

Re: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Stephen Rothwell]

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

Hi Amerigo,

On Mon, 22 Jun 2009 16:57:35 +0800 Amerigo Wang <xiyou.wangcong@gmail.com> wrote:
>
> Stephan, could you please also do compiling tests for UML in your -next tree?
> 
> Thanks!

I would be happy to do this, all I need is for someone to tell me how to
do this given we have PowerPC hosts so our X86 compilers are cross
compilers.
-- 
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: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Boaz Harrosh]

On 06/22/2009 01:52 PM, Stephen Rothwell wrote:
> Hi Amerigo,
> 
> On Mon, 22 Jun 2009 16:57:35 +0800 Amerigo Wang <xiyou.wangcong@gmail.com> wrote:
>> Stephan, could you please also do compiling tests for UML in your -next tree?
>>
>> Thanks!
> 
> I would be happy to do this, all I need is for someone to tell me how to
> do this given we have PowerPC hosts so our X86 compilers are cross
> compilers.

OK I'm not sure how to do that?

But just a plain PowerPC UML could be nice for a start. If it at all
works.

Thanks
Boaz

Re: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Boaz Harrosh]

On 06/22/2009 05:46 AM, Amerigo Wang wrote:
> On Fri, Jun 19, 2009 at 05:55:24PM -0700, Paul Menage wrote:
>> UML: Fix some apparent bitrot
>>
>> - migration of net_device methods into net_device_ops
>> - dma_sync_single() changes
>> - cpumask_clear() -> cpumask_clear_cpu()
>>
>> Signed-off-by: Paul Menage <menage@google.com>
> 
> 
> Looks good.
> 
> Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
> 
> 

Dear Jeff, Amerigo

who is pushing this patch to Linus for 2.6.31. (ASAP)
Linus has threatened to cut -rc1 soon, and it is
unbuildable for UML currently.

Thanks in advance
Boaz

Re: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Stephen Rothwell]

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

Hi all,

I applied the following patch to yesterday's linux-next and the i386 uml
defconfig build succeeded.

The last hunk of this patch (arch/um/include/asm/mmu_context.h) needs to
be notified to Rusty Russell (cc'd) since that only applied after merging
his tree.

The rest appears to apply ok to Linus' tree.

Please split this and send it to the appropriate people and cc me.

On Mon, 22 Jun 2009 11:43:52 +0300 Boaz Harrosh <bharrosh@panasas.com> wrote:
>
> On 06/20/2009 03:55 AM, Paul Menage wrote:
> > UML: Fix some apparent bitrot
> > 
> > - migration of net_device methods into net_device_ops
> > - dma_sync_single() changes
> > - cpumask_clear() -> cpumask_clear_cpu()
> > 
> > Signed-off-by: Paul Menage <menage@google.com>
> > 
> > --
> > 
> > Fixes the following compile errors:
> > 
> > include/linux/dma-mapping.h:113: error: redefinition of 'dma_sync_single'
> > arch/um/include/asm/dma-mapping.h:84: error: previous definition of 'dma_sync_single' was here
> > include/linux/dma-mapping.h: In function 'dma_sync_single':
> > include/linux/dma-mapping.h:117: error: implicit declaration of function 'dma_sync_single_for_cpu'
> > include/linux/dma-mapping.h: At top level:
> > include/linux/dma-mapping.h:120: error: redefinition of 'dma_sync_sg'
> > arch/um/include/asm/dma-mapping.h:91: error: previous definition of 'dma_sync_sg' was here
> > include/linux/dma-mapping.h: In function 'dma_sync_sg':
> > include/linux/dma-mapping.h:124: error: implicit declaration of function 'dma_sync_sg_for_cpu'
> > 
> > 
> > arch/um/drivers/slirp_kern.c: In function 'slirp_init':
> > arch/um/drivers/slirp_kern.c:35: error: 'struct net_device' has no member named 'init'
> > 
> > 
> > arch/um/include/asm/mmu_context.h: In function 'switch_mm':
> > arch/um/include/asm/mmu_context.h:38: warning: passing argument 1 of 'cpumask_clear' makes pointer from integer without
> > a cast
> > arch/um/include/asm/mmu_context.h:38: error: too many arguments to function 'cpumask_clear'
> > 
> > ---
> 
> Stephan hi.
> 
> The above breakage is the usual stuff we get every merge window. With people doing
> cross arch work and neglecting UML.
> 
> Who is the person or people responsible for the large linux-next compilation rig?
> Is it possible to also add a UML traget, at least for the x86_64/x86_32 sub-arch?
> 
> Thanks
> Boaz
> 
> > 
> >  arch/um/drivers/slip_kern.c       |    1 -
> >  arch/um/drivers/slirp_kern.c      |    1 -
> >  arch/um/include/asm/dma-mapping.h |    4 ++--
> >  arch/um/include/asm/mmu_context.h |    2 +-
> >  4 files changed, 3 insertions(+), 5 deletions(-)
> > 
> > diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c
> > index 5ec1756..dd2aadc 100644
> > --- a/arch/um/drivers/slip_kern.c
> > +++ b/arch/um/drivers/slip_kern.c
> > @@ -30,7 +30,6 @@ static void slip_init(struct net_device *dev, void *data)
> >  
> >  	slip_proto_init(&spri->slip);
> >  
> > -	dev->init = NULL;
> >  	dev->hard_header_len = 0;
> >  	dev->header_ops = NULL;
> >  	dev->addr_len = 0;
> > diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
> > index f15a6e7..e376284 100644
> > --- a/arch/um/drivers/slirp_kern.c
> > +++ b/arch/um/drivers/slirp_kern.c
> > @@ -32,7 +32,6 @@ void slirp_init(struct net_device *dev, void *data)
> >  
> >  	slip_proto_init(&spri->slip);
> >  
> > -	dev->init = NULL;
> >  	dev->hard_header_len = 0;
> >  	dev->header_ops = NULL;
> >  	dev->addr_len = 0;
> > diff --git a/arch/um/include/asm/dma-mapping.h b/arch/um/include/asm/dma-mapping.h
> > index 90fc708..378de4b 100644
> > --- a/arch/um/include/asm/dma-mapping.h
> > +++ b/arch/um/include/asm/dma-mapping.h
> > @@ -79,14 +79,14 @@ dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
> >  }
> >  
> >  static inline void
> > -dma_sync_single(struct device *dev, dma_addr_t dma_handle, size_t size,
> > +dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
> >  		enum dma_data_direction direction)
> >  {
> >  	BUG();
> >  }
> >  
> >  static inline void
> > -dma_sync_sg(struct device *dev, struct scatterlist *sg, int nelems,
> > +dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
> >  	    enum dma_data_direction direction)
> >  {
> >  	BUG();
> > diff --git a/arch/um/include/asm/mmu_context.h b/arch/um/include/asm/mmu_context.h
> > index edd719e..34d8130 100644
> > --- a/arch/um/include/asm/mmu_context.h
> > +++ b/arch/um/include/asm/mmu_context.h
> > @@ -35,7 +35,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
> >  	unsigned cpu = smp_processor_id();
> >  
> >  	if(prev != next){
> > -		cpumask_clear(cpu, mm_cpumask(prev));
> > +		cpumask_clear_cpu(cpu, mm_cpumask(prev));
> >  		cpumask_set_cpu(cpu, mm_cpumask(next));
> >  		if(next != &init_mm)
> >  			__switch_mm(&next->context.id);
> > 

-- 
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: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Boaz Harrosh]

On 06/25/2009 06:59 AM, Stephen Rothwell wrote:
> Hi all,
> 
> I applied the following patch to yesterday's linux-next and the i386 uml
> defconfig build succeeded.

Stephan Hi, 
Does this means that there will be a UML build every linux-next now?

> 
> The last hunk of this patch (arch/um/include/asm/mmu_context.h) needs to
> be notified to Rusty Russell (cc'd) since that only applied after merging
> his tree.
> 
> The rest appears to apply ok to Linus' tree.
> 
> Please split this and send it to the appropriate people and cc me.
> 

I agree, the minimum of fixing the arch definitions should be separated
from the uml-net-drivers (Which conflicts).

[One patch that needs to go to Linus Yesterday]
arch/um/include/asm/dma-mapping.h
arch/um/include/asm/mmu_context.h

[Second patch through Rusty's tree]
arch/um/drivers/slip_kern.c
arch/um/drivers/slirp_kern.c

Paul? we did not receive any feedback from you. I will wait until Sunday,
then send a patch to Andrew Morton, perhaps he can send such a fix to Linus.
Given UML maintainers have disappeared, right on a merge window.

> On Mon, 22 Jun 2009 11:43:52 +0300 Boaz Harrosh <bharrosh@panasas.com> wrote:
>> On 06/20/2009 03:55 AM, Paul Menage wrote:
>>> UML: Fix some apparent bitrot
>>>
>>> - migration of net_device methods into net_device_ops
>>> - dma_sync_single() changes
>>> - cpumask_clear() -> cpumask_clear_cpu()
>>>
>>> Signed-off-by: Paul Menage <menage@google.com>
>>>
>>> --
>>>
>>> Fixes the following compile errors:
>>>
>>> include/linux/dma-mapping.h:113: error: redefinition of 'dma_sync_single'
>>> arch/um/include/asm/dma-mapping.h:84: error: previous definition of 'dma_sync_single' was here
>>> include/linux/dma-mapping.h: In function 'dma_sync_single':
>>> include/linux/dma-mapping.h:117: error: implicit declaration of function 'dma_sync_single_for_cpu'
>>> include/linux/dma-mapping.h: At top level:
>>> include/linux/dma-mapping.h:120: error: redefinition of 'dma_sync_sg'
>>> arch/um/include/asm/dma-mapping.h:91: error: previous definition of 'dma_sync_sg' was here
>>> include/linux/dma-mapping.h: In function 'dma_sync_sg':
>>> include/linux/dma-mapping.h:124: error: implicit declaration of function 'dma_sync_sg_for_cpu'
>>>
>>>
>>> arch/um/drivers/slirp_kern.c: In function 'slirp_init':
>>> arch/um/drivers/slirp_kern.c:35: error: 'struct net_device' has no member named 'init'
>>>
>>>
>>> arch/um/include/asm/mmu_context.h: In function 'switch_mm':
>>> arch/um/include/asm/mmu_context.h:38: warning: passing argument 1 of 'cpumask_clear' makes pointer from integer without
>>> a cast
>>> arch/um/include/asm/mmu_context.h:38: error: too many arguments to function 'cpumask_clear'
>>>
>>> ---
>> Stephan hi.
>>
>> The above breakage is the usual stuff we get every merge window. With people doing
>> cross arch work and neglecting UML.
>>
>> Who is the person or people responsible for the large linux-next compilation rig?
>> Is it possible to also add a UML traget, at least for the x86_64/x86_32 sub-arch?
>>
>> Thanks
>> Boaz
>>
>>>  4 files changed, 3 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c
>>> index 5ec1756..dd2aadc 100644
>>> --- a/arch/um/drivers/slip_kern.c
>>> +++ b/arch/um/drivers/slip_kern.c
>>> @@ -30,7 +30,6 @@ static void slip_init(struct net_device *dev, void *data)
>>>  
>>>  	slip_proto_init(&spri->slip);
>>>  
>>> -	dev->init = NULL;
>>>  	dev->hard_header_len = 0;
>>>  	dev->header_ops = NULL;
>>>  	dev->addr_len = 0;
>>> diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
>>> index f15a6e7..e376284 100644
>>> --- a/arch/um/drivers/slirp_kern.c
>>> +++ b/arch/um/drivers/slirp_kern.c
>>> @@ -32,7 +32,6 @@ void slirp_init(struct net_device *dev, void *data)
>>>  
>>>  	slip_proto_init(&spri->slip);
>>>  
>>> -	dev->init = NULL;
>>>  	dev->hard_header_len = 0;
>>>  	dev->header_ops = NULL;
>>>  	dev->addr_len = 0;
>>> diff --git a/arch/um/include/asm/dma-mapping.h b/arch/um/include/asm/dma-mapping.h
>>> index 90fc708..378de4b 100644
>>> --- a/arch/um/include/asm/dma-mapping.h
>>> +++ b/arch/um/include/asm/dma-mapping.h
>>> @@ -79,14 +79,14 @@ dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
>>>  }
>>>  
>>>  static inline void
>>> -dma_sync_single(struct device *dev, dma_addr_t dma_handle, size_t size,
>>> +dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
>>>  		enum dma_data_direction direction)
>>>  {
>>>  	BUG();
>>>  }
>>>  
>>>  static inline void
>>> -dma_sync_sg(struct device *dev, struct scatterlist *sg, int nelems,
>>> +dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
>>>  	    enum dma_data_direction direction)
>>>  {
>>>  	BUG();
>>> diff --git a/arch/um/include/asm/mmu_context.h b/arch/um/include/asm/mmu_context.h
>>> index edd719e..34d8130 100644
>>> --- a/arch/um/include/asm/mmu_context.h
>>> +++ b/arch/um/include/asm/mmu_context.h
>>> @@ -35,7 +35,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
>>>  	unsigned cpu = smp_processor_id();
>>>  
>>>  	if(prev != next){
>>> -		cpumask_clear(cpu, mm_cpumask(prev));
>>> +		cpumask_clear_cpu(cpu, mm_cpumask(prev));
>>>  		cpumask_set_cpu(cpu, mm_cpumask(next));
>>>  		if(next != &init_mm)
>>>  			__switch_mm(&next->context.id);
>>>
> 

Re: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Paul Menage]

On Thu, Jun 25, 2009 at 12:57 AM, Boaz Harrosh<bharrosh@panasas.com> wrote:
>
> Paul? we did not receive any feedback from you

I split it out into two patches and sent them about an hour ago. (One
for mmu_context.h sent to Rusty and one for the other two fixes, sent
to Linus)

Paul

Re: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Boaz Harrosh]

On 06/25/2009 11:06 AM, Paul Menage wrote:
> On Thu, Jun 25, 2009 at 12:57 AM, Boaz Harrosh<bharrosh@panasas.com> wrote:
>> Paul? we did not receive any feedback from you
> 
> I split it out into two patches and sent them about an hour ago. (One
> for mmu_context.h sent to Rusty and one for the other two fixes, sent
> to Linus)
> 
> Paul

Thanks ... :-)

Boaz

Re: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Amerigo Wang]

On Wed, Jun 24, 2009 at 03:23:02PM +0300, Boaz Harrosh wrote:
>On 06/22/2009 05:46 AM, Amerigo Wang wrote:
>> On Fri, Jun 19, 2009 at 05:55:24PM -0700, Paul Menage wrote:
>>> UML: Fix some apparent bitrot
>>>
>>> - migration of net_device methods into net_device_ops
>>> - dma_sync_single() changes
>>> - cpumask_clear() -> cpumask_clear_cpu()
>>>
>>> Signed-off-by: Paul Menage <menage@google.com>
>> 
>> 
>> Looks good.
>> 
>> Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
>> 
>> 
>
>Dear Jeff, Amerigo
>
>who is pushing this patch to Linus for 2.6.31. (ASAP)
>Linus has threatened to cut -rc1 soon, and it is
>unbuildable for UML currently.

Hello, Boaz.

It is supposed to be Jeff who should take UML patches,
but since we haven't seen Jeff for a long time, Andrew
should help us to take them.

So Andrew? ping... :)

Re: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Amerigo Wang]

On Mon, Jun 22, 2009 at 08:52:26PM +1000, Stephen Rothwell wrote:
>Hi Amerigo,
>
>On Mon, 22 Jun 2009 16:57:35 +0800 Amerigo Wang <xiyou.wangcong@gmail.com> wrote:
>>
>> Stephan, could you please also do compiling tests for UML in your -next tree?
>> 
>> Thanks!
>
>I would be happy to do this, all I need is for someone to tell me how to
>do this given we have PowerPC hosts so our X86 compilers are cross
>compilers.

make ARCH=um SUBARCH=ppc? Or something similar...

Thanks.

Re: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Amerigo Wang]

On Thu, Jun 25, 2009 at 11:08:58AM +0300, Boaz Harrosh wrote:
>On 06/25/2009 11:06 AM, Paul Menage wrote:
>> On Thu, Jun 25, 2009 at 12:57 AM, Boaz Harrosh<bharrosh@panasas.com> wrote:
>>> Paul? we did not receive any feedback from you
>> 
>> I split it out into two patches and sent them about an hour ago. (One
>> for mmu_context.h sent to Rusty and one for the other two fixes, sent
>> to Linus)
>> 
>> Paul
>
>Thanks ... :-)

yeah, that is better, well done!

Thanks.

Re: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Jeff Dike]

On Thu, Jun 25, 2009 at 06:49:01PM +0800, Amerigo Wang wrote:
> make ARCH=um SUBARCH=ppc? Or something similar...

It would need to be
	make ARCH=um 
with an x86 cross-compiler.

				Jeff

Re: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Stephen Rothwell]

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

Hi Boaz,

On Thu, 25 Jun 2009 10:57:08 +0300 Boaz Harrosh <bharrosh@panasas.com> wrote:
>
> On 06/25/2009 06:59 AM, Stephen Rothwell wrote:
> > Hi all,
> > 
> > I applied the following patch to yesterday's linux-next and the i386 uml
> > defconfig build succeeded.
> 
> Stephan Hi, 
       ^
Stephen :-)

> Does this means that there will be a UML build every linux-next now?

Yes,  I will also see if the x86_64 UML will build.  I know the PPC one
won't (does anyone care?).

-- 
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: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Stephen Rothwell]

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

Hi Paul,

On Thu, 25 Jun 2009 01:06:27 -0700 Paul Menage <menage@google.com> wrote:
>
> I split it out into two patches and sent them about an hour ago. (One
> for mmu_context.h sent to Rusty and one for the other two fixes, sent
> to Linus)

Thanks for that.  I see Linus has taken his.

-- 
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: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Stephen Rothwell]

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

On Thu, 25 Jun 2009 10:51:55 -0400 Jeff Dike <jdike@addtoit.com> wrote:
>
> On Thu, Jun 25, 2009 at 06:49:01PM +0800, Amerigo Wang wrote:
> > make ARCH=um SUBARCH=ppc? Or something similar...
> 
> It would need to be
> 	make ARCH=um 
> with an x86 cross-compiler.

On out PowerPC host I am using

	make ARCH=um SUBARCH=i386 CROSS_COMPILE=<path to i386 cross compiler>

I am just building defconfig, would another config also be useful?

Currently plain "make ARCH=um" on PowerPC doesn't appear to work.
-- 
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: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Jeff Dike]

On Fri, Jun 26, 2009 at 12:01:11PM +1000, Stephen Rothwell wrote:
> On out PowerPC host I am using
> 
> 	make ARCH=um SUBARCH=i386 CROSS_COMPILE=<path to i386 cross compiler>
> 
> I am just building defconfig, would another config also be useful?

defconfig is good - that's my normal test config.

> Currently plain "make ARCH=um" on PowerPC doesn't appear to work.

No, it won't.

				Jeff

-- 
Work email - jdike at linux dot intel dot com

Re: [uml-devel] [PATCH] UML: Fix some apparent bitrot

[Stephen Rothwell]

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

Hi Jeff,

On Thu, 25 Jun 2009 22:48:02 -0400 Jeff Dike <jdike@addtoit.com> wrote:
>
> defconfig is good - that's my normal test config.
> 
> > Currently plain "make ARCH=um" on PowerPC doesn't appear to work.
> 
> No, it won't.

OK, thanks.

For reference, the result of our nightly builds (for UML) can be found
here: http://kisskb.ellerman.id.au/kisskb/compiler/26/ (we are only
building Linus' tree and linux-next).

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

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