diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2013-01-22 06:59:30 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-02-01 04:00:22 -0500 |
commit | 7034228792cc561e79ff8600f02884bd4c80e287 (patch) | |
tree | 89b77af37d087d9de236fc5d21f60bf552d0a2c6 /arch/mips/cavium-octeon/executive/cvmx-bootmem.c | |
parent | 405ab01c70e18058d9c01a1256769a61fc65413e (diff) |
MIPS: Whitespace cleanup.
Having received another series of whitespace patches I decided to do this
once and for all rather than dealing with this kind of patches trickling
in forever.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/cavium-octeon/executive/cvmx-bootmem.c')
-rw-r--r-- | arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c index 6d5ddbc112cc..504ed61a47cd 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c +++ b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c | |||
@@ -155,8 +155,8 @@ int cvmx_bootmem_init(void *mem_desc_ptr) | |||
155 | * | 155 | * |
156 | * Linux 64 bit: Set XKPHYS bit | 156 | * Linux 64 bit: Set XKPHYS bit |
157 | * Linux 32 bit: use mmap to create mapping, use virtual address | 157 | * Linux 32 bit: use mmap to create mapping, use virtual address |
158 | * CVMX 64 bit: use physical address directly | 158 | * CVMX 64 bit: use physical address directly |
159 | * CVMX 32 bit: use physical address directly | 159 | * CVMX 32 bit: use physical address directly |
160 | * | 160 | * |
161 | * Note that the CVMX environment assumes the use of 1-1 TLB | 161 | * Note that the CVMX environment assumes the use of 1-1 TLB |
162 | * mappings so that the physical addresses can be used | 162 | * mappings so that the physical addresses can be used |
@@ -398,7 +398,7 @@ error_out: | |||
398 | int __cvmx_bootmem_phy_free(uint64_t phy_addr, uint64_t size, uint32_t flags) | 398 | int __cvmx_bootmem_phy_free(uint64_t phy_addr, uint64_t size, uint32_t flags) |
399 | { | 399 | { |
400 | uint64_t cur_addr; | 400 | uint64_t cur_addr; |
401 | uint64_t prev_addr = 0; /* zero is invalid */ | 401 | uint64_t prev_addr = 0; /* zero is invalid */ |
402 | int retval = 0; | 402 | int retval = 0; |
403 | 403 | ||
404 | #ifdef DEBUG | 404 | #ifdef DEBUG |
@@ -424,7 +424,7 @@ int __cvmx_bootmem_phy_free(uint64_t phy_addr, uint64_t size, uint32_t flags) | |||
424 | if (cur_addr == 0 || phy_addr < cur_addr) { | 424 | if (cur_addr == 0 || phy_addr < cur_addr) { |
425 | /* add at front of list - special case with changing head ptr */ | 425 | /* add at front of list - special case with changing head ptr */ |
426 | if (cur_addr && phy_addr + size > cur_addr) | 426 | if (cur_addr && phy_addr + size > cur_addr) |
427 | goto bootmem_free_done; /* error, overlapping section */ | 427 | goto bootmem_free_done; /* error, overlapping section */ |
428 | else if (phy_addr + size == cur_addr) { | 428 | else if (phy_addr + size == cur_addr) { |
429 | /* Add to front of existing first block */ | 429 | /* Add to front of existing first block */ |
430 | cvmx_bootmem_phy_set_next(phy_addr, | 430 | cvmx_bootmem_phy_set_next(phy_addr, |
@@ -611,7 +611,7 @@ int cvmx_bootmem_phy_named_block_free(char *name, uint32_t flags) | |||
611 | } | 611 | } |
612 | 612 | ||
613 | cvmx_bootmem_unlock(); | 613 | cvmx_bootmem_unlock(); |
614 | return named_block_ptr != NULL; /* 0 on failure, 1 on success */ | 614 | return named_block_ptr != NULL; /* 0 on failure, 1 on success */ |
615 | } | 615 | } |
616 | 616 | ||
617 | int64_t cvmx_bootmem_phy_named_block_alloc(uint64_t size, uint64_t min_addr, | 617 | int64_t cvmx_bootmem_phy_named_block_alloc(uint64_t size, uint64_t min_addr, |