From aaa64389ce7a5fca672c961e9892ad426d639715 Mon Sep 17 00:00:00 2001
From: Nathan Lynch <ntl@pobox.com>
Date: Wed, 6 Dec 2006 18:50:45 -0600
Subject: [PATCH] --- yaml --- r: 44223 b: refs/heads/master c:
 f2d6d2d8bb4e9bb4aef225c149e42cac3ac3d4d0 h: refs/heads/master i:   44221:
 882dfe75941ec292f1a1e9e0e01f3dafa8be8a73   44219:
 27ec73ecd49f9aaf922a3c40ff65e5d710181073   44215:
 42384330108c1f7504ddedc0f337cd7820d55afe   44207:
 efa42e5c3113756028ed368dc3eba9a9b2c4286b   44191:
 5ade71f5e49d280c300a21d7ebeb42ec454e34c7   44159:
 ee8aaf56d589e71cfa2fb82959be087f83c7095b v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/kernel/rtas.c | 6 ++++++
 trunk/include/asm-powerpc/rtas.h | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4c1f0a88005d..febeb373f827 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d9d868ecf93b35c3c5b0ea3d639dc85e423eb02
+refs/heads/master: f2d6d2d8bb4e9bb4aef225c149e42cac3ac3d4d0
diff --git a/trunk/arch/powerpc/kernel/rtas.c b/trunk/arch/powerpc/kernel/rtas.c
index 952f4c2fc1eb..76b5d7ebdcc6 100644
--- a/trunk/arch/powerpc/kernel/rtas.c
+++ b/trunk/arch/powerpc/kernel/rtas.c
@@ -303,6 +303,12 @@ int rtas_token(const char *service)
 }
 EXPORT_SYMBOL(rtas_token);
 
+int rtas_service_present(const char *service)
+{
+	return rtas_token(service) != RTAS_UNKNOWN_SERVICE;
+}
+EXPORT_SYMBOL(rtas_service_present);
+
 #ifdef CONFIG_RTAS_ERROR_LOGGING
 /*
  * Return the firmware-specified size of the error log buffer
diff --git a/trunk/include/asm-powerpc/rtas.h b/trunk/include/asm-powerpc/rtas.h
index 031ef57fb195..8eaa7b28d9d0 100644
--- a/trunk/include/asm-powerpc/rtas.h
+++ b/trunk/include/asm-powerpc/rtas.h
@@ -159,6 +159,7 @@ extern struct rtas_t rtas;
 
 extern void enter_rtas(unsigned long);
 extern int rtas_token(const char *service);
+extern int rtas_service_present(const char *service);
 extern int rtas_call(int token, int, int, int *, ...);
 extern void rtas_restart(char *cmd);
 extern void rtas_power_off(void);