diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-13 15:29:36 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-13 15:30:21 +1000 |
| commit | 3a29dd6d6f445212ddbcf43a2ba6352127ce9ee8 (patch) | |
| tree | e05aad022c46d0550f2c9dc8d4361a6634591852 /arch/powerpc/platforms/pseries/pseries.h | |
| parent | f7e9e358362557c3aa2c1ec47490f29fe880a09e (diff) | |
| parent | 51925fb3c5c901aa06cdc853268a6e19e19bcdc7 (diff) | |
| download | linux-stable-3a29dd6d6f445212ddbcf43a2ba6352127ce9ee8.tar.gz linux-stable-3a29dd6d6f445212ddbcf43a2ba6352127ce9ee8.tar.bz2 linux-stable-3a29dd6d6f445212ddbcf43a2ba6352127ce9ee8.zip | |
Merge branch 'next-dlpar' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into next
Merge series from Nathan Fontenot to do memory hotplug in the kernel.
Diffstat (limited to 'arch/powerpc/platforms/pseries/pseries.h')
| -rw-r--r-- | arch/powerpc/platforms/pseries/pseries.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h index cd64672e24f8..8411c27293e4 100644 --- a/arch/powerpc/platforms/pseries/pseries.h +++ b/arch/powerpc/platforms/pseries/pseries.h @@ -11,6 +11,7 @@ #define _PSERIES_PSERIES_H #include <linux/interrupt.h> +#include <asm/rtas.h> struct device_node; @@ -60,6 +61,17 @@ extern struct device_node *dlpar_configure_connector(__be32, struct device_node *); extern int dlpar_attach_node(struct device_node *); extern int dlpar_detach_node(struct device_node *); +extern int dlpar_acquire_drc(u32 drc_index); +extern int dlpar_release_drc(u32 drc_index); + +#ifdef CONFIG_MEMORY_HOTPLUG +int dlpar_memory(struct pseries_hp_errorlog *hp_elog); +#else +static inline int dlpar_memory(struct pseries_hp_errorlog *hp_elog) +{ + return -EOPNOTSUPP; +} +#endif /* PCI root bridge prepare function override for pseries */ struct pci_host_bridge; |