Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7932f0b8 authored by John Rose's avatar John Rose Committed by Paul Mackerras
Browse files

[POWERPC] RTAS delay, fix module build breaks 



Export both news RTAS delay functions, and change the scanlog module to
use the new delay functions.

Signed-off-by: default avatarJohn Rose <johnrose@austin.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 2ba73b1d

arch/powerpc/kernel/rtas.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -797,6 +797,7 @@ EXPORT_SYMBOL(rtas_call); 
EXPORT_SYMBOL(rtas_data_buf);

EXPORT_SYMBOL(rtas_data_buf);

EXPORT_SYMBOL(rtas_data_buf_lock);

EXPORT_SYMBOL(rtas_data_buf_lock);

EXPORT_SYMBOL(rtas_busy_delay_time);

EXPORT_SYMBOL(rtas_busy_delay_time);

EXPORT_SYMBOL(rtas_busy_delay);

EXPORT_SYMBOL(rtas_get_sensor);

EXPORT_SYMBOL(rtas_get_sensor);

EXPORT_SYMBOL(rtas_get_power_level);

EXPORT_SYMBOL(rtas_get_power_level);

EXPORT_SYMBOL(rtas_set_power_level);

EXPORT_SYMBOL(rtas_set_power_level);

arch/powerpc/platforms/pseries/scanlog.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -107,9 +107,9 @@ static ssize_t scanlog_read(struct file *file, char __user *buf, 
			/* Break to sleep default time */

			/* Break to sleep default time */

			break;

			break;

		    default:

		    default:

			if (status > 9900 && status <= 9905) {

			/* Assume extended busy */

				wait_time = rtas_extended_busy_delay_time(status);

			wait_time = rtas_busy_delay_time(status);

			} else {

			if (!wait_time) {

				printk(KERN_ERR "scanlog: unknown error from rtas: %d\n", status);

				printk(KERN_ERR "scanlog: unknown error from rtas: %d\n", status);

				return -EIO;

				return -EIO;

			}

			}