diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 05:16:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 05:16:24 -0700 |
| commit | 4706df3d3c42af802597d82c8b1542c3d52eab23 (patch) | |
| tree | 4c11ca2a72158cacce93ef6d2976af3a11ed314f /arch/ppc64/xmon/start.c | |
| parent | 5bcaa155797ab62ed363932ec0f02fbcb5db1ef1 (diff) | |
| parent | cebb2b156319990fc2fba615bbfeac81be62a86a (diff) | |
| download | op-kernel-dev-4706df3d3c42af802597d82c8b1542c3d52eab23.zip op-kernel-dev-4706df3d3c42af802597d82c8b1542c3d52eab23.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/xmon/start.c')
| -rw-r--r-- | arch/ppc64/xmon/start.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ppc64/xmon/start.c b/arch/ppc64/xmon/start.c index f86b584..e50c158 100644 --- a/arch/ppc64/xmon/start.c +++ b/arch/ppc64/xmon/start.c @@ -61,7 +61,9 @@ xmon_read(void *handle, void *ptr, int nb) int xmon_read_poll(void) { - return udbg_getc_poll(); + if (udbg_getc_poll) + return udbg_getc_poll(); + return -1; } FILE *xmon_stdin; |
