diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2012-12-11 16:02:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 17:22:26 -0800 |
| commit | 748ba883ba2818890a73461ef7dde1eed17ad89f (patch) | |
| tree | 941afcafc9e7e1d00ccb5486988d326e3d042262 /arch/sparc/kernel | |
| parent | 2aea28b975ad1fbc7448e964d147fe96e3544998 (diff) | |
| download | kernel_goldelico_gta04-748ba883ba2818890a73461ef7dde1eed17ad89f.zip kernel_goldelico_gta04-748ba883ba2818890a73461ef7dde1eed17ad89f.tar.gz kernel_goldelico_gta04-748ba883ba2818890a73461ef7dde1eed17ad89f.tar.bz2 | |
arch/sparc/kernel/sys_sparc_64.c: s/COLOUR/COLOR/
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>
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/sys_sparc_64.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c index 59b66b7..97309c0 100644 --- a/arch/sparc/kernel/sys_sparc_64.c +++ b/arch/sparc/kernel/sys_sparc_64.c @@ -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); @@ -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); @@ -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); |