Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 207942
b: refs/heads/master
c: 96e077a
h: refs/heads/master
v: v3
  • Loading branch information
Alan Stern authored and Greg Kroah-Hartman committed Aug 10, 2010
1 parent d3fb6a2 commit 80097be
Show file tree
Hide file tree
Showing 149 changed files with 906 additions and 6,198 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fc385c313275b114bc6ad36e60c5177d63250548
refs/heads/master: 96e077ae347912dfce0e93f5958efc3ed6f311f4
3 changes: 0 additions & 3 deletions trunk/Documentation/kernel-parameters.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -681,11 +681,8 @@ and is between 256 and 4096 characters. It is defined in the file
earlycon= [KNL] Output early console device and options.
uart[8250],io,<addr>[,options]
uart[8250],mmio,<addr>[,options]
uart[8250],mmio32,<addr>[,options]
Start an early, polled-mode console on the 8250/16550
UART at the specified I/O port or MMIO address.
MMIO inter-register address stride is either 8bit (mmio)
or 32bit (mmio32).
The options are the same as for ttyS, above.

earlyprintk= [X86,SH,BLACKFIN]
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/alpha/include/asm/ioctls.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
# define TIOCPKT_START 8
# define TIOCPKT_NOSTOP 16
# define TIOCPKT_DOSTOP 32
# define TIOCPKT_IOCTL 64


#define TIOCNOTTY 0x5422
Expand All @@ -92,7 +91,6 @@
#define TIOCGSID 0x5429 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */

#define TIOCSERCONFIG 0x5453
#define TIOCSERGWILD 0x5454
Expand All @@ -108,5 +106,7 @@

#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */
#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */

