linux-next: ttydev tree build failure

linux-next: ttydev tree build failure

[Stephen Rothwell]

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

Hi Alan,

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

drivers/usb/serial/digi_acceleport.c: In function 'digi_close':
drivers/usb/serial/digi_acceleport.c:1419: error: 'filp' undeclared (first use in this function)
drivers/usb/serial/digi_acceleport.c:1467: error: 'tty' undeclared (first use in this function)

Caused by commit 97c58244361d981d22b3eca818c9a30d4f6fde2e
("tty-usb-use-port").

I have used the ttydev tree from next-20090417.
-- 
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: ttydev tree build failure

[Stephen Rothwell]

Hi Alan,

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

drivers/serial/pmac_zilog.c: In function 'pmz_suspend':
drivers/serial/pmac_zilog.c:1648: error: 'struct uart_state' has no member named 'mutex'
drivers/serial/pmac_zilog.c:1679: error: 'struct uart_state' has no member named 'mutex'
drivers/serial/pmac_zilog.c: In function 'pmz_resume':
drivers/serial/pmac_zilog.c:1708: error: 'struct uart_state' has no member named 'mutex'
drivers/serial/pmac_zilog.c:1740: error: 'struct uart_state' has no member named 'mutex'

Caused by commit d7b52714eee196caeb4195ae1a7aa8bf82bffda5
("serial-move-mutex") from the ttydev tree.

I applied the following patch for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 24 Jul 2009 15:48:36 +1000
Subject: [PATCH] serial: fix pmac_zilog fallout from uart_state mutex move

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

diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 6495d01..0700cd1 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -1645,7 +1645,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
 	state = pmz_uart_reg.state + uap->port.line;
 
 	mutex_lock(&pmz_irq_mutex);
-	mutex_lock(&state->mutex);
+	mutex_lock(&state->port.mutex);
 
 	spin_lock_irqsave(&uap->port.lock, flags);
 
@@ -1676,7 +1676,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
 	/* Shut the chip down */
 	pmz_set_scc_power(uap, 0);
 
-	mutex_unlock(&state->mutex);
+	mutex_unlock(&state->port.mutex);
 	mutex_unlock(&pmz_irq_mutex);
 
 	pmz_debug("suspend, switching complete\n");
@@ -1705,7 +1705,7 @@ static int pmz_resume(struct macio_dev *mdev)
 	state = pmz_uart_reg.state + uap->port.line;
 
 	mutex_lock(&pmz_irq_mutex);
-	mutex_lock(&state->mutex);
+	mutex_lock(&state->port.mutex);
 
 	spin_lock_irqsave(&uap->port.lock, flags);
 	if (!ZS_IS_OPEN(uap) && !ZS_IS_CONS(uap)) {
@@ -1737,7 +1737,7 @@ static int pmz_resume(struct macio_dev *mdev)
 	}
 
  bail:
