diff options
| author | Kyle McMartin <kyle@shortfin.cabal.ca> | 2008-04-15 11:46:03 -0500 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2008-04-18 18:53:29 -0700 |
| commit | 24319896af06b84f965bcefa0f2d926b726ed05b (patch) | |
| tree | 4da5bab4b82b887f393e12764071ab98fa68e1d3 /include | |
| parent | fe23b328b6fd02f23a30690baf45a4092162d760 (diff) | |
PARISC pdc_console: fix bizarre panic on boot
upstream commit ef1afd4d79f0479960ff36bb5fe6ec6eba1ebff2
commit 721fdf34167580ff98263c74cead8871d76936e6
Author: Kyle McMartin <kyle@shortfin.cabal.ca>
Date: Thu Dec 6 09:32:15 2007 -0800
[PARISC] print more than one character at a time for pdc console
introduced a subtle bug by accidentally removing the "static" from
iodc_dbuf. This resulted in, what appeared to be, a trap without
*current set to a task. Probably the result of a trap in real mode
while calling firmware.
Also do other misc clean ups. Since the only input from firmware is non
blocking, share iodc_dbuf between input and output, and spinlock the
only callers.
[jejb: fixed up rejections against the stable tree]
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-parisc/pdc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-parisc/pdc.h b/include/asm-parisc/pdc.h index deda8c311373..9eaa794c3e4a 100644 --- a/include/asm-parisc/pdc.h +++ b/include/asm-parisc/pdc.h @@ -645,8 +645,7 @@ int pdc_soft_power_button(int sw_control); void pdc_io_reset(void); void pdc_io_reset_devices(void); int pdc_iodc_getc(void); -int pdc_iodc_print(unsigned char *str, unsigned count); -void pdc_printf(const char *fmt, ...); +int pdc_iodc_print(const unsigned char *str, unsigned count); void pdc_emergency_unlock(void); int pdc_sti_call(unsigned long func, unsigned long flags, |