[PATCH] staging/sb105x: remove asm/segment.h dependency

[PATCH] staging/sb105x: remove asm/segment.h dependency

[Jeff Mahoney]

sb105x doesn't seem to actually need <asm/segment.h> (builds on x86
without it) and ppc/ppc64 doesn't provide it so it fails to build there.

This patch removes the dependency. Unfortunately, it now fails to build
because STD_COM_FLAGS isn't defined on most architectures. I'm not familiar
enough with the tty/serial system to patch that aspect of it.

CC: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---

 drivers/staging/sb105x/sb_pci_mp.h |    1 -
 1 file changed, 1 deletion(-)

--- a/drivers/staging/sb105x/sb_pci_mp.h
+++ b/drivers/staging/sb105x/sb_pci_mp.h
@@ -19,7 +19,6 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/segment.h>
 #include <asm/serial.h>
 #include <linux/interrupt.h>
 


-- 
Jeff Mahoney
SUSE Labs

Re: [PATCH] staging/sb105x: remove asm/segment.h dependency

[Steven Rostedt]

This patch is obsoleted by:

https://lkml.org/lkml/2012/12/13/710

Which I just got the automated reply, and it's in Greg's staging tree
now.

When I get time, I do want to try to get this driver (and device)
working on my ppc64 box.

Thanks,

-- Steve


On Mon, 2013-01-07 at 17:20 -0500, Jeff Mahoney wrote:
> sb105x doesn't seem to actually need <asm/segment.h> (builds on x86
> without it) and ppc/ppc64 doesn't provide it so it fails to build there.
> 
> This patch removes the dependency. Unfortunately, it now fails to build
> because STD_COM_FLAGS isn't defined on most architectures. I'm not familiar
> enough with the tty/serial system to patch that aspect of it.
> 
> CC: Steven Rostedt <rostedt@goodmis.org>
> Signed-off-by: Jeff Mahoney <jeffm@suse.com>
> ---
> 
>  drivers/staging/sb105x/sb_pci_mp.h |    1 -
>  1 file changed, 1 deletion(-)
> 
> --- a/drivers/staging/sb105x/sb_pci_mp.h
> +++ b/drivers/staging/sb105x/sb_pci_mp.h
> @@ -19,7 +19,6 @@
>  #include <asm/uaccess.h>
>  #include <asm/io.h>
>  #include <asm/irq.h>
> -#include <asm/segment.h>
>  #include <asm/serial.h>
>  #include <linux/interrupt.h>
>  
> 
> 

Re: [PATCH] staging/sb105x: remove asm/segment.h dependency

[Jeff Mahoney]

On 1/7/13 5:36 PM, Steven Rostedt wrote:
> This patch is obsoleted by:
> 
> https://lkml.org/lkml/2012/12/13/710
> 
> Which I just got the automated reply, and it's in Greg's staging tree
> now.
> 
> When I get time, I do want to try to get this driver (and device)
> working on my ppc64 box.

Ok, this blob (predictably) works to build on my ppc64 box.

--- a/drivers/staging/sb105x/sb_pci_mp.c
+++ b/drivers/staging/sb105x/sb_pci_mp.c
@@ -2836,7 +2836,8 @@ static void __init multi_init_ports(void
                                osc = 0;
                        for(j=0;j<osc;j++)
                                mtpt->port.uartclk *= 2;
-                       mtpt->port.flags    |= STD_COM_FLAGS | UPF_SHARE_IRQ ;
+                       mtpt->port.flags    |= UPF_BOOT_AUTOCONF|UPF_SKIP_TEST;
+                       mtpt->port.flags    |= UPF_SHARE_IRQ;
                        mtpt->port.iotype   = UPIO_PORT;
                        mtpt->port.ops      = &multi_pops;

-Jeff

> Thanks,
> 
> -- Steve
> 
> 
> On Mon, 2013-01-07 at 17:20 -0500, Jeff Mahoney wrote:
>> sb105x doesn't seem to actually need <asm/segment.h> (builds on x86
>> without it) and ppc/ppc64 doesn't provide it so it fails to build there.
>>
>> This patch removes the dependency. Unfortunately, it now fails to build
>> because STD_COM_FLAGS isn't defined on most architectures. I'm not familiar
>> enough with the tty/serial system to patch that aspect of it.
>>
>> CC: Steven Rostedt <rostedt@goodmis.org>
>> Signed-off-by: Jeff Mahoney <jeffm@suse.com>
>> ---
>>
>>  drivers/staging/sb105x/sb_pci_mp.h |    1 -
>>  1 file changed, 1 deletion(-)
>>
>> --- a/drivers/staging/sb105x/sb_pci_mp.h
>> +++ b/drivers/staging/sb105x/sb_pci_mp.h
>> @@ -19,7 +19,6 @@
>>  #include <asm/uaccess.h>
>>  #include <asm/io.h>
>>  #include <asm/irq.h>
>> -#include <asm/segment.h>
>>  #include <asm/serial.h>
>>  #include <linux/interrupt.h>
>>  
>>
>>
> 
> 
> --
> 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/
> 


-- 
Jeff Mahoney
SUSE Labs

Re: [PATCH] staging/sb105x: remove asm/segment.h dependency

[Greg Kroah-Hartman]

On Mon, Jan 07, 2013 at 05:20:43PM -0500, Jeff Mahoney wrote:
> sb105x doesn't seem to actually need <asm/segment.h> (builds on x86
> without it) and ppc/ppc64 doesn't provide it so it fails to build there.
> 
> This patch removes the dependency. Unfortunately, it now fails to build
> because STD_COM_FLAGS isn't defined on most architectures. I'm not familiar
> enough with the tty/serial system to patch that aspect of it.
> 
> CC: Steven Rostedt <rostedt@goodmis.org>
> Signed-off-by: Jeff Mahoney <jeffm@suse.com>
> ---
> 
>  drivers/staging/sb105x/sb_pci_mp.h |    1 -
>  1 file changed, 1 deletion(-)

I just committed a patch from Steven that keeps this driver from
building at all on non-x86 platforms, and it should show up in Linus's
next release.  That should solve the build issue for you, so I'll hold
off on applying this one, and let Steven fix it properly.

thanks,

greg k-h