diff options
| -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 df971fa0c32f..4896ed090585 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) | |||
| 1126 | unsigned int i; | 1126 | unsigned int i; |
| 1127 | unsigned long flags; | 1127 | unsigned long flags; |
| 1128 | 1128 | ||
| 1129 | for (i = 0; i < count && i < 79;) { | 1129 | for (i = 0; i < count;) { |
| 1130 | switch(str[i]) { | 1130 | switch(str[i]) { |
| 1131 | case '\n': | 1131 | case '\n': |
| 1132 | iodc_dbuf[i+0] = '\r'; | 1132 | iodc_dbuf[i+0] = '\r'; |
| 1133 | iodc_dbuf[i+1] = '\n'; | 1133 | iodc_dbuf[i+1] = '\n'; |
| 1134 | i += 2; | 1134 | i += 2; |
| 1135 | goto print; | 1135 | goto print; |
| 1136 | case '\b': /* BS */ | ||
| 1137 | i--; /* overwrite last */ | ||
| 1138 | default: | 1136 | default: |
| 1139 | iodc_dbuf[i] = str[i]; | 1137 | iodc_dbuf[i] = str[i]; |
| 1140 | i++; | 1138 | i++; |
| @@ -1142,15 +1140,6 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) | |||
| 1142 | } | 1140 | } |
| 1143 | } | 1141 | } |
| 1144 | 1142 | ||
| 1145 | /* if we're at the end of line, and not already inserting a newline, | ||
| 1146 | * insert one anyway. iodc console doesn't claim to support >79 char | ||
| 1147 | * lines. don't account for this in the return value. | ||
| 1148 | */ | ||
| 1149 | if (i == 79 && iodc_dbuf[i-1] != '\n') { | ||
| 1150 | iodc_dbuf[i+0] = '\r'; | ||
| 1151 | iodc_dbuf[i+1] = '\n'; | ||
| 1152 | } | ||
| 1153 | |||
| 1154 | print: | 1143 | print: |
| 1155 | spin_lock_irqsave(&pdc_lock, flags); | 1144 | spin_lock_irqsave(&pdc_lock, flags); |
| 1156 | real32_call(PAGE0->mem_cons.iodc_io, | 1145 | real32_call(PAGE0->mem_cons.iodc_io, |
