Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[karo-tx-linux.git] / arch / powerpc / kernel / rtas-proc.c

diff --git a/arch/powerpc/kernel/rtas-proc.c b/arch/powerpc/kernel/rtas-proc.c
index 1f03fb28cc0af580f8345fcdb80328df16389f77..9c9ad1fa9cce90748c7362d5dea5d744cdd84f08 100644 (file)
--- a/arch/powerpc/kernel/rtas-proc.c
+++ b/arch/powerpc/kernel/rtas-proc.c
@@ -257,12 +257,12 @@ static int __init proc_rtas_init(void)
 {
        struct proc_dir_entry *entry;
 
-       if (_machine != PLATFORM_PSERIES && _machine != PLATFORM_PSERIES_LPAR)
-               return 1;
+       if (!machine_is(pseries))
+               return -ENODEV;
 
        rtas_node = of_find_node_by_name(NULL, "rtas");
        if (rtas_node == NULL)
-               return 1;
+               return -ENODEV;
 
        entry = create_proc_entry("ppc64/rtas/progress", S_IRUGO|S_IWUSR, NULL);
        if (entry)