#endif /* _ASM_ALPHA_IOCTLS_H */
1 change: 0 additions & 1 deletion trunk/arch/alpha/include/asm/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ struct ktermios {
#define FLUSHO 0x00800000
#define PENDIN 0x20000000
#define IEXTEN 0x00000400
#define EXTPROC 0x10000000

/* Values for the ACTION argument to `tcflow'. */
#define TCOOFF 0
Expand Down
2 changes: 0 additions & 2 deletions trunk/arch/arm/include/asm/ioctls.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */

#define TIOCGRS485 0x542E
#define TIOCSRS485 0x542F
Expand Down Expand Up @@ -82,7 +81,6 @@
#define TIOCPKT_START 8
#define TIOCPKT_NOSTOP 16
#define TIOCPKT_DOSTOP 32
#define TIOCPKT_IOCTL 64

#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */

Expand Down
1 change: 0 additions & 1 deletion trunk/arch/arm/include/asm/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ struct ktermios {
#define FLUSHO 0010000
#define PENDIN 0040000
#define IEXTEN 0100000
#define EXTPROC 0200000

/* tcflow() and TCXONC use these */
#define TCOOFF 0
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/avr32/include/asm/ioctls.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */

#define TIOCGRS485 0x542E
#define TIOCSRS485 0x542F
Expand All @@ -73,6 +72,8 @@

#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */
#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */
#define FIOQSIZE 0x5460

/* Used for packet mode */
Expand All @@ -83,7 +84,6 @@
#define TIOCPKT_START 8
#define TIOCPKT_NOSTOP 16
#define TIOCPKT_DOSTOP 32
#define TIOCPKT_IOCTL 64

#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */

Expand Down
1 change: 0 additions & 1 deletion trunk/arch/avr32/include/asm/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ struct ktermios {
#define FLUSHO 0010000
#define PENDIN 0040000
#define IEXTEN 0100000
#define EXTPROC 0200000

/* tcflow() and TCXONC use these */
#define TCOOFF 0
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/cris/include/asm/ioctls.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */

#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
Expand All @@ -71,6 +70,8 @@

#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */
#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */
#define FIOQSIZE 0x5460

#define TIOCSERSETRS485 0x5461 /* enable rs-485 (deprecated) */
Expand All @@ -86,7 +87,6 @@
#define TIOCPKT_START 8
#define TIOCPKT_NOSTOP 16
#define TIOCPKT_DOSTOP 32
#define TIOCPKT_IOCTL 64

#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */

Expand Down
1 change: 0 additions & 1 deletion trunk/arch/cris/include/asm/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@ struct ktermios {
#define FLUSHO 0010000
#define PENDIN 0040000
#define IEXTEN 0100000
#define EXTPROC 0200000

/* tcflow() and TCXONC use these */
#define TCOOFF 0
Expand Down
2 changes: 0 additions & 2 deletions trunk/arch/frv/include/asm/ioctls.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */

#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
Expand All @@ -80,7 +79,6 @@
#define TIOCPKT_START 8
#define TIOCPKT_NOSTOP 16
#define TIOCPKT_DOSTOP 32
#define TIOCPKT_IOCTL 64

#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */

Expand Down
1 change: 0 additions & 1 deletion trunk/arch/frv/include/asm/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ struct ktermios {
#define FLUSHO 0010000
#define PENDIN 0040000
#define IEXTEN 0100000
#define EXTPROC 0200000


/* tcflow() and TCXONC use these */
Expand Down
2 changes: 0 additions & 2 deletions trunk/arch/h8300/include/asm/ioctls.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */

#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
Expand All @@ -80,7 +79,6 @@
#define TIOCPKT_START 8
#define TIOCPKT_NOSTOP 16
#define TIOCPKT_DOSTOP 32
#define TIOCPKT_IOCTL 64

#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */

Expand Down
1 change: 0 additions & 1 deletion trunk/arch/h8300/include/asm/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ struct ktermios {
#define FLUSHO 0010000
#define PENDIN 0040000
#define IEXTEN 0100000
#define EXTPROC 0200000


/* tcflow() and TCXONC use these */
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/ia64/include/asm/ioctls.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */

#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
Expand All @@ -76,6 +75,8 @@

#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */
#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */
#define FIOQSIZE 0x5460

/* Used for packet mode */
Expand All @@ -86,7 +87,6 @@
#define TIOCPKT_START 8
#define TIOCPKT_NOSTOP 16
#define TIOCPKT_DOSTOP 32
#define TIOCPKT_IOCTL 64

#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */

Expand Down
1 change: 0 additions & 1 deletion trunk/arch/ia64/include/asm/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ struct ktermios {
#define FLUSHO 0010000
#define PENDIN 0040000
#define IEXTEN 0100000
#define EXTPROC 0200000

/* tcflow() and TCXONC use these */
#define TCOOFF 0
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/m32r/include/asm/ioctls.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */

#define FIONCLEX 0x5450
#define FIOCLEX 0x5451
Expand All @@ -70,6 +69,8 @@

#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */
#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */
#define FIOQSIZE 0x5460

/* Used for packet mode */
Expand All @@ -80,7 +81,6 @@
#define TIOCPKT_START 8
#define TIOCPKT_NOSTOP 16
#define TIOCPKT_DOSTOP 32
#define TIOCPKT_IOCTL 64

#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */

Expand Down
1 change: 0 additions & 1 deletion trunk/arch/m32r/include/asm/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ struct ktermios {
#define FLUSHO 0010000
#define PENDIN 0040000
#define IEXTEN 0100000
#define EXTPROC 0200000

/* tcflow() and TCXONC use these */
#define TCOOFF 0
Expand Down
2 changes: 0 additions & 2 deletions trunk/arch/m68k/include/asm/ioctls.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
#define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */

#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
Expand All @@ -79,7 +78,6 @@
#define TIOCPKT_START 8
#define TIOCPKT_NOSTOP 16
#define TIOCPKT_DOSTOP 32
#define TIOCPKT_IOCTL 64

#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */

Expand Down
1 change: 0 additions & 1 deletion trunk/arch/m68k/include/asm/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ struct ktermios {
#define FLUSHO 0010000
#define PENDIN 0040000
#define IEXTEN 0100000
#define EXTPROC 0200000


/* tcflow() and TCXONC use these */
Expand Down
9 changes: 0 additions & 9 deletions trunk/arch/m68k/mac/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,15 +332,6 @@ static struct mac_model mac_data_table[] = {
.scc_type = MAC_SCC_II,
.nubus_type = MAC_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
}, {
.ident = MAC_MODEL_CCLII,
.name = "Color Classic II",
.adb_type = MAC_ADB_CUDA,
.via_type = MAC_VIA_IIci,
.scsi_type = MAC_SCSI_OLD,
.scc_type = MAC_SCC_II,
.nubus_type = MAC_NUBUS,
.floppy_type = MAC_FLOPPY_SWIM_ADDR2,
},

/*
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/m68k/mac/misc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static void cuda_write_pram(int offset, __u8 data)
#define cuda_write_pram NULL
#endif

#ifdef CONFIG_ADB_PMU68K
#if 0 /* def CONFIG_ADB_PMU68K */
static long pmu_read_time(void)
{
struct adb_request req;
Expand All @@ -102,8 +102,8 @@ static long pmu_read_time(void)
while (!req.complete)
pmu_poll();

time = (req.reply[1] << 24) | (req.reply[2] << 16)
| (req.reply[3] << 8) | req.reply[4];
time = (req.reply[0] << 24) | (req.reply[1] << 16)
| (req.reply[2] << 8) | req.reply[3];
return time - RTC_OFFSET;
}

Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/m68k/sun3/leds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ void sun3_leds(unsigned char byte)
unsigned char dfc;

GET_DFC(dfc);
SET_DFC(FC_CONTROL);
SET_CONTROL_BYTE(AC_LEDS, byte);
SET_DFC(FC_CONTROL);
SET_CONTROL_BYTE(AC_LEDS,byte);
SET_DFC(dfc);
}
5 changes: 3 additions & 2 deletions trunk/arch/mips/include/asm/ioctls.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#define TIOCPKT_START 0x08 /* start output */
#define TIOCPKT_NOSTOP 0x10 /* no more ^S, ^Q */
#define TIOCPKT_DOSTOP 0x20 /* now do ^S ^Q */
#define TIOCPKT_IOCTL 0x40 /* state change of pty driver */
/* #define TIOCPKT_IOCTL 0x40 state change of pty driver */
#define TIOCSWINSZ _IOW('t', 103, struct winsize) /* set window size */
#define TIOCGWINSZ _IOR('t', 104, struct winsize) /* get window size */
#define TIOCNOTTY 0x5471 /* void tty association */
Expand Down Expand Up @@ -83,7 +83,6 @@
#define TCSETSF2 _IOW('T', 0x2D, struct termios2)
#define TIOCGPTN _IOR('T', 0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define TIOCSPTLCK _IOW('T', 0x31, int) /* Lock/unlock Pty */
#define TIOCSIG _IOW('T', 0x36, int) /* Generate signal on Pty slave */

/* I hope the range from 0x5480 on is free ... */
#define TIOCSCTTY 0x5480 /* become controlling tty */
Expand All @@ -104,5 +103,7 @@
#define TIOCSERSETMULTI 0x5490 /* Set multiport config */
#define TIOCMIWAIT 0x5491 /* wait for a change on serial input line(s) */
#define TIOCGICOUNT 0x5492 /* read serial port inline interrupt counts */
#define TIOCGHAYESESP 0x5493 /* Get Hayes ESP configuration */
#define TIOCSHAYESESP 0x5494 /* Set Hayes ESP configuration */

#endif /* __ASM_IOCTLS_H */
1 change: 0 additions & 1 deletion trunk/arch/mips/include/asm/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ struct ktermios {
#define PENDIN 0040000 /* Retype pending input (state). */
#define TOSTOP 0100000 /* Send SIGTTOU for background output. */
#define ITOSTOP TOSTOP
#define EXTPROC 0200000 /* External processing on pty */

/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/mn10300/include/asm/ioctls.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
#define TIOCGPTN _IOR('T', 0x30, unsigned int) /* Get Pty Number
* (of pty-mux device) */
#define TIOCSPTLCK _IOW('T', 0x31, int) /* Lock/unlock Pty */
#define TIOCSIG _IOW('T', 0x36, int) /* Generate signal on Pty slave */

#define FIONCLEX 0x5450
#define FIOCLEX 0x5451
Expand All @@ -71,6 +70,8 @@

#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */
#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */
#define FIOQSIZE 0x5460

/* Used for packet mode */
Expand All @@ -81,7 +82,6 @@
#define TIOCPKT_START 8
#define TIOCPKT_NOSTOP 16
#define TIOCPKT_DOSTOP 32
#define TIOCPKT_IOCTL 64

#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */

Expand Down
1 change: 0 additions & 1 deletion trunk/arch/mn10300/include/asm/termbits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ struct ktermios {
#define FLUSHO 0010000
#define PENDIN 0040000
#define IEXTEN 0100000
#define EXTPROC 0200000

/* tcflow() and TCXONC use these */
#define TCOOFF 0
Expand Down
Loading

0 comments on commit 80097be

Please sign in to comment.