diff options
| author | Achin Gupta <achin.gupta@arm.com> | 2015-08-17 14:56:31 +0100 |
|---|---|---|
| committer | Achin Gupta <achin.gupta@arm.com> | 2015-08-17 14:56:31 +0100 |
| commit | 432b9905d5e8bcf47a077bcda97f98538cee1034 (patch) | |
| tree | 92c5b288144be3e9139c8f0aadff31e2d66641cd /lib | |
| parent | 9caf7e36711bc1387dd4d9fe381e6dffca498ebb (diff) | |
| parent | 9d070b9928b874700395ca48780ce2c88b70e588 (diff) | |
Merge pull request #361 from achingupta/for_sm/psci_proto_v5
For sm/psci proto v5
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/locks/bakery/bakery_lock_coherent.c | 4 | ||||
| -rw-r--r-- | lib/locks/bakery/bakery_lock_normal.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/locks/bakery/bakery_lock_coherent.c b/lib/locks/bakery/bakery_lock_coherent.c index fd871053..1c60dba7 100644 --- a/lib/locks/bakery/bakery_lock_coherent.c +++ b/lib/locks/bakery/bakery_lock_coherent.c @@ -128,7 +128,7 @@ void bakery_lock_get(bakery_lock_t *bakery) unsigned int my_ticket, my_prio, their_ticket; unsigned int their_bakery_data; - me = platform_get_core_pos(read_mpidr_el1()); + me = plat_my_core_pos(); assert_bakery_entry_valid(me, bakery); @@ -174,7 +174,7 @@ void bakery_lock_get(bakery_lock_t *bakery) /* Release the lock and signal contenders */ void bakery_lock_release(bakery_lock_t *bakery) { - unsigned int me = platform_get_core_pos(read_mpidr_el1()); + unsigned int me = plat_my_core_pos(); assert_bakery_entry_valid(me, bakery); assert(bakery_ticket_number(bakery->lock_data[me])); diff --git a/lib/locks/bakery/bakery_lock_normal.c b/lib/locks/bakery/bakery_lock_normal.c index 5439271e..3ca76e0d 100644 --- a/lib/locks/bakery/bakery_lock_normal.c +++ b/lib/locks/bakery/bakery_lock_normal.c @@ -148,7 +148,7 @@ void bakery_lock_get(unsigned int id, unsigned int offset) bakery_info_t *their_bakery_info; unsigned int their_bakery_data; - me = platform_get_core_pos(read_mpidr_el1()); + me = plat_my_core_pos(); is_cached = read_sctlr_el3() & SCTLR_C_BIT; |