diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-18 10:00:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-18 10:00:50 -0800 |
| commit | aa891f6b3f440402c6879ad1ecf332d318137422 (patch) | |
| tree | 35b1997a00ecf137e22713de8a25ad011d07b6d9 | |
| parent | a25cecce88194b2edf38b8c3b1665e9318eb2d22 (diff) | |
| parent | 84cd8453f30787504305a1a1f8dd5af7a92aa485 (diff) | |
| download | linux-3.10-aa891f6b3f440402c6879ad1ecf332d318137422.tar.gz linux-3.10-aa891f6b3f440402c6879ad1ecf332d318137422.tar.bz2 linux-3.10-aa891f6b3f440402c6879ad1ecf332d318137422.zip | |
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()
| -rw-r--r-- | arch/parisc/kernel/firmware.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c index df971fa0c32..4896ed09058 100644 --- a/arch/parisc/kernel/firmware.c +++ b/arch/parisc/kernel/firmware.c @@ -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, |