Skip to content

Commit 943f887

Browse files
author
Daniel Rossier
committed
Fix clang issues
1 parent ba79932 commit 943f887

5 files changed

Lines changed: 10 additions & 11 deletions

File tree

so3/arch/arm64/rpi4_64/include/mach/ipamap.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@ ipamap_t agency_ipamap[] = {
4646
ipamap_t capsule_ipamap[] = {
4747

4848
{
49-
/* Only mapping the CPU interface to the vGIC CPU interface (GICV).
50-
* Access to the distributor must lead to a trap and be handled by the hypervisor.
51-
* BCM2711 GIC-400: GICV (virtual CPU interface) at 0xFF846000.
52-
*/
49+
/* Only mapping the CPU interface to the vGIC CPU interface (GICV).
50+
* Access to the distributor must lead to a trap and be handled by the hypervisor.
51+
* BCM2711 GIC-400: GICV (virtual CPU interface) at 0xFF846000.
52+
*/
53+
5354
.ipa_addr = 0xff842000,
5455
.phys_addr = 0xff846000,
5556
.size = 0x2000,

so3/avz/kernel/hypercalls.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,6 @@ void do_avz_hypercall(void *__args)
209209
break;
210210
}
211211

212-
dsb(ish); /* inner shareable */
212+
dsb(ish); /* inner shareable */
213213
isb();
214214
}

so3/avz/kernel/smp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ void secondary_start_kernel(void)
108108
#ifdef CONFIG_SOO
109109
if (cpu != ME_CPU)
110110
#endif /* CONFIG_SOO */
111-
__mmu_switch_kernel((void *) domains[DOMID_AGENCY]->pagetable_paddr, true);
112-
111+
__mmu_switch_kernel((void *) domains[DOMID_AGENCY]->pagetable_paddr, true);
112+
113113
booted[cpu] = 1;
114114

115115
#ifdef CONFIG_CPU_SPIN_TABLE

so3/soo/kernel/hypervisor.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ void avz_get_shared(void)
5555
* generate a deferred SError (ESR: bf000002).
5656
* Override the PTE with Normal cacheable attributes.
5757
*/
58-
create_mapping(NULL, (addr_t) avz_shared,
59-
args.u.avz_domctl_args.domctl.avz_shared_paddr, PAGE_SIZE, false);
58+
create_mapping(NULL, (addr_t) avz_shared, args.u.avz_domctl_args.domctl.avz_shared_paddr, PAGE_SIZE, false);
6059
}
6160

6261
void avz_printch(char c)

so3/soo/kernel/setup.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ void post_init_setup(void)
105105
* (inner-shareable) for the ring buffer protocol.
106106
* Override the Stage-1 PTE with Normal cacheable attributes.
107107
*/
108-
create_mapping(NULL, (addr_t) __intf,
109-
pfn_to_phys(avz_shared->dom_desc.u.ME.vbstore_pfn), PAGE_SIZE, false);
108+
create_mapping(NULL, (addr_t) __intf, pfn_to_phys(avz_shared->dom_desc.u.ME.vbstore_pfn), PAGE_SIZE, false);
110109

111110
LOG_INFO("SOO Mobile Entity booting ...\n");
112111

0 commit comments

Comments
 (0)