-	mutex_unlock(&state->mutex);
+	mutex_unlock(&state->port.mutex);
 	mutex_unlock(&pmz_irq_mutex);
 
 	/* Right now, we deal with delay by blocking here, I'll be
-- 
1.6.3.3

linux-next: ttydev tree build failure

[Stephen Rothwell]

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

Hi Alan,

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

drivers/serial/icom.c: In function 'check_modem_status':
drivers/serial/icom.c:697: error: 'struct uart_state' has no member named 'delta_msr_wait'

Caused by commit d663043b15626a1917587386da503e7943e434f6
("serial-kill-info").

So again I have used the ttydev tree from next-20090713.  Not having much
luck :-(
-- 
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: ttydev tree build failure

[Stephen Rothwell]

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

Hi Alan,

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

In file included from drivers/serial/8250.c:37:
include/linux/serial_core.h: In function 'uart_handle_sysrq_char':
include/linux/serial_core.h:445: error: 'struct uart_port' has no member named 'info'

I have used the version of the ttydev tree from next-20090713 (the last
error free one).

-- 
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: ttydev tree build failure

[Stephen Rothwell]

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

Hi Alan,

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

drivers/serial/serial_core.c: In function 'uart_close':
drivers/serial/serial_core.c:1341: error: 'struct tty_port' has no member named 'cons'
drivers/serial/serial_core.c:1341: error: 'struct tty_port' has no member named 'cons'
drivers/serial/serial_core.c:1341: error: 'struct tty_port' has no member named 'line'

Caused by commit 85325e93e9473dd779e8378c1365f9d8a11f9b9e
("serial-port-portptr").

I have used the version of the ttydev tree from next-20090713 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: ttydev tree build failure

[Stephen Rothwell]

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

Hi Alan,

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

ERROR: "pm_set_vt_switch" [drivers/video/geode/lxfb.ko] undefined!
ERROR: "pm_set_vt_switch" [drivers/video/geode/gxfb.ko] undefined!

Caused by commit 2da31885ce1c33ac1bed80857ad5c9de2b95a189
("vt-pm-extract") which renamed pm_set_vt_switch to pm_vt_set_switch.

I have used the version of the ttydev tree from next-20090703 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: ttydev tree build failure

[Alan Cox]

On Mon, 24 Nov 2008 16:13:14 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> I have dropped the ttydev tree for today due to unresolved build issues on
> m68k caused by a bad conversion of drivers/char/vme_scc.c in

I've not gone a viable m68k build tree or time to work on what is
basically a dead port. I will change policy to fit linux-next. That is
old obscure serial ports will not be updated but marked as broken and
then deleted if nobody is willing to maintain them.

Alan

linux-next: ttydev tree build failure

[Stephen Rothwell]

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

Hi Alan,

I have dropped the ttydev tree for today due to unresolved build issues on
m68k caused by a bad conversion of drivers/char/vme_scc.c in
tty-port-extract-cd causing these errors:

drivers/char/vme_scc.c:634: error: syntax error before 'volatile'
drivers/char/vme_scc.c:634: error: '__mptr' undeclared (first use in this function)
drivers/char/vme_scc.c:634: error: (Each undeclared identifier is reported only once
drivers/char/vme_scc.c:634: error: for each function it appears in.)
drivers/char/vme_scc.c:634: error: syntax error before ')' token
drivers/char/vme_scc.c:635: error: 'port' undeclared here (not in a function)
drivers/char/vme_scc.c:637: error: syntax error before 'return'

-- 
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: ttydev tree build failure

[Stephen Rothwell]

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

Hi Alan, Hendrik,

On Thu, 23 Oct 2008 08:34:06 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> On Thu, 23 Oct 2008 17:29:38 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi Alan,
> > 
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> > 
> > drivers/char/hvc_console.c: In function 'hvc_set_winsz':
> > drivers/char/hvc_console.c:532: warning: passing argument 2 of 'tty_do_resize' from incompatible pointer type
> > drivers/char/hvc_console.c:532: error: too many arguments to function 'tty_do_resize'
> > 
> > Caused by commit eb6ab2d361a49470ca9785c70482772c19e49bec
> > ("pty-simplify-resize") from the ttydev tree interacting with commit
> > febde3711992a64ea83a47a719f68a90c4b0927a ("hvc_console: Add support for
> > tty window resizing").
> > 
> > The former added another call to the function that the latter changed.
> > 
> > I applied the following patch
> 
> Patch is correct.
> 
> Do the hvc patches have dependancies on the PPC tree as well as the tty
> tree ?

The powerpc patches including these hvc_console patches have now gone
upstream to Linus' 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: ttydev tree build failure

[Hendrik Brueckner]

On Thu, Oct 23, 2008 at 05:29:38PM +1100, Stephen Rothwell wrote:
> drivers/char/hvc_console.c: In function 'hvc_set_winsz':
> drivers/char/hvc_console.c:532: warning: passing argument 2 of 'tty_do_resize' from incompatible pointer type
> drivers/char/hvc_console.c:532: error: too many arguments to function 'tty_do_resize'
> 
> Caused by commit eb6ab2d361a49470ca9785c70482772c19e49bec
> ("pty-simplify-resize") from the ttydev tree interacting with commit
> febde3711992a64ea83a47a719f68a90c4b0927a ("hvc_console: Add support for
> tty window resizing").
> 
> The former added another call to the function that the latter changed.
In linux-next, the pty-simplify-resize patch has changed the
tty_do_resize() signature; and therefore the hvc patch did not compile.

> I applied the following patch.
The patch is correct.
Thanks.

Acked-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>

-- 
Regards
Hendrik

IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Martin Jetter
Geschaeftsfuehrung: Erich Baier
Sitz der Gesellschaft: Boeblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294

Re: linux-next: ttydev tree build failure

[Benjamin Herrenschmidt]

On Thu, 2008-10-23 at 08:34 +0100, Alan Cox wrote:
> 
> Patch is correct.
> 
> Do the hvc patches have dependancies on the PPC tree as well as the
> tty tree ?

Note that I have a serie of 5 hvc patches in the ppc tree...

Ben.

Re: linux-next: ttydev tree build failure

[Alan Cox]

On Thu, 23 Oct 2008 17:29:38 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> drivers/char/hvc_console.c: In function 'hvc_set_winsz':
> drivers/char/hvc_console.c:532: warning: passing argument 2 of 'tty_do_resize' from incompatible pointer type
> drivers/char/hvc_console.c:532: error: too many arguments to function 'tty_do_resize'
> 
> Caused by commit eb6ab2d361a49470ca9785c70482772c19e49bec
> ("pty-simplify-resize") from the ttydev tree interacting with commit
> febde3711992a64ea83a47a719f68a90c4b0927a ("hvc_console: Add support for
> tty window resizing").
> 
> The former added another call to the function that the latter changed.
> 
> I applied the following patch

Patch is correct.

Do the hvc patches have dependancies on the PPC tree as well as the tty
tree ?

linux-next: ttydev tree build failure

[Stephen Rothwell]

Hi Alan,

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

drivers/char/hvc_console.c: In function 'hvc_set_winsz':
drivers/char/hvc_console.c:532: warning: passing argument 2 of 'tty_do_resize' from incompatible pointer type
drivers/char/hvc_console.c:532: error: too many arguments to function 'tty_do_resize'

Caused by commit eb6ab2d361a49470ca9785c70482772c19e49bec
("pty-simplify-resize") from the ttydev tree interacting with commit
febde3711992a64ea83a47a719f68a90c4b0927a ("hvc_console: Add support for
tty window resizing").

The former added another call to the function that the latter changed.

I applied the following patch.
-- 
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 17:26:51 +1100
Subject: [PATCH] hvc_console: fallout from tty_do_resize change

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

diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 5b819b1..65f88ef 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -529,7 +529,7 @@ static void hvc_set_winsz(struct work_struct *work)
 	tty = tty_kref_get(hp->tty);
 	spin_unlock_irqrestore(&hp->lock, hvc_flags);
 
-	tty_do_resize(tty, tty, &ws);
+	tty_do_resize(tty, &ws);
 	tty_kref_put(tty);
 }
 
-- 
1.5.6.5

Re: linux-next: ttydev tree build failure

[Alan Cox]

On Mon, 20 Oct 2008 14:48:41 -0700
"Lee Howard" <lee.howard@mainpine.com> wrote:

> Do I need to rewrite the patches that I submitted?  I made them against
> 2.6.26 and I built with the patches many times, and I run systems with it,

The OXSEMI vendor ID is around somewhere and it built in my tree. Will
take a look in the next day or two see what has happened.

RE: linux-next: ttydev tree build failure

[Lee Howard]

Do I need to rewrite the patches that I submitted?  I made them against
2.6.26 and I built with the patches many times, and I run systems with it,
too.

Thanks,

Lee. 


Lee Howard
Mainpine, Inc. Software Development Lead
Tel: +1 866 363 6680 ext 805 | Fax: +1 360 462 8160
lee.howard@mainpine.com | www.mainpine.com

-----Original Message-----
From: Stephen Rothwell [mailto:sfr@canb.auug.org.au] 
Sent: Monday, October 20, 2008 1:06 AM
To: Alan Cox
Cc: linux-next@vger.kernel.org; Lee Howard
Subject: linux-next: ttydev tree build failure

Hi Alan,

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

drivers/serial/8250_pci.c: In function 'pci_oxsemi_tornado_init':
drivers/serial/8250_pci.c:1869: error: 'PCI_VENDOR_OXSEMI' undeclared (first
use in this function)
drivers/serial/8250_pci.c: In function 'pciserial_init_ports':
drivers/serial/8250_pci.c:1903: error: expected ')' before
'pci_oxsemi_tornado_init'
drivers/serial/8250_pci.c:1969: error: expected expression before '}' token

Caused by commit fd13cafdcc95c68e9ea3af4ea1d629abeac55638
("8250-oxsemi-mainpine") which was clearly never even built!  :-(

I reverted it (I shouldn't have to fix simple typos).
--
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

linux-next: ttydev tree build failure

[Stephen Rothwell]

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

Hi Alan,

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

drivers/serial/8250_pci.c: In function 'pci_oxsemi_tornado_init':
drivers/serial/8250_pci.c:1869: error: 'PCI_VENDOR_OXSEMI' undeclared (first use in this function)
drivers/serial/8250_pci.c: In function 'pciserial_init_ports':
drivers/serial/8250_pci.c:1903: error: expected ')' before 'pci_oxsemi_tornado_init'
drivers/serial/8250_pci.c:1969: error: expected expression before '}' token

Caused by commit fd13cafdcc95c68e9ea3af4ea1d629abeac55638
("8250-oxsemi-mainpine") which was clearly never even built!  :-(

I reverted it (I shouldn't have to fix simple typos).
-- 
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: ttydev tree build failure

[Stephen Rothwell]

Hi Alan,

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

drivers/serial/8250_pci.c: In function 'pci_oxsemi_tornado_init':
drivers/serial/8250_pci.c:1868: error: 'pdev' undeclared (first use in this function)

Caused by commit f7c0c0bf8236d456488731940e0283434bd79ff6
("8250-oxsemi").  I applied the foloowing patch.

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

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 15 Oct 2008 20:38:30 +1100
Subject: [PATCH] ttydev: fix typo in 8250-oxsemi

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

diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 4ddd66c..43c990a 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -1865,7 +1865,7 @@ static int pci_oxsemi_tornado_init(struct pci_dev *dev, struct pciserial_board *
 	unsigned long deviceID;
 	unsigned int  number_uarts;
 
-	p = pci_iomap(pdev, 0, 5);
+	p = pci_iomap(dev, 0, 5);
 	if (p == NULL)
 		return -ENOMEM;
     
@@ -1878,7 +1878,7 @@ static int pci_oxsemi_tornado_init(struct pci_dev *dev, struct pciserial_board *
 			"%d ports detected on Oxford PCI Express device\n",
 								number_uarts);
 	}
-	pci_iounmap(pdev, p);
+	pci_iounmap(dev, p);
 	return 0;
 }
 
-- 
1.5.6.5

Re: linux-next: ttydev tree build failure

[Alan Cox]

On Tue, 2 Sep 2008 17:23:22 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> /drivers/char/tty_ioctl.c: In function 'change_termios':
> drivers/isdn/capi/capi.c:1234: error: implicit declaration of function 'n_tty_ioctl'

Thanks - looks correct and I missed the ISDN code somehow

> drivers/isdn/gigaset/ser-gigaset.c: In function 'gigaset_tty_ioctl':
> drivers/isdn/gigaset/ser-gigaset.c:648: error: implicit declaration of function 'n_tty_ioctl'

Put what you like there, gigaset has been fairly busted for ages.

Alan

linux-next: ttydev tree build failure

[Stephen Rothwell]

Hi Alan,

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

/drivers/char/tty_ioctl.c: In function 'change_termios':
drivers/isdn/capi/capi.c:1234: error: implicit declaration of function 'n_tty_ioctl'
drivers/isdn/gigaset/ser-gigaset.c: In function 'gigaset_tty_ioctl':
drivers/isdn/gigaset/ser-gigaset.c:648: error: implicit declaration of function 'n_tty_ioctl'

Introduced by commit 686b5e4aea05a80e370dc931b7f4a8d03c80da54
("tty-move-canon-specials").  I added the following patch (which may not
be correct).

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

>From 90b2237399675ce920b1620426a6a231670574f3 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Sep 2008 17:21:47 +1000
Subject: [PATCH] ttydev: fallout from tty-move-canon-specials

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/isdn/capi/capi.c           |    2 +-
 drivers/isdn/gigaset/ser-gigaset.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 3b29c04..1b5bf87 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1231,7 +1231,7 @@ static int capinc_tty_ioctl(struct tty_struct *tty, struct file * file,
 	int error = 0;
 	switch (cmd) {
 	default:
-		error = n_tty_ioctl (tty, file, cmd, arg);
+		error = n_tty_ioctl_helper(tty, file, cmd, arg);
 		break;
 	}
 	return error;
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index 5e89fa1..cc4f4e4 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -645,7 +645,7 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file,
 	case TCGETS:
 	case TCGETA:
 		/* pass through to underlying serial device */
