lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* '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()
This commit is contained in:
Linus Torvalds
2011-01-18 10:00:50 -08:00
parent a25cecce88 84cd8453f3
commit aa891f6b3f
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/parisc/kernel/firmware.c
View File

@@ -1126,15 +1126,13 @@ int pdc_iodc_print(const unsigned char *str, unsigned count)
unsigned int i; unsigned int i;
unsigned long flags; unsigned long flags;
for (i = 0; i < count && i < 79;) { for (i = 0; i < count;) {
switch(str[i]) { switch(str[i]) {
case '\n': case '\n':
iodc_dbuf[i+0] = '\r'; iodc_dbuf[i+0] = '\r';
iodc_dbuf[i+1] = '\n'; iodc_dbuf[i+1] = '\n';
i += 2; i += 2;
goto print; goto print;
case '\b': /* BS */
i--; /* overwrite last */
default: default:
iodc_dbuf[i] = str[i]; iodc_dbuf[i] = str[i];
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: print:
spin_lock_irqsave(&pdc_lock, flags); spin_lock_irqsave(&pdc_lock, flags);
real32_call(PAGE0->mem_cons.iodc_io, real32_call(PAGE0->mem_cons.iodc_io,