Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (ffece480) · Commits · e / devices / android_kernel_samsung_smdk4412

arch/sparc/mm/init_64.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,7 @@ extern void free_initmem(void);
	#define VMEMMAP_ALIGN(x) (((x)+VMEMMAP_CHUNK-1UL)&VMEMMAP_CHUNK_MASK)		#define VMEMMAP_ALIGN(x) (((x)+VMEMMAP_CHUNK-1UL)&VMEMMAP_CHUNK_MASK)

	#define VMEMMAP_SIZE ((((1UL << MAX_PHYSADDR_BITS) >> PAGE_SHIFT) * \		#define VMEMMAP_SIZE ((((1UL << MAX_PHYSADDR_BITS) >> PAGE_SHIFT) * \
	sizeof(struct page *)) >> VMEMMAP_CHUNK_SHIFT)		sizeof(struct page)) >> VMEMMAP_CHUNK_SHIFT)
	extern unsigned long vmemmap_table[VMEMMAP_SIZE];		extern unsigned long vmemmap_table[VMEMMAP_SIZE];
	#endif		#endif

drivers/serial/suncore.c

+20 −17

Original line number	Original line	Diff line number	Diff line
	@@ -53,20 +53,21 @@ void sunserial_unregister_minors(struct uart_driver *drv, int count)
	EXPORT_SYMBOL(sunserial_unregister_minors);		EXPORT_SYMBOL(sunserial_unregister_minors);

	int sunserial_console_match(struct console con, struct device_node dp,		int sunserial_console_match(struct console con, struct device_node dp,
	struct uart_driver *drv, int line)		struct uart_driver *drv, int line, bool ignore_line)
	{		{
	int off;

	if (!con \|\| of_console_device != dp)		if (!con \|\| of_console_device != dp)
	return 0;		return 0;

	off = 0;		if (!ignore_line) {
			int off = 0;

	if (of_console_options &&		if (of_console_options &&
	*of_console_options == 'b')		*of_console_options == 'b')
	off = 1;		off = 1;

	if ((line & 1) != off)		if ((line & 1) != off)
	return 0;		return 0;
			}

	con->index = line;		con->index = line;
	drv->cons = con;		drv->cons = con;
	@@ -76,23 +77,24 @@ int sunserial_console_match(struct console con, struct device_node dp,
	}		}
	EXPORT_SYMBOL(sunserial_console_match);		EXPORT_SYMBOL(sunserial_console_match);

	void		void sunserial_console_termios(struct console con, struct device_node uart_dp)
	sunserial_console_termios(struct console *con)
	{		{
	struct device_node *dp;		const char mode, s;
	const char od, mode, *s;
	char mode_prop[] = "ttyX-mode";		char mode_prop[] = "ttyX-mode";
	int baud, bits, stop, cflag;		int baud, bits, stop, cflag;
	char parity;		char parity;

	dp = of_find_node_by_path("/options");		if (!strcmp(uart_dp->name, "rsc") \|\|
	od = of_get_property(dp, "output-device", NULL);		!strcmp(uart_dp->name, "rsc-console") \|\|
	if (!strcmp(od, "rsc")) {		!strcmp(uart_dp->name, "rsc-control")) {
	mode = of_get_property(of_console_device,		mode = of_get_property(uart_dp,
	"ssp-console-modes", NULL);		"ssp-console-modes", NULL);
	if (!mode)		if (!mode)
	mode = "115200,8,n,1,-";		mode = "115200,8,n,1,-";
			} else if (!strcmp(uart_dp->name, "lom-console")) {
			mode = "9600,8,n,1,-";
	} else {		} else {
			struct device_node *dp;
	char c;		char c;

	c = 'a';		c = 'a';
	@@ -101,6 +103,7 @@ sunserial_console_termios(struct console *con)

	mode_prop[3] = c;		mode_prop[3] = c;

			dp = of_find_node_by_path("/options");
	mode = of_get_property(dp, mode_prop, NULL);		mode = of_get_property(dp, mode_prop, NULL);
	if (!mode)		if (!mode)
	mode = "9600,8,n,1,-";		mode = "9600,8,n,1,-";

drivers/serial/suncore.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,8 @@ extern int sunserial_register_minors(struct uart_driver *, int);
	extern void sunserial_unregister_minors(struct uart_driver *, int);		extern void sunserial_unregister_minors(struct uart_driver *, int);

	extern int sunserial_console_match(struct console , struct device_node ,		extern int sunserial_console_match(struct console , struct device_node ,
	struct uart_driver *, int);		struct uart_driver *, int, bool);
	extern void sunserial_console_termios(struct console *);		extern void sunserial_console_termios(struct console *,
			struct device_node *);

	#endif /* !(_SERIAL_SUN_H) */		#endif /* !(_SERIAL_SUN_H) */

drivers/serial/sunhv.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -566,7 +566,7 @@ static int __devinit hv_probe(struct of_device op, const struct of_device_id m
	goto out_free_con_read_page;		goto out_free_con_read_page;

	sunserial_console_match(&sunhv_console, op->node,		sunserial_console_match(&sunhv_console, op->node,
	&sunhv_reg, port->line);		&sunhv_reg, port->line, false);

	err = uart_add_one_port(&sunhv_reg, port);		err = uart_add_one_port(&sunhv_reg, port);
	if (err)		if (err)

drivers/serial/sunsab.c

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -883,7 +883,7 @@ static int sunsab_console_setup(struct console con, char options)
	printk("Console: ttyS%d (SAB82532)\n",		printk("Console: ttyS%d (SAB82532)\n",
	(sunsab_reg.minor - 64) + con->index);		(sunsab_reg.minor - 64) + con->index);

	sunserial_console_termios(con);		sunserial_console_termios(con, to_of_device(up->port.dev)->node);

	switch (con->cflag & CBAUD) {		switch (con->cflag & CBAUD) {
	case B150: baud = 150; break;		case B150: baud = 150; break;
	@@ -1027,10 +1027,12 @@ static int __devinit sab_probe(struct of_device op, const struct of_device_id
	goto out1;		goto out1;

	sunserial_console_match(SUNSAB_CONSOLE(), op->node,		sunserial_console_match(SUNSAB_CONSOLE(), op->node,
	&sunsab_reg, up[0].port.line);		&sunsab_reg, up[0].port.line,
			false);

	sunserial_console_match(SUNSAB_CONSOLE(), op->node,		sunserial_console_match(SUNSAB_CONSOLE(), op->node,
	&sunsab_reg, up[1].port.line);		&sunsab_reg, up[1].port.line,
			false);

	err = uart_add_one_port(&sunsab_reg, &up[0].port);		err = uart_add_one_port(&sunsab_reg, &up[0].port);
	if (err)		if (err)
	@@ -1116,7 +1118,6 @@ static int __init sunsab_init(void)
	if (!sunsab_ports)		if (!sunsab_ports)
	return -ENOMEM;		return -ENOMEM;

	sunsab_reg.cons = SUNSAB_CONSOLE();
	err = sunserial_register_minors(&sunsab_reg, num_channels);		err = sunserial_register_minors(&sunsab_reg, num_channels);
	if (err) {		if (err) {
	kfree(sunsab_ports);		kfree(sunsab_ports);