Merge tetrachloride.(none):/mnt/stuff/kernel/2.5/bk-linus

into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart

4 files changed, 52 insertions, 40 deletions

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 5d5eaeb07738..4cd86e87769d 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -73,20 +73,6 @@ struct acpi20_table_rsdp {
 	u8			reserved[3];
 } __attribute__ ((packed));
 
-/* Common table header */
-
-struct acpi_table_header {
-	char			signature[4];
-	u32			length;
-	u8			revision;
-	u8			checksum;
-	char			oem_id[6];
-	char			oem_table_id[8];
-	u32			oem_revision;
-	char			asl_compiler_id[4];
-	u32			asl_compiler_revision;
-} __attribute__ ((packed));
-
 typedef struct {
 	u8			type;
 	u8			length;
@@ -325,12 +311,12 @@ struct acpi_table_sbst {
 /* Embedded Controller Boot Resources Table (ECDT) */
 
 struct acpi_table_ecdt {
-	struct acpi_table_header header;
-	acpi_generic_address	ec_control;
-	acpi_generic_address	ec_data;
-	u32			uid;
-	u8			gpe_bit;
-	char			ec_id[0];
+	struct acpi_table_header 	header;
+	struct acpi_generic_address	ec_control;
+	struct acpi_generic_address	ec_data;
+	u32				uid;
+	u8				gpe_bit;
+	char				ec_id[0];
 } __attribute__ ((packed));
 
 /* Table Handlers */
@@ -396,7 +382,7 @@ extern int acpi_mp_config;
 
 struct acpi_prt_entry {
 	struct list_head	node;
-	acpi_pci_id		id;
+	struct acpi_pci_id	id;
 	u8			pin;
 	struct {
 		acpi_handle		handle;
diff --git a/include/linux/device.h b/include/linux/device.h
index 2076d9c6ae4b..d5aa116942b8 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -400,21 +400,21 @@ extern int firmware_register(struct subsystem *);
 extern void firmware_unregister(struct subsystem *);
 
 /* debugging and troubleshooting/diagnostic helpers. */
-#define dev_printk(sev, dev, format, arg...)	\
-	printk(sev "%s %s: " format , (dev).driver->name , (dev).bus_id , ## arg)
+#define dev_printk(level, dev, format, arg...)	\
+	printk(level "%s %s: " format , (dev)->driver->name , (dev)->bus_id , ## arg)
 
 #ifdef DEBUG
 #define dev_dbg(dev, format, arg...)		\
-	dev_printk(KERN_DEBUG , (dev) , format , ## arg)
+	dev_printk(KERN_DEBUG , dev , format , ## arg)
 #else
 #define dev_dbg(dev, format, arg...) do {} while (0)
 #endif
 
 #define dev_err(dev, format, arg...)		\
-	dev_printk(KERN_ERR , (dev) , format , ## arg)
+	dev_printk(KERN_ERR , dev , format , ## arg)
 #define dev_info(dev, format, arg...)		\
-	dev_printk(KERN_INFO , (dev) , format , ## arg)
+	dev_printk(KERN_INFO , dev , format , ## arg)
 #define dev_warn(dev, format, arg...)		\
-	dev_printk(KERN_WARNING , (dev) , format , ## arg)
+	dev_printk(KERN_WARNING , dev , format , ## arg)
 
 #endif /* _DEVICE_H_ */
diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h
index ff599ee1cf3d..c6e4e6e29f10 100644
--- a/include/linux/pfkeyv2.h
+++ b/include/linux/pfkeyv2.h
@@ -242,17 +242,25 @@ struct sadb_x_ipsecrequest {
 #define SADB_SATYPE_MAX		9
 
 /* Authentication algorithms */
-#define SADB_AALG_NONE		0
-#define SADB_AALG_MD5HMAC	2
-#define SADB_AALG_SHA1HMAC	3
-#define SADB_AALG_MAX		3
+#define SADB_AALG_NONE			0
+#define SADB_AALG_MD5HMAC		2
+#define SADB_AALG_SHA1HMAC		3
+#define SADB_X_AALG_SHA2_256HMAC	5
+#define SADB_X_AALG_SHA2_384HMAC	6
+#define SADB_X_AALG_SHA2_512HMAC	7
+#define SADB_X_AALG_RIPEMD160HMAC	8
+#define SADB_X_AALG_NULL		251	/* kame */
+#define SADB_AALG_MAX			251
 
 /* Encryption algorithms */
-#define SADB_EALG_NONE		0
-#define SADB_EALG_DESCBC	1
-#define SADB_EALG_3DESCBC	2
-#define SADB_EALG_NULL		11
-#define SADB_EALG_MAX		11
+#define SADB_EALG_NONE			0
+#define SADB_EALG_DESCBC		1
+#define SADB_EALG_3DESCBC		2
+#define SADB_X_EALG_CASTCBC		6
+#define SADB_X_EALG_BLOWFISHCBC		7
+#define SADB_EALG_NULL			11
+#define SADB_X_EALG_AESCBC		12
+#define SADB_EALG_MAX			12
 
 /* Extension Header values */
 #define SADB_EXT_RESERVED		0
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 84e021607be9..a3422e7a903a 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -86,8 +86,8 @@ struct uart_ops {
 	void		(*break_ctl)(struct uart_port *, int ctl);
 	int		(*startup)(struct uart_port *);
 	void		(*shutdown)(struct uart_port *);
-	void		(*change_speed)(struct uart_port *, unsigned int cflag,
-				        unsigned int iflag, unsigned int quot);
+	void		(*set_termios)(struct uart_port *, struct termios *new,
+				       struct termios *old);
 	void		(*pm)(struct uart_port *, unsigned int state,
 			      unsigned int oldstate);
 	int		(*set_wake)(struct uart_port *, unsigned int state);
@@ -179,7 +179,7 @@ struct uart_port {
 #define UPF_RESOURCES		(1 << 30)
 #define UPF_IOREMAP		(1 << 31)
 
-#define UPF_FLAGS		(0x7fff)
+#define UPF_CHANGE_MASK		(0x7fff)
 #define UPF_USR_MASK		(UPF_SPD_MASK|UPF_LOW_LATENCY)
 
 	unsigned int		mctrl;			/* current modem ctrl settings */
@@ -242,7 +242,6 @@ struct uart_info {
 	unsigned char		*tmpbuf;
 	struct semaphore	tmpbuf_sem;
 
-	unsigned long		event;
 	int			blocked_open;
 
 	struct tasklet_struct	tlet;
@@ -275,12 +274,31 @@ struct uart_driver {
 };
 
 void uart_write_wakeup(struct uart_port *port);
+
+/*
+ * Baud rate helpers.
+ */
+void uart_update_timeout(struct uart_port *port, unsigned int cflag,
+			 unsigned int quot);
+unsigned int uart_get_baud_rate(struct uart_port *port, struct termios *termios,
+				struct termios *old, unsigned int min,
+				unsigned int max);
+unsigned int uart_get_divisor(struct uart_port *port, struct termios *termios,
+			      struct termios *old_termios);
+
+/*
+ * Console helpers.
+ */
 struct uart_port *uart_get_console(struct uart_port *ports, int nr,
 				   struct console *c);
 void uart_parse_options(char *options, int *baud, int *parity, int *bits,
 			int *flow);
 int uart_set_options(struct uart_port *port, struct console *co, int baud,
 		     int parity, int bits, int flow);
+
+/*
+ * Port/driver registration/removal
+ */
 int uart_register_driver(struct uart_driver *uart);
 void uart_unregister_driver(struct uart_driver *uart);
 void uart_unregister_port(struct uart_driver *reg, int line);