diff options
Diffstat (limited to 'arch/powerpc/platforms/pseries')
-rw-r--r-- | arch/powerpc/platforms/pseries/firmware.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/hvconsole.c | 5 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/ras.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c index 989f4bc136cb..c01d8f0cbe6d 100644 --- a/arch/powerpc/platforms/pseries/firmware.c +++ b/arch/powerpc/platforms/pseries/firmware.c | |||
@@ -91,7 +91,7 @@ void __init fw_feature_init(void) | |||
91 | continue; | 91 | continue; |
92 | 92 | ||
93 | /* we have a match */ | 93 | /* we have a match */ |
94 | ppc64_firmware_features |= | 94 | powerpc_firmware_features |= |
95 | firmware_features_table[i].val; | 95 | firmware_features_table[i].val; |
96 | break; | 96 | break; |
97 | } | 97 | } |
diff --git a/arch/powerpc/platforms/pseries/hvconsole.c b/arch/powerpc/platforms/pseries/hvconsole.c index 138e128a3886..ba6befd96636 100644 --- a/arch/powerpc/platforms/pseries/hvconsole.c +++ b/arch/powerpc/platforms/pseries/hvconsole.c | |||
@@ -62,6 +62,11 @@ int hvc_put_chars(uint32_t vtermno, const char *buf, int count) | |||
62 | unsigned long *lbuf = (unsigned long *) buf; | 62 | unsigned long *lbuf = (unsigned long *) buf; |
63 | long ret; | 63 | long ret; |
64 | 64 | ||
65 | |||
66 | /* hcall will ret H_PARAMETER if 'count' exceeds firmware max.*/ | ||
67 | if (count > MAX_VIO_PUT_CHARS) | ||
68 | count = MAX_VIO_PUT_CHARS; | ||
69 | |||
65 | ret = plpar_hcall_norets(H_PUT_TERM_CHAR, vtermno, count, lbuf[0], | 70 | ret = plpar_hcall_norets(H_PUT_TERM_CHAR, vtermno, count, lbuf[0], |
66 | lbuf[1]); | 71 | lbuf[1]); |
67 | if (ret == H_Success) | 72 | if (ret == H_Success) |
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c index b046bcf7443d..9639c66b453d 100644 --- a/arch/powerpc/platforms/pseries/ras.c +++ b/arch/powerpc/platforms/pseries/ras.c | |||
@@ -132,7 +132,7 @@ static int __init init_ras_IRQ(void) | |||
132 | of_node_put(np); | 132 | of_node_put(np); |
133 | } | 133 | } |
134 | 134 | ||
135 | return 1; | 135 | return 0; |
136 | } | 136 | } |
137 | __initcall(init_ras_IRQ); | 137 | __initcall(init_ras_IRQ); |
138 | 138 | ||
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 213bf983242f..f736234db9b2 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -385,7 +385,7 @@ static int __init pSeries_probe(int platform) | |||
385 | */ | 385 | */ |
386 | 386 | ||
387 | if (platform == PLATFORM_PSERIES_LPAR) | 387 | if (platform == PLATFORM_PSERIES_LPAR) |
388 | ppc64_firmware_features |= FW_FEATURE_LPAR; | 388 | powerpc_firmware_features |= FW_FEATURE_LPAR; |
389 | 389 | ||
390 | return 1; | 390 | return 1; |
391 | } | 391 | } |