Skip to content

Commit

Permalink
arch/sparc/kernel/sys_sparc_64.c: s/COLOUR/COLOR/
Browse files Browse the repository at this point in the history
Consistently spell this word across arch/sparc/mm and arch/sparc/kernel.

Acked-by: David Miller <davem@davemloft.net>
Cc: Michel Lespinasse <walken@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Dec 12, 2012
1 parent 2aea28b commit 748ba88
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/sparc/kernel/sys_sparc_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static inline int invalid_64bit_range(unsigned long addr, unsigned long len)
* the spitfire/niagara VA-hole.
*/

static inline unsigned long COLOUR_ALIGN(unsigned long addr,
static inline unsigned long COLOR_ALIGN(unsigned long addr,
unsigned long pgoff)
{
unsigned long base = (addr+SHMLBA-1)&~(SHMLBA-1);
Expand Down Expand Up @@ -113,7 +113,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi

if (addr) {
if (do_color_align)
addr = COLOUR_ALIGN(addr, pgoff);
addr = COLOR_ALIGN(addr, pgoff);
else
addr = PAGE_ALIGN(addr);

Expand Down Expand Up @@ -176,7 +176,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
/* requesting a specific address */
if (addr) {
if (do_color_align)
addr = COLOUR_ALIGN(addr, pgoff);
addr = COLOR_ALIGN(addr, pgoff);
else
addr = PAGE_ALIGN(addr);

Expand Down

0 comments on commit 748ba88

Please sign in to comment.