diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2005-11-06 21:12:03 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-06 21:31:13 -0500 |
commit | 76032de898f34db55b5048349db56557828a1390 (patch) | |
tree | dd92b9155c1b49b20c05b64a86742aeb73a537f8 /include/asm-powerpc/machdep.h | |
parent | 2249ca9d60d3a8a1f6f223f0f0a0283fcb7ce33e (diff) |
[PATCH] powerpc: Make ppc_md.set_dabr non 64-bit specific
Define ppc_md.set_dabr for both 32 + 64 bit. Cleanup the implementation for
pSeries also, it was needlessly complex. Now we just do two firmware tests at
setup time, and use one of two functions, rather than using one function and
testing on every call.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/machdep.h')
-rw-r--r-- | include/asm-powerpc/machdep.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h index 629ca964b974..b623bc4a1553 100644 --- a/include/asm-powerpc/machdep.h +++ b/include/asm-powerpc/machdep.h | |||
@@ -80,7 +80,6 @@ struct machdep_calls { | |||
80 | void (*iommu_dev_setup)(struct pci_dev *dev); | 80 | void (*iommu_dev_setup)(struct pci_dev *dev); |
81 | void (*iommu_bus_setup)(struct pci_bus *bus); | 81 | void (*iommu_bus_setup)(struct pci_bus *bus); |
82 | void (*irq_bus_setup)(struct pci_bus *bus); | 82 | void (*irq_bus_setup)(struct pci_bus *bus); |
83 | int (*set_dabr)(unsigned long dabr); | ||
84 | #endif | 83 | #endif |
85 | 84 | ||
86 | int (*probe)(int platform); | 85 | int (*probe)(int platform); |
@@ -156,6 +155,9 @@ struct machdep_calls { | |||
156 | platform, called once per cpu. */ | 155 | platform, called once per cpu. */ |
157 | void (*enable_pmcs)(void); | 156 | void (*enable_pmcs)(void); |
158 | 157 | ||
158 | /* Set DABR for this platform, leave empty for default implemenation */ | ||
159 | int (*set_dabr)(unsigned long dabr); | ||
160 | |||
159 | #ifdef CONFIG_PPC32 /* XXX for now */ | 161 | #ifdef CONFIG_PPC32 /* XXX for now */ |
160 | /* A general init function, called by ppc_init in init/main.c. | 162 | /* A general init function, called by ppc_init in init/main.c. |
161 | May be NULL. */ | 163 | May be NULL. */ |