-		rc = n_tty_ioctl(tty, file, cmd, arg);
+		rc = n_tty_ioctl_helper(tty, file, cmd, arg);
 		break;
 
 	case TCFLSH:
@@ -660,7 +660,7 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file,
 			break;
 		}
 		/* flush the serial port's buffer */
-		rc = n_tty_ioctl(tty, file, cmd, arg);
+		rc = n_tty_ioctl_helper(tty, file, cmd, arg);
 		break;
 
 	case FIONREAD:
-- 
1.5.6.5

Re: linux-next: ttydev tree build failure

[Stephen Rothwell]

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

Hi Alan,

On Wed, 20 Aug 2008 09:26:36 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> Thanks - it's not quite right but it'll do the job. I'll push a corrected
> change for the case where you build without legacy BSD PTY today.

OK, thanks.

-- 
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: ttydev tree build failure

[Alan Cox]

On Wed, 20 Aug 2008 18:23:53 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Today's linux-next build (powerpc allnoconfig) failed like this:
> 
> drivers/char/pty.c:420: error: 'pty_bsd_ioctl' undeclared here (not in a function)
> 
> Caused by 5265223407c8eed1b023aca77492c631e2676f5c ("tty-fix-shutdown").
> I applied the following patch (which may not be correct).

Thanks - it's not quite right but it'll do the job. I'll push a corrected
change for the case where you build without legacy BSD PTY today.

