diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-03-28 23:15:54 +1100 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2006-03-28 23:15:54 +1100 |
| commit | e8222502ee6157e2713da9e0792c21f4ad458d50 (patch) | |
| tree | 0f970fb99912c257a7e5254f863a53f79d22ab14 /arch/powerpc/kernel/proc_ppc64.c | |
| parent | ppc: Fix compile error in arch/ppc/lib/strcase.c (diff) | |
| download | linux-dev-e8222502ee6157e2713da9e0792c21f4ad458d50.tar.xz linux-dev-e8222502ee6157e2713da9e0792c21f4ad458d50.zip | |
[PATCH] powerpc: Kill _machine and hard-coded platform numbers
This removes statically assigned platform numbers and reworks the
powerpc platform probe code to use a better mechanism. With this,
board support files can simply declare a new machine type with a
macro, and implement a probe() function that uses the flattened
device-tree to detect if they apply for a given machine.
We now have a machine_is() macro that replaces the comparisons of
_machine with the various PLATFORM_* constants. This commit also
changes various drivers to use the new macro instead of looking at
_machine.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/proc_ppc64.c')
| -rw-r--r-- | arch/powerpc/kernel/proc_ppc64.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/proc_ppc64.c b/arch/powerpc/kernel/proc_ppc64.c index 7ba42a405f41..3c2cf661f6d9 100644 --- a/arch/powerpc/kernel/proc_ppc64.c +++ b/arch/powerpc/kernel/proc_ppc64.c @@ -23,6 +23,7 @@ #include <linux/slab.h> #include <linux/kernel.h> +#include <asm/machdep.h> #include <asm/vdso_datapage.h> #include <asm/rtas.h> #include <asm/uaccess.h> @@ -51,7 +52,7 @@ static int __init proc_ppc64_create(void) if (!root) return 1; - if (!(platform_is_pseries() || _machine == PLATFORM_CELL)) + if (!machine_is(pseries) && !machine_is(cell)) return 0; if (!proc_mkdir("rtas", root)) |