diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-30 00:49:17 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-30 00:49:17 -0400 |
| commit | 76ef6a25ce2a1fbb9a51c553c93d2ad74f0f9185 (patch) | |
| tree | 6e71c8bcc2a2d48657be28cb07963f969bc2d626 /arch/powerpc/include | |
| parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) | |
| parent | 3252c8a3d0bf3c6af6ce7c76c40444943cda2943 (diff) | |
Merge remote-tracking branch 'geoff/for-powerpc' into next
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/lv1call.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/lv1call.h b/arch/powerpc/include/asm/lv1call.h index 233f9ecae761..f5117674bf92 100644 --- a/arch/powerpc/include/asm/lv1call.h +++ b/arch/powerpc/include/asm/lv1call.h | |||
| @@ -265,8 +265,8 @@ LV1_CALL(get_spe_irq_outlet, 2, 1, 78 ) | |||
| 265 | LV1_CALL(set_spe_privilege_state_area_1_register, 3, 0, 79 ) | 265 | LV1_CALL(set_spe_privilege_state_area_1_register, 3, 0, 79 ) |
| 266 | LV1_CALL(create_repository_node, 6, 0, 90 ) | 266 | LV1_CALL(create_repository_node, 6, 0, 90 ) |
| 267 | LV1_CALL(read_repository_node, 5, 2, 91 ) | 267 | LV1_CALL(read_repository_node, 5, 2, 91 ) |
| 268 | LV1_CALL(modify_repository_node_value, 6, 0, 92 ) | 268 | LV1_CALL(write_repository_node, 6, 0, 92 ) |
| 269 | LV1_CALL(remove_repository_node, 4, 0, 93 ) | 269 | LV1_CALL(delete_repository_node, 4, 0, 93 ) |
| 270 | LV1_CALL(read_htab_entries, 2, 5, 95 ) | 270 | LV1_CALL(read_htab_entries, 2, 5, 95 ) |
| 271 | LV1_CALL(set_dabr, 2, 0, 96 ) | 271 | LV1_CALL(set_dabr, 2, 0, 96 ) |
| 272 | LV1_CALL(get_total_execution_time, 2, 1, 103 ) | 272 | LV1_CALL(get_total_execution_time, 2, 1, 103 ) |