linux-next: ttydev tree build failure

[Stephen Rothwell]

Hi Alan,

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

drivers/char/pty.c:420: error: 'pty_bsd_ioctl' undeclared here (not in a function)

Caused by 5265223407c8eed1b023aca77492c631e2676f5c ("tty-fix-shutdown").
I applied the following patch (which may not be correct).

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

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Aug 2008 18:21:53 +1000
Subject: [PATCH] ttydev: fix for tty-fix-shutdown

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

diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index fbd215b..2cae85c 100644
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -417,7 +417,7 @@ static const struct tty_operations pts_unix98_ops = {
 	.chars_in_buffer = pty_chars_in_buffer,
 	.unthrottle = pty_unthrottle,
 	.set_termios = pty_set_termios,
-	.ioctl = pty_bsd_ioctl,
+	.ioctl = pty_unix98_ioctl,
 	.shutdown = pty_shutdown
 };
 
-- 
1.5.6.3

Re: linux-next: ttydev tree build failure

[Geert Uytterhoeven]

On Wed, 23 Jul 2008, Alan Cox wrote:
> > Update all drivers when making core tty infrastructure changes?
> > Thanks!
> 
> I don't have an Amiga with that board, I don't have an obscure VME 68K
> board. The changes required at this point would be tricky to verify
> without hardware, and the upcoming changes will require significant
> changes to all the hardware drivers, which will need someone to actually
> maintain the drivers, or to drop them.

IC, testing/maintaining non-trival changes is a different situation.

But it would still be nice to announce such removals/breakings in advance,
cfr. Documentation/feature-removal-schedule.txt. At least we knew the old
NCR53C9x core was going away, taken with it all drivers depending on it...

Anyone who cares about these drivers (ser_a2232 and vme_scc, perhaps
others?)?

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: linux-next: ttydev tree build failure

[Geert Uytterhoeven]

	Hi Alan,

On Wed, 23 Jul 2008, Alan Cox wrote:
> On Wed, 23 Jul 2008 17:49:13 +0200 (CEST)
> Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> > On Wed, 23 Jul 2008, Alan Cox wrote:
> > > On Wed, 23 Jul 2008 14:39:08 +0200 (CEST)
> > > Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> > > > On Wed, 23 Jul 2008, Stephen Rothwell wrote:
> > > > > Today's linux-next build (m68k defconfig) failed like this:
> > > > > 
> > > > > drivers/char/vme_scc.c:186: error: 'struct gs_port' has no member named 'open_wait'
> > > > 
> > > > Not just in linux-next, also in mainline, while these problems have been
> > > > reported before.
> > > 
> > > And at the time I asked if anyone was using this hardware and if so would
> > > they send patches. Shall I send Linus patches to delete them or is anyone
> > > actually using this stuff ?
> > 
> > Sorry, I did not see that question.
> 
> No problem - what do you want me to do however ?

Update all drivers when making core tty infrastructure changes?
Thanks!

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: linux-next: ttydev tree build failure

[Alan Cox]

> Update all drivers when making core tty infrastructure changes?
> Thanks!

I don't have an Amiga with that board, I don't have an obscure VME 68K
board. The changes required at this point would be tricky to verify
without hardware, and the upcoming changes will require significant
changes to all the hardware drivers, which will need someone to actually
maintain the drivers, or to drop them.

I expect to drop several PC serial drivers at the same time as they also
don't appear to have any users.

Re: linux-next: ttydev tree build failure

[Geert Uytterhoeven]

	Hi Alan,

On Wed, 23 Jul 2008, Alan Cox wrote:
> On Wed, 23 Jul 2008 14:39:08 +0200 (CEST)
> Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> > On Wed, 23 Jul 2008, Stephen Rothwell wrote:
> > > Today's linux-next build (m68k defconfig) failed like this:
> > > 
> > > drivers/char/vme_scc.c:186: error: 'struct gs_port' has no member named 'open_wait'
> > 
> > Not just in linux-next, also in mainline, while these problems have been
> > reported before.
> 
> And at the time I asked if anyone was using this hardware and if so would
> they send patches. Shall I send Linus patches to delete them or is anyone
> actually using this stuff ?

Sorry, I did not see that question.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: linux-next: ttydev tree build failure

[Alan Cox]

On Wed, 23 Jul 2008 17:49:13 +0200 (CEST)
Geert Uytterhoeven <geert@linux-m68k.org> wrote:

> 	Hi Alan,
> 
> On Wed, 23 Jul 2008, Alan Cox wrote:
> > On Wed, 23 Jul 2008 14:39:08 +0200 (CEST)
> > Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> > > On Wed, 23 Jul 2008, Stephen Rothwell wrote:
> > > > Today's linux-next build (m68k defconfig) failed like this:
> > > > 
> > > > drivers/char/vme_scc.c:186: error: 'struct gs_port' has no member named 'open_wait'
> > > 
> > > Not just in linux-next, also in mainline, while these problems have been
> > > reported before.
> > 
> > And at the time I asked if anyone was using this hardware and if so would
> > they send patches. Shall I send Linus patches to delete them or is anyone
> > actually using this stuff ?
> 
> Sorry, I did not see that question.

No problem - what do you want me to do however ?

Alan

Re: linux-next: ttydev tree build failure

[Alan Cox]

On Wed, 23 Jul 2008 14:39:08 +0200 (CEST)
Geert Uytterhoeven <geert@linux-m68k.org> wrote:

