Skip to contentSkip to conversation

staging/sb105x: remove asm/segment.h dependency

PATCH In review Jeff Mahoney 3 participants 4 messages Jan 7, 2013 – Jan 8, 2013 Staging

lore
Share & tools
lore

Jeff Mahoney

author
#0 lore raw

PATCH 1/1 staging/sb105x: remove asm/segment.h dependency

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 <[email protected]>
Signed-off-by Jeff Mahoney <[email protected]>

---

 drivers/staging/sb105x/sb_pci_mp.h |    1 -
 1 file changed, 1 deletion(-)
drivers/staging/sb105x/sb_pci_mp.h +0 -1
@@ -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>
Signature · 2 lines
Jeff Mahoney
SUSE Labs
#1 lore raw

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

Quoted 26 lines · 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 <[email protected]>
Signed-off-by Jeff Mahoney <[email protected]>

---

 drivers/staging/sb105x/sb_pci_mp.h |    1 -
 1 file changed, 1 deletion(-)
drivers/staging/sb105x/sb_pci_mp.h +0 -1
@@ -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>
author
#2 lore raw
Quoted 9 lines · 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.

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

drivers/staging/sb105x/sb_pci_mp.c +2 -1
@@ -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

Quoted 40 lines

Thanks,

-- Steve

Quoted 19 lines · 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 <[email protected]>
Signed-off-by Jeff Mahoney <[email protected]>

---

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

drivers/staging/sb105x/sb_pci_mp.h line 24

Quoted 7 lines
drivers/staging/sb105x/sb_pci_mp.h +0 -1
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Signature · 2 lines
Jeff Mahoney
SUSE Labs
maintainer
#3 lore raw
In reply to Jeff Mahoney
Quoted 7 lines · 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.

Quoted 6 lines
CC Steven Rostedt <[email protected]>
Signed-off-by Jeff Mahoney <[email protected]>

---

 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