Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa891f6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
  parisc: fix compile breakage caused by inlining maybe_mkwrite
  parisc : Remove broken line wrapping handling pdc_iodc_print()
parents a25cecce 84cd8453

arch/parisc/kernel/firmware.c

+1 −12
Original line number Diff line number Diff line
@@ -1126,15 +1126,13 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) 
	unsigned int i;

	unsigned long flags;



	for (i = 0; i < count && i < 79;) {

	for (i = 0; i < count;) {

		switch(str[i]) {

		case '\n':

			iodc_dbuf[i+0] = '\r';

			iodc_dbuf[i+1] = '\n';

			i += 2;

			goto print;

		case '\b':	/* BS */

			i--; /* overwrite last */

		default:

			iodc_dbuf[i] = str[i];

			i++;
@@ -1142,15 +1140,6 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) 
		}

	}



	/* if we're at the end of line, and not already inserting a newline,

	 * insert one anyway. iodc console doesn't claim to support >79 char

	 * lines. don't account for this in the return value.

	 */

	if (i == 79 && iodc_dbuf[i-1] != '\n') {

		iodc_dbuf[i+0] = '\r';

		iodc_dbuf[i+1] = '\n';

	}



print:

        spin_lock_irqsave(&pdc_lock, flags);

        real32_call(PAGE0->mem_cons.iodc_io,