> 	Hi Stephen, Alan,
> 
> On Wed, 23 Jul 2008, Stephen Rothwell wrote:
> > Today's linux-next build (m68k defconfig) failed like this:
> > 
> > drivers/char/vme_scc.c:186: error: 'struct gs_port' has no member named 'open_wait'
> 
> Not just in linux-next, also in mainline, while these problems have been
> reported before.

And at the time I asked if anyone was using this hardware and if so would
they send patches. Shall I send Linus patches to delete them or is anyone
actually using this stuff ?

Alan

Re: linux-next: ttydev tree build failure

[Geert Uytterhoeven]

	Hi Stephen, Alan,

On Wed, 23 Jul 2008, Stephen Rothwell wrote:
> Today's linux-next build (m68k defconfig) failed like this:
> 
> drivers/char/vme_scc.c:186: error: 'struct gs_port' has no member named 'open_wait'

Not just in linux-next, also in mainline, while these problems have been
reported before.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

linux-next: ttydev tree build failure

[Stephen Rothwell]

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

Hi Alan,

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

drivers/char/vme_scc.c:186: error: 'struct gs_port' has no member named 'open_wait'
drivers/char/vme_scc.c:187: error: 'struct gs_port' has no member named 'close_wait'
drivers/char/vme_scc.c:425: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:456: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:503: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:515: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:516: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:525: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:526: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:530: error: 'struct gs_port' has no member named 'flags'
drivers/char/vme_scc.c:532: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:533: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:553: error: 'struct gs_port' has no member named 'flags'
drivers/char/vme_scc.c:556: error: 'struct gs_port' has no member named 'open_wait'
drivers/char/vme_scc.c:559: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:560: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:581: error: 'struct gs_port' has no member named 'flags'
drivers/char/vme_scc.c:639: error: 'struct gs_port' has no member named 'flags'
drivers/char/vme_scc.c:640: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:640: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:655: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:655: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:662: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:681: error: 'struct gs_port' has no member named 'flags'
drivers/char/vme_scc.c:683: error: 'struct gs_port' has no member named 'flags'
drivers/char/vme_scc.c:859: error: 'struct gs_port' has no member named 'flags'
drivers/char/vme_scc.c:883: error: 'struct gs_port' has no member named 'tty'
drivers/char/vme_scc.c:884: error: 'struct gs_port' has no member named 'count'
drivers/char/vme_scc.c:887: error: 'struct gs_port' has no member named 'count'
drivers/char/vme_scc.c:890: error: 'struct gs_port' has no member named 'flags'
drivers/char/vme_scc.c:894: error: 'struct gs_port' has no member named 'count'
drivers/char/ser_a2232.c:195: error: 'struct gs_port' has no member named 'tty'
drivers/char/ser_a2232.c:229: error: 'struct gs_port' has no member named 'flags'
drivers/char/ser_a2232.c:245: error: 'struct gs_port' has no member named 'flags'
drivers/char/ser_a2232.c:279: error: 'struct gs_port' has no member named 'flags'
drivers/char/ser_a2232.c:281: error: 'struct gs_port' has no member named 'tty'
drivers/char/ser_a2232.c:281: error: 'struct gs_port' has no member named 'tty'
drivers/char/ser_a2232.c:312: error: 'struct gs_port' has no member named 'tty'
drivers/char/ser_a2232.c:312: error: 'struct gs_port' has no member named 'tty'
drivers/char/ser_a2232.c:348: error: 'struct gs_port' has no member named 'tty'
drivers/char/ser_a2232.c:385: error: 'struct gs_port' has no member named 'tty'
drivers/char/ser_a2232.c:403: error: 'struct gs_port' has no member named 'flags'
drivers/char/ser_a2232.c:405: error: 'struct gs_port' has no member named 'flags'
drivers/char/ser_a2232.c:485: error: 'struct gs_port' has no member named 'tty'
drivers/char/ser_a2232.c:486: error: 'struct gs_port' has no member named 'count'
drivers/char/ser_a2232.c:489: error: 'struct gs_port' has no member named 'count'
drivers/char/ser_a2232.c:492: error: 'struct gs_port' has no member named 'flags'
drivers/char/ser_a2232.c:496: error: 'struct gs_port' has no member named 'count'
drivers/char/ser_a2232.c:525: error: 'struct gs_port' has no member named 'flags'
drivers/char/ser_a2232.c:580: error: 'struct gs_port' has no member named 'tty'
drivers/char/ser_a2232.c:581: error: 'struct gs_port' has no member named 'tty'
drivers/char/ser_a2232.c:595: error: 'struct gs_port' has no member named 'tty'
drivers/char/ser_a2232.c:596: error: 'struct gs_port' has no member named 'tty'
drivers/char/ser_a2232.c:616: error: 'struct gs_port' has no member named 'flags'
drivers/char/ser_a2232.c:621: error: 'struct gs_port' has no member named 'open_wait'
drivers/char/ser_a2232.c:624: error: 'struct gs_port' has no member named 'tty'
drivers/char/ser_a2232.c:625: error: 'struct gs_port' has no member named 'tty'
drivers/char/ser_a2232.c:658: error: 'struct gs_port' has no member named 'open_wait'
drivers/char/ser_a2232.c:659: error: 'struct gs_port' has no member named 'close_wait'

-- 
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: ttydev tree build failure

[Aleksey Gorelov]

