UML: Fix some apparent bitrot
PATCH 1/1 UML: Fix some apparent bitrot
UML: Fix some apparent bitrot
- migration of net_device methods into net_device_ops
- dma_sync_single() changes
- cpumask_clear() -> cpumask_clear_cpu()
--
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 castarch/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(-)
arch/um/drivers/slip_kern.c +0 -1
@@ -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 ;
arch/um/drivers/slirp_kern.c +0 -1
@@ -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 ;
arch/um/include/asm/dma-mapping.h +2 -2
@@ -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 ();
arch/um/include/asm/mmu_context.h +1 -1
@@ -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);
Quoted 7 lines · Paul Menage
UML: Fix some apparent bitrot
- migration of
net_devicemethods intonet_device_ops
-dma_sync_single()changes
-cpumask_clear()->cpumask_clear_cpu()Signed-off-by Paul Menage <[email protected]>
Looks good.
Quoted 97 lines
--
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 hereinclude/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 hereinclude/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: 'structnet_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 castarch/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(-)arch/um/drivers/slip_kern.c +0
-1@@ -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 ;arch/um/drivers/slirp_kern.c +0
-1@@ -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 ;arch/um/include/asm/dma-mapping.h +0
-0@@ -79,14 +79,14 @@ dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries, }static inline void
arch/um/include/asm/dma-mapping.h +1
-1-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_directiondirection){ BUG(); }static inline void
arch/um/include/asm/dma-mapping.h +1
-1-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_directiondirection){ BUG();arch/um/include/asm/mmu_context.h +1
-2@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Quoted 7 lines · Amerigo Wang
Quoted 6 lines · Paul Menage
UML: Fix some apparent bitrot
- migration of
net_devicemethods intonet_device_ops
-dma_sync_single()changes
-cpumask_clear()->cpumask_clear_cpu()
Quoted 8 lines
Quoted 1 line
Signed-off-by Paul Menage <[email protected]>Looks good.
Acked-by WANG Cong <[email protected]>
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
Quoted 17 lines · Boaz Harrosh
Quoted 7 lines · Amerigo Wang
Quoted 6 lines · Paul Menage
UML: Fix some apparent bitrot
- migration of
net_devicemethods intonet_device_ops
-dma_sync_single()changes
-cpumask_clear()->cpumask_clear_cpu()Quoted 8 lines
Quoted 1 line
Signed-off-by Paul Menage <[email protected]>Looks good.
Acked-by WANG Cong <[email protected]>
Quoted 5 lines
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... :)
Quoted 27 lines · Paul Menage
UML: Fix some apparent bitrot
- migration of
net_devicemethods intonet_device_ops
-dma_sync_single()changes
-cpumask_clear()->cpumask_clear_cpu()Signed-off-by Paul Menage <[email protected]>--
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 hereinclude/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 hereinclude/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: 'structnet_device' has no member named 'init'
Quoted 6 lines
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 castarch/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
Quoted 67 lines
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(-)arch/um/drivers/slip_kern.c +0
-1@@ -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 ;arch/um/drivers/slirp_kern.c +0
-1@@ -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 ;arch/um/include/asm/dma-mapping.h +2
-2@@ -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 ();arch/um/include/asm/mmu_context.h +1
-1@@ -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);
Quoted 8 lines · Boaz Harrosh
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!
Hi Amerigo,
Quoted 4 lines · On Mon, 22 Jun 2009 16:57:35 +0800 Amerigo Wang <[email protected]>…
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.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Quoted 10 lines · Stephen Rothwell
Hi Amerigo,
Quoted 3 lines · On Mon, 22 Jun 2009 16:57:35 +0800 Amerigo Wang <[email protected]>…
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
Quoted 11 lines · Stephen Rothwell
Hi Amerigo,
Quoted 4 lines · On Mon, 22 Jun 2009 16:57:35 +0800 Amerigo Wang <[email protected]>…
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.
------------------------------------------------------------------------------
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Quoted 1 line · Amerigo Wang
make ARCH=um SUBARCH=ppc? Or something similar...
It would need to be
make ARCH=um
with an x86 cross-compiler.
Jeff
------------------------------------------------------------------------------
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Quoted 7 lines · On Thu, 25 Jun 2009 10:51:55 -0400 Jeff Dike <[email protected]> wrote:
Quoted 1 line · Amerigo Wang
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.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Quoted 5 lines · Stephen Rothwell
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.
Quoted 1 line
Currently plain "make ARCH=um" on PowerPC doesn't appear to work.
No, it won't.
Jeff
Signature · 7 lines
Work email - jdike at linux dot intel dot com ------------------------------------------------------------------------------ _______________________________________________ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Hi Jeff,
Quoted 6 lines · On Thu, 25 Jun 2009 22:48:02 -0400 Jeff Dike <[email protected]> wrote:
defconfig is good - that's my normal test config.
Quoted 1 line
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).
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
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.
Quoted 113 lines · On Mon, 22 Jun 2009 11:43:52 +0300 Boaz Harrosh <[email protected]> wrote:
Quoted 27 lines · Paul Menage
UML: Fix some apparent bitrot
- migration of
net_devicemethods intonet_device_ops
-dma_sync_single()changes
-cpumask_clear()->cpumask_clear_cpu()Signed-off-by Paul Menage <[email protected]>--
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 hereinclude/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 hereinclude/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: 'structnet_device' has no member named 'init'Quoted 6 lines
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 castarch/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
BoazQuoted 66 lines
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(-)arch/um/drivers/slip_kern.c +0
-1@@ -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 ;arch/um/drivers/slirp_kern.c +0
-1@@ -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 ;arch/um/include/asm/dma-mapping.h +2
-2@@ -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 ();arch/um/include/asm/mmu_context.h +1
-1@@ -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);
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Quoted 4 lines · Stephen Rothwell
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?
Quoted 9 lines
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.harch/um/include/asm/mmu_context.h
[Second patch through Rusty's tree]arch/um/drivers/slip_kern.carch/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.
Quoted 108 lines · On Mon, 22 Jun 2009 11:43:52 +0300 Boaz Harrosh <[email protected]> wrote:
Quoted 106 lines · Paul Menage
Quoted 27 lines
UML: Fix some apparent bitrot
- migration of
net_devicemethods intonet_device_ops
-dma_sync_single()changes
-cpumask_clear()->cpumask_clear_cpu()Signed-off-by Paul Menage <[email protected]>--
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 hereinclude/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 hereinclude/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: 'structnet_device' has no member named 'init'Quoted 6 lines
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 castarch/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
BoazQuoted 61 lines
4 files changed, 3 insertions(+), 5 deletions(-)arch/um/drivers/slip_kern.c +0
-1@@ -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 ;arch/um/drivers/slirp_kern.c +0
-1@@ -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 ;arch/um/include/asm/dma-mapping.h +2
-2@@ -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 ();arch/um/include/asm/mmu_context.h +1
-1@@ -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);
Quoted 2 lines · Boaz Harrosh
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
Quoted 8 lines · Paul Menage
Quoted 1 line · Boaz Harrosh
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.hsent to Rusty and one for the other two fixes, sent to Linus)Paul
Thanks ... :-)
Boaz
------------------------------------------------------------------------------
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Quoted 11 lines · Boaz Harrosh
Quoted 8 lines · Paul Menage
Quoted 1 line · Boaz Harrosh
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.hsent to Rusty and one for the other two fixes, sent to Linus)Paul
Thanks ... :-)
yeah, that is better, well done!
Thanks.
Hi Paul,
Quoted 4 lines · On Thu, 25 Jun 2009 01:06:27 -0700 Paul Menage <[email protected]> wrote:
I split it out into two patches and sent them about an hour ago. (One for
mmu_context.hsent to Rusty and one for the other two fixes, sent to Linus)
Thanks for that. I see Linus has taken his.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Hi Boaz,
Quoted 8 lines · On Thu, 25 Jun 2009 10:57:08 +0300 Boaz Harrosh <[email protected]> wrote:
Quoted 4 lines · Stephen Rothwell
Hi all,
I applied the following patch to yesterday's linux-next and the i386 uml defconfig build succeeded.
Stephan Hi,
^
Stephen :-)
Quoted 1 line
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?).
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/