----- Original Message ----
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> To: Alan Cox <alan@lxorguk.ukuu.org.uk>
> Cc: linux-next@vger.kernel.org; Greg KH <greg@kroah.com>; Aleksey Gorelov <dared1st@yahoo.com>
> Sent: Friday, July 18, 2008 1:59:45 AM
> Subject: linux-next: ttydev tree build failure
> 
> Hi Alan,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> drivers/usb/serial/usb_debug.c: In function 'usb_debug_open':
> drivers/usb/serial/usb_debug.c:37: warning: passing argument 1 of 
> 'usb_serial_generic_open' from incompatible pointer type
> drivers/usb/serial/usb_debug.c:37: warning: passing argument 2 of 
> 'usb_serial_generic_open' from incompatible pointer type
> drivers/usb/serial/usb_debug.c:37: error: too few arguments to function 
> 'usb_serial_generic_open'
> drivers/usb/serial/usb_debug.c: At top level:
> drivers/usb/serial/usb_debug.c:47: warning: initialization from incompatible 
> pointer type
> 
> usb_debug_open was added in commit
> 1d051a41474c386498bc37e3ae89f7937222cfe7 ("USB: debug port converter does
> not accept more than 8 byte packets") from the usb tree.
> 
> I applied the patch below and will do so until it can be resolved.
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> From 36676f026d56652cf4d42c13651373dc6a232141 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell 
> Date: Fri, 18 Jul 2008 18:54:09 +1000
> Subject: [PATCH] usb: tty API change fallout
> 
> Signed-off-by: Stephen Rothwell 
> ---
> drivers/usb/serial/usb_debug.c |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c
> index 9ca4d4d..06a272b 100644
> --- a/drivers/usb/serial/usb_debug.c
> +++ b/drivers/usb/serial/usb_debug.c
> @@ -31,10 +31,10 @@ static struct usb_driver debug_driver = {
>     .no_dynamic_id =     1,
> };
> 
> -int usb_debug_open(struct usb_serial_port *port, struct file *filp)
> +int usb_debug_open(struct tty_struct *tty, struct usb_serial_port *port, struct 
> file *filp)
> {
>     port->bulk_out_size = USB_DEBUG_MAX_PACKET_SIZE;
> -    return usb_serial_generic_open(port, filp);
> +    return usb_serial_generic_open(tty, port, filp);
> }
> 
> static struct usb_serial_driver debug_device = {
> -- 
> 1.5.6.2

original patch was against 2.6.26 git which still has
int usb_serial_generic_open (struct usb_serial_port *port, struct file *filp)

Aleks.

linux-next: ttydev tree build failure

[Stephen Rothwell]

Hi Alan,

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

drivers/usb/serial/usb_debug.c: In function 'usb_debug_open':
drivers/usb/serial/usb_debug.c:37: warning: passing argument 1 of 'usb_serial_generic_open' from incompatible pointer type
drivers/usb/serial/usb_debug.c:37: warning: passing argument 2 of 'usb_serial_generic_open' from incompatible pointer type
drivers/usb/serial/usb_debug.c:37: error: too few arguments to function 'usb_serial_generic_open'
drivers/usb/serial/usb_debug.c: At top level:
drivers/usb/serial/usb_debug.c:47: warning: initialization from incompatible pointer type

usb_debug_open was added in commit
1d051a41474c386498bc37e3ae89f7937222cfe7 ("USB: debug port converter does
not accept more than 8 byte packets") from the usb tree.

I applied the patch below and will do so until it can be resolved.

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

>From 36676f026d56652cf4d42c13651373dc6a232141 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 18 Jul 2008 18:54:09 +1000
Subject: [PATCH] usb: tty API change fallout

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

diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c
index 9ca4d4d..06a272b 100644
--- a/drivers/usb/serial/usb_debug.c
+++ b/drivers/usb/serial/usb_debug.c
@@ -31,10 +31,10 @@ static struct usb_driver debug_driver = {
 	.no_dynamic_id = 	1,
 };
 
-int usb_debug_open(struct usb_serial_port *port, struct file *filp)
+int usb_debug_open(struct tty_struct *tty, struct usb_serial_port *port, struct file *filp)
 {
 	port->bulk_out_size = USB_DEBUG_MAX_PACKET_SIZE;
-	return usb_serial_generic_open(port, filp);
+	return usb_serial_generic_open(tty, port, filp);
 }
 
 static struct usb_serial_driver debug_device = {
-- 
1.5.6.2

Re: linux-next: ttydev tree build failure

[Alan Cox]

On Wed, 2 Jul 2008 11:10:06 -0700
Randy Dunlap <randy.dunlap@oracle.com> wrote:

> On Wed, 2 Jul 2008 15:30:11 +1000 Stephen Rothwell wrote:
> 
> > Hi Alan,
> > 
> > Today's linux-next build (sparc defconfig) failed like this:

Scratch head.. will sort that tomorrow/friday. Really we ought to just
delete stallion/istallion, they've been BROKEN_ON_SMP for years and
nobody ships them enabled

Re: linux-next: ttydev tree build failure

[Randy Dunlap]

On Wed, 2 Jul 2008 15:30:11 +1000 Stephen Rothwell wrote:

> Hi Alan,
> 
> Today's linux-next build (sparc defconfig) failed like this:


istallion (on x86_64 or i386) has several build errors:

linux-next-20080702/drivers/char/istallion.c:829: error: 'struct stliport' has no member named 'refcount'
linux-next-20080702/drivers/char/istallion.c:891: error: 'struct stliport' has no member named 'refcount'
linux-next-20080702/drivers/char/istallion.c:892: error: 'struct stliport' has no member named 'refcount'
linux-next-20080702/drivers/char/istallion.c:893: error: 'struct stliport' has no member named 'refcount'
linux-next-20080702/drivers/char/istallion.c:928: error: 'struct tty_ldisc' has no member named 'flush_buffer'
linux-next-20080702/drivers/char/istallion.c:929: error: 'struct tty_ldisc' has no member named 'flush_buffer'
linux-next-20080702/drivers/char/istallion.c:1205: error: 'struct stliport' has no member named 'refcount'
linux-next-20080702/drivers/char/istallion.c:1234: error: 'struct stliport' has no member named 'refcount'
linux-next-20080702/drivers/char/istallion.c:1663: warning: unused variable 'ival'
linux-next-20080702/drivers/char/istallion.c:1860: error: 'struct stliport' has no member named 'refcount'
linux-next-20080702/drivers/char/istallion.c:4250: error: 'struct tty_port' has no member named 'flag'
linux-next-20080702/drivers/char/istallion.c:4501: warning: initialization from incompatible pointer type
make[3]: *** [drivers/char/istallion.o] Error 1



---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/

Re: linux-next: ttydev tree build failure

[Alan Cox]

On Wed, 2 Jul 2008 15:19:16 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Today's linux-next build (sparc64 defconfig) failed like this:
> 
> drivers/serial/sunhv.c: In function `receive_chars':
> drivers/serial/sunhv.c:188: error: structure has no member named `tty'
> drivers/serial/sunsu.c: In function `receive_chars':
> drivers/serial/sunsu.c:314: error: structure has no member named `tty'
> drivers/serial/sunsab.c: In function `receive_chars':
> drivers/serial/sunsab.c:121: error: structure has no member named `tty'
> 
> I applied the following patch (which, again, may not be correct).

Indeed correct and applied (although the email patch was mangled).

Alan

Re: linux-next: ttydev tree build failure

[Alan Cox]

On Wed, 2 Jul 2008 15:08:27 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alan,
> 
> Today's linux-next build (powerpc allyesconfig) failed like this:
> 
> drivers/serial/pmac_zilog.c: In function 'pmz_receive_chars':
> drivers/serial/pmac_zilog.c:245: error: 'struct uart_info' has no member named 'tty'
> drivers/serial/pmac_zilog.c:250: error: 'struct uart_info' has no member named 'tty'
> 
> I applied the patch below (which builds but may, or may not, be correct).

Your patch is correct. Sorry about that. I need to set up a PPC cross
build clearly.

linux-next: ttydev tree build failure

[Stephen Rothwell]

Hi Alan,

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

drivers/serial/sunzilog.c: In function `sunzilog_receive_chars':
drivers/serial/sunzilog.c:332: error: structure has no member named `tty'
drivers/serial/sunzilog.c:333: error: structure has no member named `tty'

I applied the patch below ...

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

>From 0e9176265b70d21292f7566417d3310d0fe37019 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 2 Jul 2008 15:23:01 +1000
Subject: [PATCH] ttydev: sparc32 fix for tty move

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

diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 7e9fa5e..ea385ba 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -329,8 +329,8 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up,
 
 	tty = NULL;
 	if (up->port.info != NULL &&		/* Unopened serial console */
-	    up->port.info->tty != NULL)		/* Keyboard || mouse */
-		tty = up->port.info->tty;
+	    up->port.info->port.tty != NULL)		/* Keyboard || mouse */
+		tty = up->port.info->port.tty;
 
 	for (;;) {
 
-- 
1.5.6

Re: linux-next: ttydev tree build failure

[Stephen Rothwell]

[Sorry Jesper, not reaaly meant for you :-)]

On Wed, 2 Jul 2008 15:19:16 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Alan,
> 
> Today's linux-next build (sparc64 defconfig) failed like this:
> 
> drivers/serial/sunhv.c: In function `receive_chars':
> drivers/serial/sunhv.c:188: error: structure has no member named `tty'
> drivers/serial/sunsu.c: In function `receive_chars':
> drivers/serial/sunsu.c:314: error: structure has no member named `tty'
> drivers/serial/sunsab.c: In function `receive_chars':
> drivers/serial/sunsab.c:121: error: structure has no member named `tty'
> 
> I applied the following patch (which, again, may not be correct).
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 
> From 64954736b8e00870d991549f46b5d64d51de1280 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 2 Jul 2008 15:12:18 +1000
> Subject: [PATCH] ttydev: sparc fix for tty move
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/serial/sunhv.c  |    2 +-
>  drivers/serial/sunsab.c |    2 +-
>  drivers/serial/sunsu.c  |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
> index 2847336..aeeec55 100644
> --- a/drivers/serial/sunhv.c
> +++ b/drivers/serial/sunhv.c
> @@ -185,7 +185,7 @@ static struct tty_struct *receive_chars(struct uart_port *port)
>  	struct tty_struct *tty = NULL;
>  
>  	if (port->info != NULL)		/* Unopened serial console */
> -		tty = port->info->tty;
> +		tty = port->info->port.tty;
>  
>  	if (sunhv_ops->receive_chars(port, tty))
>  		sun_do_break();
> diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
> index 9ff5b38..15ee497 100644
> --- a/drivers/serial/sunsab.c
> +++ b/drivers/serial/sunsab.c
> @@ -118,7 +118,7 @@ receive_chars(struct uart_sunsab_port *up,
>  	int i;
>  
>  	if (up->port.info != NULL)		/* Unopened serial console */
> -		tty = up->port.info->tty;
> +		tty = up->port.info->port.tty;
>  
>  	/* Read number of BYTES (Character + Status) available. */
>  	if (stat->sreg.isr0 & SAB82532_ISR0_RPF) {
> diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
> index 1074e73..e24e682 100644
> --- a/drivers/serial/sunsu.c
> +++ b/drivers/serial/sunsu.c
> @@ -311,7 +311,7 @@ static void sunsu_enable_ms(struct uart_port *port)
>  static struct tty_struct *
>  receive_chars(struct uart_sunsu_port *up, unsigned char *status)
>  {
> -	struct tty_struct *tty = up->port.info->tty;
> +	struct tty_struct *tty = up->port.info->port.tty;
>  	unsigned char ch, flag;
>  	int max_count = 256;
>  	int saw_console_brk = 0;
> -- 
> 1.5.6

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

linux-next: ttydev tree build failure

[Stephen Rothwell]

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

Hi Alan,

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

drivers/serial/sunhv.c: In function `receive_chars':
drivers/serial/sunhv.c:188: error: structure has no member named `tty'
drivers/serial/sunsu.c: In function `receive_chars':
drivers/serial/sunsu.c:314: error: structure has no member named `tty'
drivers/serial/sunsab.c: In function `receive_chars':
drivers/serial/sunsab.c:121: error: structure has no member named `tty'

I applied the following patch (which, again, may not be correct).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

>From 64954736b8e00870d991549f46b5d64d51de1280 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 2 Jul 2008 15:12:18 +1000
Subject: [PATCH] ttydev: sparc fix for tty move

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/serial/sunhv.c  |    2 +-
 drivers/serial/sunsab.c |    2 +-
 drivers/serial/sunsu.c  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index 2847336..aeeec55 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -185,7 +185,7 @@ static struct tty_struct *receive_chars(struct uart_port *port)
 	struct tty_struct *tty = NULL;
 
 	if (port->info != NULL)		/* Unopened serial console */
-		tty = port->info->tty;
+		tty = port->info->port.tty;
 
 	if (sunhv_ops->receive_chars(port, tty))
 		sun_do_break();
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index 9ff5b38..15ee497 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -118,7 +118,7 @@ receive_chars(struct uart_sunsab_port *up,
 	int i;
 
 	if (up->port.info != NULL)		/* Unopened serial console */
-		tty = up->port.info->tty;
+		tty = up->port.info->port.tty;
 
 	/* Read number of BYTES (Character + Status) available. */
 	if (stat->sreg.isr0 & SAB82532_ISR0_RPF) {
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 1074e73..e24e682 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -311,7 +311,7 @@ static void sunsu_enable_ms(struct uart_port *port)
 static struct tty_struct *
 receive_chars(struct uart_sunsu_port *up, unsigned char *status)
 {
-	struct tty_struct *tty = up->port.info->tty;
+	struct tty_struct *tty = up->port.info->port.tty;
 	unsigned char ch, flag;
 	int max_count = 256;
 	int saw_console_brk = 0;
-- 
1.5.6


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

linux-next: ttydev tree build failure

[Stephen Rothwell]

Hi Alan,

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

drivers/serial/pmac_zilog.c: In function 'pmz_receive_chars':
drivers/serial/pmac_zilog.c:245: error: 'struct uart_info' has no member named 'tty'
drivers/serial/pmac_zilog.c:250: error: 'struct uart_info' has no member named 'tty'

I applied the patch below (which builds but may, or may not, be correct).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

>From 31719942fd3a5caf6522261790c36b7ffa0e907c Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 2 Jul 2008 15:01:31 +1000
Subject: [PATCH] ttydev: fix pamc_zilog for tty pointer move

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

diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 794bd0f..317b061 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -242,12 +242,12 @@ static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap)
 	}
 
 	/* Sanity check, make sure the old bug is no longer happening */
-	if (uap->port.info == NULL || uap->port.info->tty == NULL) {
+	if (uap->port.info == NULL || uap->port.info->port.tty == NULL) {
 		WARN_ON(1);
 		(void)read_zsdata(uap);
 		return NULL;
 	}
-	tty = uap->port.info->tty;
+	tty = uap->port.info->port.tty;
 
 	while (1) {
 		error = 0;
-- 
1.5.6

Re: linux-next: ttydev tree build failure

[Alan Cox]

> One downsides of the way linux-next works is that, because it is
> recreated every day, you cannot really base anything on it that is to be
> merged into it.
> 
> I really need to think about this when I am awake :-(

As its a patch series not  git tree I don't think this is actually the
problem it would be with git.

Producing a 'fits on top of firmware' merge doesn't mean losing anything
as its just another patch set (and at the very least its a reference for
you to do the exact same merge work yourself if you have both). It might
for the moment anchor the tty dev work to follow the firmware work but I
can live with that for now.

Alan

Re: linux-next: ttydev tree build failure

[Greg KH]

On Wed, Jul 02, 2008 at 12:51:34AM +1000, Stephen Rothwell wrote:
> Hi Alan,
> 
> On Tue, 1 Jul 2008 15:23:02 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> >
> > > It could easily (probably) have been the merge.
> > > 
> > > I have reverted the ttydev tree for now.  I am not sure quite where we go
> > > from here.
> > 
> > Well I expected there would be a few explosions from merging a large new
> > tree in. No problem. As soon as the new tree is done and out I will
> > regenerate the patch set versus that which should iron out all the
> > firmware clashes and the like.
> 
> One downsides of the way linux-next works is that, because it is
> recreated every day, you cannot really base anything on it that is to be
> merged into it.
> 
> I really need to think about this when I am awake :-(

As there were a lot of merge issues with my tree, I don't mind putting
this in my queue if needed.

I had started to merge it in, and handled lots of these merge issues in
my tree pretty easily, so if needed, I can put it all back in there to
help with this problem.

thanks,

greg k-h

Re: linux-next: ttydev tree build failure

[Stephen Rothwell]

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

Hi Alan,

On Tue, 1 Jul 2008 15:23:02 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> > It could easily (probably) have been the merge.
> > 
> > I have reverted the ttydev tree for now.  I am not sure quite where we go
> > from here.
> 
> Well I expected there would be a few explosions from merging a large new
> tree in. No problem. As soon as the new tree is done and out I will
> regenerate the patch set versus that which should iron out all the
> firmware clashes and the like.

One downsides of the way linux-next works is that, because it is
recreated every day, you cannot really base anything on it that is to be
merged into it.

I really need to think about this when I am awake :-(
-- 
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: ttydev tree build failure

[Alan Cox]

> It could easily (probably) have been the merge.
> 
> I have reverted the ttydev tree for now.  I am not sure quite where we go
> from here.

Well I expected there would be a few explosions from merging a large new
tree in. No problem. As soon as the new tree is done and out I will
regenerate the patch set versus that which should iron out all the
firmware clashes and the like.

Thanks
Alan

linux-next: ttydev tree build failure

[Stephen Rothwell]

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

Hi Alan,

After all the merging, today's linux-next build (powerpc ppc64_defconfig)
failed like this:

make[3]: *** No rule to make target `drivers/char/tty_ldisc.o', needed by `drivers/char/built-in.o'.  Stop.
drivers/serial/serial_txx9.c: In function 'receive_chars':
drivers/serial/serial_txx9.c:275: error: 'struct uart_info' has no member named 'tty'
drivers/serial/icom.c: In function 'recv_interrupt':
drivers/serial/icom.c:733: error: 'struct uart_info' has no member named 'tty'

It could easily (probably) have been the merge.

I have reverted the ttydev tree for now.  I am not sure quite where we go
from here.

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

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